@@ -54,7 +54,7 @@ |
||
54 | 54 | final protected function setUpSmarty() |
55 | 55 | { |
56 | 56 | $this->smarty = new Smarty(); |
57 | - $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins'); |
|
57 | + $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath().'/smarty-plugins'); |
|
58 | 58 | |
59 | 59 | $this->assign('currentUser', User::getCommunity()); |
60 | 60 | $this->assign('loggedIn', false); |
@@ -15,88 +15,88 @@ |
||
15 | 15 | |
16 | 16 | trait TemplateOutput |
17 | 17 | { |
18 | - /** @var Smarty */ |
|
19 | - private $smarty; |
|
20 | - /** @var string Extra JavaScript to include at the end of the page's execution */ |
|
21 | - private $tailScript; |
|
18 | + /** @var Smarty */ |
|
19 | + private $smarty; |
|
20 | + /** @var string Extra JavaScript to include at the end of the page's execution */ |
|
21 | + private $tailScript; |
|
22 | 22 | |
23 | - /** |
|
24 | - * @return SiteConfiguration |
|
25 | - */ |
|
26 | - protected abstract function getSiteConfiguration(); |
|
23 | + /** |
|
24 | + * @return SiteConfiguration |
|
25 | + */ |
|
26 | + protected abstract function getSiteConfiguration(); |
|
27 | 27 | |
28 | - /** |
|
29 | - * Include extra JavaScript at the end of the page's execution |
|
30 | - * |
|
31 | - * @param $script string JavaScript to include at the end of the page |
|
32 | - */ |
|
33 | - final protected function setTailScript($script) |
|
34 | - { |
|
35 | - $this->tailScript = $script; |
|
36 | - } |
|
28 | + /** |
|
29 | + * Include extra JavaScript at the end of the page's execution |
|
30 | + * |
|
31 | + * @param $script string JavaScript to include at the end of the page |
|
32 | + */ |
|
33 | + final protected function setTailScript($script) |
|
34 | + { |
|
35 | + $this->tailScript = $script; |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * Assigns a Smarty variable |
|
40 | - * |
|
41 | - * @param array|string $name the template variable name(s) |
|
42 | - * @param mixed $value the value to assign |
|
43 | - */ |
|
44 | - final protected function assign($name, $value) |
|
45 | - { |
|
46 | - $this->smarty->assign($name, $value); |
|
47 | - } |
|
38 | + /** |
|
39 | + * Assigns a Smarty variable |
|
40 | + * |
|
41 | + * @param array|string $name the template variable name(s) |
|
42 | + * @param mixed $value the value to assign |
|
43 | + */ |
|
44 | + final protected function assign($name, $value) |
|
45 | + { |
|
46 | + $this->smarty->assign($name, $value); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Sets up the variables used by the main Smarty base template. |
|
51 | - * |
|
52 | - * This list is getting kinda long. |
|
53 | - */ |
|
54 | - final protected function setUpSmarty() |
|
55 | - { |
|
56 | - $this->smarty = new Smarty(); |
|
57 | - $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins'); |
|
49 | + /** |
|
50 | + * Sets up the variables used by the main Smarty base template. |
|
51 | + * |
|
52 | + * This list is getting kinda long. |
|
53 | + */ |
|
54 | + final protected function setUpSmarty() |
|
55 | + { |
|
56 | + $this->smarty = new Smarty(); |
|
57 | + $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins'); |
|
58 | 58 | |
59 | - $this->assign('currentUser', User::getCommunity()); |
|
60 | - $this->assign('loggedIn', false); |
|
61 | - $this->assign('baseurl', $this->getSiteConfiguration()->getBaseUrl()); |
|
62 | - $this->assign('mediawikiScriptPath', $this->getSiteConfiguration()->getMediawikiScriptPath()); |
|
59 | + $this->assign('currentUser', User::getCommunity()); |
|
60 | + $this->assign('loggedIn', false); |
|
61 | + $this->assign('baseurl', $this->getSiteConfiguration()->getBaseUrl()); |
|
62 | + $this->assign('mediawikiScriptPath', $this->getSiteConfiguration()->getMediawikiScriptPath()); |
|
63 | 63 | |
64 | - $this->assign('siteNoticeText', ''); |
|
65 | - $this->assign('toolversion', Environment::getToolVersion()); |
|
64 | + $this->assign('siteNoticeText', ''); |
|
65 | + $this->assign('toolversion', Environment::getToolVersion()); |
|
66 | 66 | |
67 | - // default these |
|
68 | - $this->assign('onlineusers', array()); |
|
69 | - $this->assign('typeAheadBlock', ''); |
|
70 | - $this->assign('extraJs', array()); |
|
71 | - $this->assign('extraCss', array()); |
|
67 | + // default these |
|
68 | + $this->assign('onlineusers', array()); |
|
69 | + $this->assign('typeAheadBlock', ''); |
|
70 | + $this->assign('extraJs', array()); |
|
71 | + $this->assign('extraCss', array()); |
|
72 | 72 | |
73 | - // nav menu access control |
|
74 | - $this->assign('nav__canRequests', false); |
|
75 | - $this->assign('nav__canLogs', false); |
|
76 | - $this->assign('nav__canUsers', false); |
|
77 | - $this->assign('nav__canSearch', false); |
|
78 | - $this->assign('nav__canStats', false); |
|
79 | - $this->assign('nav__canBan', false); |
|
80 | - $this->assign('nav__canEmailMgmt', false); |
|
81 | - $this->assign('nav__canWelcomeMgmt', false); |
|
82 | - $this->assign('nav__canSiteNoticeMgmt', false); |
|
83 | - $this->assign('nav__canUserMgmt', false); |
|
84 | - $this->assign('nav__canViewRequest', false); |
|
73 | + // nav menu access control |
|
74 | + $this->assign('nav__canRequests', false); |
|
75 | + $this->assign('nav__canLogs', false); |
|
76 | + $this->assign('nav__canUsers', false); |
|
77 | + $this->assign('nav__canSearch', false); |
|
78 | + $this->assign('nav__canStats', false); |
|
79 | + $this->assign('nav__canBan', false); |
|
80 | + $this->assign('nav__canEmailMgmt', false); |
|
81 | + $this->assign('nav__canWelcomeMgmt', false); |
|
82 | + $this->assign('nav__canSiteNoticeMgmt', false); |
|
83 | + $this->assign('nav__canUserMgmt', false); |
|
84 | + $this->assign('nav__canViewRequest', false); |
|
85 | 85 | |
86 | - $this->assign('page', $this); |
|
87 | - } |
|
86 | + $this->assign('page', $this); |
|
87 | + } |
|
88 | 88 | |
89 | - /** |
|
90 | - * Fetches a rendered Smarty template |
|
91 | - * |
|
92 | - * @param $template string Template file path, relative to /templates/ |
|
93 | - * |
|
94 | - * @return string Templated HTML |
|
95 | - */ |
|
96 | - final protected function fetchTemplate($template) |
|
97 | - { |
|
98 | - $this->assign("tailScript", $this->tailScript); |
|
89 | + /** |
|
90 | + * Fetches a rendered Smarty template |
|
91 | + * |
|
92 | + * @param $template string Template file path, relative to /templates/ |
|
93 | + * |
|
94 | + * @return string Templated HTML |
|
95 | + */ |
|
96 | + final protected function fetchTemplate($template) |
|
97 | + { |
|
98 | + $this->assign("tailScript", $this->tailScript); |
|
99 | 99 | |
100 | - return $this->smarty->fetch($template); |
|
101 | - } |
|
100 | + return $this->smarty->fetch($template); |
|
101 | + } |
|
102 | 102 | } |
@@ -17,25 +17,25 @@ |
||
17 | 17 | */ |
18 | 18 | class Session |
19 | 19 | { |
20 | - public static function start() |
|
21 | - { |
|
22 | - ini_set('session.cookie_httponly', 1); |
|
20 | + public static function start() |
|
21 | + { |
|
22 | + ini_set('session.cookie_httponly', 1); |
|
23 | 23 | |
24 | - if (WebRequest::isHttps()) { |
|
25 | - ini_set('session.cookie_secure', 1); |
|
26 | - } |
|
24 | + if (WebRequest::isHttps()) { |
|
25 | + ini_set('session.cookie_secure', 1); |
|
26 | + } |
|
27 | 27 | |
28 | - session_start(); |
|
29 | - } |
|
28 | + session_start(); |
|
29 | + } |
|
30 | 30 | |
31 | - public static function destroy() |
|
32 | - { |
|
33 | - session_destroy(); |
|
34 | - } |
|
31 | + public static function destroy() |
|
32 | + { |
|
33 | + session_destroy(); |
|
34 | + } |
|
35 | 35 | |
36 | - public static function restart() |
|
37 | - { |
|
38 | - self::destroy(); |
|
39 | - self::start(); |
|
40 | - } |
|
36 | + public static function restart() |
|
37 | + { |
|
38 | + self::destroy(); |
|
39 | + self::start(); |
|
40 | + } |
|
41 | 41 | } |
@@ -21,141 +21,141 @@ |
||
21 | 21 | */ |
22 | 22 | class SessionAlert |
23 | 23 | { |
24 | - private $message; |
|
25 | - private $title; |
|
26 | - private $type; |
|
27 | - private $closable; |
|
28 | - private $block; |
|
29 | - |
|
30 | - /** |
|
31 | - * @param string $message |
|
32 | - * @param string $title |
|
33 | - * @param string $type |
|
34 | - * @param bool $closable |
|
35 | - * @param bool $block |
|
36 | - */ |
|
37 | - public function __construct($message, $title, $type = "alert-info", $closable = true, $block = true) |
|
38 | - { |
|
39 | - $this->message = $message; |
|
40 | - $this->title = $title; |
|
41 | - $this->type = $type; |
|
42 | - $this->closable = $closable; |
|
43 | - $this->block = $block; |
|
44 | - } |
|
45 | - |
|
46 | - /** |
|
47 | - * Shows a quick one-liner message |
|
48 | - * |
|
49 | - * @param string $message |
|
50 | - * @param string $type |
|
51 | - */ |
|
52 | - public static function quick($message, $type = "alert-info") |
|
53 | - { |
|
54 | - self::append(new SessionAlert($message, "", $type, true, false)); |
|
55 | - } |
|
56 | - |
|
57 | - /** |
|
58 | - * @param SessionAlert $alert |
|
59 | - */ |
|
60 | - public static function append(SessionAlert $alert) |
|
61 | - { |
|
62 | - $data = WebRequest::getSessionAlertData(); |
|
63 | - $data[] = serialize($alert); |
|
64 | - WebRequest::setSessionAlertData($data); |
|
65 | - } |
|
66 | - |
|
67 | - /** |
|
68 | - * Shows a quick one-liner success message |
|
69 | - * |
|
70 | - * @param string $message |
|
71 | - */ |
|
72 | - public static function success($message) |
|
73 | - { |
|
74 | - self::append(new SessionAlert($message, "", "alert-success", true, true)); |
|
75 | - } |
|
76 | - |
|
77 | - /** |
|
78 | - * Shows a quick one-liner warning message |
|
79 | - * |
|
80 | - * @param string $message |
|
81 | - * @param string $title |
|
82 | - */ |
|
83 | - public static function warning($message, $title = "Warning!") |
|
84 | - { |
|
85 | - self::append(new SessionAlert($message, $title, "alert-warning", true, true)); |
|
86 | - } |
|
87 | - |
|
88 | - /** |
|
89 | - * Shows a quick one-liner error message |
|
90 | - * |
|
91 | - * @param string $message |
|
92 | - * @param string $title |
|
93 | - */ |
|
94 | - public static function error($message, $title = "Error!") |
|
95 | - { |
|
96 | - self::append(new SessionAlert($message, $title, "alert-error", true, true)); |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * Retrieves the alerts which have been saved to the session |
|
101 | - * @return array |
|
102 | - */ |
|
103 | - public static function getAlerts() |
|
104 | - { |
|
105 | - $alertData = array(); |
|
106 | - |
|
107 | - foreach (WebRequest::getSessionAlertData() as $a) { |
|
108 | - $alertData[] = unserialize($a); |
|
109 | - } |
|
110 | - |
|
111 | - return $alertData; |
|
112 | - } |
|
113 | - |
|
114 | - /** |
|
115 | - * Clears the alerts from the session |
|
116 | - */ |
|
117 | - public static function clearAlerts() |
|
118 | - { |
|
119 | - WebRequest::clearSessionAlertData(); |
|
120 | - } |
|
121 | - |
|
122 | - /** |
|
123 | - * @return boolean |
|
124 | - */ |
|
125 | - public function isBlock() |
|
126 | - { |
|
127 | - return $this->block; |
|
128 | - } |
|
129 | - |
|
130 | - /** |
|
131 | - * @return boolean |
|
132 | - */ |
|
133 | - public function isClosable() |
|
134 | - { |
|
135 | - return $this->closable; |
|
136 | - } |
|
137 | - |
|
138 | - /** |
|
139 | - * @return string |
|
140 | - */ |
|
141 | - public function getType() |
|
142 | - { |
|
143 | - return $this->type; |
|
144 | - } |
|
145 | - |
|
146 | - /** |
|
147 | - * @return string |
|
148 | - */ |
|
149 | - public function getTitle() |
|
150 | - { |
|
151 | - return $this->title; |
|
152 | - } |
|
153 | - |
|
154 | - /** |
|
155 | - * @return string |
|
156 | - */ |
|
157 | - public function getMessage() |
|
158 | - { |
|
159 | - return $this->message; |
|
160 | - } |
|
24 | + private $message; |
|
25 | + private $title; |
|
26 | + private $type; |
|
27 | + private $closable; |
|
28 | + private $block; |
|
29 | + |
|
30 | + /** |
|
31 | + * @param string $message |
|
32 | + * @param string $title |
|
33 | + * @param string $type |
|
34 | + * @param bool $closable |
|
35 | + * @param bool $block |
|
36 | + */ |
|
37 | + public function __construct($message, $title, $type = "alert-info", $closable = true, $block = true) |
|
38 | + { |
|
39 | + $this->message = $message; |
|
40 | + $this->title = $title; |
|
41 | + $this->type = $type; |
|
42 | + $this->closable = $closable; |
|
43 | + $this->block = $block; |
|
44 | + } |
|
45 | + |
|
46 | + /** |
|
47 | + * Shows a quick one-liner message |
|
48 | + * |
|
49 | + * @param string $message |
|
50 | + * @param string $type |
|
51 | + */ |
|
52 | + public static function quick($message, $type = "alert-info") |
|
53 | + { |
|
54 | + self::append(new SessionAlert($message, "", $type, true, false)); |
|
55 | + } |
|
56 | + |
|
57 | + /** |
|
58 | + * @param SessionAlert $alert |
|
59 | + */ |
|
60 | + public static function append(SessionAlert $alert) |
|
61 | + { |
|
62 | + $data = WebRequest::getSessionAlertData(); |
|
63 | + $data[] = serialize($alert); |
|
64 | + WebRequest::setSessionAlertData($data); |
|
65 | + } |
|
66 | + |
|
67 | + /** |
|
68 | + * Shows a quick one-liner success message |
|
69 | + * |
|
70 | + * @param string $message |
|
71 | + */ |
|
72 | + public static function success($message) |
|
73 | + { |
|
74 | + self::append(new SessionAlert($message, "", "alert-success", true, true)); |
|
75 | + } |
|
76 | + |
|
77 | + /** |
|
78 | + * Shows a quick one-liner warning message |
|
79 | + * |
|
80 | + * @param string $message |
|
81 | + * @param string $title |
|
82 | + */ |
|
83 | + public static function warning($message, $title = "Warning!") |
|
84 | + { |
|
85 | + self::append(new SessionAlert($message, $title, "alert-warning", true, true)); |
|
86 | + } |
|
87 | + |
|
88 | + /** |
|
89 | + * Shows a quick one-liner error message |
|
90 | + * |
|
91 | + * @param string $message |
|
92 | + * @param string $title |
|
93 | + */ |
|
94 | + public static function error($message, $title = "Error!") |
|
95 | + { |
|
96 | + self::append(new SessionAlert($message, $title, "alert-error", true, true)); |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * Retrieves the alerts which have been saved to the session |
|
101 | + * @return array |
|
102 | + */ |
|
103 | + public static function getAlerts() |
|
104 | + { |
|
105 | + $alertData = array(); |
|
106 | + |
|
107 | + foreach (WebRequest::getSessionAlertData() as $a) { |
|
108 | + $alertData[] = unserialize($a); |
|
109 | + } |
|
110 | + |
|
111 | + return $alertData; |
|
112 | + } |
|
113 | + |
|
114 | + /** |
|
115 | + * Clears the alerts from the session |
|
116 | + */ |
|
117 | + public static function clearAlerts() |
|
118 | + { |
|
119 | + WebRequest::clearSessionAlertData(); |
|
120 | + } |
|
121 | + |
|
122 | + /** |
|
123 | + * @return boolean |
|
124 | + */ |
|
125 | + public function isBlock() |
|
126 | + { |
|
127 | + return $this->block; |
|
128 | + } |
|
129 | + |
|
130 | + /** |
|
131 | + * @return boolean |
|
132 | + */ |
|
133 | + public function isClosable() |
|
134 | + { |
|
135 | + return $this->closable; |
|
136 | + } |
|
137 | + |
|
138 | + /** |
|
139 | + * @return string |
|
140 | + */ |
|
141 | + public function getType() |
|
142 | + { |
|
143 | + return $this->type; |
|
144 | + } |
|
145 | + |
|
146 | + /** |
|
147 | + * @return string |
|
148 | + */ |
|
149 | + public function getTitle() |
|
150 | + { |
|
151 | + return $this->title; |
|
152 | + } |
|
153 | + |
|
154 | + /** |
|
155 | + * @return string |
|
156 | + */ |
|
157 | + public function getMessage() |
|
158 | + { |
|
159 | + return $this->message; |
|
160 | + } |
|
161 | 161 | } |
@@ -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 | } |
@@ -96,7 +96,7 @@ |
||
96 | 96 | |
97 | 97 | $statement = $this->getDatabase()->prepare($query); |
98 | 98 | $statement->bindValue(":username", $this->user->getUsername()); |
99 | - $statement->bindValue(":date", date('Y-m-d') . "%"); |
|
99 | + $statement->bindValue(":date", date('Y-m-d')."%"); |
|
100 | 100 | $statement->execute(); |
101 | 101 | $today = $statement->fetchColumn(); |
102 | 102 | $statement->closeCursor(); |
@@ -20,47 +20,47 @@ 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 | - // Let the IRC bot handle the result of this. |
|
56 | - $this->fetchAdminData($userElement); |
|
55 | + // Let the IRC bot handle the result of this. |
|
56 | + $this->fetchAdminData($userElement); |
|
57 | 57 | |
58 | - return $apiDocument; |
|
59 | - } |
|
58 | + return $apiDocument; |
|
59 | + } |
|
60 | 60 | |
61 | - private function getAccountsCreated() |
|
62 | - { |
|
63 | - $query = <<<QUERY |
|
61 | + private function getAccountsCreated() |
|
62 | + { |
|
63 | + $query = <<<QUERY |
|
64 | 64 | SELECT COUNT(*) AS count |
65 | 65 | FROM log |
66 | 66 | LEFT JOIN emailtemplate ON concat('Closed ', emailtemplate.id) = log.action |
@@ -71,17 +71,17 @@ discard block |
||
71 | 71 | AND user.username = :username; |
72 | 72 | QUERY; |
73 | 73 | |
74 | - $statement = $this->getDatabase()->prepare($query); |
|
75 | - $statement->execute(array(":username" => $this->user->getUsername())); |
|
76 | - $result = $statement->fetchColumn(); |
|
77 | - $statement->closeCursor(); |
|
74 | + $statement = $this->getDatabase()->prepare($query); |
|
75 | + $statement->execute(array(":username" => $this->user->getUsername())); |
|
76 | + $result = $statement->fetchColumn(); |
|
77 | + $statement->closeCursor(); |
|
78 | 78 | |
79 | - return $result; |
|
80 | - } |
|
79 | + return $result; |
|
80 | + } |
|
81 | 81 | |
82 | - private function getToday() |
|
83 | - { |
|
84 | - $query = <<<QUERY |
|
82 | + private function getToday() |
|
83 | + { |
|
84 | + $query = <<<QUERY |
|
85 | 85 | SELECT |
86 | 86 | COUNT(*) AS count |
87 | 87 | FROM log |
@@ -93,99 +93,99 @@ discard block |
||
93 | 93 | AND user.username = :username; |
94 | 94 | QUERY; |
95 | 95 | |
96 | - $statement = $this->getDatabase()->prepare($query); |
|
97 | - $statement->bindValue(":username", $this->user->getUsername()); |
|
98 | - $statement->bindValue(":date", date('Y-m-d') . "%"); |
|
99 | - $statement->execute(); |
|
100 | - $today = $statement->fetchColumn(); |
|
101 | - $statement->closeCursor(); |
|
102 | - |
|
103 | - return $today; |
|
104 | - } |
|
105 | - |
|
106 | - private function fetchAdminData(DOMElement $userElement) |
|
107 | - { |
|
108 | - $query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;"; |
|
109 | - |
|
110 | - $statement = $this->getDatabase()->prepare($query); |
|
111 | - $statement->bindValue(":userid", $this->user->getId()); |
|
112 | - $statement->bindValue(":action", "Suspended"); |
|
113 | - $statement->execute(); |
|
114 | - $sus = $statement->fetchColumn(); |
|
115 | - $userElement->setAttribute("suspended", $sus); |
|
116 | - $statement->closeCursor(); |
|
117 | - |
|
118 | - $statement->bindValue(":action", "Promoted"); |
|
119 | - $statement->execute(); |
|
120 | - $pro = $statement->fetchColumn(); |
|
121 | - $userElement->setAttribute("promoted", $pro); |
|
122 | - $statement->closeCursor(); |
|
123 | - |
|
124 | - $statement->bindValue(":action", "Approved"); |
|
125 | - $statement->execute(); |
|
126 | - $app = $statement->fetchColumn(); |
|
127 | - $userElement->setAttribute("approved", $app); |
|
128 | - $statement->closeCursor(); |
|
129 | - |
|
130 | - $statement->bindValue(":action", "Demoted"); |
|
131 | - $statement->execute(); |
|
132 | - $dem = $statement->fetchColumn(); |
|
133 | - $userElement->setAttribute("demoted", $dem); |
|
134 | - $statement->closeCursor(); |
|
135 | - |
|
136 | - $statement->bindValue(":action", "Declined"); |
|
137 | - $statement->execute(); |
|
138 | - $dec = $statement->fetchColumn(); |
|
139 | - $userElement->setAttribute("declined", $dec); |
|
140 | - $statement->closeCursor(); |
|
141 | - |
|
142 | - $statement->bindValue(":action", "Renamed"); |
|
143 | - $statement->execute(); |
|
144 | - $rnc = $statement->fetchColumn(); |
|
145 | - $userElement->setAttribute("renamed", $rnc); |
|
146 | - $statement->closeCursor(); |
|
147 | - |
|
148 | - $statement->bindValue(":action", "Edited"); |
|
149 | - $statement->execute(); |
|
150 | - $mec = $statement->fetchColumn(); |
|
151 | - $userElement->setAttribute("edited", $mec); |
|
152 | - $statement->closeCursor(); |
|
153 | - |
|
154 | - $statement->bindValue(":action", "Prefchange"); |
|
155 | - $statement->execute(); |
|
156 | - $pcc = $statement->fetchColumn(); |
|
157 | - $userElement->setAttribute("prefchange", $pcc); |
|
158 | - $statement->closeCursor(); |
|
159 | - |
|
160 | - // Combine all three actions affecting Welcome templates into one count. |
|
161 | - $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
96 | + $statement = $this->getDatabase()->prepare($query); |
|
97 | + $statement->bindValue(":username", $this->user->getUsername()); |
|
98 | + $statement->bindValue(":date", date('Y-m-d') . "%"); |
|
99 | + $statement->execute(); |
|
100 | + $today = $statement->fetchColumn(); |
|
101 | + $statement->closeCursor(); |
|
102 | + |
|
103 | + return $today; |
|
104 | + } |
|
105 | + |
|
106 | + private function fetchAdminData(DOMElement $userElement) |
|
107 | + { |
|
108 | + $query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;"; |
|
109 | + |
|
110 | + $statement = $this->getDatabase()->prepare($query); |
|
111 | + $statement->bindValue(":userid", $this->user->getId()); |
|
112 | + $statement->bindValue(":action", "Suspended"); |
|
113 | + $statement->execute(); |
|
114 | + $sus = $statement->fetchColumn(); |
|
115 | + $userElement->setAttribute("suspended", $sus); |
|
116 | + $statement->closeCursor(); |
|
117 | + |
|
118 | + $statement->bindValue(":action", "Promoted"); |
|
119 | + $statement->execute(); |
|
120 | + $pro = $statement->fetchColumn(); |
|
121 | + $userElement->setAttribute("promoted", $pro); |
|
122 | + $statement->closeCursor(); |
|
123 | + |
|
124 | + $statement->bindValue(":action", "Approved"); |
|
125 | + $statement->execute(); |
|
126 | + $app = $statement->fetchColumn(); |
|
127 | + $userElement->setAttribute("approved", $app); |
|
128 | + $statement->closeCursor(); |
|
129 | + |
|
130 | + $statement->bindValue(":action", "Demoted"); |
|
131 | + $statement->execute(); |
|
132 | + $dem = $statement->fetchColumn(); |
|
133 | + $userElement->setAttribute("demoted", $dem); |
|
134 | + $statement->closeCursor(); |
|
135 | + |
|
136 | + $statement->bindValue(":action", "Declined"); |
|
137 | + $statement->execute(); |
|
138 | + $dec = $statement->fetchColumn(); |
|
139 | + $userElement->setAttribute("declined", $dec); |
|
140 | + $statement->closeCursor(); |
|
141 | + |
|
142 | + $statement->bindValue(":action", "Renamed"); |
|
143 | + $statement->execute(); |
|
144 | + $rnc = $statement->fetchColumn(); |
|
145 | + $userElement->setAttribute("renamed", $rnc); |
|
146 | + $statement->closeCursor(); |
|
147 | + |
|
148 | + $statement->bindValue(":action", "Edited"); |
|
149 | + $statement->execute(); |
|
150 | + $mec = $statement->fetchColumn(); |
|
151 | + $userElement->setAttribute("edited", $mec); |
|
152 | + $statement->closeCursor(); |
|
153 | + |
|
154 | + $statement->bindValue(":action", "Prefchange"); |
|
155 | + $statement->execute(); |
|
156 | + $pcc = $statement->fetchColumn(); |
|
157 | + $userElement->setAttribute("prefchange", $pcc); |
|
158 | + $statement->closeCursor(); |
|
159 | + |
|
160 | + // Combine all three actions affecting Welcome templates into one count. |
|
161 | + $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
162 | 162 | SELECT |
163 | 163 | COUNT(*) AS count |
164 | 164 | FROM log |
165 | 165 | WHERE log.user = :userid |
166 | 166 | AND log.action IN ('CreatedTemplate', 'EditedTemplate', 'DeletedTemplate'); |
167 | 167 | SQL |
168 | - ); |
|
168 | + ); |
|
169 | 169 | |
170 | - $combinedquery->bindValue(":userid", $this->user->getId()); |
|
171 | - $combinedquery->execute(); |
|
172 | - $dtc = $combinedquery->fetchColumn(); |
|
173 | - $userElement->setAttribute("welctempchange", $dtc); |
|
174 | - $combinedquery->closeCursor(); |
|
170 | + $combinedquery->bindValue(":userid", $this->user->getId()); |
|
171 | + $combinedquery->execute(); |
|
172 | + $dtc = $combinedquery->fetchColumn(); |
|
173 | + $userElement->setAttribute("welctempchange", $dtc); |
|
174 | + $combinedquery->closeCursor(); |
|
175 | 175 | |
176 | - // Combine both actions affecting Email templates into one count. |
|
177 | - $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
176 | + // Combine both actions affecting Email templates into one count. |
|
177 | + $combinedquery = $this->getDatabase()->prepare(<<<SQL |
|
178 | 178 | SELECT COUNT(*) AS count |
179 | 179 | FROM log |
180 | 180 | WHERE log.user = :userid |
181 | 181 | AND log.action IN ('CreatedEmail', 'EditedEmail'); |
182 | 182 | SQL |
183 | - ); |
|
184 | - |
|
185 | - $combinedquery->bindValue(":userid", $this->user->getId()); |
|
186 | - $combinedquery->execute(); |
|
187 | - $cec = $combinedquery->fetchColumn(); |
|
188 | - $userElement->setAttribute("emailtempchange", $cec); |
|
189 | - $combinedquery->closeCursor(); |
|
190 | - } |
|
183 | + ); |
|
184 | + |
|
185 | + $combinedquery->bindValue(":userid", $this->user->getId()); |
|
186 | + $combinedquery->execute(); |
|
187 | + $cec = $combinedquery->fetchColumn(); |
|
188 | + $userElement->setAttribute("emailtempchange", $cec); |
|
189 | + $combinedquery->closeCursor(); |
|
190 | + } |
|
191 | 191 | } |
@@ -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 | } |