Completed
Push — newinternal-releasecandidate ( 06bb07...1c5b59 )
by Simon
06:04
created
includes/Pages/Statistics/StatsMonthlyStats.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 
14 14
 class StatsMonthlyStats extends InternalPageBase
15 15
 {
16
-    public function main()
17
-    {
18
-        $this->setHtmlTitle('Monthly Stats :: Statistics');
16
+	public function main()
17
+	{
18
+		$this->setHtmlTitle('Monthly Stats :: Statistics');
19 19
 
20
-        $query = <<<SQL
20
+		$query = <<<SQL
21 21
 SELECT
22 22
     COUNT(DISTINCT id) AS closed,
23 23
     YEAR(timestamp) AS year,
@@ -28,12 +28,12 @@  discard block
 block discarded – undo
28 28
 ORDER BY YEAR(timestamp) , MONTH(timestamp) ASC;
29 29
 SQL;
30 30
 
31
-        $database = $this->getDatabase();
32
-        $statement = $database->query($query);
33
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
31
+		$database = $this->getDatabase();
32
+		$statement = $database->query($query);
33
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
34 34
 
35
-        $this->assign('dataTable', $data);
36
-        $this->assign('statsPageTitle', 'Monthly Statistics');
37
-        $this->setTemplate('statistics/monthly-stats.tpl');
38
-    }
35
+		$this->assign('dataTable', $data);
36
+		$this->assign('statsPageTitle', 'Monthly Statistics');
37
+		$this->setTemplate('statistics/monthly-stats.tpl');
38
+	}
39 39
 }
Please login to merge, or discard this patch.
includes/Pages/Statistics/StatsFastCloses.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 
14 14
 class StatsFastCloses extends InternalPageBase
15 15
 {
16
-    public function main()
17
-    {
18
-        $this->setHtmlTitle('Fast Closes :: Statistics');
16
+	public function main()
17
+	{
18
+		$this->setHtmlTitle('Fast Closes :: Statistics');
19 19
 
20
-        $query = <<<SQL
20
+		$query = <<<SQL
21 21
 SELECT
22 22
   log_closed.objectid AS request,
23 23
   user.username AS user,
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 ORDER BY TIMEDIFF(log_closed.timestamp, log_reserved.timestamp) ASC
43 43
 ;
44 44
 SQL;
45
-        $database = $this->getDatabase();
46
-        $statement = $database->query($query);
47
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
48
-        $this->assign('dataTable', $data);
49
-        $this->assign('statsPageTitle', 'Requests closed less than 30 seconds after reservation in the past 3 months');
50
-        $this->setTemplate('statistics/fast-closes.tpl');
51
-    }
45
+		$database = $this->getDatabase();
46
+		$statement = $database->query($query);
47
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
48
+		$this->assign('dataTable', $data);
49
+		$this->assign('statsPageTitle', 'Requests closed less than 30 seconds after reservation in the past 3 months');
50
+		$this->setTemplate('statistics/fast-closes.tpl');
51
+	}
52 52
 }
Please login to merge, or discard this patch.
includes/Pages/Statistics/StatsMain.php 1 patch
Indentation   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -12,99 +12,99 @@
 block discarded – undo
12 12
 
13 13
 class StatsMain extends InternalPageBase
