enwikipedia-acc / waca

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');
+	}
 }

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');
+		}
+	}
 }

includes/Pages/PageEditComment.php

Indentation +51 added lines, -51 removed lines

@@ -20,67 +20,67 @@
 
 class PageEditComment extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     */
-    protected function main()
-    {
-        $commentId = WebRequest::getInt('id');
-        if ($commentId === null) {
-            throw new ApplicationLogicException('Comment ID not specified');
-        }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 */
+	protected function main()
+	{
+		$commentId = WebRequest::getInt('id');
+		if ($commentId === null) {
+			throw new ApplicationLogicException('Comment ID not specified');
+		}
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        /** @var Comment $comment */
-        $comment = Comment::getById($commentId, $database);
-        if ($comment === false) {
-            throw new ApplicationLogicException('Comment not found');
-        }
+		/** @var Comment $comment */
+		$comment = Comment::getById($commentId, $database);
+		if ($comment === false) {
+			throw new ApplicationLogicException('Comment not found');
+		}
 
-        $currentUser = User::getCurrent($database);
-        if ($comment->getUser() !== $currentUser->getId() && !$this->barrierTest('editOthers', $currentUser)) {
-            throw new AccessDeniedException($this->getSecurityManager());
-        }
+		$currentUser = User::getCurrent($database);
+		if ($comment->getUser() !== $currentUser->getId() && !$this->barrierTest('editOthers', $currentUser)) {
+			throw new AccessDeniedException($this->getSecurityManager());
+		}
 
-        /** @var Request $request */
-        $request = Request::getById($comment->getRequest(), $database);
+		/** @var Request $request */
+		$request = Request::getById($comment->getRequest(), $database);
 
-        if ($request === false) {
-            throw new ApplicationLogicException('Request was not found.');
-        }
+		if ($request === false) {
+			throw new ApplicationLogicException('Request was not found.');
+		}
 
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $newComment = WebRequest::postString('newcomment');
-            $visibility = WebRequest::postString('visibility');
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$newComment = WebRequest::postString('newcomment');
+			$visibility = WebRequest::postString('visibility');
 
-            if ($visibility !== 'user' && $visibility !== 'admin') {
-                throw new ApplicationLogicException('Comment visibility is not valid');
-            }
+			if ($visibility !== 'user' && $visibility !== 'admin') {
+				throw new ApplicationLogicException('Comment visibility is not valid');
+			}
 
-            // optimisticly lock from the load of the edit comment form
-            $updateVersion = WebRequest::postInt('updateversion');
-            $comment->setUpdateVersion($updateVersion);
+			// optimisticly lock from the load of the edit comment form
+			$updateVersion = WebRequest::postInt('updateversion');
+			$comment->setUpdateVersion($updateVersion);
 
-            $comment->setComment($newComment);
-            $comment->setVisibility($visibility);
+			$comment->setComment($newComment);
+			$comment->setVisibility($visibility);
 
-            $comment->save();
+			$comment->save();
 
-            Logger::editComment($database, $comment, $request);
-            $this->getNotificationHelper()->commentEdited($comment, $request);
-            SessionAlert::success("Comment has been saved successfully");
+			Logger::editComment($database, $comment, $request);
+			$this->getNotificationHelper()->commentEdited($comment, $request);
+			SessionAlert::success("Comment has been saved successfully");
 
-            $this->redirect('viewRequest', null, array('id' => $comment->getRequest()));
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('comment', $comment);
-            $this->assign('request', $request);
-            $this->assign('user', User::getById($comment->getUser(), $database));
-            $this->setTemplate('edit-comment.tpl');
-        }
-    }
+			$this->redirect('viewRequest', null, array('id' => $comment->getRequest()));
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('comment', $comment);
+			$this->assign('request', $request);
+			$this->assign('user', User::getById($comment->getUser(), $database));
+			$this->setTemplate('edit-comment.tpl');
+		}
+	}
 }

includes/Pages/PageOAuth.php

Indentation +130 added lines, -130 removed lines

