mdaniels5757 / waca

includes/Pages/Request/PageEmailConfirmationRequired.php

Indentation +8 added lines, -8 removed lines

@@ -12,12 +12,12 @@
 
 class PageEmailConfirmationRequired extends PublicInterfacePageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setTemplate('request/email-confirmation.tpl');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setTemplate('request/email-confirmation.tpl');
+	}
 }
\ No newline at end of file

includes/Pages/Request/PageRequestAccount.php

Indentation +146 added lines, -146 removed lines

@@ -19,150 +19,150 @@
 
 class PageRequestAccount extends PublicInterfacePageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        // dual mode page
-        if (WebRequest::wasPosted()) {
-            $request = $this->createNewRequest();
-
-            $validationErrors = $this->validateRequest($request);
-
-            if (count($validationErrors) > 0) {
-                foreach ($validationErrors as $validationError) {
-                    SessionAlert::error($validationError->getErrorMessage());
-                }
-
-                // Preserve the data after an error
-                WebRequest::setSessionContext('accountReq',
-                    array(
-                        'username' => WebRequest::postString('name'),
-                        'email'    => WebRequest::postEmail('email'),
-                        'comments' => WebRequest::postString('comments'),
-                    )
-                );
-
-                // Validation error, bomb out early.
-                $this->redirect();
-
-                return;
-            }
-
-            // actually save the request to the database
-            if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
-                $this->saveAsEmailConfirmation($request);
-            }
-            else {
-                $this->saveWithoutEmailConfirmation($request);
-            }
-        }
-        else {
-            // set the form values from the session context
-            $context = WebRequest::getSessionContext('accountReq');
-            if ($context !== null && is_array($context)) {
-                $this->assign('username', $context['username']);
-                $this->assign('email', $context['email']);
-                $this->assign('comments', $context['comments']);
-            }
-
-            // Clear it for a refresh
-            WebRequest::setSessionContext('accountReq', null);
-
-            $this->setTemplate('request/request-form.tpl');
-        }
-    }
-
-    /**
-     * @return Request
-     */
-    protected function createNewRequest()
-    {
-        $request = new Request();
-        $request->setDatabase($this->getDatabase());
-
-        $request->setName(WebRequest::postString('name'));
-        $request->setEmail(WebRequest::postEmail('email'));
-        $request->setComment(WebRequest::postString('comments'));
-
-        $request->setIp(WebRequest::remoteAddress());
-        $request->setForwardedIp(WebRequest::forwardedAddress());
-
-        $request->setUserAgent(WebRequest::userAgent());
-
-        return $request;
-    }
-
-    /**
-     * @param Request $request
-     *
-     * @return ValidationError[]
-     */
-    protected function validateRequest($request)
-    {
-        $validationHelper = new RequestValidationHelper(
-            new BanHelper($this->getDatabase()),
-            $request,
-            WebRequest::postEmail('emailconfirm'),
-            $this->getDatabase(),
-            $this->getAntiSpoofProvider(),
-            $this->getXffTrustProvider(),
-            $this->getHttpHelper(),
-            $this->getSiteConfiguration()->getMediawikiWebServiceEndpoint(),
-            $this->getSiteConfiguration()->getTitleBlacklistEnabled(),
-            $this->getTorExitProvider());
-
-        // These are arrays of ValidationError.
-        $nameValidation = $validationHelper->validateName();
-        $emailValidation = $validationHelper->validateEmail();
-        $otherValidation = $validationHelper->validateOther();
-
-        $validationErrors = array_merge($nameValidation, $emailValidation, $otherValidation);
-
-        return $validationErrors;
-    }
-
-    /**
-     * @param Request $request
-     *
-     * @throws Exception
-     */
-    protected function saveAsEmailConfirmation(Request $request)
-    {
-        $request->generateEmailConfirmationHash();
-        $request->save();
-
-        $trustedIp = $this->getXffTrustProvider()->getTrustedClientIp(
-            $request->getIp(),
-            $request->getForwardedIp());
-
-        $this->assign("ip", $trustedIp);
-        $this->assign("id", $request->getId());
-        $this->assign("hash", $request->getEmailConfirm());
-
-        // Sends the confirmation email to the user.
-        $this->getEmailHelper()->sendMail(
-            $request->getEmail(),
-            "[ACC #{$request->getId()}] English Wikipedia Account Request",
-            $this->fetchTemplate('request/confirmation-mail.tpl'));
-
-        $this->redirect('emailConfirmationRequired');
-    }
-
-    /**
-     * @param Request $request
-     *
-     * @throws Exception
-     */
-    protected function saveWithoutEmailConfirmation(Request $request)
-    {
-        $request->setEmailConfirm(0); // fixme Since it can't be null
-        $request->save();
-
-        $this->getNotificationHelper()->requestReceived($request);
-
-        $this->redirect('requestSubmitted');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		// dual mode page
+		if (WebRequest::wasPosted()) {
+			$request = $this->createNewRequest();
+
+			$validationErrors = $this->validateRequest($request);
+
+			if (count($validationErrors) > 0) {
+				foreach ($validationErrors as $validationError) {
+					SessionAlert::error($validationError->getErrorMessage());
+				}
+
+				// Preserve the data after an error
+				WebRequest::setSessionContext('accountReq',
+					array(
+						'username' => WebRequest::postString('name'),
+						'email'    => WebRequest::postEmail('email'),
+						'comments' => WebRequest::postString('comments'),
+					)
+				);
+
+				// Validation error, bomb out early.
+				$this->redirect();
+
+				return;
+			}
+
+			// actually save the request to the database
+			if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
+				$this->saveAsEmailConfirmation($request);
+			}
+			else {
+				$this->saveWithoutEmailConfirmation($request);
+			}
+		}
+		else {
+			// set the form values from the session context
+			$context = WebRequest::getSessionContext('accountReq');
+			if ($context !== null && is_array($context)) {
+				$this->assign('username', $context['username']);
+				$this->assign('email', $context['email']);
+				$this->assign('comments', $context['comments']);
+			}
+
+			// Clear it for a refresh
+			WebRequest::setSessionContext('accountReq', null);
+
+			$this->setTemplate('request/request-form.tpl');
+		}
+	}
+
+	/**
+	 * @return Request
+	 */
+	protected function createNewRequest()
+	{
+		$request = new Request();
+		$request->setDatabase($this->getDatabase());
+
+		$request->setName(WebRequest::postString('name'));
+		$request->setEmail(WebRequest::postEmail('email'));
+		$request->setComment(WebRequest::postString('comments'));
+
+		$request->setIp(WebRequest::remoteAddress());
+		$request->setForwardedIp(WebRequest::forwardedAddress());
+
+		$request->setUserAgent(WebRequest::userAgent());
+
+		return $request;
+	}
+
+	/**
+	 * @param Request $request
+	 *
+	 * @return ValidationError[]
+	 */
+	protected function validateRequest($request)
+	{
+		$validationHelper = new RequestValidationHelper(
+			new BanHelper($this->getDatabase()),
+			$request,
+			WebRequest::postEmail('emailconfirm'),
+			$this->getDatabase(),
+			$this->getAntiSpoofProvider(),
+			$this->getXffTrustProvider(),
+			$this->getHttpHelper(),
+			$this->getSiteConfiguration()->getMediawikiWebServiceEndpoint(),
+			$this->getSiteConfiguration()->getTitleBlacklistEnabled(),
+			$this->getTorExitProvider());
+
+		// These are arrays of ValidationError.
+		$nameValidation = $validationHelper->validateName();
+		$emailValidation = $validationHelper->validateEmail();
+		$otherValidation = $validationHelper->validateOther();
+
+		$validationErrors = array_merge($nameValidation, $emailValidation, $otherValidation);
+
+		return $validationErrors;
+	}
+
+	/**
+	 * @param Request $request
+	 *
+	 * @throws Exception
+	 */
+	protected function saveAsEmailConfirmation(Request $request)
+	{
+		$request->generateEmailConfirmationHash();
+		$request->save();
+
+		$trustedIp = $this->getXffTrustProvider()->getTrustedClientIp(
+			$request->getIp(),
+			$request->getForwardedIp());
+
+		$this->assign("ip", $trustedIp);
+		$this->assign("id", $request->getId());
+		$this->assign("hash", $request->getEmailConfirm());
+
+		// Sends the confirmation email to the user.
+		$this->getEmailHelper()->sendMail(
+			$request->getEmail(),
+			"[ACC #{$request->getId()}] English Wikipedia Account Request",
+			$this->fetchTemplate('request/confirmation-mail.tpl'));
+
+		$this->redirect('emailConfirmationRequired');
+	}
+
+	/**
+	 * @param Request $request
+	 *
+	 * @throws Exception
+	 */
+	protected function saveWithoutEmailConfirmation(Request $request)
+	{
+		$request->setEmailConfirm(0); // fixme Since it can't be null
+		$request->save();
+
+		$this->getNotificationHelper()->requestReceived($request);
+
+		$this->redirect('requestSubmitted');
+	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -54,12 +54,10 @@
             // actually save the request to the database
             if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
                 $this->saveAsEmailConfirmation($request);
-            }
-            else {
+            } else {
                 $this->saveWithoutEmailConfirmation($request);
             }
