enwikipedia-acc / waca

includes/Pages/Statistics/StatsFastCloses.php

Indentation +11 added lines, -11 removed lines

@@ -13,11 +13,11 @@ 
 
 class StatsFastCloses extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Fast Closes :: Statistics');
+	public function main()
+	{
+		$this->setHtmlTitle('Fast Closes :: Statistics');
 
-        $query = <<<SQL
+		$query = <<<SQL
 SELECT
   log_closed.objectid AS request,
   user.username AS user,
@@ -42,11 +42,11 @@ 
 ORDER BY TIMEDIFF(log_closed.timestamp, log_reserved.timestamp) ASC
 ;
 SQL;
-        $database = $this->getDatabase();
-        $statement = $database->query($query);
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
-        $this->assign('dataTable', $data);
-        $this->assign('statsPageTitle', 'Requests closed less than 30 seconds after reservation in the past 3 months');
-        $this->setTemplate('statistics/fast-closes.tpl');
-    }
+		$database = $this->getDatabase();
+		$statement = $database->query($query);
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
+		$this->assign('dataTable', $data);
+		$this->assign('statsPageTitle', 'Requests closed less than 30 seconds after reservation in the past 3 months');
+		$this->setTemplate('statistics/fast-closes.tpl');
+	}
 }

includes/Pages/Statistics/StatsMain.php

Indentation +84 added lines, -84 removed lines

@@ -12,99 +12,99 @@
 
 class StatsMain extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Statistics');
