Completed
Pull Request — newinternal (#285)
by Simon
07:17 queued 04:17
created
includes/Helpers/EmailHelper.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,21 +12,21 @@
 block discarded – undo
12 12
 
13 13
 class EmailHelper implements IEmailHelper
14 14
 {
15
-    /**
16
-     * @param string $to
17
-     * @param string $subject
18
-     * @param string $content
19
-     * @param array  $headers Extra headers to include
20
-     */
21
-    public function sendMail($to, $subject, $content, $headers = array())
22
-    {
23
-        $headers['From'] = '[email protected]';
24
-        $headerString = '';
15
+	/**
16
+	 * @param string $to
17
+	 * @param string $subject
18
+	 * @param string $content
19
+	 * @param array  $headers Extra headers to include
20
+	 */
21
+	public function sendMail($to, $subject, $content, $headers = array())
22
+	{
23
+		$headers['From'] = '[email protected]';
24
+		$headerString = '';
25 25
 
26
-        foreach ($headers as $header => $headerValue) {
27
-            $headerString .= $header . ': ' . $headerValue . "\r\n";
28
-        }
26
+		foreach ($headers as $header => $headerValue) {
27
+			$headerString .= $header . ': ' . $headerValue . "\r\n";
28
+		}
29 29
 
30
-        mail($to, $subject, $content, $headerString);
31
-    }
30
+		mail($to, $subject, $content, $headerString);
31
+	}
32 32
 }
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         $headerString = '';
25 25
 
26 26
         foreach ($headers as $header => $headerValue) {
27
-            $headerString .= $header . ': ' . $headerValue . "\r\n";
27
+            $headerString .= $header.': '.$headerValue."\r\n";
28 28
         }
29 29
 
30 30
         mail($to, $subject, $content, $headerString);
Please login to merge, or discard this patch.
includes/Helpers/Interfaces/IBanHelper.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -12,30 +12,30 @@
 block discarded – undo
12 12
 
13 13
 interface IBanHelper
14 14
 {
15
-    /**
16
-     * Summary of nameIsBanned
17
-     *
18
-     * @param string $name The name to test if is banned.
19
-     *
20
-     * @return Ban
21
-     */
22
-    public function nameIsBanned($name);
15
+	/**
16
+	 * Summary of nameIsBanned
17
+	 *
18
+	 * @param string $name The name to test if is banned.
19
+	 *
20
+	 * @return Ban
21
+	 */
22
+	public function nameIsBanned($name);
23 23
 
24
-    /**
25
-     * Summary of emailIsBanned
26
-     *
27
-     * @param string $email
28
-     *
29
-     * @return Ban
30
-     */
31
-    public function emailIsBanned($email);
24
+	/**
25
+	 * Summary of emailIsBanned
26
+	 *
27
+	 * @param string $email
28
+	 *
29
+	 * @return Ban
30
+	 */
31
+	public function emailIsBanned($email);
32 32
 
33
-    /**
34
-     * Summary of ipIsBanned
35
-     *
36
-     * @param string $ip
37
-     *
38
-     * @return Ban
39
-     */
40
-    public function ipIsBanned($ip);
33
+	/**
34
+	 * Summary of ipIsBanned
35
+	 *
36
+	 * @param string $ip
37
+	 *
38
+	 * @return Ban
39
+	 */
40
+	public function ipIsBanned($ip);
41 41
 }
Please login to merge, or discard this patch.
includes/Helpers/Interfaces/IEmailHelper.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -17,15 +17,15 @@
 block discarded – undo
17 17
  */
18 18
 interface IEmailHelper
19 19
 {
20
-    /**
21
-     * Sends an email to the specified email address.
22
-     *
23
-     * @param string $to
24
-     * @param string $subject
25
-     * @param string $content
26
-     * @param array  $headers Extra headers to include
27
-     *
28
-     * @return void
29
-     */
30
-    public function sendMail($to, $subject, $content, $headers = array());
20
+	/**
21
+	 * Sends an email to the specified email address.
22
+	 *
23
+	 * @param string $to
24
+	 * @param string $subject
25
+	 * @param string $content
26
+	 * @param array  $headers Extra headers to include
27
+	 *
28
+	 * @return void
29
+	 */
30
+	public function sendMail($to, $subject, $content, $headers = array());
31 31
 }
32 32
\ No newline at end of file
Please login to merge, or discard this patch.
includes/Helpers/Interfaces/IBlacklistHelper.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,12 +10,12 @@
 block discarded – undo
10 10
 
11 11
 interface IBlacklistHelper
12 12
 {
13
-    /**
14
-     * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
15
-     *
16
-     * @param string $username
17
-     *
18
-     * @return bool
19
-     */
20
-    public function isBlacklisted($username);
13
+	/**
14
+	 * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
15
+	 *
16
+	 * @param string $username
17
+	 *
18
+	 * @return bool
19
+	 */
20
+	public function isBlacklisted($username);
21 21
 }
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
includes/Helpers/Interfaces/ITypeAheadHelper.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -10,16 +10,16 @@
 block discarded – undo
10 10
 
11 11
 interface ITypeAheadHelper
12 12
 {
13
-    /**
14
-     * @param string   $class     CSS class to apply this typeahead to.
15
-     * @param callable $generator Generator function taking no arguments to return an array of strings.
16
-     *
17
-     * @return void
18
-     */
19
-    public function defineTypeAheadSource($class, callable $generator);
13
+	/**
14
+	 * @param string   $class     CSS class to apply this typeahead to.
15
+	 * @param callable $generator Generator function taking no arguments to return an array of strings.
16
+	 *
17
+	 * @return void
18
+	 */
19
+	public function defineTypeAheadSource($class, callable $generator);
20 20
 
21
-    /**
22
-     * @return string HTML fragment containing a JS block for typeaheads.
23
-     */
24
-    public function getTypeAheadScriptBlock();
21
+	/**
22
+	 * @return string HTML fragment containing a JS block for typeaheads.
23
+	 */
24
+	public function getTypeAheadScriptBlock();
25 25
 }
26 26
\ No newline at end of file
Please login to merge, or discard this patch.
includes/Helpers/Interfaces/IOAuthHelper.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -15,39 +15,39 @@
 block discarded – undo
15 15
 
16 16
 interface IOAuthHelper
17 17
 {
18
-    /**
19
-     * @return stdClass
20
-     *
21
-     * @throws Exception
22
-     * @throws CurlException
23
-     */
24
-    public function getRequestToken();
18
+	/**
19
+	 * @return stdClass
20
+	 *
21
+	 * @throws Exception
22
+	 * @throws CurlException
23
+	 */
24
+	public function getRequestToken();
25 25
 
26
-    /**
27
-     * @param string $requestToken
28
-     *
29
-     * @return string
30
-     */
31
-    public function getAuthoriseUrl($requestToken);
26
+	/**
27
+	 * @param string $requestToken
28
+	 *
29
+	 * @return string
30
+	 */
31
+	public function getAuthoriseUrl($requestToken);
32 32
 
33
-    /**
34
-     * @param string $oauthRequestToken
35
-     * @param string $oauthRequestSecret
36
-     * @param string $oauthVerifier
37
-     *
38
-     * @return stdClass
39
-     * @throws CurlException
40
-     * @throws Exception
41
-     */
42
-    public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier);
33
+	/**
34
+	 * @param string $oauthRequestToken
35
+	 * @param string $oauthRequestSecret
36
+	 * @param string $oauthVerifier
37
+	 *
38
+	 * @return stdClass
39
+	 * @throws CurlException
40
+	 * @throws Exception
41
+	 */
42
+	public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier);
43 43
 