14 14
 {
15
-    public function main()
16
-    {
17
-        $this->setHtmlTitle('Statistics');
18
-
19
-        $this->assign('statsPageTitle', 'Account Creation Statistics');
20
-
21
-        $statsPages = array(
22
-            'fastCloses'       => 'Requests closed less than 30 seconds after reservation in the past 3 months',
23
-            'inactiveUsers'    => 'Inactive tool users',
24
-            'monthlyStats'     => 'Monthly Statistics',
25
-            'reservedRequests' => 'All currently reserved requests',
26
-            'templateStats'    => 'Template Stats',
27
-            'topCreators'      => 'Top Account Creators',
28
-            'users'            => 'Account Creation Tool users',
29
-        );
30
-
31
-        $this->generateSmallStatsTable();
32
-
33
-        $this->assign('statsPages', $statsPages);
34
-
35
-        $graphList = array('day', '2day', '4day', 'week', '2week', 'month', '3month');
36
-        $this->assign('graphList', $graphList);
37
-
38
-        $this->setTemplate('statistics/main.tpl');
39
-    }
40
-
41
-    /**
42
-     * Gets the relevant statistics from the database for the small statistics table
43
-     */
44
-    private function generateSmallStatsTable()
45
-    {
46
-        $database = $this->getDatabase();
47
-        $requestsQuery = <<<'SQL'
15
+	public function main()
16
+	{
17
+		$this->setHtmlTitle('Statistics');
18
+
19
+		$this->assign('statsPageTitle', 'Account Creation Statistics');
20
+
21
+		$statsPages = array(
22
+			'fastCloses'       => 'Requests closed less than 30 seconds after reservation in the past 3 months',
23
+			'inactiveUsers'    => 'Inactive tool users',
24
+			'monthlyStats'     => 'Monthly Statistics',
25
+			'reservedRequests' => 'All currently reserved requests',
26
+			'templateStats'    => 'Template Stats',
27
+			'topCreators'      => 'Top Account Creators',
28
+			'users'            => 'Account Creation Tool users',
29
+		);
30
+
31
+		$this->generateSmallStatsTable();
32
+
33
+		$this->assign('statsPages', $statsPages);
34
+
35
+		$graphList = array('day', '2day', '4day', 'week', '2week', 'month', '3month');
36
+		$this->assign('graphList', $graphList);
37
+
38
+		$this->setTemplate('statistics/main.tpl');
39
+	}
40
+
41
+	/**
42
+	 * Gets the relevant statistics from the database for the small statistics table
43
+	 */
44
+	private function generateSmallStatsTable()
45
+	{
46
+		$database = $this->getDatabase();
47
+		$requestsQuery = <<<'SQL'
48 48
 SELECT COUNT(*) FROM request WHERE status = :status AND emailconfirm = 'Confirmed';
49 49
 SQL;
50
-        $requestsStatement = $database->prepare($requestsQuery);
50
+		$requestsStatement = $database->prepare($requestsQuery);
51 51
 
52
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
52
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
53 53
 
54
-        $requestStateData = array();
54
+		$requestStateData = array();
55 55
 
56
-        foreach ($requestStates as $statusName => $data) {
57
-            $requestsStatement->execute(array(':status' => $statusName));
58
-            $requestCount = $requestsStatement->fetchColumn();
59
-            $requestsStatement->closeCursor();
60
-            $headerText = $data['header'];
61
-            $requestStateData[$headerText] = $requestCount;
62
-        }
56
+		foreach ($requestStates as $statusName => $data) {
57
+			$requestsStatement->execute(array(':status' => $statusName));
58
+			$requestCount = $requestsStatement->fetchColumn();
59
+			$requestsStatement->closeCursor();
60
+			$headerText = $data['header'];
61
+			$requestStateData[$headerText] = $requestCount;
62
+		}
63 63
 
64
-        $this->assign('requestCountData', $requestStateData);
64
+		$this->assign('requestCountData', $requestStateData);
65 65
 
66
-        // Unconfirmed requests
67
-        $unconfirmedStatement = $database->query(<<<SQL
66
+		// Unconfirmed requests
67
+		$unconfirmedStatement = $database->query(<<<SQL
68 68
 SELECT COUNT(*) FROM request WHERE emailconfirm != 'Confirmed' AND emailconfirm != '';
69 69
 SQL
70
-        );
71
-        $unconfirmed = $unconfirmedStatement->fetchColumn();
72
-        $unconfirmedStatement->closeCursor();
73
-        $this->assign('statsUnconfirmed', $unconfirmed);
74
-
75
-        $userStatusStatement = $database->prepare('SELECT COUNT(*) FROM user WHERE status = :status;');
76
-
77
-        // Admin users
78
-        $userStatusStatement->execute(array(':status' => 'Admin'));
79
-        $adminUsers = $userStatusStatement->fetchColumn();
80
-        $userStatusStatement->closeCursor();
81
-        $this->assign('statsAdminUsers', $adminUsers);
82
-
83
-        // Users
84
-        $userStatusStatement->execute(array(':status' => 'User'));
85
-        $users = $userStatusStatement->fetchColumn();
86
-        $userStatusStatement->closeCursor();
87
-        $this->assign('statsUsers', $users);
88
-
89
-        // Suspended users
90
-        $userStatusStatement->execute(array(':status' => 'Suspended'));
91
-        $suspendedUsers = $userStatusStatement->fetchColumn();
92
-        $userStatusStatement->closeCursor();
93
-        $this->assign('statsSuspendedUsers', $suspendedUsers);
94
-
95
-        // New users
96
-        $userStatusStatement->execute(array(':status' => 'New'));
97
-        $newUsers = $userStatusStatement->fetchColumn();
98
-        $userStatusStatement->closeCursor();
99
-        $this->assign('statsNewUsers', $newUsers);
100
-
101
-        // Most comments on a request
102
-        $mostCommentsStatement = $database->query(<<<SQL
70
+		);
71
+		$unconfirmed = $unconfirmedStatement->fetchColumn();
72
+		$unconfirmedStatement->closeCursor();
73
+		$this->assign('statsUnconfirmed', $unconfirmed);
74
+
75
+		$userStatusStatement = $database->prepare('SELECT COUNT(*) FROM user WHERE status = :status;');
76
+
77
+		// Admin users
78
+		$userStatusStatement->execute(array(':status' => 'Admin'));
79
+		$adminUsers = $userStatusStatement->fetchColumn();
80
+		$userStatusStatement->closeCursor();
81
+		$this->assign('statsAdminUsers', $adminUsers);
82
+
83
+		// Users
84
+		$userStatusStatement->execute(array(':status' => 'User'));
85
+		$users = $userStatusStatement->fetchColumn();
86
+		$userStatusStatement->closeCursor();
87
+		$this->assign('statsUsers', $users);
88
+
89
+		// Suspended users
90
+		$userStatusStatement->execute(array(':status' => 'Suspended'));
91
+		$suspendedUsers = $userStatusStatement->fetchColumn();
92
+		$userStatusStatement->closeCursor();
93
+		$this->assign('statsSuspendedUsers', $suspendedUsers);
94
+
95
+		// New users
96
+		$userStatusStatement->execute(array(':status' => 'New'));
97
+		$newUsers = $userStatusStatement->fetchColumn();
98
+		$userStatusStatement->closeCursor();
99
+		$this->assign('statsNewUsers', $newUsers);
100
+
101
+		// Most comments on a request
102
+		$mostCommentsStatement = $database->query(<<<SQL
103 103
 SELECT request FROM comment GROUP BY request ORDER BY COUNT(*) DESC LIMIT 1;
104 104
 SQL
105
-        );
106
-        $mostComments = $mostCommentsStatement->fetchColumn();
107
-        $mostCommentsStatement->closeCursor();
108
-        $this->assign('mostComments', $mostComments);
109
-    }
105
+		);
106
+		$mostComments = $mostCommentsStatement->fetchColumn();
107
+		$mostCommentsStatement->closeCursor();
108
+		$this->assign('mostComments', $mostComments);
109
+	}
110 110
 }