-
-        $this->assign('statsPageTitle', 'Account Creation Statistics');
-
-        $statsPages = array(
-            'fastCloses'       => 'Requests closed less than 30 seconds after reservation in the past 3 months',
-            'inactiveUsers'    => 'Inactive tool users',
-            'monthlyStats'     => 'Monthly Statistics',
-            'reservedRequests' => 'All currently reserved requests',
-            'templateStats'    => 'Template Stats',
-            'topCreators'      => 'Top Account Creators',
-            'users'            => 'Account Creation Tool users',
-        );
-
-        $this->generateSmallStatsTable();
-
-        $this->assign('statsPages', $statsPages);
-
-        $graphList = array('day', '2day', '4day', 'week', '2week', 'month', '3month');
-        $this->assign('graphList', $graphList);
-
-        $this->setTemplate('statistics/main.tpl');
-    }
-
-    /**
-     * Gets the relevant statistics from the database for the small statistics table
-     */
-    private function generateSmallStatsTable()
-    {
-        $database = $this->getDatabase();
-        $requestsQuery = <<<'SQL'
+	public function main()
+	{
+		$this->setHtmlTitle('Statistics');
+
+		$this->assign('statsPageTitle', 'Account Creation Statistics');
+
+		$statsPages = array(
+			'fastCloses'       => 'Requests closed less than 30 seconds after reservation in the past 3 months',
+			'inactiveUsers'    => 'Inactive tool users',
+			'monthlyStats'     => 'Monthly Statistics',
+			'reservedRequests' => 'All currently reserved requests',
+			'templateStats'    => 'Template Stats',
+			'topCreators'      => 'Top Account Creators',
+			'users'            => 'Account Creation Tool users',
+		);
+
+		$this->generateSmallStatsTable();
+
+		$this->assign('statsPages', $statsPages);
+
+		$graphList = array('day', '2day', '4day', 'week', '2week', 'month', '3month');
+		$this->assign('graphList', $graphList);
+
+		$this->setTemplate('statistics/main.tpl');
+	}
+
+	/**
+	 * Gets the relevant statistics from the database for the small statistics table
+	 */
+	private function generateSmallStatsTable()
+	{
+		$database = $this->getDatabase();
+		$requestsQuery = <<<'SQL'
 SELECT COUNT(*) FROM request WHERE status = :status AND emailconfirm = 'Confirmed';
 SQL;
-        $requestsStatement = $database->prepare($requestsQuery);
+		$requestsStatement = $database->prepare($requestsQuery);
 
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
 
-        $requestStateData = array();
+		$requestStateData = array();
 
-        foreach ($requestStates as $statusName => $data) {
-            $requestsStatement->execute(array(':status' => $statusName));
-            $requestCount = $requestsStatement->fetchColumn();
-            $requestsStatement->closeCursor();
-            $headerText = $data['header'];
-            $requestStateData[$headerText] = $requestCount;
-        }
+		foreach ($requestStates as $statusName => $data) {
+			$requestsStatement->execute(array(':status' => $statusName));
+			$requestCount = $requestsStatement->fetchColumn();
+			$requestsStatement->closeCursor();
+			$headerText = $data['header'];
+			$requestStateData[$headerText] = $requestCount;
+		}
 
-        $this->assign('requestCountData', $requestStateData);
+		$this->assign('requestCountData', $requestStateData);
 
-        // Unconfirmed requests
-        $unconfirmedStatement = $database->query(<<<SQL
+		// Unconfirmed requests
+		$unconfirmedStatement = $database->query(<<<SQL
 SELECT COUNT(*) FROM request WHERE emailconfirm != 'Confirmed' AND emailconfirm != '';
 SQL
-        );
-        $unconfirmed = $unconfirmedStatement->fetchColumn();
-        $unconfirmedStatement->closeCursor();
-        $this->assign('statsUnconfirmed', $unconfirmed);
-
-        $userStatusStatement = $database->prepare('SELECT COUNT(*) FROM user WHERE status = :status;');
-
-        // Admin users
-        $userStatusStatement->execute(array(':status' => 'Admin'));
-        $adminUsers = $userStatusStatement->fetchColumn();
-        $userStatusStatement->closeCursor();
-        $this->assign('statsAdminUsers', $adminUsers);
-
-        // Users
-        $userStatusStatement->execute(array(':status' => 'User'));
-        $users = $userStatusStatement->fetchColumn();
-        $userStatusStatement->closeCursor();
-        $this->assign('statsUsers', $users);
-
-        // Suspended users
-        $userStatusStatement->execute(array(':status' => 'Suspended'));
-        $suspendedUsers = $userStatusStatement->fetchColumn();
-        $userStatusStatement->closeCursor();
-        $this->assign('statsSuspendedUsers', $suspendedUsers);
-
-        // New users
-        $userStatusStatement->execute(array(':status' => 'New'));
-        $newUsers = $userStatusStatement->fetchColumn();
-        $userStatusStatement->closeCursor();
-        $this->assign('statsNewUsers', $newUsers);
-
-        // Most comments on a request
-        $mostCommentsStatement = $database->query(<<<SQL
+		);
+		$unconfirmed = $unconfirmedStatement->fetchColumn();
+		$unconfirmedStatement->closeCursor();
+		$this->assign('statsUnconfirmed', $unconfirmed);
+
+		$userStatusStatement = $database->prepare('SELECT COUNT(*) FROM user WHERE status = :status;');
+
+		// Admin users
+		$userStatusStatement->execute(array(':status' => 'Admin'));
+		$adminUsers = $userStatusStatement->fetchColumn();
+		$userStatusStatement->closeCursor();
+		$this->assign('statsAdminUsers', $adminUsers);
+
+		// Users
+		$userStatusStatement->execute(array(':status' => 'User'));
+		$users = $userStatusStatement->fetchColumn();
+		$userStatusStatement->closeCursor();
+		$this->assign('statsUsers', $users);
+
+		// Suspended users
+		$userStatusStatement->execute(array(':status' => 'Suspended'));
+		$suspendedUsers = $userStatusStatement->fetchColumn();
+		$userStatusStatement->closeCursor();
+		$this->assign('statsSuspendedUsers', $suspendedUsers);
+
+		// New users
+		$userStatusStatement->execute(array(':status' => 'New'));
+		$newUsers = $userStatusStatement->fetchColumn();
+		$userStatusStatement->closeCursor();
+		$this->assign('statsNewUsers', $newUsers);
+
+		// Most comments on a request
+		$mostCommentsStatement = $database->query(<<<SQL
 SELECT request FROM comment GROUP BY request ORDER BY COUNT(*) DESC LIMIT 1;
 SQL
-        );
-        $mostComments = $mostCommentsStatement->fetchColumn();
-        $mostCommentsStatement->closeCursor();
-        $this->assign('mostComments', $mostComments);
-    }
+		);
+		$mostComments = $mostCommentsStatement->fetchColumn();
+		$mostCommentsStatement->closeCursor();
+		$this->assign('mostComments', $mostComments);
+	}
 }

