Completed
Branch newinternal (cdd491)
by Simon
04:39
created
includes/Fragments/RequestData.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -95,6 +95,9 @@
 block discarded – undo
95 95
 	/** @return SecurityManager */
96 96
 	abstract protected function getSecurityManager();
97 97
 
98
+	/**
99
+	 * @param string $name
100
+	 */
98 101
 	abstract protected function assign($name, $value);
99 102
 	abstract protected function setTemplate($name);
100 103
 
Please login to merge, or discard this patch.
includes/Pages/RequestAction/PageCloseRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -239,11 +239,11 @@
 block discarded – undo
239 239
 
240 240
 		$emailSig = $currentUser->getEmailSig();
241 241
 		if ($emailSig !== '' || $emailSig !== null) {
242
-			$emailSig = "\n\n" . $emailSig;
242
+			$emailSig = "\n\n".$emailSig;
243 243
 		}
244 244
 
245 245
 		$subject = "RE: [ACC #{$request->getId()}] English Wikipedia Account Request";
246
-		$content = $mailText . $emailSig;
246
+		$content = $mailText.$emailSig;
247 247
 
248 248
 		$helper->sendMail($request->getEmail(), $subject, $content, $headers);
249 249
 
Please login to merge, or discard this patch.
includes/Pages/PageViewRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 			}
102 102
 		}
103 103
 
104
-		$this->setHtmlTitle($statusSymbol . ' #' . $request->getId());
104
+		$this->setHtmlTitle($statusSymbol.' #'.$request->getId());
105 105
 	}
106 106
 
107 107
 	/**
Please login to merge, or discard this patch.
includes/Pages/PageSearch.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			$searchTerm = WebRequest::postString('term');
35 35
 
36 36
 			$validationError = "";
37
-			if(!$this->validateSearchParameters($searchType, $searchTerm, $validationError)) {
37
+			if (!$this->validateSearchParameters($searchType, $searchTerm, $validationError)) {
38 38
 				SessionAlert::error($validationError, "Search error");
39 39
 				$this->redirect("search");
40 40
 				return;
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 */
86 86
 	private function getNameSearchResults($searchTerm)
87 87
 	{
88
-		$padded = '%' . $searchTerm . '%';
88
+		$padded = '%'.$searchTerm.'%';
89 89
 
90 90
 		return RequestSearchHelper::get($this->getDatabase())
91 91
 			->byName($padded)
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 			throw new ApplicationLogicException('The search term "@" is not valid for email address searches!');
108 108
 		}
109 109
 
110
-		$padded = '%' . $searchTerm . '%';
110
+		$padded = '%'.$searchTerm.'%';
111 111
 
112 112
 		return RequestSearchHelper::get($this->getDatabase())
113 113
 			->byEmailAddress($padded)
Please login to merge, or discard this patch.
includes/Pages/PageLogin.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			}
35 35
 			else {
36 36
 				// This is the login form, not the request form. We need protection here.
37
-				$this->redirectUrl('https://' . WebRequest::serverName() . WebRequest::requestUri());
37
+				$this->redirectUrl('https://'.WebRequest::serverName().WebRequest::requestUri());
38 38
 
39 39
 				return;
40 40
 			}
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 			try {
49 49
 				$user = $this->getAuthenticatingUser();
50 50
 			}
51
-			catch (ApplicationLogicException $ex){
51
+			catch (ApplicationLogicException $ex) {
52 52
 				SessionAlert::error($ex->getMessage());
53 53
 				$this->redirect('login');
54 54
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 			try {
49 49
 				$user = $this->getAuthenticatingUser();
50 50
 			}
51
-			catch (ApplicationLogicException $ex){
51
+			catch (ApplicationLogicException $ex) {
52 52
 				SessionAlert::error($ex->getMessage());
53 53
 				$this->redirect('login');
54 54
 
Please login to merge, or discard this patch.
includes/Validation/RequestValidationHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
 		}
121 121
 
122 122
 		// username can't contain #@/<>[]|{}
123
-		if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $this->request->getName()) === 1) {
123
+		if (preg_match("/[".preg_quote("#@/<>[]|{}", "/")."]/", $this->request->getName()) === 1) {
124 124
 			$errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
125 125
 		}
126 126
 
Please login to merge, or discard this patch.
includes/Fragments/TemplateOutput.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 	final protected function setUpSmarty()
56 56
 	{
57 57
 		$this->smarty = new Smarty();
58
-		$this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins');
58
+		$this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath().'/smarty-plugins');
59 59
 
60 60
 		$this->assign('currentUser', User::getCommunity());
61 61
 		$this->assign('loggedIn', false);
Please login to merge, or discard this patch.
includes/Tasks/PageBase.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@
 block discarded – undo
215 215
 		$url = implode('/', $pathInfo);
216 216
 
217 217
 		if (is_array($parameters) && count($parameters) > 0) {
218
-			$url .= '?' . http_build_query($parameters);
218
+			$url .= '?'.http_build_query($parameters);
219 219
 		}
220 220
 
221 221
 		$this->redirectUrl($url);
Please login to merge, or discard this patch.