Please login to merge, or discard this patch.
includes/Pages/Statistics/StatsTemplateStats.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 
14 14
 class StatsTemplateStats extends InternalPageBase
15 15
 {
16
-    public function main()
17
-    {
18
-        $this->setHtmlTitle('Template Stats :: Statistics');
16
+	public function main()
17
+	{
18
+		$this->setHtmlTitle('Template Stats :: Statistics');
19 19
 
20
-        $query = <<<SQL
20
+		$query = <<<SQL
21 21
 SELECT
22 22
     t.id AS templateid,
23 23
     t.usercode AS usercode,
@@ -45,11 +45,11 @@  discard block
 block discarded – undo
45 45
         GROUP BY welcome_template
46 46
     ) u2 ON u2.allid = t.id;
47 47
 SQL;
48
-        $database = $this->getDatabase();
49
-        $statement = $database->query($query);
50
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
51
-        $this->assign('dataTable', $data);
52
-        $this->assign('statsPageTitle', 'Template Stats');
53
-        $this->setTemplate('statistics/welcome-template-usage.tpl');
54
-    }
48
+		$database = $this->getDatabase();
49
+		$statement = $database->query($query);
50
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
51
+		$this->assign('dataTable', $data);
52
+		$this->assign('statsPageTitle', 'Template Stats');
53
+		$this->setTemplate('statistics/welcome-template-usage.tpl');
54
+	}
55 55
 }