includes/Pages/Statistics/StatsTemplateStats.php

Indentation +11 added lines, -11 removed lines

@@ -13,11 +13,11 @@ 
 
 class StatsTemplateStats extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Template Stats :: Statistics');
+	public function main()
+	{
+		$this->setHtmlTitle('Template Stats :: Statistics');
 
-        $query = <<<SQL
+		$query = <<<SQL
 SELECT
     t.id AS templateid,
     t.usercode AS usercode,
@@ -45,11 +45,11 @@ 
         GROUP BY welcome_template
     ) u2 ON u2.allid = t.id;
 SQL;
-        $database = $this->getDatabase();
-        $statement = $database->query($query);
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
-        $this->assign('dataTable', $data);
-        $this->assign('statsPageTitle', 'Template Stats');
-        $this->setTemplate('statistics/welcome-template-usage.tpl');
-    }
+		$database = $this->getDatabase();
+		$statement = $database->query($query);
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
+		$this->assign('dataTable', $data);
+		$this->assign('statsPageTitle', 'Template Stats');
+		$this->setTemplate('statistics/welcome-template-usage.tpl');
+	}
 }

includes/Pages/Statistics/StatsReservedRequests.php

Indentation +11 added lines, -11 removed lines

@@ -13,11 +13,11 @@ 
 
 class StatsReservedRequests extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Reserved Requests :: Statistics');
+	public function main()
+	{
+		$this->setHtmlTitle('Reserved Requests :: Statistics');
 
-        $query = <<<sql
+		$query = <<<sql
 SELECT
     p.id AS requestid,
     p.name AS name,
@@ -29,11 +29,11 @@ 
 WHERE reserved != 0;
 sql;
 
-        $database = $this->getDatabase();
-        $statement = $database->query($query);
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
-        $this->assign('dataTable', $data);
-        $this->assign('statsPageTitle', 'All currently reserved requests');
-        $this->setTemplate('statistics/reserved-requests.tpl');
-    }
+		$database = $this->getDatabase();
+		$statement = $database->query($query);
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
+		$this->assign('dataTable', $data);
+		$this->assign('statsPageTitle', 'All currently reserved requests');
+		$this->setTemplate('statistics/reserved-requests.tpl');
+	}
 }

includes/Pages/RequestAction/PageBreakReservation.php

Indentation +64 added lines, -64 removed lines

@@ -19,79 +19,79 @@
 
 class PageBreakReservation extends RequestActionBase
 {
-    protected function main()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database);
+	protected function main()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database);
 
-        if ($request->getReserved() === null) {
-            throw new ApplicationLogicException('Request is not reserved!');
-        }
+		if ($request->getReserved() === null) {
+			throw new ApplicationLogicException('Request is not reserved!');
+		}
 
-        $currentUser = User::getCurrent($database);
+		$currentUser = User::getCurrent($database);
 
-        if ($currentUser->getId() === $request->getReserved()) {
-            $this->doUnreserve($request, $database);
-        }
-        else {
-            // not the same user!
-            if ($this->barrierTest('force', $currentUser)) {
-                $this->doBreakReserve($request, $database);
-            }
-            else {
-                throw new AccessDeniedException($this->getSecurityManager());
-            }
-        }
-    }
+		if ($currentUser->getId() === $request->getReserved()) {
+			$this->doUnreserve($request, $database);
+		}
+		else {
+			// not the same user!
+			if ($this->barrierTest('force', $currentUser)) {
+				$this->doBreakReserve($request, $database);
+			}
+			else {
+				throw new AccessDeniedException($this->getSecurityManager());
+			}
+		}
+	}
 