@@ -17,134 +17,134 @@
 
 class PageOAuth extends InternalPageBase
 {
-    /**
-     * Attach entry point
-     *
-     * must be posted, or will redirect to preferences
-     */
-    protected function attach()
-    {
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('preferences');
-
-            return;
-        }
-
-        $this->validateCSRFToken();
-
-        $oauthHelper = $this->getOAuthHelper();
-        $user = User::getCurrent($this->getDatabase());
-
-        $requestToken = $oauthHelper->getRequestToken();
-
-        $user->setOAuthRequestToken($requestToken->key);
-        $user->setOAuthRequestSecret($requestToken->secret);
-        $user->save();
-
-        $this->redirectUrl($oauthHelper->getAuthoriseUrl($requestToken->key));
-    }
-
-    /**
-     * Detach account entry point
-     */
-    protected function detach()
-    {
-        if ($this->getSiteConfiguration()->getEnforceOAuth()) {
-            throw new AccessDeniedException($this->getSecurityManager());
-        }
-
-        $user = User::getCurrent($this->getDatabase());
-
-        $user->setOnWikiName($user->getOnWikiName());
-        $user->setOAuthAccessSecret(null);
-        $user->setOAuthAccessToken(null);
-        $user->setOAuthRequestSecret(null);
-        $user->setOAuthRequestToken(null);
-
-        $user->clearOAuthData();
-
-        $user->setForcelogout(true);
-
-        $user->save();
-
-        // force the user to log out
-        Session::destroy();
-
-        $this->redirect('login');
-    }
-
-    /**
-     * Callback entry point
-     */
-    protected function callback()
-    {
-        $oauthToken = WebRequest::getString('oauth_token');
-        $oauthVerifier = WebRequest::getString('oauth_verifier');
-
-        $this->doCallbackValidation($oauthToken, $oauthVerifier);
-
-        $user = User::getByRequestToken($oauthToken, $this->getDatabase());
-        if ($user === false) {
-            throw new ApplicationLogicException('Token not found in store, please try again');
-        }
-
-        $accessToken = $this->getOAuthHelper()->callbackCompleted(
-            $user->getOAuthRequestToken(),
-            $user->getOAuthRequestSecret(),
-            $oauthVerifier);
-
-        $user->setOAuthRequestSecret(null);
-        $user->setOAuthRequestToken(null);
-        $user->setOAuthAccessToken($accessToken->key);
-        $user->setOAuthAccessSecret($accessToken->secret);
-
-        // @todo we really should stop doing this kind of thing... it adds performance bottlenecks and breaks 3NF
-        $user->setOnWikiName('##OAUTH##');
-
-        $user->save();
-
-        // OK, we're the same session that just did a partial login that was redirected to OAuth. Let's upgrade the
-        // login to a full login
-        if (WebRequest::getPartialLogin() === $user->getId()) {
-            WebRequest::setLoggedInUser($user);
-        }
-
-        // My thinking is there are three cases here:
-        //   a) new user => redirect to prefs - it's the only thing they can access other than stats
-        //   b) existing user hit the connect button in prefs => redirect to prefs since it's where they were
-        //   c) existing user logging in => redirect to wherever they came from
-        $redirectDestination = WebRequest::clearPostLoginRedirect();
-        if ($redirectDestination !== null && !$user->isNewUser()) {
-            $this->redirectUrl($redirectDestination);
-        }
-        else {
-            $this->redirect('preferences', null, null, 'internal.php');
-        }
-    }
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->redirect('preferences');
-    }
-
-    /**
-     * @param string $oauthToken
-     * @param string $oauthVerifier
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function doCallbackValidation($oauthToken, $oauthVerifier)
-    {
-        if ($oauthToken === null) {
-            throw new ApplicationLogicException('No token provided');
-        }
-
-        if ($oauthVerifier === null) {
-            throw new ApplicationLogicException('No oauth verifier provided.');
-        }
-    }
+	/**
+	 * Attach entry point
+	 *
+	 * must be posted, or will redirect to preferences
+	 */
+	protected function attach()
+	{
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('preferences');
+
+			return;
+		}
+
+		$this->validateCSRFToken();
+
+		$oauthHelper = $this->getOAuthHelper();
+		$user = User::getCurrent($this->getDatabase());
+
+		$requestToken = $oauthHelper->getRequestToken();
+
+		$user->setOAuthRequestToken($requestToken->key);
+		$user->setOAuthRequestSecret($requestToken->secret);
+		$user->save();
+
+		$this->redirectUrl($oauthHelper->getAuthoriseUrl($requestToken->key));
+	}
+
+	/**
+	 * Detach account entry point
+	 */
+	protected function detach()
+	{
+		if ($this->getSiteConfiguration()->getEnforceOAuth()) {
+			throw new AccessDeniedException($this->getSecurityManager());
+		}
+
+		$user = User::getCurrent($this->getDatabase());
+
+		$user->setOnWikiName($user->getOnWikiName());
+		$user->setOAuthAccessSecret(null);
+		$user->setOAuthAccessToken(null);
+		$user->setOAuthRequestSecret(null);
+		$user->setOAuthRequestToken(null);
+
+		$user->clearOAuthData();
+
+		$user->setForcelogout(true);
+
+		$user->save();
+
+		// force the user to log out
+		Session::destroy();
+
+		$this->redirect('login');
+	}
+
+	/**
+	 * Callback entry point
+	 */
+	protected function callback()
+	{
+		$oauthToken = WebRequest::getString('oauth_token');
+		$oauthVerifier = WebRequest::getString('oauth_verifier');
+
+		$this->doCallbackValidation($oauthToken, $oauthVerifier);
+
+		$user = User::getByRequestToken($oauthToken, $this->getDatabase());
+		if ($user === false) {
+			throw new ApplicationLogicException('Token not found in store, please try again');
+		}
+
+		$accessToken = $this->getOAuthHelper()->callbackCompleted(
+			$user->getOAuthRequestToken(),
+			$user->getOAuthRequestSecret(),
+			$oauthVerifier);
+
+		$user->setOAuthRequestSecret(null);
+		$user->setOAuthRequestToken(null);
+		$user->setOAuthAccessToken($accessToken->key);
+		$user->setOAuthAccessSecret($accessToken->secret);
+
+		// @todo we really should stop doing this kind of thing... it adds performance bottlenecks and breaks 3NF
+		$user->setOnWikiName('##OAUTH##');
+
+		$user->save();
+
+		// OK, we're the same session that just did a partial login that was redirected to OAuth. Let's upgrade the
+		// login to a full login
+		if (WebRequest::getPartialLogin() === $user->getId()) {
+			WebRequest::setLoggedInUser($user);
+		}
+
+		// My thinking is there are three cases here:
+		//   a) new user => redirect to prefs - it's the only thing they can access other than stats
+		//   b) existing user hit the connect button in prefs => redirect to prefs since it's where they were
+		//   c) existing user logging in => redirect to wherever they came from
+		$redirectDestination = WebRequest::clearPostLoginRedirect();
+		if ($redirectDestination !== null && !$user->isNewUser()) {
+			$this->redirectUrl($redirectDestination);
+		}
+		else {
+			$this->redirect('preferences', null, null, 'internal.php');
+		}
+	}
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->redirect('preferences');
+	}
+
+	/**
+	 * @param string $oauthToken
+	 * @param string $oauthVerifier
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function doCallbackValidation($oauthToken, $oauthVerifier)
+	{
+		if ($oauthToken === null) {
+			throw new ApplicationLogicException('No token provided');
+		}
+
+		if ($oauthVerifier === null) {
+			throw new ApplicationLogicException('No oauth verifier provided.');
+		}
+	}
 }

includes/Pages/PageLogout.php

Indentation +12 added lines, -12 removed lines

@@ -13,17 +13,17 @@
 
 class PageLogout extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     */