Please login to merge, or discard this patch.
includes/Pages/Statistics/StatsReservedRequests.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 
14 14
 class StatsReservedRequests extends InternalPageBase
15 15
 {
16
-    public function main()
17
-    {
18
-        $this->setHtmlTitle('Reserved Requests :: Statistics');
16
+	public function main()
17
+	{
18
+		$this->setHtmlTitle('Reserved Requests :: Statistics');
19 19
 
20
-        $query = <<<sql
20
+		$query = <<<sql
21 21
 SELECT
22 22
     p.id AS requestid,
23 23
     p.name AS name,
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 WHERE reserved != 0;
30 30
 sql;
31 31
 
32
-        $database = $this->getDatabase();
33
-        $statement = $database->query($query);
34
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
35
-        $this->assign('dataTable', $data);
36
-        $this->assign('statsPageTitle', 'All currently reserved requests');
37
-        $this->setTemplate('statistics/reserved-requests.tpl');
38
-    }
32
+		$database = $this->getDatabase();
33
+		$statement = $database->query($query);
34
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
35
+		$this->assign('dataTable', $data);
36
+		$this->assign('statsPageTitle', 'All currently reserved requests');
37
+		$this->setTemplate('statistics/reserved-requests.tpl');
38
+	}
39 39
 }
Please login to merge, or discard this patch.
includes/Pages/RequestAction/PageBreakReservation.php 1 patch
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -19,79 +19,79 @@
 block discarded – undo
19 19
 
20 20
 class PageBreakReservation extends RequestActionBase