-    /**
-     * @param Request     $request
-     * @param PdoDatabase $database
-     *
-     * @throws Exception
-     */
-    protected function doUnreserve(Request $request, PdoDatabase $database)
-    {
-        // same user! we allow people to unreserve their own stuff
-        $request->setReserved(null);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
+	/**
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 *
+	 * @throws Exception
+	 */
+	protected function doUnreserve(Request $request, PdoDatabase $database)
+	{
+		// same user! we allow people to unreserve their own stuff
+		$request->setReserved(null);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
 
-        Logger::unreserve($database, $request);
-        $this->getNotificationHelper()->requestUnreserved($request);
+		Logger::unreserve($database, $request);
+		$this->getNotificationHelper()->requestUnreserved($request);
 
-        // Redirect home!
-        $this->redirect();
-    }
+		// Redirect home!
+		$this->redirect();
+	}
 
-    /**
-     * @param Request     $request
-     * @param PdoDatabase $database
-     *
-     * @throws Exception
-     */
-    protected function doBreakReserve(Request $request, PdoDatabase $database)
-    {
-        if (!WebRequest::postBoolean("confirm")) {
-            $this->assignCSRFToken();
+	/**
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 *
+	 * @throws Exception
+	 */
+	protected function doBreakReserve(Request $request, PdoDatabase $database)
+	{
+		if (!WebRequest::postBoolean("confirm")) {
+			$this->assignCSRFToken();
 
-            $this->assign("request", $request->getId());
-            $this->assign("reservedUser", User::getById($request->getReserved(), $database));
-            $this->assign("updateversion", WebRequest::postInt('updateversion'));
+			$this->assign("request", $request->getId());
+			$this->assign("reservedUser", User::getById($request->getReserved(), $database));
+			$this->assign("updateversion", WebRequest::postInt('updateversion'));
 
-            $this->setTemplate("confirmations/breakreserve.tpl");
-        }
-        else {
-            $request->setReserved(null);
-            $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $request->save();
+			$this->setTemplate("confirmations/breakreserve.tpl");
+		}
+		else {
+			$request->setReserved(null);
+			$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$request->save();
 
-            Logger::breakReserve($database, $request);
-            $this->getNotificationHelper()->requestReserveBroken($request);
+			Logger::breakReserve($database, $request);
+			$this->getNotificationHelper()->requestReserveBroken($request);
 
-            // Redirect home!
-            $this->redirect();
-        }
-    }
+			// Redirect home!
+			$this->redirect();
+		}
+	}
 }

includes/Pages/RequestAction/PageReservation.php

Indentation +43 added lines, -43 removed lines

@@ -17,58 +17,58 @@
 
 class PageReservation extends RequestActionBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     */
-    protected function main()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database);
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 */
+	protected function main()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database);
 
-        $closureDate = $request->getClosureDate();
+		$closureDate = $request->getClosureDate();
 
-        $date = new DateTime();
-        $date->modify("-7 days");
-        $oneweek = $date->format("Y-m-d H:i:s");
+		$date = new DateTime();
+		$date->modify("-7 days");
+		$oneweek = $date->format("Y-m-d H:i:s");
 
-        $currentUser = User::getCurrent($database);
-        if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
-            if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
-                throw new ApplicationLogicException(
-                    "You are not allowed to reserve a request that has been closed for over a week.");
-            }
-        }
+		$currentUser = User::getCurrent($database);
+		if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
+			if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
+				throw new ApplicationLogicException(
+					"You are not allowed to reserve a request that has been closed for over a week.");
+			}
+		}
 
-        if ($request->getReserved() !== null && $request->getReserved() != $currentUser->getId()) {
-            throw new ApplicationLogicException("Request is already reserved!");
-        }
+		if ($request->getReserved() !== null && $request->getReserved() != $currentUser->getId()) {
+			throw new ApplicationLogicException("Request is already reserved!");
+		}
 