44
-    /**
45
-     * @param string $oauthAccessToken
46
-     * @param string $oauthAccessSecret
47
-     *
48
-     * @return JWT
49
-     * @throws CurlException
50
-     * @throws Exception
51
-     */
52
-    public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret);
44
+	/**
45
+	 * @param string $oauthAccessToken
46
+	 * @param string $oauthAccessSecret
47
+	 *
48
+	 * @return JWT
49
+	 * @throws CurlException
50
+	 * @throws Exception
51
+	 */
52
+	public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret);
53 53
 }
54 54
\ No newline at end of file
Please login to merge, or discard this patch.
includes/WebStart.php 1 patch
Indentation   +219 added lines, -219 removed lines patch added patch discarded remove patch
@@ -29,223 +29,223 @@
 block discarded – undo
29 29
  */
30 30
 class WebStart extends ApplicationBase
31 31
 {
32
-    /**
33
-     * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
34
-     *                                    routers and hence different URL mappings
35
-     */
36
-    private $requestRouter;
37
-    /**
38
-     * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
39
-     */
40
-    private $isPublic = false;
41
-
42
-    /**
43
-     * WebStart constructor.
44
-     *
45
-     * @param SiteConfiguration $configuration The site configuration
46
-     * @param IRequestRouter    $router        The request router to use
47
-     */
48
-    public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
49
-    {
50
-        parent::__construct($configuration);
51
-
52
-        $this->requestRouter = $router;
53
-    }
54
-
55
-    /**
56
-     * @param ITask             $page
57
-     * @param SiteConfiguration $siteConfiguration
58
-     * @param PdoDatabase       $database
59
-     * @param PdoDatabase       $notificationsDatabase
60
-     *
61
-     * @return void
62
-     */
63
-    protected function setupHelpers(
64
-        ITask $page,
65
-        SiteConfiguration $siteConfiguration,
66
-        PdoDatabase $database,
67
-        PdoDatabase $notificationsDatabase = null
68
-    ) {
69
-        parent::setupHelpers($page, $siteConfiguration, $database, $notificationsDatabase);
70
-
71
-        if ($page instanceof PageBase) {
72
-            $page->setTokenManager(new TokenManager());
73
-
74
-            if ($page instanceof InternalPageBase) {
75
-                $page->setTypeAheadHelper(new TypeAheadHelper());
76
-
77
-                $identificationVerifier = new IdentificationVerifier($page->getHttpHelper(), $siteConfiguration,
78
-                    $database);
79
-                $page->setIdentificationVerifier($identificationVerifier);
80
-
81
-                $page->setSecurityManager(new SecurityManager($identificationVerifier,
82
-                    $siteConfiguration->getForceIdentification()));
83
-
84
-                if ($siteConfiguration->getTitleBlacklistEnabled()) {
85
-                    $page->setBlacklistHelper(new FakeBlacklistHelper());
86
-                }
87
-                else {
88
-                    $page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(),
89
-                        $siteConfiguration->getMediawikiWebServiceEndpoint()));
90
-                }
91
-            }
92
-        }
93
-    }
94
-
95
-    /**
96
-     * Application entry point.
97
-     *
98
-     * Sets up the environment and runs the application, performing any global cleanup operations when done.
99
-     */
100
-    public function run()
101
-    {
102
-        try {
103
-            if ($this->setupEnvironment()) {
104
-                $this->main();
105
-            }
106
-        }
107
-        catch (EnvironmentException $ex) {
108
-            ob_end_clean();
109
-            print Offline::getOfflineMessage($this->isPublic(), $ex->getMessage());
110
-        }
111
-        catch (ReadableException $ex) {
112
-            ob_end_clean();
113
-            print $ex->getReadableError();
114
-        }
115
-        finally {
116
-            $this->cleanupEnvironment();
117
-        }
118
-    }
119
-
120
-    /**
121
-     * Environment setup
122
-     *
123
-     * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
124
-     * and shut down prematurely.
125
-     *
126
-     * @return bool
127
-     * @throws EnvironmentException
128
-     */
129
-    protected function setupEnvironment()
130
-    {
131
-        // initialise global exception handler
132
-        set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
133
-        set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
134
-
135
-        // start output buffering if necessary
136
-        if (ob_get_level() === 0) {
137
-            ob_start();
138
-        }
139
-
140
-        // initialise super-global providers
141
-        WebRequest::setGlobalStateProvider(new GlobalStateProvider());
142
-
143
-        if (Offline::isOffline()) {
144
-            print Offline::getOfflineMessage($this->isPublic());
145
-            ob_end_flush();
146
-
147
-            return false;
148
-        }
149
-
150
-        // Call parent setup
151
-        if (!parent::setupEnvironment()) {
152
-            return false;
153
-        }
154
-
155
-        // Start up sessions
156
-        Session::start();
157
-
158
-        // Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
159
-        // get the current user cached.
160
-        // I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
161
-        // session I suppose.
162
-        $this->checkForceLogout();
163
-
164
-        // environment initialised!
165
-        return true;
166
-    }
167
-
168
-    /**
169
-     * Main application logic
170
-     */
171
-    protected function main()
172
-    {
173
-        // Get the right route for the request
174
-        $page = $this->requestRouter->route();
175
-
176
-        $siteConfiguration = $this->getConfiguration();
177
-        $database = PdoDatabase::getDatabaseConnection('acc');
178
-
179
-        if ($siteConfiguration->getIrcNotificationsEnabled()) {
180
-            $notificationsDatabase = PdoDatabase::getDatabaseConnection('notifications');
181
-        }
182
-        else {
183
-            // @todo federated table here?
184
-            $notificationsDatabase = $database;
185
-        }
186
-
187
-        $this->setupHelpers($page, $siteConfiguration, $database, $notificationsDatabase);
188
-
189
-        /* @todo Remove this global statement! It's here for User.php, which does far more than it should. */
190
-        global $oauthHelper;
191
-        $oauthHelper = $page->getOAuthHelper();
192
-
193
-        /* @todo Remove this global statement! It's here for Request.php, which does far more than it should. */
194
-        global $globalXffTrustProvider;
195
-        $globalXffTrustProvider = $page->getXffTrustProvider();
196
-
197
-        // run the route code for the request.
198
-        $page->execute();
199
-    }
200
-
201
-    /**
202
-     * Any cleanup tasks should go here
203
-     *
204
-     * Note that we need to be very careful here, as exceptions may have been thrown and handled.
205
-     * This should *only* be for cleaning up, no logic should go here.
206
-     */
207
-    protected function cleanupEnvironment()
208
-    {
209
-        // Clean up anything we splurged after sending the page.
210
-        if (ob_get_level() > 0) {
211
-            for ($i = ob_get_level(); $i > 0; $i--) {
212
-                ob_end_clean();
213
-            }
214
-        }
215
-    }
216
-
217
-    private function checkForceLogout()
218
-    {
219
-        $database = PdoDatabase::getDatabaseConnection('acc');
220
-
221
-        $sessionUserId = WebRequest::getSessionUserId();
222
-        iF ($sessionUserId === null) {
223
-            return;
224
-        }
225
-
226
-        // Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
227
-        $currentUser = User::getById($sessionUserId, $database);
228
-
229
-        if ($currentUser === false) {
230
-            // Umm... this user has a session cookie with a userId set, but no user exists...
231
-            Session::restart();
232
-        }
233
-
234
-        if ($currentUser->getForceLogout()) {
235
-            Session::restart();
236
-
237
-            $currentUser->setForceLogout(false);
238
-            $currentUser->save();
239
-        }
240
-    }
241
-
242
-    public function isPublic()
243
-    {
244
-        return $this->isPublic;
245
-    }
246
-
247
-    public function setPublic($isPublic)
248
-    {
249
-        $this->isPublic = $isPublic;
250
-    }
32
+	/**
33
+	 * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
34
+	 *                                    routers and hence different URL mappings
35
+	 */
36
+	private $requestRouter;
37
+	/**
38
+	 * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
39
+	 */
40
+	private $isPublic = false;
41
+
42
+	/**
43
+	 * WebStart constructor.
44
+	 *
45
+	 * @param SiteConfiguration $configuration The site configuration
46
+	 * @param IRequestRouter    $router        The request router to use
47
+	 */
48
+	public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
49
+	{
50
+		parent::__construct($configuration);
51
+
52
+		$this->requestRouter = $router;
53
+	}
54
+
55
+	/**
56
+	 * @param ITask             $page
57
+	 * @param SiteConfiguration $siteConfiguration
58
+	 * @param PdoDatabase       $database
59
+	 * @param PdoDatabase       $notificationsDatabase
60
+	 *
61
+	 * @return void
62
+	 */
63
+	protected function setupHelpers(
64
+		ITask $page,
65
+		SiteConfiguration $siteConfiguration,
66
+		PdoDatabase $database,
67
+		PdoDatabase $notificationsDatabase = null
68
+	) {
69
+		parent::setupHelpers($page, $siteConfiguration, $database, $notificationsDatabase);
70
+
71
+		if ($page instanceof PageBase) {
72
+			$page->setTokenManager(new TokenManager());
73
+
74
+			if ($page instanceof InternalPageBase) {
75
+				$page->setTypeAheadHelper(new TypeAheadHelper());
76
+
77
+				$identificationVerifier = new IdentificationVerifier($page->getHttpHelper(), $siteConfiguration,
78
+					$database);
79
+				$page->setIdentificationVerifier($identificationVerifier);
80
+
81
+				$page->setSecurityManager(new SecurityManager($identificationVerifier,
82
+					$siteConfiguration->getForceIdentification()));
83
+
84
+				if ($siteConfiguration->getTitleBlacklistEnabled()) {
85
+					$page->setBlacklistHelper(new FakeBlacklistHelper());
86
+				}
87
+				else {
88
+					$page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(),
89
+						$siteConfiguration->getMediawikiWebServiceEndpoint()));
90
+				}
91
+			}
92
+		}
93
+	}
94
+
95
+	/**
96
+	 * Application entry point.
97
+	 *
98
+	 * Sets up the environment and runs the application, performing any global cleanup operations when done.
99
+	 */
100
+	public function run()
101
+	{
102
+		try {
103
+			if ($this->setupEnvironment()) {
104
+				$this->main();
105
+			}
106
+		}
107
+		catch (EnvironmentException $ex) {
108
+			ob_end_clean();
109
+			print Offline::getOfflineMessage($this->isPublic(), $ex->getMessage());
110
+		}
111
+		catch (ReadableException $ex) {
112
+			ob_end_clean();
113
+			print $ex->getReadableError();
114
+		}
115
+		finally {
116
+			$this->cleanupEnvironment();
117
+		}
118
+	}
119
+
120
+	/**
121
+	 * Environment setup
122
+	 *
123
+	 * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
124
+	 * and shut down prematurely.
125
+	 *
126
+	 * @return bool
127
+	 * @throws EnvironmentException
128
+	 */
129
+	protected function setupEnvironment()
130
+	{
131
+		// initialise global exception handler
132
+		set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
133
+		set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
134
+
135
+		// start output buffering if necessary
136
+		if (ob_get_level() === 0) {
137
+			ob_start();
138
+		}
139
+
140
+		// initialise super-global providers
141
+		WebRequest::setGlobalStateProvider(new GlobalStateProvider());
142
+
143
+		if (Offline::isOffline()) {
144
+			print Offline::getOfflineMessage($this->isPublic());
145
+			ob_end_flush();
146
+
147
+			return false;
148
+		}
149
+
150
+		// Call parent setup
151
+		if (!parent::setupEnvironment()) {
152
+			return false;
153
+		}
154
+
155
+		// Start up sessions
156
+		Session::start();
157
+
158
+		// Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
159
+		// get the current user cached.
160
+		// I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
161
+		// session I suppose.
162
+		$this->checkForceLogout();
163
+
164
+		// environment initialised!
165
+		return true;
166
+	}
167
+
168
+	/**
169
+	 * Main application logic
170
+	 */
171
+	protected function main()
172
+	{
173
+		// Get the right route for the request
174
+		$page = $this->requestRouter->route();
175
+
176
+		$siteConfiguration = $this->getConfiguration();
177
+		$database = PdoDatabase::getDatabaseConnection('acc');
178
+
179
+		if ($siteConfiguration->getIrcNotificationsEnabled()) {
180
+			$notificationsDatabase = PdoDatabase::getDatabaseConnection('notifications');
181
+		}
182
+		else {
183
+			// @todo federated table here?
184
+			$notificationsDatabase = $database;
185
+		}
186
+
187
+		$this->setupHelpers($page, $siteConfiguration, $database, $notificationsDatabase);
188
+
189
+		/* @todo Remove this global statement! It's here for User.php, which does far more than it should. */
190
+		global $oauthHelper;
191
+		$oauthHelper = $page->getOAuthHelper();
192
+
193
+		/* @todo Remove this global statement! It's here for Request.php, which does far more than it should. */
194
+		global $globalXffTrustProvider;
195
+		$globalXffTrustProvider = $page->getXffTrustProvider();
196
+
197
+		// run the route code for the request.
198
+		$page->execute();
199
+	}
200
+
201
+	/**
202
+	 * Any cleanup tasks should go here
203
+	 *
204
+	 * Note that we need to be very careful here, as exceptions may have been thrown and handled.
205
+	 * This should *only* be for cleaning up, no logic should go here.
206
+	 */
207
+	protected function cleanupEnvironment()
208
+	{
209
+		// Clean up anything we splurged after sending the page.
210
+		if (ob_get_level() > 0) {
211
+			for ($i = ob_get_level(); $i > 0; $i--) {
212
+				ob_end_clean();
213
+			}
214
+		}
215
+	}
216
+
217
+	private function checkForceLogout()
218
+	{
219
+		$database = PdoDatabase::getDatabaseConnection('acc');
220
+
221
+		$sessionUserId = WebRequest::getSessionUserId();
222
+		iF ($sessionUserId === null) {
223
+			return;
224
+		}
225
+
226
+		// Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
227
+		$currentUser = User::getById($sessionUserId, $database);
228
+
229
+		if ($currentUser === false) {
230
+			// Umm... this user has a session cookie with a userId set, but no user exists...
231
+			Session::restart();
232
+		}
233
+
234
+		if ($currentUser->getForceLogout()) {
235
+			Session::restart();
236
+
237
+			$currentUser->setForceLogout(false);
238
+			$currentUser->save();
239
+		}
240
+	}
241
+
242
+	public function isPublic()
243
+	{
244
+		return $this->isPublic;
245
+	}
246
+
247
+	public function setPublic($isPublic)
248
+	{
249
+		$this->isPublic = $isPublic;
250
+	}
251 251
 }