-    protected function main()
-    {
-        Session::destroy();
-        $this->redirect("login");
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 */
+	protected function main()
+	{
+		Session::destroy();
+		$this->redirect("login");
+	}
 
-    protected function isProtectedPage()
-    {
-        return false;
-    }
+	protected function isProtectedPage()
+	{
+		return false;
+	}
 }

includes/Pages/Registration/PageRegisterOption.php

Indentation +12 added lines, -12 removed lines

@@ -12,17 +12,17 @@
 
 class PageRegisterOption extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setTemplate('registration/option.tpl');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setTemplate('registration/option.tpl');
+	}
 
-    protected function isProtectedPage()
-    {
-        return false;
-    }
+	protected function isProtectedPage()
+	{
+		return false;
+	}
 }

includes/Pages/Registration/PageRegisterStandard.php

Indentation +14 added lines, -14 removed lines

@@ -10,19 +10,19 @@
 
 class PageRegisterStandard extends PageRegisterBase
 {
-    /**
-     * @return string
-     */
-    protected function getRegistrationTemplate()
-    {
-        return "registration/register.tpl";
-    }
+	/**
+	 * @return string
+	 */
+	protected function getRegistrationTemplate()
+	{
+		return "registration/register.tpl";
+	}
 
-    /**
-     * @return string
-     */
-    protected function getDefaultRole()
-    {
-        return 'user';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getDefaultRole()
+	{
+		return 'user';
+	}
 }

includes/Pages/PageSiteNotice.php

Indentation +33 added lines, -33 removed lines

@@ -15,37 +15,37 @@
 
 class PageSiteNotice extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Site Notice');
-
-        $database = $this->getDatabase();
-
-        /** @var SiteNotice $siteNoticeMessage */
-        $siteNoticeMessage = SiteNotice::getById(1, $database);
-
-        // Dual-mode
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $siteNoticeMessage->setContent(WebRequest::postString('mailtext'));
-            $siteNoticeMessage->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $siteNoticeMessage->save();
-
-            Logger::siteNoticeEdited($database, $siteNoticeMessage);
-            $this->getNotificationHelper()->siteNoticeEdited();
-
-            $this->redirect();
-        }
-        else {
-            $this->assignCSRFToken();
-
-            $this->setTemplate('site-notice/edit-form.tpl');
-            $this->assign('message', $siteNoticeMessage);
-        }
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Site Notice');
+
+		$database = $this->getDatabase();
+
+		/** @var SiteNotice $siteNoticeMessage */
+		$siteNoticeMessage = SiteNotice::getById(1, $database);
+
+		// Dual-mode
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$siteNoticeMessage->setContent(WebRequest::postString('mailtext'));
+			$siteNoticeMessage->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$siteNoticeMessage->save();
+
+			Logger::siteNoticeEdited($database, $siteNoticeMessage);
+			$this->getNotificationHelper()->siteNoticeEdited();
+
+			$this->redirect();
+		}
+		else {
+			$this->assignCSRFToken();
+
+			$this->setTemplate('site-notice/edit-form.tpl');
+			$this->assign('message', $siteNoticeMessage);
+		}
+	}
 }