-        if ($request->getReserved() === null) {
-            // Check the number of requests a user has reserved already
-            $doubleReserveCountQuery = $database->prepare("SELECT COUNT(*) FROM request WHERE reserved = :userid;");
-            $doubleReserveCountQuery->bindValue(":userid", $currentUser->getId());
-            $doubleReserveCountQuery->execute();
-            $doubleReserveCount = $doubleReserveCountQuery->fetchColumn();
-            $doubleReserveCountQuery->closeCursor();
+		if ($request->getReserved() === null) {
+			// Check the number of requests a user has reserved already
+			$doubleReserveCountQuery = $database->prepare("SELECT COUNT(*) FROM request WHERE reserved = :userid;");
+			$doubleReserveCountQuery->bindValue(":userid", $currentUser->getId());
+			$doubleReserveCountQuery->execute();
+			$doubleReserveCount = $doubleReserveCountQuery->fetchColumn();
+			$doubleReserveCountQuery->closeCursor();
 
-            // User already has at least one reserved.
-            if ($doubleReserveCount != 0) {
-                SessionAlert::warning("You have multiple requests reserved!");
-            }
+			// User already has at least one reserved.
+			if ($doubleReserveCount != 0) {
+				SessionAlert::warning("You have multiple requests reserved!");
+			}
 
-            $request->setReserved($currentUser->getId());
-            $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $request->save();
+			$request->setReserved($currentUser->getId());
+			$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$request->save();
 
-            Logger::reserve($database, $request);
+			Logger::reserve($database, $request);
 
-            $this->getNotificationHelper()->requestReserved($request);
+			$this->getNotificationHelper()->requestReserved($request);
 
-            SessionAlert::success("Reserved request {$request->getId()}.");
-        }
+			SessionAlert::success("Reserved request {$request->getId()}.");
+		}
 
-        $this->redirect('viewRequest', null, array('id' => $request->getId()));
-    }
+		$this->redirect('viewRequest', null, array('id' => $request->getId()));
+	}
 }

includes/Pages/RequestAction/PageDeferRequest.php

Indentation +41 added lines, -41 removed lines

@@ -17,57 +17,57 @@
 
 class PageDeferRequest extends RequestActionBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     */
-    protected function main()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database);
-        $currentUser = User::getCurrent($database);
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 */
+	protected function main()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database);
+		$currentUser = User::getCurrent($database);
 
-        $target = WebRequest::postString('target');
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
+		$target = WebRequest::postString('target');
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
 
-        if (!array_key_exists($target, $requestStates)) {
-            throw new ApplicationLogicException('Defer target not valid');
-        }
+		if (!array_key_exists($target, $requestStates)) {
+			throw new ApplicationLogicException('Defer target not valid');
+		}
 
-        if ($request->getStatus() == $target) {
-            SessionAlert::warning('This request is already in the specified queue.');
-            $this->redirect('viewRequest', null, array('id' => $request->getId()));
+		if ($request->getStatus() == $target) {
+			SessionAlert::warning('This request is already in the specified queue.');
+			$this->redirect('viewRequest', null, array('id' => $request->getId()));
 
-            return;
-        }
+			return;
+		}
 
-        $closureDate = $request->getClosureDate();
-        $date = new DateTime();
-        $date->modify("-7 days");
-        $oneweek = $date->format("Y-m-d H:i:s");
+		$closureDate = $request->getClosureDate();
+		$date = new DateTime();
+		$date->modify("-7 days");
+		$oneweek = $date->format("Y-m-d H:i:s");
 
 
-        if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
-            if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
-                throw new ApplicationLogicException(
-                    "You are not allowed to re-open a request that has been closed for over a week.");
-            }
-        }
+		if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
+			if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
+				throw new ApplicationLogicException(
+					"You are not allowed to re-open a request that has been closed for over a week.");
+			}
+		}
 
-        $request->setReserved(null);
-        $request->setStatus($target);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
+		$request->setReserved(null);
+		$request->setStatus($target);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
 
-        $deto = $requestStates[$target]['deferto'];
-        $detolog = $requestStates[$target]['defertolog'];
+		$deto = $requestStates[$target]['deferto'];
+		$detolog = $requestStates[$target]['defertolog'];
 
-        Logger::deferRequest($database, $request, $detolog);
+		Logger::deferRequest($database, $request, $detolog);
 
-        $this->getNotificationHelper()->requestDeferred($request);
-        SessionAlert::success("Request {$request->getId()} deferred to {$deto}");
+		$this->getNotificationHelper()->requestDeferred($request);
+		SessionAlert::success("Request {$request->getId()} deferred to {$deto}");
 
-        $this->redirect();
-    }
+		$this->redirect();
+	}
 }

includes/Pages/RequestAction/PageSendToUser.php