-        }
-        else {
+        } else {
             // set the form values from the session context
             $context = WebRequest::getSessionContext('accountReq');
             if ($context !== null && is_array($context)) {

includes/Pages/Request/PageConfirmEmail.php

Indentation +63 added lines, -63 removed lines

@@ -18,67 +18,67 @@
 
 class PageConfirmEmail extends PublicInterfacePageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     * @throws Exception
-     */
-    protected function main()
-    {
-        $id = WebRequest::getInt('id');
-        $si = WebRequest::getString('si');
-
-        if ($id === null || $si === null) {
-            throw new ApplicationLogicException('Link incomplete - please double check the link you received.');
-        }
-
-        /** @var Request|false $request */
-        $request = Request::getById($id, $this->getDatabase());
-
-        if ($request === false) {
-            throw new ApplicationLogicException('Request not found');
-        }
-
-        if ($request->getEmailConfirm() === 'Confirmed') {
-            // request has already been confirmed. Bomb out silently.
-            $this->redirect('requestSubmitted');
-
-            return;
-        }
-
-        if ($request->getEmailConfirm() === $si) {
-            $request->setEmailConfirm('Confirmed');
-        }
-        else {
-            throw new ApplicationLogicException('The confirmation value does not appear to match the expected value');
-        }
-
-        try {
-            $request->save();
-        }
-        catch (OptimisticLockFailedException $ex) {
-            // Okay. Someone's edited this in the time between us loading this page and doing the checks, and us getting
-            // to saving the page. We *do not* want to show an optimistic lock failure, the most likely problem is they
-            // double-loaded this page (see #255). Let's confirm this, and bomb out with a success message if it's the
-            // case.
-
-            $request = Request::getById($id, $this->getDatabase());
-            if ($request->getEmailConfirm() === 'Confirmed') {
-                // we've already done the sanity checks above
-
-                $this->redirect('requestSubmitted');
-
-                // skip the log and notification
-                return;
-            }
-
-            // something really weird happened. Another race condition?
-            throw $ex;
-        }
-
-        Logger::emailConfirmed($this->getDatabase(), $request);
-        $this->getNotificationHelper()->requestReceived($request);
-
-        $this->redirect('requestSubmitted');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 * @throws Exception
+	 */
+	protected function main()
+	{
+		$id = WebRequest::getInt('id');
+		$si = WebRequest::getString('si');
+
+		if ($id === null || $si === null) {
+			throw new ApplicationLogicException('Link incomplete - please double check the link you received.');
+		}
+
+		/** @var Request|false $request */
+		$request = Request::getById($id, $this->getDatabase());
+
+		if ($request === false) {
+			throw new ApplicationLogicException('Request not found');
+		}
+
+		if ($request->getEmailConfirm() === 'Confirmed') {
+			// request has already been confirmed. Bomb out silently.
+			$this->redirect('requestSubmitted');
+
+			return;
+		}
+
+		if ($request->getEmailConfirm() === $si) {
+			$request->setEmailConfirm('Confirmed');
+		}
+		else {
+			throw new ApplicationLogicException('The confirmation value does not appear to match the expected value');
+		}
+
+		try {
+			$request->save();
+		}
+		catch (OptimisticLockFailedException $ex) {
+			// Okay. Someone's edited this in the time between us loading this page and doing the checks, and us getting
+			// to saving the page. We *do not* want to show an optimistic lock failure, the most likely problem is they
+			// double-loaded this page (see #255). Let's confirm this, and bomb out with a success message if it's the
+			// case.
+
+			$request = Request::getById($id, $this->getDatabase());
+			if ($request->getEmailConfirm() === 'Confirmed') {
+				// we've already done the sanity checks above
+
+				$this->redirect('requestSubmitted');
+
+				// skip the log and notification
+				return;
+			}
+
+			// something really weird happened. Another race condition?
+			throw $ex;
+		}
+
+		Logger::emailConfirmed($this->getDatabase(), $request);
+		$this->getNotificationHelper()->requestReceived($request);
+
+		$this->redirect('requestSubmitted');
+	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         if ($request->getEmailConfirm() === $si) {
             $request->setEmailConfirm('Confirmed');
-        }
-        else {
+        } else {
             throw new ApplicationLogicException('The confirmation value does not appear to match the expected value');
         }
 

includes/Pages/Request/PageRequestSubmitted.php

Indentation +8 added lines, -8 removed lines

@@ -12,12 +12,12 @@
 
 class PageRequestSubmitted extends PublicInterfacePageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setTemplate('request/email-confirmed.tpl');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setTemplate('request/email-confirmed.tpl');
+	}
 }
\ No newline at end of file

includes/Pages/PageTeam.php

Indentation +23 added lines, -23 removed lines

@@ -12,31 +12,31 @@
 
 class PageTeam extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $path = $this->getSiteConfiguration()->getFilePath() . '/team.json';
-        $json = file_get_contents($path);
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$path = $this->getSiteConfiguration()->getFilePath() . '/team.json';
+		$json = file_get_contents($path);
 
-        $teamData = json_decode($json, true);
+		$teamData = json_decode($json, true);
 
-        $active = array();
-        $inactive = array();
+		$active = array();
+		$inactive = array();
 
-        foreach ($teamData as $name => $item) {
-            if (count($item['Role']) == 0) {
-                $inactive[$name] = $item;
-            }
-            else {
-                $active[$name] = $item;
-            }
-        }
+		foreach ($teamData as $name => $item) {
+			if (count($item['Role']) == 0) {
+				$inactive[$name] = $item;
+			}
+			else {
+				$active[$name] = $item;
+			}
+		}
 
-        $this->assign('developer', $active);
-        $this->assign('inactiveDeveloper', $inactive);
-        $this->setTemplate('team/team.tpl');
-    }
+		$this->assign('developer', $active);
+		$this->assign('inactiveDeveloper', $inactive);
+		$this->setTemplate('team/team.tpl');
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
         foreach ($teamData as $name => $item) {
             if (count($item['Role']) == 0) {
                 $inactive[$name] = $item;
-            }
-            else {
+            } else {
                 $active[$name] = $item;
             }
         }

includes/Pages/RequestAction/PageCustomClose.php

Braces +4 added lines, -8 removed lines

@@ -42,8 +42,7 @@ 
             $this->doCustomClose($currentUser, $request, $database);
 
             $this->redirect();
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->showCustomCloseForm($database, $request);
         }