Please login to merge, or discard this patch.
includes/DataObjects/RDnsCache.php 1 patch
Indentation   +99 added lines, -99 removed lines patch added patch discarded remove patch
@@ -19,110 +19,110 @@
 block discarded – undo
19 19
  */
20 20
 class RDnsCache extends DataObject
21 21
 {
22
-    private $address;
23
-    private $data;
24
-    private $creation;
25
-
26
-    /**
27
-     * @param string      $address
28
-     * @param PdoDatabase $database
29
-     *
30
-     * @return RDnsCache|false
31
-     */
32
-    public static function getByAddress($address, PdoDatabase $database)
33
-    {
34
-        // @todo add cache invalidation (timestamp?)
35
-        $statement = $database->prepare("SELECT * FROM rdnscache WHERE address = :id LIMIT 1;");
36
-        $statement->bindValue(":id", $address);
37
-
38
-        $statement->execute();
39
-
40
-        $resultObject = $statement->fetchObject(get_called_class());
41
-
42
-        if ($resultObject != false) {
43
-            $resultObject->setDatabase($database);
44
-        }
45
-
46
-        return $resultObject;
47
-    }
48
-
49
-    public function save()
50
-    {
51
-        if ($this->isNew()) {
52
-            // insert
53
-            $statement = $this->dbObject->prepare(<<<SQL
22
+	private $address;
23
+	private $data;
24
+	private $creation;
25
+
26
+	/**
27
+	 * @param string      $address
28
+	 * @param PdoDatabase $database
29
+	 *
30
+	 * @return RDnsCache|false
31
+	 */
32
+	public static function getByAddress($address, PdoDatabase $database)
33
+	{
34
+		// @todo add cache invalidation (timestamp?)
35
+		$statement = $database->prepare("SELECT * FROM rdnscache WHERE address = :id LIMIT 1;");
36
+		$statement->bindValue(":id", $address);
37
+
38
+		$statement->execute();
39
+
40
+		$resultObject = $statement->fetchObject(get_called_class());
41
+
42
+		if ($resultObject != false) {
43
+			$resultObject->setDatabase($database);
44
+		}
45
+
46
+		return $resultObject;
47
+	}
48
+
49
+	public function save()
50
+	{
51
+		if ($this->isNew()) {
52
+			// insert
53
+			$statement = $this->dbObject->prepare(<<<SQL
54 54
 INSERT INTO `rdnscache` (address, data) VALUES (:address, :data);
55 55
 SQL
56
-            );
57
-            $statement->bindValue(":address", $this->address);
58
-            $statement->bindValue(":data", $this->data);
59
-
60
-            if ($statement->execute()) {
61
-                $this->id = (int)$this->dbObject->lastInsertId();
62
-            }
63
-            else {
64
-                throw new Exception($statement->errorInfo());
65
-            }
66
-        }
67
-        else {
68
-            // update
69
-            $statement = $this->dbObject->prepare(<<<SQL
56
+			);
57
+			$statement->bindValue(":address", $this->address);
58
+			$statement->bindValue(":data", $this->data);
59
+
60
+			if ($statement->execute()) {
61
+				$this->id = (int)$this->dbObject->lastInsertId();
62
+			}
63
+			else {
64
+				throw new Exception($statement->errorInfo());
65
+			}
66
+		}
67
+		else {
68
+			// update
69
+			$statement = $this->dbObject->prepare(<<<SQL
70 70
 UPDATE `rdnscache`
71 71
 SET address = :address, data = :data, updateversion = updateversion + 1
72 72
 WHERE id = :id AND updateversion = :updateversion
73 73
 LIMIT 1;
74 74
 SQL
75
-            );
76
-
77
-            $statement->bindValue(':id', $this->id);
78
-            $statement->bindValue(':updateversion', $this->updateversion);
79
-
80
-            $statement->bindValue(':address', $this->address);
81
-            $statement->bindValue(':data', $this->data);
82
-
83
-            if (!$statement->execute()) {
84
-                throw new Exception($statement->errorInfo());
85
-            }
86
-
87
-            if ($statement->rowCount() !== 1) {
88
-                throw new OptimisticLockFailedException();
89
-            }
90
-
91
-            $this->updateversion++;
92
-        }
93
-    }
94
-
95
-    public function getAddress()
96
-    {
97
-        return $this->address;
98
-    }
99
-
100
-    /**
101
-     * @param string $address
102
-     */
103
-    public function setAddress($address)
104
-    {
105
-        $this->address = $address;
106
-    }
107
-
108
-    /**
109
-     * @return string
110
-     */
111
-    public function getData()
112
-    {
113
-        return unserialize($this->data);
114
-    }
115
-
116
-    public function setData($data)
117
-    {
118
-        $this->data = serialize($data);
119
-    }
120
-
121
-    /**
122
-     * @return DateTimeImmutable
123
-     */
124
-    public function getCreation()
125
-    {
126
-        return new DateTimeImmutable($this->creation);
127
-    }
75
+			);
76
+
77
+			$statement->bindValue(':id', $this->id);
78
+			$statement->bindValue(':updateversion', $this->updateversion);
79
+
80
+			$statement->bindValue(':address', $this->address);
81
+			$statement->bindValue(':data', $this->data);
82
+
83
+			if (!$statement->execute()) {
84
+				throw new Exception($statement->errorInfo());
85
+			}
86
+
87
+			if ($statement->rowCount() !== 1) {
88
+				throw new OptimisticLockFailedException();
89
+			}
90
+
91
+			$this->updateversion++;
92
+		}
93
+	}
94
+
95
+	public function getAddress()
96
+	{
97
+		return $this->address;
98
+	}
99
+
100
+	/**
101
+	 * @param string $address
102
+	 */
103
+	public function setAddress($address)
104
+	{
105
+		$this->address = $address;
106
+	}
107
+
108
+	/**
109
+	 * @return string
110
+	 */
111
+	public function getData()
112
+	{
113
+		return unserialize($this->data);
114
+	}
115
+
116
+	public function setData($data)
117
+	{
118
+		$this->data = serialize($data);
119
+	}
120
+
121
+	/**
122
+	 * @return DateTimeImmutable
123
+	 */
124
+	public function getCreation()
125
+	{
126
+		return new DateTimeImmutable($this->creation);
127
+	}
128 128
 }