Indentation +39 added lines, -39 removed lines

@@ -17,43 +17,43 @@
 
 class PageSendToUser extends RequestActionBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     * @throws Exception
-     */
-    protected function main()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database);
-
-        if ($request->getReserved() !== User::getCurrent($database)->getId()) {
-            throw new ApplicationLogicException('You don\'t have this request reserved!');
-        }
-
-        $username = WebRequest::postString('user');
-        if ($username === null) {
-            throw new ApplicationLogicException('User must be specified');
-        }
-
-        $user = User::getByUsername($username, $database);
-        if ($user === false) {
-            throw new ApplicationLogicException('User not found');
-        }
-
-        if (!$user->isActive()) {
-            throw new ApplicationLogicException('User is currently not active on the tool');
-        }
-
-        $request->setReserved($user->getId());
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
-
-        Logger::sendReservation($database, $request, $user);
-        $this->getNotificationHelper()->requestReservationSent($request, $user);
-        SessionAlert::success("Reservation sent successfully");
-
-        $this->redirect('viewRequest', null, array('id' => $request->getId()));
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 * @throws Exception
+	 */
+	protected function main()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database);
+
+		if ($request->getReserved() !== User::getCurrent($database)->getId()) {
+			throw new ApplicationLogicException('You don\'t have this request reserved!');
+		}
+
+		$username = WebRequest::postString('user');
+		if ($username === null) {
+			throw new ApplicationLogicException('User must be specified');
+		}
+
+		$user = User::getByUsername($username, $database);
+		if ($user === false) {
+			throw new ApplicationLogicException('User not found');
+		}
+
+		if (!$user->isActive()) {
+			throw new ApplicationLogicException('User is currently not active on the tool');
+		}
+
+		$request->setReserved($user->getId());
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
+
+		Logger::sendReservation($database, $request, $user);
+		$this->getNotificationHelper()->requestReservationSent($request, $user);
+		SessionAlert::success("Reservation sent successfully");
+
+		$this->redirect('viewRequest', null, array('id' => $request->getId()));
+	}
 }

includes/Pages/PageWelcomeTemplateManagement.php

Indentation +171 added lines, -171 removed lines

@@ -19,223 +19,223 @@
 
 class PageWelcomeTemplateManagement extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $templateList = WelcomeTemplate::getAll($this->getDatabase());
-
-        $this->assignCSRFToken();
-
-        $user = User::getCurrent($this->getDatabase());
-        $this->assign('canEdit', $this->barrierTest('edit', $user));
-        $this->assign('canAdd', $this->barrierTest('add', $user));
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$templateList = WelcomeTemplate::getAll($this->getDatabase());
+
+		$this->assignCSRFToken();
+
+		$user = User::getCurrent($this->getDatabase());
+		$this->assign('canEdit', $this->barrierTest('edit', $user));
+		$this->assign('canAdd', $this->barrierTest('add', $user));
 
-        $this->assign('templateList', $templateList);
-        $this->setTemplate('welcome-template/list.tpl');
-    }
+		$this->assign('templateList', $templateList);
+		$this->setTemplate('welcome-template/list.tpl');
+	}
 