21 21
 {
22
-    protected function main()
23
-    {
24
-        $this->checkPosted();
25
-        $database = $this->getDatabase();
26
-        $request = $this->getRequest($database);
22
+	protected function main()
23
+	{
24
+		$this->checkPosted();
25
+		$database = $this->getDatabase();
26
+		$request = $this->getRequest($database);
27 27
 
28
-        if ($request->getReserved() === null) {
29
-            throw new ApplicationLogicException('Request is not reserved!');
30
-        }
28
+		if ($request->getReserved() === null) {
29
+			throw new ApplicationLogicException('Request is not reserved!');
30
+		}
31 31
 
32
-        $currentUser = User::getCurrent($database);
32
+		$currentUser = User::getCurrent($database);
33 33
 
34
-        if ($currentUser->getId() === $request->getReserved()) {
35
-            $this->doUnreserve($request, $database);
36
-        }
37
-        else {
38
-            // not the same user!
39
-            if ($this->barrierTest('force', $currentUser)) {
40
-                $this->doBreakReserve($request, $database);
41
-            }
42
-            else {
43
-                throw new AccessDeniedException($this->getSecurityManager());
44
-            }
45
-        }
46
-    }
34
+		if ($currentUser->getId() === $request->getReserved()) {
35
+			$this->doUnreserve($request, $database);
36
+		}
37
+		else {
38
+			// not the same user!
39
+			if ($this->barrierTest('force', $currentUser)) {
40
+				$this->doBreakReserve($request, $database);
41
+			}
42
+			else {
43
+				throw new AccessDeniedException($this->getSecurityManager());
44
+			}
45
+		}
46
+	}
47 47
 
48
-    /**
49
-     * @param Request     $request
50
-     * @param PdoDatabase $database
51
-     *
52
-     * @throws Exception
53
-     */
54
-    protected function doUnreserve(Request $request, PdoDatabase $database)
55
-    {
56
-        // same user! we allow people to unreserve their own stuff
57
-        $request->setReserved(null);
58
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
59
-        $request->save();
48
+	/**
49
+	 * @param Request     $request
50
+	 * @param PdoDatabase $database
51
+	 *
52
+	 * @throws Exception
53
+	 */
54
+	protected function doUnreserve(Request $request, PdoDatabase $database)
55
+	{
56
+		// same user! we allow people to unreserve their own stuff
57
+		$request->setReserved(null);
58
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
59
+		$request->save();
60 60
 
61
-        Logger::unreserve($database, $request);
62
-        $this->getNotificationHelper()->requestUnreserved($request);
61
+		Logger::unreserve($database, $request);
62
+		$this->getNotificationHelper()->requestUnreserved($request);
63 63
 
64
-        // Redirect home!
65
-        $this->redirect();
66
-    }
64
+		// Redirect home!
65
+		$this->redirect();
66
+	}
67 67
 
68
-    /**
69
-     * @param Request     $request
70
-     * @param PdoDatabase $database
71
-     *
72
-     * @throws Exception
73
-     */
74
-    protected function doBreakReserve(Request $request, PdoDatabase $database)
75
-    {
76
-        if (!WebRequest::postBoolean("confirm")) {
77
-            $this->assignCSRFToken();
68
+	/**
69
+	 * @param Request     $request
70
+	 * @param PdoDatabase $database
71
+	 *
72
+	 * @throws Exception
73
+	 */
74
+	protected function doBreakReserve(Request $request, PdoDatabase $database)
75
+	{
76
+		if (!WebRequest::postBoolean("confirm")) {
77
+			$this->assignCSRFToken();
78 78
 
79
-            $this->assign("request", $request->getId());
80
-            $this->assign("reservedUser", User::getById($request->getReserved(), $database));
81
-            $this->assign("updateversion", WebRequest::postInt('updateversion'));
79
+			$this->assign("request", $request->getId());
80
+			$this->assign("reservedUser", User::getById($request->getReserved(), $database));
81
+			$this->assign("updateversion", WebRequest::postInt('updateversion'));
82 82
 
83
-            $this->setTemplate("confirmations/breakreserve.tpl");
84
-        }
85
-        else {
86
-            $request->setReserved(null);
87
-            $request->setUpdateVersion(WebRequest::postInt('updateversion'));
88
-            $request->save();
83
+			$this->setTemplate("confirmations/breakreserve.tpl");
84
+		}
85
+		else {
86
+			$request->setReserved(null);
87
+			$request->setUpdateVersion(WebRequest::postInt('updateversion'));
88
+			$request->save();
89 89
 
90
-            Logger::breakReserve($database, $request);
91
-            $this->getNotificationHelper()->requestReserveBroken($request);
90
+			Logger::breakReserve($database, $request);
91
+			$this->getNotificationHelper()->requestReserveBroken($request);
92 92
 
93
-            // Redirect home!
94
-            $this->redirect();
95
-        }
96
-    }
93
+			// Redirect home!
94
+			$this->redirect();
95
+		}
96
+	}
97 97
 }
Please login to merge, or discard this patch.
includes/Pages/RequestAction/PageComment.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -15,51 +15,51 @@
 block discarded – undo
15 15
 
16 16
 class PageComment extends RequestActionBase
