@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | 89 | * Summary of getUserObject |
| 90 | - * @return User|null |
|
| 90 | + * @return DataObject|null |
|
| 91 | 91 | */ |
| 92 | 92 | public function getUserObject() |
| 93 | 93 | { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | /** |
| 128 | 128 | * Summary of getRequestObject |
| 129 | - * @return Request|null |
|
| 129 | + * @return DataObject|null |
|
| 130 | 130 | */ |
| 131 | 131 | public function getRequestObject() |
| 132 | 132 | { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | 87 | * Summary of getUserObject |
| 88 | - * @return User|null |
|
| 88 | + * @return DataObject|null |
|
| 89 | 89 | */ |
| 90 | 90 | public function getUserObject() |
| 91 | 91 | { |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * Summary of setUser |
| 97 | - * @param int|User $user |
|
| 97 | + * @param User $user |
|
| 98 | 98 | */ |
| 99 | 99 | public function setUser($user) |
| 100 | 100 | { |
@@ -822,11 +822,13 @@ |
||
| 822 | 822 | |
| 823 | 823 | #endregion |
| 824 | 824 | |
| 825 | - public function getForgottenPasswordHash() { |
|
| 825 | + public function getForgottenPasswordHash() |
|
| 826 | + { |
|
| 826 | 827 | return md5($this->username . $this->email . $this->welcome_template . $this->id . $this->password); |
| 827 | 828 | } |
| 828 | 829 | |
| 829 | - public function getApprovalDate() { |
|
| 830 | + public function getApprovalDate() |
|
| 831 | + { |
|
| 830 | 832 | $query = $this->dbObject->prepare(<<<SQL |
| 831 | 833 | SELECT timestamp |
| 832 | 834 | FROM log |
@@ -425,8 +425,7 @@ |
||
| 425 | 425 | ); |
| 426 | 426 | |
| 427 | 427 | $statement = $database->query("SELECT CONCAT('Closed ', id) as k, CONCAT('closed (',name,')') as v FROM emailtemplate;"); |
| 428 | - foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) |
|
| 429 | - { |
|
| 428 | + foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) { |
|
| 430 | 429 | $lookup[$row['k']] = $row['v']; |
| 431 | 430 | } |
| 432 | 431 | |
@@ -1281,7 +1281,7 @@ discard block |
||
| 1281 | 1281 | if ($_POST['action'] == EmailTemplate::CREATED || $_POST['action'] == EmailTemplate::NOT_CREATED) { |
| 1282 | 1282 | $request->setStatus('Closed'); |
| 1283 | 1283 | |
| 1284 | - if($_POST['action'] == EmailTemplate::CREATED){ |
|
| 1284 | + if($_POST['action'] == EmailTemplate::CREATED) { |
|
| 1285 | 1285 | $gem = 'custom-y'; |
| 1286 | 1286 | $crea = "Custom, Created"; |
| 1287 | 1287 | } |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | BootstrapSkin::displayInternalFooter(); |
| 1332 | 1332 | die(); |
| 1333 | 1333 | } |
| 1334 | - else{ |
|
| 1334 | + else { |
|
| 1335 | 1335 | // Not a custom close, just a normal close |
| 1336 | 1336 | |
| 1337 | 1337 | $request->setStatus('Closed'); |
@@ -35,6 +35,7 @@ discard block |
||
| 35 | 35 | /** |
| 36 | 36 | * Formats a string to be used as a username. |
| 37 | 37 | * @deprecated StringFunctions class |
| 38 | + * @param string $username |
|
| 38 | 39 | */ |
| 39 | 40 | public function struname($username) |
| 40 | 41 | { |
@@ -50,6 +51,7 @@ discard block |
||
| 50 | 51 | * from the beginning/end of the Email, as well as immediately before/after |
| 51 | 52 | * the @ in the Email). |
| 52 | 53 | * @deprecated StringFunctions class |
| 54 | + * @param string $email |
|
| 53 | 55 | */ |
| 54 | 56 | public function stremail($email) |
| 55 | 57 | { |
@@ -10,11 +10,13 @@ |
||
| 10 | 10 | $this->irc = new IrcColourCode(); |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - public function tearDown() { |
|
| 13 | + public function tearDown() |
|
| 14 | + { |
|
| 14 | 15 | $this->irc = NULL; |
| 15 | 16 | } |
| 16 | 17 | |
| 17 | - public function test_colorCodes() { |
|
| 18 | + public function test_colorCodes() |
|
| 19 | + { |
|
| 18 | 20 | |
| 19 | 21 | $i = $this->irc; |
| 20 | 22 | |
@@ -10,11 +10,13 @@ discard block |
||
| 10 | 10 | $this->e = new StringFunctions(); |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - public function tearDown() { |
|
| 13 | + public function tearDown() |
|
| 14 | + { |
|
| 14 | 15 | $this->e = NULL; |
| 15 | 16 | } |
| 16 | 17 | |
| 17 | - public function test_formatAsUsername() { |
|
| 18 | + public function test_formatAsUsername() |
|
| 19 | + { |
|
| 18 | 20 | // Happy path |
| 19 | 21 | $this->assertEquals($this->e->formatAsUsername("this"), "This"); |
| 20 | 22 | $this->assertEquals($this->e->formatAsUsername("1this"), "1this"); |
@@ -29,7 +31,8 @@ discard block |
||
| 29 | 31 | $this->assertNotEquals($this->e->formatAsUsername("1this"), "1This"); |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | - public function test_formatAsEmail() { |
|
| 34 | + public function test_formatAsEmail() |
|
| 35 | + { |
|
| 33 | 36 | $this->assertEquals($this->e->formatAsEmail("[email protected]"), "[email protected]"); |
| 34 | 37 | $this->assertEquals($this->e->formatAsEmail("[email protected]"), "[email protected]"); |
| 35 | 38 | $this->assertEquals($this->e->formatAsEmail(" [email protected]"), "[email protected]"); |
@@ -10,11 +10,13 @@ discard block |
||
| 10 | 10 | $this->e = new strings(); |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - public function tearDown() { |
|
| 13 | + public function tearDown() |
|
| 14 | + { |
|
| 14 | 15 | $this->e = NULL; |
| 15 | 16 | } |
| 16 | 17 | |
| 17 | - public function test_struname() { |
|
| 18 | + public function test_struname() |
|
| 19 | + { |
|
| 18 | 20 | // Happy path |
| 19 | 21 | $this->assertEquals($this->e->struname("this"), "This"); |
| 20 | 22 | $this->assertEquals($this->e->struname("1this"), "1this"); |
@@ -29,7 +31,8 @@ discard block |
||
| 29 | 31 | $this->assertNotEquals($this->e->struname("1this"), "1This"); |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | - public function test_stremail() { |
|
| 34 | + public function test_stremail() |
|
| 35 | + { |
|
| 33 | 36 | $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
| 34 | 37 | $this->assertEquals($this->e->stremail("[email protected]"), "[email protected]"); |
| 35 | 38 | $this->assertEquals($this->e->stremail(" [email protected]"), "[email protected]"); |