@@ -17,17 +17,17 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | interface IApiAction extends IRoutedTask |
| 19 | 19 | { |
| 20 | - /** |
|
| 21 | - * Method that runs API action |
|
| 22 | - * |
|
| 23 | - * @param DOMElement $apiDocument |
|
| 24 | - * |
|
| 25 | - * @return DOMElement The modified API document |
|
| 26 | - */ |
|
| 27 | - public function executeApiAction(DOMElement $apiDocument); |
|
| 20 | + /** |
|
| 21 | + * Method that runs API action |
|
| 22 | + * |
|
| 23 | + * @param DOMElement $apiDocument |
|
| 24 | + * |
|
| 25 | + * @return DOMElement The modified API document |
|
| 26 | + */ |
|
| 27 | + public function executeApiAction(DOMElement $apiDocument); |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * @return string the XML, or false if an error occurred. |
|
| 31 | - */ |
|
| 32 | - public function runApiPage(); |
|
| 29 | + /** |
|
| 30 | + * @return string the XML, or false if an error occurred. |
|
| 31 | + */ |
|
| 32 | + public function runApiPage(); |
|
| 33 | 33 | } |
@@ -18,34 +18,34 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | class HelpAction extends ApiPageBase implements IApiAction |
| 20 | 20 | { |
| 21 | - public function executeApiAction(DOMElement $apiDocument) |
|
| 22 | - { |
|
| 23 | - $helpElement = $this->getHelpElement(); |
|
| 24 | - $apiDocument->appendChild($helpElement); |
|
| 25 | - |
|
| 26 | - return $apiDocument; |
|
| 27 | - } |
|
| 28 | - |
|
| 29 | - /** |
|
| 30 | - * Gets the help information |
|
| 31 | - * @return DOMElement |
|
| 32 | - */ |
|
| 33 | - protected function getHelpElement() |
|
| 34 | - { |
|
| 35 | - $helpInfo = "Help info goes here!"; |
|
| 36 | - |
|
| 37 | - $help = $this->document->createElement("help"); |
|
| 38 | - $helptext = $this->document->createElement("info", $helpInfo); |
|
| 39 | - $helpactions = $this->document->createElement("actions"); |
|
| 40 | - |
|
| 41 | - foreach (ApiRequestRouter::getActionList() as $action) { |
|
| 42 | - $actionElement = $this->document->createElement("action", $action); |
|
| 43 | - $helpactions->appendChild($actionElement); |
|
| 44 | - } |
|
| 45 | - |
|
| 46 | - $help->appendChild($helptext); |
|
| 47 | - $help->appendChild($helpactions); |
|
| 48 | - |
|
| 49 | - return $help; |
|
| 50 | - } |
|
| 21 | + public function executeApiAction(DOMElement $apiDocument) |
|
| 22 | + { |
|
| 23 | + $helpElement = $this->getHelpElement(); |
|
| 24 | + $apiDocument->appendChild($helpElement); |
|
| 25 | + |
|
| 26 | + return $apiDocument; |
|
| 27 | + } |
|
| 28 | + |
|
| 29 | + /** |
|
| 30 | + * Gets the help information |
|
| 31 | + * @return DOMElement |
|
| 32 | + */ |
|
| 33 | + protected function getHelpElement() |
|
| 34 | + { |
|
| 35 | + $helpInfo = "Help info goes here!"; |
|
| 36 | + |
|
| 37 | + $help = $this->document->createElement("help"); |
|
| 38 | + $helptext = $this->document->createElement("info", $helpInfo); |
|
| 39 | + $helpactions = $this->document->createElement("actions"); |
|
| 40 | + |
|
| 41 | + foreach (ApiRequestRouter::getActionList() as $action) { |
|
| 42 | + $actionElement = $this->document->createElement("action", $action); |
|
| 43 | + $helpactions->appendChild($actionElement); |
|
| 44 | + } |
|
| 45 | + |
|
| 46 | + $help->appendChild($helptext); |
|
| 47 | + $help->appendChild($helpactions); |
|
| 48 | + |
|
| 49 | + return $help; |
|
| 50 | + } |
|
| 51 | 51 | } |
@@ -20,48 +20,48 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class CountAction extends ApiPageBase implements IApiAction |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * The target user |
|
| 25 | - * @var User $user |
|
| 26 | - */ |
|
| 27 | - private $user; |
|
| 23 | + /** |
|
| 24 | + * The target user |
|
| 25 | + * @var User $user |
|
| 26 | + */ |
|
| 27 | + private $user; |
|
| 28 | 28 | |
| 29 | - public function executeApiAction(DOMElement $apiDocument) |
|
| 30 | - { |
|
| 31 | - $username = WebRequest::getString('user'); |
|
| 32 | - if ($username === null) { |
|
| 33 | - throw new ApiException("Please specify a username"); |
|
| 34 | - } |
|
| 29 | + public function executeApiAction(DOMElement $apiDocument) |
|
| 30 | + { |
|
| 31 | + $username = WebRequest::getString('user'); |
|
| 32 | + if ($username === null) { |
|
| 33 | + throw new ApiException("Please specify a username"); |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - $userElement = $this->document->createElement("user"); |
|
| 37 | - $userElement->setAttribute("name", $username); |
|
| 38 | - $apiDocument->appendChild($userElement); |
|
| 36 | + $userElement = $this->document->createElement("user"); |
|
| 37 | + $userElement->setAttribute("name", $username); |
|
| 38 | + $apiDocument->appendChild($userElement); |
|
| 39 | 39 | |
| 40 | - $user = User::getByUsername($username, $this->getDatabase()); |
|
| 40 | + $user = User::getByUsername($username, $this->getDatabase()); |
|
| 41 | 41 | |
| 42 | - if ($user === false) { |
|
| 43 | - $userElement->setAttribute("missing", "true"); |
|
| 42 | + if ($user === false) { |
|
| 43 | + $userElement->setAttribute("missing", "true"); |
|
| 44 | 44 | |
| 45 | - return $apiDocument; |
|
| 46 | - } |
|
| 45 | + return $apiDocument; |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - $this->user = $user; |
|
| 48 | + $this->user = $user; |
|
| 49 | 49 | |
| 50 | - $userElement->setAttribute("level", $this->user->getStatus()); |
|
| 51 | - $userElement->setAttribute("created", $this->getAccountsCreated()); |
|
| 50 | + $userElement->setAttribute("level", $this->user->getStatus()); |
|
| 51 | + $userElement->setAttribute("created", $this->getAccountsCreated()); |
|
| 52 | 52 | |
| 53 | - $userElement->setAttribute("today", $this->getToday()); |
|
| 53 | + $userElement->setAttribute("today", $this->getToday()); |
|
| 54 | 54 | |
| 55 | - if ($this->user->isAdmin()) { |
|
| 56 | - $this->fetchAdminData($userElement); |
|
| 57 | - } |
|
| 55 | + if ($this->user->isAdmin()) { |
|
| 56 | + $this->fetchAdminData($userElement); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - return $apiDocument; |
|
| 60 | - } |
|
| 59 | + return $apiDocument; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - private function getAccountsCreated() |
|
| 63 | - { |
|
| 64 | - $query = <<<QUERY |
|
| 62 | + private function getAccountsCreated() |
|
| 63 | + { |
|
| 64 | + $query = <<<QUERY |
|
| 65 | 65 | SELECT COUNT(*) AS count |
| 66 | 66 | FROM log |
| 67 | 67 | LEFT JOIN emailtemplate ON concat('Closed ', emailtemplate.id) = log.action |
@@ -72,17 +72,17 @@ discard block |
||
| 72 | 72 | AND user.username = :username; |
| 73 | 73 | QUERY; |
| 74 | 74 | |
| 75 | - $statement = $this->getDatabase()->prepare($query); |
|
| 76 | - $statement->execute(array(":username" => $this->user->getUsername())); |
|
| 77 | - $result = $statement->fetchColumn(); |
|
| 78 | - $statement->closeCursor(); |
|
| 75 | + $statement = $this->getDatabase()->prepare($query); |
|
| 76 | + $statement->execute(array(":username" => $this->user->getUsername())); |
|
| 77 | + $result = $statement->fetchColumn(); |
|
| 78 | + $statement->closeCursor(); |
|
| 79 | 79 | |
| 80 | - return $result; |
|
| 81 | - } |
|
| 80 | + return $result; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - private function getToday() |
|
| 84 | - { |
|
| 85 | - $query = <<<QUERY |
|
| 83 | + private function getToday() |
|
| 84 | + { |
|
| 85 | + $query = <<<QUERY |
|
| 86 | 86 | SELECT |
| 87 | 87 | COUNT(*) AS count |
| 88 | 88 | FROM log |
@@ -94,99 +94,99 @@ discard block |
||
| 94 | 94 | AND user.username = :username; |
| 95 | 95 | QUERY; |
| 96 | 96 | |
| 97 | - $statement = $this->getDatabase()->prepare($query); |
|
| 98 | - $statement->bindValue(":username", $this->user->getUsername()); |
|
| 99 | - $statement->bindValue(":date", date('Y-m-d') . "%"); |
|
| 100 | - $statement->execute(); |
|
| 101 | - $today = $statement->fetchColumn(); |
|
| 102 | - $statement->closeCursor(); |
|
| 103 | - |
|
| 104 | - return $today; |
|
| 105 | - } |
|
| 106 | - |
|
| 107 | - private function fetchAdminData(DOMElement $userElement) |
|
| 108 | - { |
|
| 109 | - $query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;"; |
|
| 110 | - |
|
| 111 | - $statement = $this->getDatabase()->prepare($query); |
|
| 112 | - $statement->bindValue(":userid", $this->user->getId()); |
|
| 113 | - $statement->bindValue(":action", "Suspended"); |
|
| 114 | - $statement->execute(); |
|
| 115 | - $sus = $statement->fetchColumn(); |
|
| 116 | - $userElement->setAttribute("suspended", $sus); |
|
| 117 | - $statement->closeCursor(); |
|
| 118 | - |
|
| 119 | - $statement->bindValue(":action", "Promoted"); |
|
| 120 | - $statement->execute(); |
|
| 121 | - $pro = $statement->fetchColumn(); |
|
| 122 | - $userElement->setAttribute("promoted", $pro); |
|
| 123 | - $statement->closeCursor(); |
|
| 124 | - |
|
| 125 | - $statement->bindValue(":action", "Approved"); |
|
| 126 | - $statement->execute(); |
|
| 127 | - $app = $statement->fetchColumn(); |
|
| 128 | - $userElement->setAttribute("approved", $app); |
|
| 129 | - $statement->closeCursor(); |
|
| 130 | - |
|
| 131 | - $statement->bindValue(":action", "Demoted"); |
|
| 132 | - $statement->execute(); |
|
| 133 | - $dem = $statement->fetchColumn(); |
|
| 134 | - $userElement->setAttribute("demoted", $dem); |
|
| 135 | - $statement->closeCursor(); |
|
| 136 | - |
|
| 137 | - $statement->bindValue(":action", "Declined"); |
|
| 138 | - $statement->execute(); |
|
| 139 | - $dec = $statement->fetchColumn(); |
|
| 140 | - $userElement->setAttribute("declined", $dec); |
|
| 141 | - $statement->closeCursor(); |
|
| 142 | - |
|
| 143 | - $statement->bindValue(":action", "Renamed"); |
|
| 144 | - $statement->execute(); |
|
| 145 | - $rnc = $statement->fetchColumn(); |
|
| 146 | - $userElement->setAttribute("renamed", $rnc); |
|
| 147 | - $statement->closeCursor(); |
|
| 148 | - |
|
| 149 | - $statement->bindValue(":action", "Edited"); |
|
| 150 | - $statement->execute(); |
|
| 151 | - $mec = $statement->fetchColumn(); |
|
| 152 | - $userElement->setAttribute("edited", $mec); |
|
| 153 | - $statement->closeCursor(); |
|
| 154 | - |
|
| 155 | - $statement->bindValue(":action", "Prefchange"); |
|
| 156 | - $statement->execute(); |
|
| 157 | - $pcc = $statement->fetchColumn(); |
|
| 158 | - $userElement->setAttribute("prefchange", $pcc); |
|
| 159 | - $statement->closeCursor(); |
|
| 160 | - |
|
| 161 | - // Combine all three actions affecting Welcome templates into one count. |
|
| 162 | - $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
| 97 | + $statement = $this->getDatabase()->prepare($query); |
|
| 98 | + $statement->bindValue(":username", $this->user->getUsername()); |
|
| 99 | + $statement->bindValue(":date", date('Y-m-d') . "%"); |
|
| 100 | + $statement->execute(); |
|
| 101 | + $today = $statement->fetchColumn(); |
|
| 102 | + $statement->closeCursor(); |
|
| 103 | + |
|
| 104 | + return $today; |
|
| 105 | + } |
|
| 106 | + |
|
| 107 | + private function fetchAdminData(DOMElement $userElement) |
|
| 108 | + { |
|
| 109 | + $query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;"; |
|
| 110 | + |
|
| 111 | + $statement = $this->getDatabase()->prepare($query); |
|
| 112 | + $statement->bindValue(":userid", $this->user->getId()); |
|
| 113 | + $statement->bindValue(":action", "Suspended"); |
|
| 114 | + $statement->execute(); |
|
| 115 | + $sus = $statement->fetchColumn(); |
|
| 116 | + $userElement->setAttribute("suspended", $sus); |
|
| 117 | + $statement->closeCursor(); |
|
| 118 | + |
|
| 119 | + $statement->bindValue(":action", "Promoted"); |
|
| 120 | + $statement->execute(); |
|
| 121 | + $pro = $statement->fetchColumn(); |
|
| 122 | + $userElement->setAttribute("promoted", $pro); |
|
| 123 | + $statement->closeCursor(); |
|
| 124 | + |
|
| 125 | + $statement->bindValue(":action", "Approved"); |
|
| 126 | + $statement->execute(); |
|
| 127 | + $app = $statement->fetchColumn(); |
|
| 128 | + $userElement->setAttribute("approved", $app); |
|
| 129 | + $statement->closeCursor(); |
|
| 130 | + |
|
| 131 | + $statement->bindValue(":action", "Demoted"); |
|
| 132 | + $statement->execute(); |
|
| 133 | + $dem = $statement->fetchColumn(); |
|
| 134 | + $userElement->setAttribute("demoted", $dem); |
|
| 135 | + $statement->closeCursor(); |
|
| 136 | + |
|
| 137 | + $statement->bindValue(":action", "Declined"); |
|
| 138 | + $statement->execute(); |
|
| 139 | + $dec = $statement->fetchColumn(); |
|
| 140 | + $userElement->setAttribute("declined", $dec); |
|
| 141 | + $statement->closeCursor(); |
|
| 142 | + |
|
| 143 | + $statement->bindValue(":action", "Renamed"); |
|
| 144 | + $statement->execute(); |
|
| 145 | + $rnc = $statement->fetchColumn(); |
|
| 146 | + $userElement->setAttribute("renamed", $rnc); |
|
| 147 | + $statement->closeCursor(); |
|
| 148 | + |
|
| 149 | + $statement->bindValue(":action", "Edited"); |
|
| 150 | + $statement->execute(); |
|
| 151 | + $mec = $statement->fetchColumn(); |
|
| 152 | + $userElement->setAttribute("edited", $mec); |
|
| 153 | + $statement->closeCursor(); |
|
| 154 | + |
|
| 155 | + $statement->bindValue(":action", "Prefchange"); |
|
| 156 | + $statement->execute(); |
|
| 157 | + $pcc = $statement->fetchColumn(); |
|
| 158 | + $userElement->setAttribute("prefchange", $pcc); |
|
| 159 | + $statement->closeCursor(); |
|
| 160 | + |
|
| 161 | + // Combine all three actions affecting Welcome templates into one count. |
|
| 162 | + $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
| 163 | 163 | SELECT |
| 164 | 164 | COUNT(*) AS count |
| 165 | 165 | FROM log |
| 166 | 166 | WHERE log.user = :userid |
| 167 | 167 | AND log.action IN ('CreatedTemplate', 'EditedTemplate', 'DeletedTemplate'); |
| 168 | 168 | SQL |
| 169 | - ); |
|
| 169 | + ); |
|
| 170 | 170 | |
| 171 | - $combinedquery->bindValue(":userid", $this->user->getId()); |
|
| 172 | - $combinedquery->execute(); |
|
| 173 | - $dtc = $combinedquery->fetchColumn(); |
|
| 174 | - $userElement->setAttribute("welctempchange", $dtc); |
|
| 175 | - $combinedquery->closeCursor(); |
|
| 171 | + $combinedquery->bindValue(":userid", $this->user->getId()); |
|
| 172 | + $combinedquery->execute(); |
|
| 173 | + $dtc = $combinedquery->fetchColumn(); |
|
| 174 | + $userElement->setAttribute("welctempchange", $dtc); |
|
| 175 | + $combinedquery->closeCursor(); |
|
| 176 | 176 | |
| 177 | - // Combine both actions affecting Email templates into one count. |
|
| 178 | - $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
| 177 | + // Combine both actions affecting Email templates into one count. |
|
| 178 | + $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
| 179 | 179 | SELECT COUNT(*) AS count |
| 180 | 180 | FROM log |
| 181 | 181 | WHERE log.user = :userid |
| 182 | 182 | AND log.action IN ('CreatedEmail', 'EditedEmail'); |
| 183 | 183 | SQL |
| 184 | - ); |
|
| 185 | - |
|
| 186 | - $combinedquery->bindValue(":userid", $this->user->getId()); |
|
| 187 | - $combinedquery->execute(); |
|
| 188 | - $cec = $combinedquery->fetchColumn(); |
|
| 189 | - $userElement->setAttribute("emailtempchange", $cec); |
|
| 190 | - $combinedquery->closeCursor(); |
|
| 191 | - } |
|
| 184 | + ); |
|
| 185 | + |
|
| 186 | + $combinedquery->bindValue(":userid", $this->user->getId()); |
|
| 187 | + $combinedquery->execute(); |
|
| 188 | + $cec = $combinedquery->fetchColumn(); |
|
| 189 | + $userElement->setAttribute("emailtempchange", $cec); |
|
| 190 | + $combinedquery->closeCursor(); |
|
| 191 | + } |
|
| 192 | 192 | } |
@@ -17,67 +17,67 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | class StatusAction extends ApiPageBase implements IApiAction |
| 19 | 19 | { |
| 20 | - public function executeApiAction(DOMElement $apiDocument) |
|
| 21 | - { |
|
| 22 | - $statusElement = $this->document->createElement("status"); |
|
| 23 | - $apiDocument->appendChild($statusElement); |
|
| 20 | + public function executeApiAction(DOMElement $apiDocument) |
|
| 21 | + { |
|
| 22 | + $statusElement = $this->document->createElement("status"); |
|
| 23 | + $apiDocument->appendChild($statusElement); |
|
| 24 | 24 | |
| 25 | - $query = $this->getDatabase()->prepare(<<<SQL |
|
| 25 | + $query = $this->getDatabase()->prepare(<<<SQL |
|
| 26 | 26 | SELECT /* Api/StatusAction */ COUNT(*) AS count |
| 27 | 27 | FROM request |
| 28 | 28 | WHERE |
| 29 | 29 | status = :pstatus |
| 30 | 30 | AND emailconfirm = 'Confirmed'; |
| 31 | 31 | SQL |
| 32 | - ); |
|
| 32 | + ); |
|
| 33 | 33 | |
| 34 | - $availableRequestStates = $this->getSiteConfiguration()->getRequestStates(); |
|
| 34 | + $availableRequestStates = $this->getSiteConfiguration()->getRequestStates(); |
|
| 35 | 35 | |
| 36 | - foreach ($availableRequestStates as $key => $value) { |
|
| 37 | - $query->bindValue(":pstatus", $key); |
|
| 38 | - $query->execute(); |
|
| 39 | - $sus = $query->fetchColumn(); |
|
| 40 | - $statusElement->setAttribute($value['api'], $sus); |
|
| 41 | - $query->closeCursor(); |
|
| 42 | - } |
|
| 36 | + foreach ($availableRequestStates as $key => $value) { |
|
| 37 | + $query->bindValue(":pstatus", $key); |
|
| 38 | + $query->execute(); |
|
| 39 | + $sus = $query->fetchColumn(); |
|
| 40 | + $statusElement->setAttribute($value['api'], $sus); |
|
| 41 | + $query->closeCursor(); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - $query = $this->getDatabase()->prepare(<<<SQL |
|
| 44 | + $query = $this->getDatabase()->prepare(<<<SQL |
|
| 45 | 45 | SELECT /* Api/StatusAction */ COUNT(*) AS count |
| 46 | 46 | FROM ban |
| 47 | 47 | WHERE |
| 48 | 48 | (duration > UNIX_TIMESTAMP() OR duration = -1) |
| 49 | 49 | AND active = 1; |
| 50 | 50 | SQL |
| 51 | - ); |
|
| 51 | + ); |
|
| 52 | 52 | |
| 53 | - $query->execute(); |
|
| 54 | - $sus = $query->fetchColumn(); |
|
| 55 | - $statusElement->setAttribute("bans", $sus); |
|
| 56 | - $query->closeCursor(); |
|
| 53 | + $query->execute(); |
|
| 54 | + $sus = $query->fetchColumn(); |
|
| 55 | + $statusElement->setAttribute("bans", $sus); |
|
| 56 | + $query->closeCursor(); |
|
| 57 | 57 | |
| 58 | - $query = $this->getDatabase()->prepare(<<<SQL |
|
| 58 | + $query = $this->getDatabase()->prepare(<<<SQL |
|
| 59 | 59 | SELECT /* Api/StatusAction */ COUNT(*) AS count |
| 60 | 60 | FROM user WHERE status = :ulevel; |
| 61 | 61 | SQL |
| 62 | - ); |
|
| 63 | - $query->bindValue(":ulevel", "Admin"); |
|
| 64 | - $query->execute(); |
|
| 65 | - $sus = $query->fetchColumn(); |
|
| 66 | - $statusElement->setAttribute("useradmin", $sus); |
|
| 67 | - $query->closeCursor(); |
|
| 62 | + ); |
|
| 63 | + $query->bindValue(":ulevel", "Admin"); |
|
| 64 | + $query->execute(); |
|
| 65 | + $sus = $query->fetchColumn(); |
|
| 66 | + $statusElement->setAttribute("useradmin", $sus); |
|
| 67 | + $query->closeCursor(); |
|
| 68 | 68 | |
| 69 | - $query->bindValue(":ulevel", "User"); |
|
| 70 | - $query->execute(); |
|
| 71 | - $sus = $query->fetchColumn(); |
|
| 72 | - $statusElement->setAttribute("user", $sus); |
|
| 73 | - $query->closeCursor(); |
|
| 69 | + $query->bindValue(":ulevel", "User"); |
|
| 70 | + $query->execute(); |
|
| 71 | + $sus = $query->fetchColumn(); |
|
| 72 | + $statusElement->setAttribute("user", $sus); |
|
| 73 | + $query->closeCursor(); |
|
| 74 | 74 | |
| 75 | - $query->bindValue(":ulevel", "New"); |
|
| 76 | - $query->execute(); |
|
| 77 | - $sus = $query->fetchColumn(); |
|
| 78 | - $statusElement->setAttribute("usernew", $sus); |
|
| 79 | - $query->closeCursor(); |
|
| 75 | + $query->bindValue(":ulevel", "New"); |
|
| 76 | + $query->execute(); |
|
| 77 | + $sus = $query->fetchColumn(); |
|
| 78 | + $statusElement->setAttribute("usernew", $sus); |
|
| 79 | + $query->closeCursor(); |
|
| 80 | 80 | |
| 81 | - return $apiDocument; |
|
| 82 | - } |
|
| 81 | + return $apiDocument; |
|
| 82 | + } |
|
| 83 | 83 | } |
@@ -19,55 +19,55 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | class StatsAction extends ApiPageBase implements IApiAction |
| 21 | 21 | { |
| 22 | - /** |
|
| 23 | - * The target user |
|
| 24 | - * @var User $user |
|
| 25 | - */ |
|
| 26 | - private $user; |
|
| 22 | + /** |
|
| 23 | + * The target user |
|
| 24 | + * @var User $user |
|
| 25 | + */ |
|
| 26 | + private $user; |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Summary of execute |
|
| 30 | - * |
|
| 31 | - * @param \DOMElement $apiDocument |
|
| 32 | - * |
|
| 33 | - * @return \DOMElement |
|
| 34 | - * @throws ApiException |
|
| 35 | - * @throws \Exception |
|
| 36 | - */ |
|
| 37 | - public function executeApiAction(\DOMElement $apiDocument) |
|
| 38 | - { |
|
| 39 | - $username = WebRequest::getString('user'); |
|
| 40 | - $wikiusername = WebRequest::getString('wikiuser'); |
|
| 28 | + /** |
|
| 29 | + * Summary of execute |
|
| 30 | + * |
|
| 31 | + * @param \DOMElement $apiDocument |
|
| 32 | + * |
|
| 33 | + * @return \DOMElement |
|
| 34 | + * @throws ApiException |
|
| 35 | + * @throws \Exception |
|
| 36 | + */ |
|
| 37 | + public function executeApiAction(\DOMElement $apiDocument) |
|
| 38 | + { |
|
| 39 | + $username = WebRequest::getString('user'); |
|
| 40 | + $wikiusername = WebRequest::getString('wikiuser'); |
|
| 41 | 41 | |
| 42 | - if ($username === null && $wikiusername === null) { |
|
| 43 | - throw new ApiException("Please specify a username using either user or wikiuser parameters."); |
|
| 44 | - } |
|
| 42 | + if ($username === null && $wikiusername === null) { |
|
| 43 | + throw new ApiException("Please specify a username using either user or wikiuser parameters."); |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - $userElement = $this->document->createElement("user"); |
|
| 47 | - $apiDocument->appendChild($userElement); |
|
| 46 | + $userElement = $this->document->createElement("user"); |
|
| 47 | + $apiDocument->appendChild($userElement); |
|
| 48 | 48 | |
| 49 | - if ($username !== null) { |
|
| 50 | - $user = User::getByUsername($username, $this->getDatabase()); |
|
| 51 | - } |
|
| 52 | - else { |
|
| 53 | - $user = User::getByOnWikiUsername($wikiusername, $this->getDatabase()); |
|
| 54 | - } |
|
| 49 | + if ($username !== null) { |
|
| 50 | + $user = User::getByUsername($username, $this->getDatabase()); |
|
| 51 | + } |
|
| 52 | + else { |
|
| 53 | + $user = User::getByOnWikiUsername($wikiusername, $this->getDatabase()); |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - if ($user === false) { |
|
| 57 | - $userElement->setAttribute("missing", "true"); |
|
| 56 | + if ($user === false) { |
|
| 57 | + $userElement->setAttribute("missing", "true"); |
|
| 58 | 58 | |
| 59 | - return $apiDocument; |
|
| 60 | - } |
|
| 59 | + return $apiDocument; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - $this->user = $user; |
|
| 62 | + $this->user = $user; |
|
| 63 | 63 | |
| 64 | - $userElement->setAttribute("username", $this->user->getUsername()); |
|
| 65 | - $userElement->setAttribute("status", $this->user->getStatus()); |
|
| 66 | - $userElement->setAttribute("lastactive", $this->user->getLastActive()); |
|
| 67 | - $userElement->setAttribute("welcome_template", $this->user->getWelcomeTemplate()); |
|
| 68 | - $userElement->setAttribute("onwikiname", $this->user->getOnWikiName()); |
|
| 69 | - $userElement->setAttribute("oauth", $this->user->isOAuthLinked() ? "true" : "false"); |
|
| 64 | + $userElement->setAttribute("username", $this->user->getUsername()); |
|
| 65 | + $userElement->setAttribute("status", $this->user->getStatus()); |
|
| 66 | + $userElement->setAttribute("lastactive", $this->user->getLastActive()); |
|
| 67 | + $userElement->setAttribute("welcome_template", $this->user->getWelcomeTemplate()); |
|
| 68 | + $userElement->setAttribute("onwikiname", $this->user->getOnWikiName()); |
|
| 69 | + $userElement->setAttribute("oauth", $this->user->isOAuthLinked() ? "true" : "false"); |
|
| 70 | 70 | |
| 71 | - return $apiDocument; |
|
| 72 | - } |
|
| 71 | + return $apiDocument; |
|
| 72 | + } |
|
| 73 | 73 | } |
@@ -23,65 +23,65 @@ |
||
| 23 | 23 | */ |
| 24 | 24 | class MonitorAction extends ApiPageBase implements IApiAction |
| 25 | 25 | { |
| 26 | - /** |
|
| 27 | - * @param DOMElement $apiDocument |
|
| 28 | - * |
|
| 29 | - * @return DOMElement |
|
| 30 | - */ |
|
| 31 | - public function executeApiAction(DOMElement $apiDocument) |
|
| 32 | - { |
|
| 33 | - $now = new DateTime(); |
|
| 26 | + /** |
|
| 27 | + * @param DOMElement $apiDocument |
|
| 28 | + * |
|
| 29 | + * @return DOMElement |
|
| 30 | + */ |
|
| 31 | + public function executeApiAction(DOMElement $apiDocument) |
|
| 32 | + { |
|
| 33 | + $now = new DateTime(); |
|
| 34 | 34 | |
| 35 | - $old = $this->getOldest(); |
|
| 36 | - $oldest = new DateTime($old); |
|
| 35 | + $old = $this->getOldest(); |
|
| 36 | + $oldest = new DateTime($old); |
|
| 37 | 37 | |
| 38 | - $new = $this->getNewest(); |
|
| 39 | - $newest = new DateTime($new); |
|
| 38 | + $new = $this->getNewest(); |
|
| 39 | + $newest = new DateTime($new); |
|
| 40 | 40 | |
| 41 | - $monitoringElement = $this->document->createElement("data"); |
|
| 42 | - $monitoringElement->setAttribute("date", $now->format('c')); |
|
| 43 | - $monitoringElement->setAttribute("oldest", $old === null ? null : $oldest->format('c')); |
|
| 44 | - $monitoringElement->setAttribute("newest", $new === null ? null : $newest->format('c')); |
|
| 45 | - $apiDocument->appendChild($monitoringElement); |
|
| 41 | + $monitoringElement = $this->document->createElement("data"); |
|
| 42 | + $monitoringElement->setAttribute("date", $now->format('c')); |
|
| 43 | + $monitoringElement->setAttribute("oldest", $old === null ? null : $oldest->format('c')); |
|
| 44 | + $monitoringElement->setAttribute("newest", $new === null ? null : $newest->format('c')); |
|
| 45 | + $apiDocument->appendChild($monitoringElement); |
|
| 46 | 46 | |
| 47 | - return $apiDocument; |
|
| 48 | - } |
|
| 47 | + return $apiDocument; |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @return string|null |
|
| 52 | - */ |
|
| 53 | - private function getOldest() |
|
| 54 | - { |
|
| 55 | - $statement = $this->getDatabase() |
|
| 56 | - ->prepare("SELECT min(date) FROM request WHERE email != :email AND ip != :ip;"); |
|
| 57 | - $successful = $statement->execute(array( |
|
| 58 | - ':email' => $this->getSiteConfiguration()->getDataClearEmail(), |
|
| 59 | - ':ip' => $this->getSiteConfiguration()->getDataClearIp(), |
|
| 60 | - )); |
|
| 50 | + /** |
|
| 51 | + * @return string|null |
|
| 52 | + */ |
|
| 53 | + private function getOldest() |
|
| 54 | + { |
|
| 55 | + $statement = $this->getDatabase() |
|
| 56 | + ->prepare("SELECT min(date) FROM request WHERE email != :email AND ip != :ip;"); |
|
| 57 | + $successful = $statement->execute(array( |
|
| 58 | + ':email' => $this->getSiteConfiguration()->getDataClearEmail(), |
|
| 59 | + ':ip' => $this->getSiteConfiguration()->getDataClearIp(), |
|
| 60 | + )); |
|
| 61 | 61 | |
| 62 | - if (!$successful) { |
|
| 63 | - return null; |
|
| 64 | - } |
|
| 62 | + if (!$successful) { |
|
| 63 | + return null; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - $result = $statement->fetchColumn(); |
|
| 66 | + $result = $statement->fetchColumn(); |
|
| 67 | 67 | |
| 68 | - return $result; |
|
| 69 | - } |
|
| 68 | + return $result; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * @return string |
|
| 73 | - */ |
|
| 74 | - private function getNewest() |
|
| 75 | - { |
|
| 76 | - $statement = $this->getDatabase() |
|
| 77 | - ->prepare("SELECT max(date) FROM request WHERE email != :email AND ip != :ip;"); |
|
| 78 | - $statement->execute(array( |
|
| 79 | - ':email' => $this->getSiteConfiguration()->getDataClearEmail(), |
|
| 80 | - ':ip' => $this->getSiteConfiguration()->getDataClearIp(), |
|
| 81 | - )); |
|
| 71 | + /** |
|
| 72 | + * @return string |
|
| 73 | + */ |
|
| 74 | + private function getNewest() |
|
| 75 | + { |
|
| 76 | + $statement = $this->getDatabase() |
|
| 77 | + ->prepare("SELECT max(date) FROM request WHERE email != :email AND ip != :ip;"); |
|
| 78 | + $statement->execute(array( |
|
| 79 | + ':email' => $this->getSiteConfiguration()->getDataClearEmail(), |
|
| 80 | + ':ip' => $this->getSiteConfiguration()->getDataClearIp(), |
|
| 81 | + )); |
|
| 82 | 82 | |
| 83 | - $result = $statement->fetchColumn(0); |
|
| 83 | + $result = $statement->fetchColumn(0); |
|
| 84 | 84 | |
| 85 | - return $result; |
|
| 86 | - } |
|
| 85 | + return $result; |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -16,15 +16,15 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | class UnknownAction extends HelpAction implements IApiAction |
| 18 | 18 | { |
| 19 | - public function executeApiAction(DOMElement $apiDocument) |
|
| 20 | - { |
|
| 21 | - $errorText = "Unknown API action specified."; |
|
| 22 | - $errorNode = $this->document->createElement("error", $errorText); |
|
| 23 | - $apiDocument->appendChild($errorNode); |
|
| 19 | + public function executeApiAction(DOMElement $apiDocument) |
|
| 20 | + { |
|
| 21 | + $errorText = "Unknown API action specified."; |
|
| 22 | + $errorNode = $this->document->createElement("error", $errorText); |
|
| 23 | + $apiDocument->appendChild($errorNode); |
|
| 24 | 24 | |
| 25 | - $helpElement = $this->getHelpElement(); |
|
| 26 | - $apiDocument->appendChild($helpElement); |
|
| 25 | + $helpElement = $this->getHelpElement(); |
|
| 26 | + $apiDocument->appendChild($helpElement); |
|
| 27 | 27 | |
| 28 | - return $apiDocument; |
|
| 29 | - } |
|
| 28 | + return $apiDocument; |
|
| 29 | + } |
|
| 30 | 30 | } |
@@ -15,11 +15,11 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | class ApiException extends Exception |
| 17 | 17 | { |
| 18 | - /** |
|
| 19 | - * @param string $message |
|
| 20 | - */ |
|
| 21 | - public function __construct($message) |
|
| 22 | - { |
|
| 23 | - $this->message = $message; |
|
| 24 | - } |
|
| 18 | + /** |
|
| 19 | + * @param string $message |
|
| 20 | + */ |
|
| 21 | + public function __construct($message) |
|
| 22 | + { |
|
| 23 | + $this->message = $message; |
|
| 24 | + } |
|
| 25 | 25 | } |
@@ -10,96 +10,96 @@ |
||
| 10 | 10 | |
| 11 | 11 | class AuthUtility |
| 12 | 12 | { |
| 13 | - /** |
|
| 14 | - * Test the specified data against the specified credentials |
|
| 15 | - * |
|
| 16 | - * @param string $password |
|
| 17 | - * @param string $credentials |
|
| 18 | - * |
|
| 19 | - * @return bool |
|
| 20 | - */ |
|
| 21 | - public static function testCredentials($password, $credentials) |
|
| 22 | - { |
|
| 23 | - global $minimumPasswordVersion; |
|
| 13 | + /** |
|
| 14 | + * Test the specified data against the specified credentials |
|
| 15 | + * |
|
| 16 | + * @param string $password |
|
| 17 | + * @param string $credentials |
|
| 18 | + * |
|
| 19 | + * @return bool |
|
| 20 | + */ |
|
| 21 | + public static function testCredentials($password, $credentials) |
|
| 22 | + { |
|
| 23 | + global $minimumPasswordVersion; |
|
| 24 | 24 | |
| 25 | - if (substr($credentials, 0, 1) != ":") { |
|
| 26 | - return false; |
|
| 27 | - } |
|
| 25 | + if (substr($credentials, 0, 1) != ":") { |
|
| 26 | + return false; |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - // determine password version |
|
| 30 | - $data = explode(':', substr($credentials, 1)); |
|
| 29 | + // determine password version |
|
| 30 | + $data = explode(':', substr($credentials, 1)); |
|
| 31 | 31 | |
| 32 | - // call the encryptVersion function for the version that this password actually is. |
|
| 33 | - // syntax: :1:SALT:HASH |
|
| 34 | - // syntax: :2:x:HASH |
|
| 32 | + // call the encryptVersion function for the version that this password actually is. |
|
| 33 | + // syntax: :1:SALT:HASH |
|
| 34 | + // syntax: :2:x:HASH |
|
| 35 | 35 | |
| 36 | - // check the version is one of the allowed ones: |
|
| 37 | - if ($minimumPasswordVersion > $data[0]) { |
|
| 38 | - return false; |
|
| 39 | - } |
|
| 36 | + // check the version is one of the allowed ones: |
|
| 37 | + if ($minimumPasswordVersion > $data[0]) { |
|
| 38 | + return false; |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - if ($data[0] == 1) { |
|
| 42 | - return $credentials == self::encryptVersion1($password, $data[1]); |
|
| 43 | - } |
|
| 41 | + if ($data[0] == 1) { |
|
| 42 | + return $credentials == self::encryptVersion1($password, $data[1]); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - if ($data[0] == 2) { |
|
| 46 | - return self::verifyVersion2($password, $data[2]); |
|
| 47 | - } |
|
| 45 | + if ($data[0] == 2) { |
|
| 46 | + return self::verifyVersion2($password, $data[2]); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - return false; |
|
| 50 | - } |
|
| 49 | + return false; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @param string $credentials |
|
| 54 | - * |
|
| 55 | - * @return bool |
|
| 56 | - */ |
|
| 57 | - public static function isCredentialVersionLatest($credentials) |
|
| 58 | - { |
|
| 59 | - return substr($credentials, 0, 3) === ":2:"; |
|
| 60 | - } |
|
| 52 | + /** |
|
| 53 | + * @param string $credentials |
|
| 54 | + * |
|
| 55 | + * @return bool |
|
| 56 | + */ |
|
| 57 | + public static function isCredentialVersionLatest($credentials) |
|
| 58 | + { |
|
| 59 | + return substr($credentials, 0, 3) === ":2:"; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Encrypts a user's password with the latest version of the hash algorithm |
|
| 64 | - * |
|
| 65 | - * @param string $password |
|
| 66 | - * |
|
| 67 | - * @return string |
|
| 68 | - */ |
|
| 69 | - public static function encryptPassword($password) |
|
| 70 | - { |
|
| 71 | - return self::encryptVersion2($password); |
|
| 72 | - } |
|
| 62 | + /** |
|
| 63 | + * Encrypts a user's password with the latest version of the hash algorithm |
|
| 64 | + * |
|
| 65 | + * @param string $password |
|
| 66 | + * |
|
| 67 | + * @return string |
|
| 68 | + */ |
|
| 69 | + public static function encryptPassword($password) |
|
| 70 | + { |
|
| 71 | + return self::encryptVersion2($password); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * @param string $password |
|
| 76 | - * @param string $salt |
|
| 77 | - * |
|
| 78 | - * @return string |
|
| 79 | - */ |
|
| 80 | - private static function encryptVersion1($password, $salt) |
|
| 81 | - { |
|
| 82 | - return ':1:' . $salt . ':' . md5($salt . '-' . md5($password)); |
|
| 83 | - } |
|
| 74 | + /** |
|
| 75 | + * @param string $password |
|
| 76 | + * @param string $salt |
|
| 77 | + * |
|
| 78 | + * @return string |
|
| 79 | + */ |
|
| 80 | + private static function encryptVersion1($password, $salt) |
|
| 81 | + { |
|
| 82 | + return ':1:' . $salt . ':' . md5($salt . '-' . md5($password)); |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - /** |
|
| 86 | - * @param string $password |
|
| 87 | - * |
|
| 88 | - * @return string |
|
| 89 | - */ |
|
| 90 | - private static function encryptVersion2($password) |
|
| 91 | - { |
|
| 92 | - return ':2:x:' . password_hash($password, PASSWORD_BCRYPT); |
|
| 93 | - } |
|
| 85 | + /** |
|
| 86 | + * @param string $password |
|
| 87 | + * |
|
| 88 | + * @return string |
|
| 89 | + */ |
|
| 90 | + private static function encryptVersion2($password) |
|
| 91 | + { |
|
| 92 | + return ':2:x:' . password_hash($password, PASSWORD_BCRYPT); |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * @param string $password |
|
| 97 | - * @param string $hash |
|
| 98 | - * |
|
| 99 | - * @return bool |
|
| 100 | - */ |
|
| 101 | - private static function verifyVersion2($password, $hash) |
|
| 102 | - { |
|
| 103 | - return password_verify($password, $hash); |
|
| 104 | - } |
|
| 95 | + /** |
|
| 96 | + * @param string $password |
|
| 97 | + * @param string $hash |
|
| 98 | + * |
|
| 99 | + * @return bool |
|
| 100 | + */ |
|
| 101 | + private static function verifyVersion2($password, $hash) |
|
| 102 | + { |
|
| 103 | + return password_verify($password, $hash); |
|
| 104 | + } |
|
| 105 | 105 | } |