17 17
 {
18
-    /**
19
-     * Main function for this page, when no specific actions are called.
20
-     * @return void
21
-     */
22
-    protected function main()
23
-    {
24
-        $this->checkPosted();
25
-        $database = $this->getDatabase();
26
-        $request = $this->getRequest($database);
18
+	/**
19
+	 * Main function for this page, when no specific actions are called.
20
+	 * @return void
21
+	 */
22
+	protected function main()
23
+	{
24
+		$this->checkPosted();
25
+		$database = $this->getDatabase();
26
+		$request = $this->getRequest($database);
27 27
 
28
-        $commentText = WebRequest::postString('comment');
29
-        if ($commentText === false || $commentText == '') {
30
-            $this->redirect('viewRequest', null, array('id' => $request->getId()));
28
+		$commentText = WebRequest::postString('comment');
29
+		if ($commentText === false || $commentText == '') {
30
+			$this->redirect('viewRequest', null, array('id' => $request->getId()));
31 31
 
32
-            return;
33
-        }
32
+			return;
33
+		}
34 34
 
35
-        //Look for and detect IPv4/IPv6 addresses in comment text, and warn the commenter.
36
-        $ipv4Regex = '/\b' . RegexConstants::IPV4 . '\b/';
37
-        $ipv6Regex = '/\b' . RegexConstants::IPV6 . '\b/';
35
+		//Look for and detect IPv4/IPv6 addresses in comment text, and warn the commenter.
36
+		$ipv4Regex = '/\b' . RegexConstants::IPV4 . '\b/';
37
+		$ipv6Regex = '/\b' . RegexConstants::IPV6 . '\b/';
38 38
 
39
-        $overridePolicy = WebRequest::postBoolean('privpol-check-override');
39
+		$overridePolicy = WebRequest::postBoolean('privpol-check-override');
40 40
 
41
-        if ((preg_match($ipv4Regex, $commentText) || preg_match($ipv6Regex, $commentText)) && !$overridePolicy) {
42
-            $this->assignCSRFToken();
43
-            $this->assign("request", $request);
44
-            $this->assign("comment", $commentText);
45
-            $this->setTemplate("privpol-warning.tpl");
41
+		if ((preg_match($ipv4Regex, $commentText) || preg_match($ipv6Regex, $commentText)) && !$overridePolicy) {
42
+			$this->assignCSRFToken();
43
+			$this->assign("request", $request);
44
+			$this->assign("comment", $commentText);
45
+			$this->setTemplate("privpol-warning.tpl");
46 46
 
47
-            return;
48
-        }
47
+			return;
48
+		}
49 49
 
50
-        $visibility = WebRequest::postBoolean('adminOnly') ? 'admin' : 'user';
50
+		$visibility = WebRequest::postBoolean('adminOnly') ? 'admin' : 'user';
51 51
 
52
-        $comment = new Comment();
53
-        $comment->setDatabase($database);
52
+		$comment = new Comment();
53
+		$comment->setDatabase($database);
54 54
 
55
-        $comment->setRequest($request->getId());
56
-        $comment->setVisibility($visibility);
57
-        $comment->setUser(User::getCurrent($database)->getId());
58
-        $comment->setComment($commentText);
55
+		$comment->setRequest($request->getId());
56
+		$comment->setVisibility($visibility);
57
+		$comment->setUser(User::getCurrent($database)->getId());
58
+		$comment->setComment($commentText);
59 59
 
60
-        $comment->save();
60
+		$comment->save();
61 61
 
62
-        $this->getNotificationHelper()->commentCreated($comment, $request);
63
-        $this->redirect('viewRequest', null, array('id' => $request->getId()));
64
-    }
62
+		$this->getNotificationHelper()->commentCreated($comment, $request);
63
+		$this->redirect('viewRequest', null, array('id' => $request->getId()));
64
+	}
65 65
 }
Please login to merge, or discard this patch.
includes/Pages/RequestAction/PageReservation.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -17,58 +17,58 @@
 block discarded – undo
17 17
 
18 18
 class PageReservation extends RequestActionBase