Please login to merge, or discard this patch.
includes/DataObjects/Notification.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -22,73 +22,73 @@
 block discarded – undo
22 22
  */
23 23
 class Notification extends DataObject
24 24
 {
25
-    private $date;
26
-    private $type;
27
-    private $text;
25
+	private $date;
26
+	private $type;
27
+	private $text;
28 28
 
29
-    public function delete()
30
-    {
31
-        throw new Exception("You shouldn't be doing this...");
32
-    }
29
+	public function delete()
30
+	{
31
+		throw new Exception("You shouldn't be doing this...");
32
+	}
33 33
 
34
-    public function save()
35
-    {
36
-        if ($this->isNew()) {
37
-            // insert
38
-            $statement = $this->dbObject->prepare("INSERT INTO notification ( type, text ) VALUES ( :type, :text );");
39
-            $statement->bindValue(":type", $this->type);
40
-            $statement->bindValue(":text", $this->text);
34
+	public function save()
35
+	{
36
+		if ($this->isNew()) {
37
+			// insert
38
+			$statement = $this->dbObject->prepare("INSERT INTO notification ( type, text ) VALUES ( :type, :text );");
39
+			$statement->bindValue(":type", $this->type);
40
+			$statement->bindValue(":text", $this->text);
41 41
 
42
-            if ($statement->execute()) {
43
-                $this->id = (int)$this->dbObject->lastInsertId();
44
-            }
45
-            else {
46
-                throw new Exception($statement->errorInfo());
47
-            }
48
-        }
49
-        else {
50
-            throw new Exception("You shouldn't be doing this...");
51
-        }
52
-    }
42
+			if ($statement->execute()) {
43
+				$this->id = (int)$this->dbObject->lastInsertId();
44
+			}
45
+			else {
46
+				throw new Exception($statement->errorInfo());
47
+			}
48
+		}
49
+		else {
50
+			throw new Exception("You shouldn't be doing this...");
51
+		}
52
+	}
53 53
 
54
-    public function getDate()
55
-    {
56
-        return new DateTimeImmutable($this->date);
57
-    }
54
+	public function getDate()
55
+	{
56
+		return new DateTimeImmutable($this->date);
57
+	}
58 58
 
59
-    /**
60
-     * @return int
61
-     */
62
-    public function getType()
63
-    {
64
-        return $this->type;
65
-    }
59
+	/**
60
+	 * @return int
61
+	 */
62
+	public function getType()
63
+	{
64
+		return $this->type;
65
+	}
66 66
 
67
-    /**
68
-     * @return string
69
-     */
70
-    public function getText()
71
-    {
72
-        return $this->text;
73
-    }
67
+	/**
68
+	 * @return string
69
+	 */
70
+	public function getText()
71
+	{
72
+		return $this->text;
73
+	}
74 74
 
75
-    /**
76
-     * Summary of setType
77
-     *
78
-     * @param int $type
79
-     */
80
-    public function setType($type)
81
-    {
82
-        $this->type = $type;
83
-    }
75
+	/**
76
+	 * Summary of setType
77
+	 *
78
+	 * @param int $type
79
+	 */
80
+	public function setType($type)
81
+	{
82
+		$this->type = $type;
83
+	}
84 84
 
85
-    /**
86
-     * Summary of setText
87
-     *
88
-     * @param string $text
89
-     */
90
-    public function setText($text)
91
-    {
92
-        $this->text = $text;
93
-    }
85
+	/**
86
+	 * Summary of setText
87
+	 *
88
+	 * @param string $text
89
+	 */
90
+	public function setText($text)
91
+	{
92
+		$this->text = $text;
93
+	}
94 94
 }
Please login to merge, or discard this patch.