@@ -185,16 +184,14 @@ 
 
             // Send the mail after the save, since save can be rolled back
             $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-        }
-        else {
+        } else {
             if (array_key_exists($action, $availableRequestStates)) {
                 // Defer to other state
                 $this->deferRequest($request, $database, $action, $availableRequestStates, $messageBody);
 
                 // Send the mail after the save, since save can be rolled back
                 $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-            }
-            else {
+            } else {
                 $request->setReserved(null);
                 $request->setUpdateVersion(WebRequest::postInt('updateversion'));
                 $request->save();
@@ -236,8 +233,7 @@ 
         if ($action == EmailTemplate::CREATED) {
             $logCloseType = 'custom-y';
             $notificationCloseType = "Custom, Created";
-        }
-        else {
+        } else {
             $logCloseType = 'custom-n';
             $notificationCloseType = "Custom, Not Created";
         }

Indentation +274 added lines, -274 removed lines

@@ -24,278 +24,278 @@
 
 class PageCustomClose extends PageCloseRequest
 {
-    use RequestData;
-
-    protected function main()
-    {
-        $database = $this->getDatabase();
-
-        $request = $this->getRequest($database);
-        $currentUser = User::getCurrent($this->getDatabase());
-
-        if ($request->getStatus() === 'Closed') {
-            throw new ApplicationLogicException('Request is already closed');
-        }
-
-        // Dual-mode page
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $this->doCustomClose($currentUser, $request, $database);
-
-            $this->redirect();
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->showCustomCloseForm($database, $request);
-        }
-    }
-
-    /**
-     * @param $database
-     *
-     * @return Request
-     * @throws ApplicationLogicException
-     */
-    protected function getRequest(PdoDatabase $database)
-    {
-        $requestId = WebRequest::getInt('request');
-        if ($requestId === null) {
-            throw new ApplicationLogicException('Request ID not found');
-        }
-
-        /** @var Request $request */
-        $request = Request::getById($requestId, $database);
-
-        if ($request === false) {
-            throw new ApplicationLogicException('Request not found');
-        }
-
-        return $request;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return EmailTemplate|null
-     */
-    protected function getTemplate(PdoDatabase $database)
-    {
-        $templateId = WebRequest::getInt('template');
-        if ($templateId === null) {
-            return null;
-        }
-
-        /** @var EmailTemplate $template */
-        $template = EmailTemplate::getById($templateId, $database);
-        if ($template === false || !$template->getActive()) {
-            return null;
-        }
-
-        return $template;
-    }
-
-    /**
-     * @param $database
-     * @param $request
-     *
-     * @throws Exception
-     */
-    protected function showCustomCloseForm(PdoDatabase $database, Request $request)
-    {
-        $currentUser = User::getCurrent($database);
-        $config = $this->getSiteConfiguration();
-
-        $allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
-        if (!$allowedPrivateData) {
-            // we probably shouldn't be showing the user this form if they're not allowed to access private data...
-            throw new AccessDeniedException($this->getSecurityManager());
-        }
-
-        $template = $this->getTemplate($database);
-
-        // Preload data
-        $this->assign('defaultAction', '');
-        $this->assign('preloadText', '');
-        $this->assign('preloadTitle', '');
-
-        if ($template !== null) {
-            $this->assign('defaultAction', $template->getDefaultAction());
-            $this->assign('preloadText', $template->getText());
-            $this->assign('preloadTitle', $template->getName());
-        }
-
-        // Static data
-        $this->assign('requeststates', $config->getRequestStates());
-
-        // request data
-        $this->assign('requestId', $request->getIp());
-        $this->assign('updateVersion', $request->getUpdateVersion());
-        $this->setupBasicData($request, $config);
-        $this->setupReservationDetails($request->getReserved(), $database, $currentUser);
-        $this->setupPrivateData($request, $currentUser, $this->getSiteConfiguration(), $database);
-
-        // IP location
-        $trustedIp = $this->getXffTrustProvider()->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
-        $this->assign('iplocation', $this->getLocationProvider()->getIpLocation($trustedIp));
-
-        // Confirmations
-        $this->assign('confirmEmailAlreadySent', $this->checkEmailAlreadySent($request));
-
-        $this->assign('canSkipCcMailingList', $this->barrierTest('skipCcMailingList', $currentUser));
-
-        $this->assign('allowWelcomeSkip', false);
-        $this->assign('forceWelcomeSkip', false);
-
-        $oauth = new OAuthUserHelper($currentUser, $this->getDatabase(), $this->getOAuthProtocolHelper(), $config);
-
-        if ($currentUser->getWelcomeTemplate() != 0) {
-            $this->assign('allowWelcomeSkip', true);
-
-            if (!$oauth->canWelcome()) {
-                $this->assign('forceWelcomeSkip', true);
-            }
-        }
-
-
-        // template
-        $this->setTemplate('custom-close.tpl');
-    }
-
-    /**
-     * @param User        $currentUser
-     * @param Request     $request
-     * @param PdoDatabase $database
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function doCustomClose(User $currentUser, Request $request, PdoDatabase $database)
-    {
-        $messageBody = WebRequest::postString('msgbody');
-        if ($messageBody === null || trim($messageBody) === '') {
-            throw new ApplicationLogicException('Message body cannot be blank');
-        }
-
-        $ccMailingList = true;
-        if ($this->barrierTest('skipCcMailingList', $currentUser)) {
-            $ccMailingList = WebRequest::postBoolean('ccMailingList');
-        }
-
-        if ($request->getStatus() === 'Closed') {
-            throw new ApplicationLogicException('Request is already closed');
-        }
-
-        if (!(WebRequest::postBoolean('confirmEmailAlreadySent'))
-        ) {
-            throw new ApplicationLogicException('Not all confirmations checked');
-        }
-
-        $action = WebRequest::postString('action');
-        $availableRequestStates = $this->getSiteConfiguration()->getRequestStates();
-
-        if ($action === EmailTemplate::CREATED || $action === EmailTemplate::NOT_CREATED) {
-            // Close request
-            $this->closeRequest($request, $database, $action, $messageBody);
-
-            $this->processWelcome($action);
-
-            // Send the mail after the save, since save can be rolled back
-            $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-        }
-        else {
-            if (array_key_exists($action, $availableRequestStates)) {
-                // Defer to other state
-                $this->deferRequest($request, $database, $action, $availableRequestStates, $messageBody);
-
-                // Send the mail after the save, since save can be rolled back
-                $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-            }
-            else {
-                $request->setReserved(null);
-                $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-                $request->save();
-
-                // Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
-                // and be rolled back.
-
-                // Send mail
-                $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-
-                Logger::sentMail($database, $request, $messageBody);
-                Logger::unreserve($database, $request);
-
-                $this->getNotificationHelper()->sentMail($request);
-                SessionAlert::success("Sent mail to Request {$request->getId()}");
-            }
-        }
-    }
-
-    /**
-     * @param Request     $request
-     * @param PdoDatabase $database
-     * @param string      $action
-     * @param string      $messageBody
-     *
-     * @throws Exception
-     * @throws OptimisticLockFailedException
-     */
-    protected function closeRequest(Request $request, PdoDatabase $database, $action, $messageBody)
-    {
-        $request->setStatus('Closed');
-        $request->setReserved(null);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
-
-        // Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE and
-        // be rolled back.
-
-        if ($action == EmailTemplate::CREATED) {
-            $logCloseType = 'custom-y';
-            $notificationCloseType = "Custom, Created";
-        }
-        else {
-            $logCloseType = 'custom-n';
-            $notificationCloseType = "Custom, Not Created";
-        }
-
-        Logger::closeRequest($database, $request, $logCloseType, $messageBody);
-        $this->getNotificationHelper()->requestClosed($request, $notificationCloseType);
-
-        $requestName = htmlentities($request->getName(), ENT_COMPAT, 'UTF-8');
-        SessionAlert::success("Request {$request->getId()} ({$requestName}) closed as {$notificationCloseType}.");
-    }
-
-    /**
-     * @param Request     $request
-     * @param PdoDatabase $database
-     * @param string      $action
-     * @param             $availableRequestStates
-     * @param string      $messageBody
-     *
-     * @throws Exception
-     * @throws OptimisticLockFailedException
-     */
-    protected function deferRequest(
-        Request $request,
-        PdoDatabase $database,
-        $action,
-        $availableRequestStates,
-        $messageBody
-    ) {
-        $request->setStatus($action);
-        $request->setReserved(null);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
-
-        // Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
-        // and be rolled back.
-
-        $deferToLog = $availableRequestStates[$action]['defertolog'];
-        Logger::sentMail($database, $request, $messageBody);
-        Logger::deferRequest($database, $request, $deferToLog);
-
-        $this->getNotificationHelper()->requestDeferredWithMail($request);
-
-        $deferTo = $availableRequestStates[$action]['deferto'];
-        SessionAlert::success("Request {$request->getId()} deferred to $deferTo, sending an email.");
-    }
+	use RequestData;
+
+	protected function main()
+	{
+		$database = $this->getDatabase();
+
+		$request = $this->getRequest($database);
+		$currentUser = User::getCurrent($this->getDatabase());
+
+		if ($request->getStatus() === 'Closed') {
+			throw new ApplicationLogicException('Request is already closed');
+		}
+
+		// Dual-mode page
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$this->doCustomClose($currentUser, $request, $database);
+
+			$this->redirect();
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->showCustomCloseForm($database, $request);
+		}
+	}
+
+	/**
+	 * @param $database
+	 *
+	 * @return Request
+	 * @throws ApplicationLogicException
+	 */
+	protected function getRequest(PdoDatabase $database)
+	{
+		$requestId = WebRequest::getInt('request');
+		if ($requestId === null) {
+			throw new ApplicationLogicException('Request ID not found');
+		}
+
+		/** @var Request $request */
+		$request = Request::getById($requestId, $database);
+
+		if ($request === false) {
+			throw new ApplicationLogicException('Request not found');
+		}
+
+		return $request;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return EmailTemplate|null
+	 */
+	protected function getTemplate(PdoDatabase $database)
+	{
+		$templateId = WebRequest::getInt('template');
+		if ($templateId === null) {
+			return null;
+		}
+
+		/** @var EmailTemplate $template */
+		$template = EmailTemplate::getById($templateId, $database);
+		if ($template === false || !$template->getActive()) {
+			return null;
+		}
+
+		return $template;
+	}
+
+	/**
+	 * @param $database
+	 * @param $request
+	 *
+	 * @throws Exception
+	 */
+	protected function showCustomCloseForm(PdoDatabase $database, Request $request)
+	{
+		$currentUser = User::getCurrent($database);
+		$config = $this->getSiteConfiguration();
+
+		$allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
+		if (!$allowedPrivateData) {
+			// we probably shouldn't be showing the user this form if they're not allowed to access private data...
+			throw new AccessDeniedException($this->getSecurityManager());
+		}
+
+		$template = $this->getTemplate($database);
+
+		// Preload data
+		$this->assign('defaultAction', '');
+		$this->assign('preloadText', '');
+		$this->assign('preloadTitle', '');
+
+		if ($template !== null) {
+			$this->assign('defaultAction', $template->getDefaultAction());
+			$this->assign('preloadText', $template->getText());
+			$this->assign('preloadTitle', $template->getName());
+		}
+
+		// Static data
+		$this->assign('requeststates', $config->getRequestStates());
+
+		// request data
+		$this->assign('requestId', $request->getIp());
+		$this->assign('updateVersion', $request->getUpdateVersion());
+		$this->setupBasicData($request, $config);
+		$this->setupReservationDetails($request->getReserved(), $database, $currentUser);
+		$this->setupPrivateData($request, $currentUser, $this->getSiteConfiguration(), $database);
+
+		// IP location
+		$trustedIp = $this->getXffTrustProvider()->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
+		$this->assign('iplocation', $this->getLocationProvider()->getIpLocation($trustedIp));
+
+		// Confirmations
+		$this->assign('confirmEmailAlreadySent', $this->checkEmailAlreadySent($request));
+
+		$this->assign('canSkipCcMailingList', $this->barrierTest('skipCcMailingList', $currentUser));
+
+		$this->assign('allowWelcomeSkip', false);
+		$this->assign('forceWelcomeSkip', false);
+
+		$oauth = new OAuthUserHelper($currentUser, $this->getDatabase(), $this->getOAuthProtocolHelper(), $config);
+
+		if ($currentUser->getWelcomeTemplate() != 0) {
+			$this->assign('allowWelcomeSkip', true);
+
+			if (!$oauth->canWelcome()) {
+				$this->assign('forceWelcomeSkip', true);
+			}
+		}
+
+
+		// template
+		$this->setTemplate('custom-close.tpl');
+	}
+
+	/**
+	 * @param User        $currentUser
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function doCustomClose(User $currentUser, Request $request, PdoDatabase $database)
+	{
+		$messageBody = WebRequest::postString('msgbody');
+		if ($messageBody === null || trim($messageBody) === '') {
+			throw new ApplicationLogicException('Message body cannot be blank');
+		}
+
+		$ccMailingList = true;
+		if ($this->barrierTest('skipCcMailingList', $currentUser)) {
+			$ccMailingList = WebRequest::postBoolean('ccMailingList');
+		}
+
+		if ($request->getStatus() === 'Closed') {
+			throw new ApplicationLogicException('Request is already closed');
+		}
+
+		if (!(WebRequest::postBoolean('confirmEmailAlreadySent'))
+		) {
+			throw new ApplicationLogicException('Not all confirmations checked');
+		}
+
+		$action = WebRequest::postString('action');
+		$availableRequestStates = $this->getSiteConfiguration()->getRequestStates();
+
+		if ($action === EmailTemplate::CREATED || $action === EmailTemplate::NOT_CREATED) {
+			// Close request
+			$this->closeRequest($request, $database, $action, $messageBody);
+
+			$this->processWelcome($action);
+
+			// Send the mail after the save, since save can be rolled back
+			$this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
+		}
+		else {
+			if (array_key_exists($action, $availableRequestStates)) {
+				// Defer to other state
+				$this->deferRequest($request, $database, $action, $availableRequestStates, $messageBody);
+
+				// Send the mail after the save, since save can be rolled back
+				$this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
+			}
+			else {
+				$request->setReserved(null);
+				$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+				$request->save();
+
+				// Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
+				// and be rolled back.
+
+				// Send mail
+				$this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
+
+				Logger::sentMail($database, $request, $messageBody);
+				Logger::unreserve($database, $request);
+
+				$this->getNotificationHelper()->sentMail($request);
+				SessionAlert::success("Sent mail to Request {$request->getId()}");
+			}
+		}
+	}
+
+	/**
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 * @param string      $action
+	 * @param string      $messageBody
+	 *
+	 * @throws Exception
+	 * @throws OptimisticLockFailedException
+	 */
+	protected function closeRequest(Request $request, PdoDatabase $database, $action, $messageBody)
+	{
+		$request->setStatus('Closed');
+		$request->setReserved(null);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
+
+		// Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE and
+		// be rolled back.
+
+		if ($action == EmailTemplate::CREATED) {
+			$logCloseType = 'custom-y';
+			$notificationCloseType = "Custom, Created";
+		}
+		else {
+			$logCloseType = 'custom-n';
+			$notificationCloseType = "Custom, Not Created";
+		}
+
+		Logger::closeRequest($database, $request, $logCloseType, $messageBody);
+		$this->getNotificationHelper()->requestClosed($request, $notificationCloseType);
+
+		$requestName = htmlentities($request->getName(), ENT_COMPAT, 'UTF-8');
+		SessionAlert::success("Request {$request->getId()} ({$requestName}) closed as {$notificationCloseType}.");
+	}
+
+	/**
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 * @param string      $action
+	 * @param             $availableRequestStates
+	 * @param string      $messageBody
+	 *
+	 * @throws Exception
+	 * @throws OptimisticLockFailedException
+	 */
+	protected function deferRequest(
+		Request $request,
+		PdoDatabase $database,
+		$action,
+		$availableRequestStates,
+		$messageBody
+	) {
+		$request->setStatus($action);
+		$request->setReserved(null);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
+
+		// Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
+		// and be rolled back.
+
+		$deferToLog = $availableRequestStates[$action]['defertolog'];
+		Logger::sentMail($database, $request, $messageBody);
+		Logger::deferRequest($database, $request, $deferToLog);
+
+		$this->getNotificationHelper()->requestDeferredWithMail($request);
+
+		$deferTo = $availableRequestStates[$action]['deferto'];
+		SessionAlert::success("Request {$request->getId()} deferred to $deferTo, sending an email.");
+	}
 }

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/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/Offline.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         if ($external) {
             return $smarty->fetch("offline/external.tpl");
-        }
-        else {
+        } else {
             $hideCulprit = true;
 
             // Use the provided message if possible

Indentation +37 added lines, -37 removed lines

@@ -17,16 +17,16 @@ 
  */
 class Offline
 {
-    /**
-     * Determines if the tool is offline
-     * @return bool
-     */
-    public static function isOffline()
-    {
-        global $dontUseDb;
+	/**
+	 * Determines if the tool is offline
+	 * @return bool
+	 */
+	public static function isOffline()
+	{
+		global $dontUseDb;
 
-        return (bool)$dontUseDb;
-    }
+		return (bool)$dontUseDb;
+	}
 
 	/**
 	 * Gets the offline message
@@ -37,38 +37,38 @@ 
 	 * @return string
 	 * @throws SmartyException
 	 */
-    public static function getOfflineMessage($external, $message = null)
-    {
-        global $dontUseDbCulprit, $dontUseDbReason, $baseurl;
+	public static function getOfflineMessage($external, $message = null)
+	{
+		global $dontUseDbCulprit, $dontUseDbReason, $baseurl;
 
-        $smarty = new Smarty();
-        $smarty->assign("baseurl", $baseurl);
-        $smarty->assign("alerts", []);
-        $smarty->assign("toolversion", Environment::getToolVersion());
+		$smarty = new Smarty();
+		$smarty->assign("baseurl", $baseurl);
+		$smarty->assign("alerts", []);
+		$smarty->assign("toolversion", Environment::getToolVersion());
 
-        if (!headers_sent()) {
-            header("HTTP/1.1 503 Service Unavailable");
-        }
+		if (!headers_sent()) {
+			header("HTTP/1.1 503 Service Unavailable");
+		}
 
-        if ($external) {
-            return $smarty->fetch("offline/external.tpl");
-        }
-        else {
-            $hideCulprit = true;
+		if ($external) {
+			return $smarty->fetch("offline/external.tpl");
+		}
+		else {
+			$hideCulprit = true;
 
-            // Use the provided message if possible
-            if ($message === null) {
-                $hideCulprit = false;
-                $message = $dontUseDbReason;
-            }
+			// Use the provided message if possible
+			if ($message === null) {
+				$hideCulprit = false;
+				$message = $dontUseDbReason;
+			}
 
-            $smarty->assign("hideCulprit", $hideCulprit);
-            $smarty->assign("dontUseDbCulprit", $dontUseDbCulprit);
-            $smarty->assign("dontUseDbReason", $message);
-            $smarty->assign("alerts", array());
-            $smarty->assign('currentUser', User::getCommunity());
+			$smarty->assign("hideCulprit", $hideCulprit);
+			$smarty->assign("dontUseDbCulprit", $dontUseDbCulprit);
+			$smarty->assign("dontUseDbReason", $message);
+			$smarty->assign("alerts", array());
+			$smarty->assign('currentUser', User::getCommunity());
 
-            return $smarty->fetch("offline/internal.tpl");
-        }
-    }
+			return $smarty->fetch("offline/internal.tpl");
+		}
+	}
 }