@@ -210,10 +210,10 @@ |
||
210 | 210 | { |
211 | 211 | // Ensure there's a trailing slash |
212 | 212 | $system_path = strtr( |
213 | - rtrim($system_path, '/\\'), |
|
214 | - '/\\', |
|
215 | - DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
|
216 | - ).DIRECTORY_SEPARATOR; |
|
213 | + rtrim($system_path, '/\\'), |
|
214 | + '/\\', |
|
215 | + DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
|
216 | + ).DIRECTORY_SEPARATOR; |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | // Is the system path correct? |
@@ -77,9 +77,9 @@ |
||
77 | 77 | public function verification_check(string $verificationCode) { |
78 | 78 | //user is trying to validate their email for signup, check if verification code is still valid/exists |
79 | 79 | $query = $this->db->select('email, verification_code_time') |
80 | - ->from('auth_signup_verification') |
|
81 | - ->where(array('verification_code' => $verificationCode)) |
|
82 | - ->get(); |
|
80 | + ->from('auth_signup_verification') |
|
81 | + ->where(array('verification_code' => $verificationCode)) |
|
82 | + ->get(); |
|
83 | 83 | |
84 | 84 | $return = FALSE; |
85 | 85 | if($query->num_rows() > 0) { |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | class UnitTester extends \Codeception\Actor |
20 | 20 | { |
21 | - use _generated\UnitTesterActions; |
|
21 | + use _generated\UnitTesterActions; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * Define custom actions here |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | class AcceptanceTester extends \Codeception\Actor |
20 | 20 | { |
21 | - use _generated\AcceptanceTesterActions; |
|
21 | + use _generated\AcceptanceTesterActions; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * Define custom actions here |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | class FunctionalTester extends \Codeception\Actor |
20 | 20 | { |
21 | - use _generated\FunctionalTesterActions; |
|
21 | + use _generated\FunctionalTesterActions; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * Define custom actions here |
@@ -9,9 +9,9 @@ |
||
9 | 9 | $success = FALSE; |
10 | 10 | if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) { |
11 | 11 | $success = (bool) $this->db->set(['tags' => $tag_string, 'active' => 'Y', 'last_updated' => NULL]) |
12 | - ->where('user_id', $userID) |
|
13 | - ->where('id', $chapterID) |
|
14 | - ->update('tracker_chapters'); |
|
12 | + ->where('user_id', $userID) |
|
13 | + ->where('id', $chapterID) |
|
14 | + ->update('tracker_chapters'); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | if($success) { |
@@ -7,9 +7,9 @@ discard block |
||
7 | 7 | |
8 | 8 | public function setByID(int $userID, int $chapterID, string $category) : bool { |
9 | 9 | $success = $this->db->set(['category' => $category, 'active' => 'Y', 'last_updated' => NULL]) |
10 | - ->where('user_id', $userID) |
|
11 | - ->where('id', $chapterID) |
|
12 | - ->update('tracker_chapters'); |
|
10 | + ->where('user_id', $userID) |
|
11 | + ->where('id', $chapterID) |
|
12 | + ->update('tracker_chapters'); |
|
13 | 13 | |
14 | 14 | return (bool) $success; |
15 | 15 | } |
@@ -40,11 +40,11 @@ discard block |
||
40 | 40 | |
41 | 41 | public function getUsed(int $userID) : array { |
42 | 42 | $query = $this->db->distinct() |
43 | - ->select('category') |
|
44 | - ->from('tracker_chapters') |
|
45 | - ->where('tracker_chapters.active', 'Y') |
|
46 | - ->where('user_id', $userID) |
|
47 | - ->get(); |
|
43 | + ->select('category') |
|
44 | + ->from('tracker_chapters') |
|
45 | + ->where('tracker_chapters.active', 'Y') |
|
46 | + ->where('user_id', $userID) |
|
47 | + ->get(); |
|
48 | 48 | |
49 | 49 | return array_column($query->result_array(), 'category'); |
50 | 50 | } |
@@ -11,9 +11,9 @@ |
||
11 | 11 | |
12 | 12 | //This is pretty barebones bug reporting, and honestly not a great way to do it, but it works for now (until the Github is public). |
13 | 13 | $body = "". |
14 | - (!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : ""). |
|
15 | - "Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n". |
|
16 | - "<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000)); |
|
14 | + (!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : ""). |
|
15 | + "Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n". |
|
16 | + "<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000)); |
|
17 | 17 | |
18 | 18 | $success = TRUE; |
19 | 19 | $this->email->from('[email protected]', $this->config->item('site_title', 'ion_auth')); |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | $this->load->database(); |
41 | 41 | |
42 | 42 | $query = $this->db->select('*') |
43 | - ->from('auth_users') |
|
44 | - ->where('username', $username) |
|
45 | - ->get(); |
|
43 | + ->from('auth_users') |
|
44 | + ->where('username', $username) |
|
45 | + ->get(); |
|
46 | 46 | |
47 | 47 | return (bool) $query->num_rows(); |
48 | 48 | } |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | $this->load->database(); |
65 | 65 | |
66 | 66 | $query = $this->db->select('email') |
67 | - ->from('auth_users') |
|
68 | - ->where('username', $identity) |
|
69 | - ->get(); |
|
67 | + ->from('auth_users') |
|
68 | + ->where('username', $identity) |
|
69 | + ->get(); |
|
70 | 70 | |
71 | 71 | if($query->num_rows() > 0) { |
72 | 72 | //username exists, grab email |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | $user = NULL; |
85 | 85 | |
86 | 86 | $query = $this->db->select('*') |
87 | - ->from('auth_users') |
|
88 | - ->where('username', $username) |
|
89 | - ->get(); |
|
87 | + ->from('auth_users') |
|
88 | + ->where('username', $username) |
|
89 | + ->get(); |
|
90 | 90 | |
91 | 91 | if($query->num_rows() > 0) { |
92 | 92 | $user = $query->row(); |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | |
115 | 115 | public function get_id_from_api_key(string $api_key) { |
116 | 116 | $query = $this->db->select('id') |
117 | - ->from('auth_users') |
|
118 | - ->where('api_key', $api_key) |
|
119 | - ->get(); |
|
117 | + ->from('auth_users') |
|
118 | + ->where('api_key', $api_key) |
|
119 | + ->get(); |
|
120 | 120 | |
121 | 121 | if($query->num_rows() > 0) { |
122 | 122 | $userID = $query->row('id'); |
@@ -150,12 +150,12 @@ discard block |
||
150 | 150 | } |
151 | 151 | public function hideLatestNotice() { |
152 | 152 | $idQuery = $this->db->select('1') |
153 | - ->where('user_id', $this->User->id) |
|
154 | - ->get('tracker_user_notices'); |
|
153 | + ->where('user_id', $this->User->id) |
|
154 | + ->get('tracker_user_notices'); |
|
155 | 155 | if($idQuery->num_rows() > 0) { |
156 | 156 | $success = (bool) $this->db->set('hidden_notice_id', '(SELECT id FROM tracker_notices ORDER BY id DESC LIMIT 1)', FALSE) |
157 | - ->where('user_id', $this->User->id) |
|
158 | - ->update('tracker_user_notices'); |
|
157 | + ->where('user_id', $this->User->id) |
|
158 | + ->update('tracker_user_notices'); |
|
159 | 159 | } else { |
160 | 160 | $success = (bool) $this->db->insert('tracker_user_notices', [ |
161 | 161 | 'user_id' => $this->User->id, |