-    /**
-     * Handles the requests for selecting a template to use.
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function select()
-    {
-        // get rid of GETs
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('welcomeTemplates');
-        }
-
-        $this->validateCSRFToken();
-
-        $user = User::getCurrent($this->getDatabase());
-
-        if (WebRequest::postBoolean('disable')) {
-            $user->setWelcomeTemplate(null);
-            $user->save();
-
-            SessionAlert::success('Disabled automatic user welcoming.');
-            $this->redirect('welcomeTemplates');
-
-            return;
-        }
-
-        $database = $this->getDatabase();
+	/**
+	 * Handles the requests for selecting a template to use.
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function select()
+	{
+		// get rid of GETs
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('welcomeTemplates');
+		}
+
+		$this->validateCSRFToken();
+
+		$user = User::getCurrent($this->getDatabase());
+
+		if (WebRequest::postBoolean('disable')) {
+			$user->setWelcomeTemplate(null);
+			$user->save();
+
+			SessionAlert::success('Disabled automatic user welcoming.');
+			$this->redirect('welcomeTemplates');
+
+			return;
+		}
+
+		$database = $this->getDatabase();
 
-        $templateId = WebRequest::postInt('template');
-        /** @var false|WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		$templateId = WebRequest::postInt('template');
+		/** @var false|WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false || $template->isDeleted()) {
-            throw new ApplicationLogicException('Unknown template');
-        }
+		if ($template === false || $template->isDeleted()) {
+			throw new ApplicationLogicException('Unknown template');
+		}
 
-        $user->setWelcomeTemplate($template->getId());
-        $user->save();
+		$user->setWelcomeTemplate($template->getId());
+		$user->save();
 
-        SessionAlert::success("Updated selected welcome template for automatic welcoming.");
+		SessionAlert::success("Updated selected welcome template for automatic welcoming.");
 
-        $this->redirect('welcomeTemplates');
-    }
+		$this->redirect('welcomeTemplates');
+	}
 
-    /**
-     * Handles the requests for viewing a template.
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function view()
-    {
-        $database = $this->getDatabase();
+	/**
+	 * Handles the requests for viewing a template.
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function view()
+	{
+		$database = $this->getDatabase();
 
-        $templateId = WebRequest::getInt('template');
+		$templateId = WebRequest::getInt('template');
 
-        /** @var WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		/** @var WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false) {
-            throw new ApplicationLogicException('Cannot find requested template');
-        }
+		if ($template === false) {
+			throw new ApplicationLogicException('Cannot find requested template');
+		}
 
-        $templateHtml = $this->getWikiTextHelper()->getHtmlForWikiText($template->getBotCode());
+		$templateHtml = $this->getWikiTextHelper()->getHtmlForWikiText($template->getBotCode());
 
-        $this->assign('templateHtml', $templateHtml);
-        $this->assign('template', $template);
-        $this->setTemplate('welcome-template/view.tpl');
-    }
+		$this->assign('templateHtml', $templateHtml);
+		$this->assign('template', $template);
+		$this->setTemplate('welcome-template/view.tpl');
+	}
 
-    /**
-     * Handler for the add action to create a new welcome template
-     *
-     * @throws Exception
-     */
-    protected function add()
-    {
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $database = $this->getDatabase();
+	/**
+	 * Handler for the add action to create a new welcome template
+	 *
+	 * @throws Exception
+	 */
+	protected function add()
+	{
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$database = $this->getDatabase();
 
-            $userCode = WebRequest::postString('usercode');
-            $botCode = WebRequest::postString('botcode');
+			$userCode = WebRequest::postString('usercode');
+			$botCode = WebRequest::postString('botcode');
 
-            $this->validate($userCode, $botCode);
+			$this->validate($userCode, $botCode);
 
-            $template = new WelcomeTemplate();
-            $template->setDatabase($database);
-            $template->setUserCode($userCode);
-            $template->setBotCode($botCode);
-            $template->save();
+			$template = new WelcomeTemplate();
+			$template->setDatabase($database);
+			$template->setUserCode($userCode);
+			$template->setBotCode($botCode);
+			$template->save();
 
-            Logger::welcomeTemplateCreated($database, $template);
+			Logger::welcomeTemplateCreated($database, $template);
 
-            $this->getNotificationHelper()->welcomeTemplateCreated($template);
+			$this->getNotificationHelper()->welcomeTemplateCreated($template);
 
-            SessionAlert::success("Template successfully created.");
+			SessionAlert::success("Template successfully created.");
 
-            $this->redirect('welcomeTemplates');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate("welcome-template/add.tpl");
-        }
-    }
+			$this->redirect('welcomeTemplates');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate("welcome-template/add.tpl");
+		}
+	}
 