19 19
 {
20
-    /**
21
-     * Main function for this page, when no specific actions are called.
22
-     * @throws ApplicationLogicException
23
-     */
24
-    protected function main()
25
-    {
26
-        $this->checkPosted();
27
-        $database = $this->getDatabase();
28
-        $request = $this->getRequest($database);
20
+	/**
21
+	 * Main function for this page, when no specific actions are called.
22
+	 * @throws ApplicationLogicException
23
+	 */
24
+	protected function main()
25
+	{
26
+		$this->checkPosted();
27
+		$database = $this->getDatabase();
28
+		$request = $this->getRequest($database);
29 29
 
30
-        $closureDate = $request->getClosureDate();
30
+		$closureDate = $request->getClosureDate();
31 31
 
32
-        $date = new DateTime();
33
-        $date->modify("-7 days");
34
-        $oneweek = $date->format("Y-m-d H:i:s");
32
+		$date = new DateTime();
33
+		$date->modify("-7 days");
34
+		$oneweek = $date->format("Y-m-d H:i:s");
35 35
 
36
-        $currentUser = User::getCurrent($database);
37
-        if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
38
-            if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
39
-                throw new ApplicationLogicException(
40
-                    "You are not allowed to reserve a request that has been closed for over a week.");
41
-            }
42
-        }
36
+		$currentUser = User::getCurrent($database);
37
+		if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
38
+			if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
39
+				throw new ApplicationLogicException(
40
+					"You are not allowed to reserve a request that has been closed for over a week.");
41
+			}
42
+		}
43 43
 
44
-        if ($request->getReserved() !== null && $request->getReserved() != $currentUser->getId()) {
45
-            throw new ApplicationLogicException("Request is already reserved!");
46
-        }
44
+		if ($request->getReserved() !== null && $request->getReserved() != $currentUser->getId()) {
45
+			throw new ApplicationLogicException("Request is already reserved!");
46
+		}
47 47
 
48
-        if ($request->getReserved() === null) {
49
-            // Check the number of requests a user has reserved already
50
-            $doubleReserveCountQuery = $database->prepare("SELECT COUNT(*) FROM request WHERE reserved = :userid;");
51
-            $doubleReserveCountQuery->bindValue(":userid", $currentUser->getId());
52
-            $doubleReserveCountQuery->execute();
53
-            $doubleReserveCount = $doubleReserveCountQuery->fetchColumn();
54
-            $doubleReserveCountQuery->closeCursor();
48
+		if ($request->getReserved() === null) {
49
+			// Check the number of requests a user has reserved already
50
+			$doubleReserveCountQuery = $database->prepare("SELECT COUNT(*) FROM request WHERE reserved = :userid;");
51
+			$doubleReserveCountQuery->bindValue(":userid", $currentUser->getId());
52
+			$doubleReserveCountQuery->execute();
53
+			$doubleReserveCount = $doubleReserveCountQuery->fetchColumn();
54
+			$doubleReserveCountQuery->closeCursor();
55 55
 
56
-            // User already has at least one reserved.
57
-            if ($doubleReserveCount != 0) {
58
-                SessionAlert::warning("You have multiple requests reserved!");
59
-            }
56
+			// User already has at least one reserved.
57
+			if ($doubleReserveCount != 0) {
58
+				SessionAlert::warning("You have multiple requests reserved!");
59
+			}
60 60
 
61
-            $request->setReserved($currentUser->getId());
62
-            $request->setUpdateVersion(WebRequest::postInt('updateversion'));
63
-            $request->save();
61
+			$request->setReserved($currentUser->getId());
62
+			$request->setUpdateVersion(WebRequest::postInt('updateversion'));
63
+			$request->save();
64 64
 
65
-            Logger::reserve($database, $request);
65
+			Logger::reserve($database, $request);
66 66
 
67
-            $this->getNotificationHelper()->requestReserved($request);
67
+			$this->getNotificationHelper()->requestReserved($request);
68 68
 
69
-            SessionAlert::success("Reserved request {$request->getId()}.");
70
-        }
69
+			SessionAlert::success("Reserved request {$request->getId()}.");
70
+		}
71 71
 