includes/Pages/PageLog.php

Indentation +109 added lines, -109 removed lines

@@ -18,113 +18,113 @@
 
 class PageLog extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Logs');
-
-        $filterUser = WebRequest::getString('filterUser');
-        $filterAction = WebRequest::getString('filterAction');
-
-        $database = $this->getDatabase();
-
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
-            return UserSearchHelper::get($database)->fetchColumn('username');
-        });
-
-        $limit = WebRequest::getInt('limit');
-        if ($limit === null) {
-            $limit = 100;
-        }
-
-        $page = WebRequest::getInt('page');
-        if ($page === null) {
-            $page = 1;
-        }
-
-        $offset = ($page - 1) * $limit;
-
-        $logSearch = LogSearchHelper::get($database)->limit($limit, $offset);
-        if ($filterUser !== null) {
-            $logSearch->byUser(User::getByUsername($filterUser, $database)->getId());
-        }
-
-        if ($filterAction !== null) {
-            $logSearch->byAction($filterAction);
-        }
-
-        /** @var Log[] $logs */
-        $logs = $logSearch->getRecordCount($count)->fetch();
-
-        if ($count === 0) {
-            $this->assign('logs', array());
-            $this->setTemplate('logs/main.tpl');
-
-            return;
-        }
-
-        list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
-
-        $this->setupPageData($page, $limit, $count);
-
-        $this->assign("logs", $logData);
-        $this->assign("users", $users);
-
-        $this->assign("filterUser", $filterUser);
-        $this->assign("filterAction", $filterAction);
-
-        $this->assign('allLogActions', LogHelper::getLogActions($this->getDatabase()));
-
-        $this->setTemplate("logs/main.tpl");
-    }
-
-    /**
-     * @param int $page
-     * @param int $limit
-     * @param int $count
-     */
-    protected function setupPageData($page, $limit, $count)
-    {
-        // The number of pages on the pager to show. Must be odd
-        $pageLimit = 9;
-
-        $pageData = array(
-            // Can the user go to the previous page?
-            'canprev'   => $page != 1,
-            // Can the user go to the next page?
-            'cannext'   => ($page * $limit) < $count,
-            // Maximum page number
-            'maxpage'   => ceil($count / $limit),
-            // Limit to the number of pages to display
-            'pagelimit' => $pageLimit,
-        );
-
-        // number of pages either side of the current to show
-        $pageMargin = (($pageLimit - 1) / 2);
-
-        // Calculate the number of pages either side to show - this is for situations like:
-        //  [1]  [2] [[3]] [4]  [5]  [6]  [7]  [8]  [9] - where you can't just use the page margin calculated
-        $pageData['lowpage'] = max(1, $page - $pageMargin);
-        $pageData['hipage'] = min($pageData['maxpage'], $page + $pageMargin);
-        $pageCount = ($pageData['hipage'] - $pageData['lowpage']) + 1;
-
-        if ($pageCount < $pageLimit) {
-            if ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
-                $pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
-            }
-            elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
-                $pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
-            }
-        }
-
-        // Put the range of pages into the page data
-        $pageData['pages'] = range($pageData['lowpage'], $pageData['hipage']);
-
-        $this->assign("pagedata", $pageData);
-
-        $this->assign("limit", $limit);
-        $this->assign("page", $page);
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Logs');
+
+		$filterUser = WebRequest::getString('filterUser');
+		$filterAction = WebRequest::getString('filterAction');
+
+		$database = $this->getDatabase();
+
+		$this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+			return UserSearchHelper::get($database)->fetchColumn('username');
+		});
+
+		$limit = WebRequest::getInt('limit');
+		if ($limit === null) {
+			$limit = 100;
+		}
+
+		$page = WebRequest::getInt('page');
+		if ($page === null) {
+			$page = 1;
+		}
+
+		$offset = ($page - 1) * $limit;
+
+		$logSearch = LogSearchHelper::get($database)->limit($limit, $offset);
+		if ($filterUser !== null) {
+			$logSearch->byUser(User::getByUsername($filterUser, $database)->getId());
+		}
+
+		if ($filterAction !== null) {
+			$logSearch->byAction($filterAction);
+		}
+
+		/** @var Log[] $logs */
+		$logs = $logSearch->getRecordCount($count)->fetch();
+
+		if ($count === 0) {
+			$this->assign('logs', array());
+			$this->setTemplate('logs/main.tpl');
+
+			return;
+		}
+
+		list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
+
+		$this->setupPageData($page, $limit, $count);
+
+		$this->assign("logs", $logData);
+		$this->assign("users", $users);
+
+		$this->assign("filterUser", $filterUser);
+		$this->assign("filterAction", $filterAction);
+
+		$this->assign('allLogActions', LogHelper::getLogActions($this->getDatabase()));
+
+		$this->setTemplate("logs/main.tpl");
+	}
+
+	/**
+	 * @param int $page
+	 * @param int $limit
+	 * @param int $count
+	 */
+	protected function setupPageData($page, $limit, $count)
+	{
+		// The number of pages on the pager to show. Must be odd
+		$pageLimit = 9;
+
+		$pageData = array(
+			// Can the user go to the previous page?
+			'canprev'   => $page != 1,
+			// Can the user go to the next page?
+			'cannext'   => ($page * $limit) < $count,
+			// Maximum page number
+			'maxpage'   => ceil($count / $limit),
+			// Limit to the number of pages to display
+			'pagelimit' => $pageLimit,
+		);
+
+		// number of pages either side of the current to show
+		$pageMargin = (($pageLimit - 1) / 2);
+
+		// Calculate the number of pages either side to show - this is for situations like:
+		//  [1]  [2] [[3]] [4]  [5]  [6]  [7]  [8]  [9] - where you can't just use the page margin calculated
+		$pageData['lowpage'] = max(1, $page - $pageMargin);
+		$pageData['hipage'] = min($pageData['maxpage'], $page + $pageMargin);
+		$pageCount = ($pageData['hipage'] - $pageData['lowpage']) + 1;
+
+		if ($pageCount < $pageLimit) {
+			if ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
+				$pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
+			}
+			elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
+				$pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
+			}
+		}
+
+		// Put the range of pages into the page data
+		$pageData['pages'] = range($pageData['lowpage'], $pageData['hipage']);
+
+		$this->assign("pagedata", $pageData);
+
+		$this->assign("limit", $limit);
+		$this->assign("page", $page);
+	}
 }