-    /**
-     * Hander for editing templates
-     */
-    protected function edit()
-    {
-        $database = $this->getDatabase();
+	/**
+	 * Hander for editing templates
+	 */
+	protected function edit()
+	{
+		$database = $this->getDatabase();
 
-        $templateId = WebRequest::getInt('template');
+		$templateId = WebRequest::getInt('template');
 
-        /** @var WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		/** @var WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false) {
-            throw new ApplicationLogicException('Cannot find requested template');
-        }
+		if ($template === false) {
+			throw new ApplicationLogicException('Cannot find requested template');
+		}
 
-        if ($template->isDeleted()) {
-            throw new ApplicationLogicException('The specified template has been deleted');
-        }
+		if ($template->isDeleted()) {
+			throw new ApplicationLogicException('The specified template has been deleted');
+		}
 
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
 
-            $userCode = WebRequest::postString('usercode');
-            $botCode = WebRequest::postString('botcode');
+			$userCode = WebRequest::postString('usercode');
+			$botCode = WebRequest::postString('botcode');
 
-            $this->validate($userCode, $botCode);
+			$this->validate($userCode, $botCode);
 
-            $template->setUserCode($userCode);
-            $template->setBotCode($botCode);
-            $template->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $template->save();
+			$template->setUserCode($userCode);
+			$template->setBotCode($botCode);
+			$template->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$template->save();
 
-            Logger::welcomeTemplateEdited($database, $template);
+			Logger::welcomeTemplateEdited($database, $template);
 
-            SessionAlert::success("Template updated.");
+			SessionAlert::success("Template updated.");
 
-            $this->getNotificationHelper()->welcomeTemplateEdited($template);
+			$this->getNotificationHelper()->welcomeTemplateEdited($template);
 
-            $this->redirect('welcomeTemplates');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('template', $template);
-            $this->setTemplate('welcome-template/edit.tpl');
-        }
-    }
+			$this->redirect('welcomeTemplates');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('template', $template);
+			$this->setTemplate('welcome-template/edit.tpl');
+		}
+	}
 
-    protected function delete()
-    {
-        $this->redirect('welcomeTemplates');
+	protected function delete()
+	{
+		$this->redirect('welcomeTemplates');
 
-        if (!WebRequest::wasPosted()) {
-            return;
-        }
+		if (!WebRequest::wasPosted()) {
+			return;
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        $templateId = WebRequest::postInt('template');
-        $updateVersion = WebRequest::postInt('updateversion');
+		$templateId = WebRequest::postInt('template');
+		$updateVersion = WebRequest::postInt('updateversion');
 
-        /** @var WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		/** @var WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false || $template->isDeleted()) {
-            throw new ApplicationLogicException('Cannot find requested template');
-        }
+		if ($template === false || $template->isDeleted()) {
+			throw new ApplicationLogicException('Cannot find requested template');
+		}
 
-        // set the update version to the version sent by the client (optimisticly lock from initial page load)
-        $template->setUpdateVersion($updateVersion);
+		// set the update version to the version sent by the client (optimisticly lock from initial page load)
+		$template->setUpdateVersion($updateVersion);
 
-        $database
-            ->prepare("UPDATE user SET welcome_template = NULL WHERE welcome_template = :id;")
-            ->execute(array(":id" => $templateId));
+		$database
+			->prepare("UPDATE user SET welcome_template = NULL WHERE welcome_template = :id;")
+			->execute(array(":id" => $templateId));
 
-        Logger::welcomeTemplateDeleted($database, $template);
+		Logger::welcomeTemplateDeleted($database, $template);
 
-        $template->delete();
+		$template->delete();
 
-        SessionAlert::success(
-            "Template deleted. Any users who were using this template have had automatic welcoming disabled.");
-        $this->getNotificationHelper()->welcomeTemplateDeleted($templateId);
-    }
+		SessionAlert::success(
+			"Template deleted. Any users who were using this template have had automatic welcoming disabled.");
+		$this->getNotificationHelper()->welcomeTemplateDeleted($templateId);
+	}
 
-    private function validate($userCode, $botCode)
-    {
-        if ($userCode === null) {
-            throw new ApplicationLogicException('User code cannot be null');
-        }
+	private function validate($userCode, $botCode)
+	{
+		if ($userCode === null) {
+			throw new ApplicationLogicException('User code cannot be null');
+		}
 
-        if ($botCode === null) {
-            throw new ApplicationLogicException('Bot code cannot be null');
-        }
-    }
+		if ($botCode === null) {
+			throw new ApplicationLogicException('Bot code cannot be null');
+		}
+	}
 }