72
-        $this->redirect('viewRequest', null, array('id' => $request->getId()));
73
-    }
72
+		$this->redirect('viewRequest', null, array('id' => $request->getId()));
73
+	}
74 74
 }
Please login to merge, or discard this patch.
includes/Pages/RequestAction/PageDeferRequest.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -17,57 +17,57 @@
 block discarded – undo
17 17
 
18 18
 class PageDeferRequest extends RequestActionBase
19 19
 {
20
-    /**
21
-     * Main function for this page, when no specific actions are called.
22
-     * @throws ApplicationLogicException
23
-     */
24
-    protected function main()
25
-    {
26
-        $this->checkPosted();
27
-        $database = $this->getDatabase();
28
-        $request = $this->getRequest($database);
29
-        $currentUser = User::getCurrent($database);
20
+	/**
21
+	 * Main function for this page, when no specific actions are called.
22
+	 * @throws ApplicationLogicException
23
+	 */
24
+	protected function main()
25
+	{
26
+		$this->checkPosted();
27
+		$database = $this->getDatabase();
28
+		$request = $this->getRequest($database);
29
+		$currentUser = User::getCurrent($database);
30 30
 
31
-        $target = WebRequest::postString('target');
32
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
31
+		$target = WebRequest::postString('target');
32
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
33 33
 
34
-        if (!array_key_exists($target, $requestStates)) {
35
-            throw new ApplicationLogicException('Defer target not valid');
36
-        }
34
+		if (!array_key_exists($target, $requestStates)) {
35
+			throw new ApplicationLogicException('Defer target not valid');
36
+		}
37 37
 
38
-        if ($request->getStatus() == $target) {
39
-            SessionAlert::warning('This request is already in the specified queue.');
40
-            $this->redirect('viewRequest', null, array('id' => $request->getId()));
38
+		if ($request->getStatus() == $target) {
39
+			SessionAlert::warning('This request is already in the specified queue.');
40
+			$this->redirect('viewRequest', null, array('id' => $request->getId()));
41 41
 
42
-            return;
43
-        }
42
+			return;
43
+		}
44 44
 
45
-        $closureDate = $request->getClosureDate();
46
-        $date = new DateTime();
47
-        $date->modify("-7 days");
48
-        $oneweek = $date->format("Y-m-d H:i:s");
45
+		$closureDate = $request->getClosureDate();
46
+		$date = new DateTime();
47
+		$date->modify("-7 days");
48
+		$oneweek = $date->format("Y-m-d H:i:s");
49 49
 
50 50
 
51
-        if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
52
-            if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
53
-                throw new ApplicationLogicException(
54
-                    "You are not allowed to re-open a request that has been closed for over a week.");
55
-            }
56
-        }
51
+		if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
52
+			if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
53
+				throw new ApplicationLogicException(
54
+					"You are not allowed to re-open a request that has been closed for over a week.");
55
+			}
56
+		}
57 57
 
58
-        $request->setReserved(null);
59
-        $request->setStatus($target);
60
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
61
-        $request->save();
58
+		$request->setReserved(null);
59
+		$request->setStatus($target);
60
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
61
+		$request->save();
62 62
 
63
-        $deto = $requestStates[$target]['deferto'];
64
-        $detolog = $requestStates[$target]['defertolog'];
63
+		$deto = $requestStates[$target]['deferto'];
64
+		$detolog = $requestStates[$target]['defertolog'];
65 65
 
66
-        Logger::deferRequest($database, $request, $detolog);
66
+		Logger::deferRequest($database, $request, $detolog);
67 67
 
68
-        $this->getNotificationHelper()->requestDeferred($request);
69
-        SessionAlert::success("Request {$request->getId()} deferred to {$deto}");
68
+		$this->getNotificationHelper()->requestDeferred($request);
69
+		SessionAlert::success("Request {$request->getId()} deferred to {$deto}");
70 70
 
71
-        $this->redirect();
72
-    }
71
+		$this->redirect();
72
+	}
73 73
 }
Please login to merge, or discard this patch.