@@ -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? |
@@ -29,27 +29,27 @@ discard block |
||
29 | 29 | |
30 | 30 | public function getMock_ion_auth_logged_in() { |
31 | 31 | $ion_auth = $this->getMockBuilder('Ion_auth') |
32 | - ->disableOriginalConstructor() |
|
33 | - ->getMock(); |
|
32 | + ->disableOriginalConstructor() |
|
33 | + ->getMock(); |
|
34 | 34 | |
35 | 35 | $ion_auth->expects($this->at(0)) |
36 | - ->method('logged_in') |
|
37 | - ->willReturn(TRUE); |
|
36 | + ->method('logged_in') |
|
37 | + ->willReturn(TRUE); |
|
38 | 38 | $ion_auth->expects($this->at(1)) |
39 | - ->method('logged_in') |
|
40 | - ->willReturn(TRUE); |
|
39 | + ->method('logged_in') |
|
40 | + ->willReturn(TRUE); |
|
41 | 41 | |
42 | 42 | $ion_auth->expects($this->any()) |
43 | - ->method($this->anything()) |
|
44 | - ->will($this->returnSelf()); |
|
43 | + ->method($this->anything()) |
|
44 | + ->will($this->returnSelf()); |
|
45 | 45 | |
46 | 46 | return $ion_auth; |
47 | 47 | } |
48 | 48 | |
49 | 49 | public function getMock_CI_DB_result(array $methods) { |
50 | 50 | $db_result = $this->getMockBuilder('CI_DB_result') |
51 | - ->disableOriginalConstructor() |
|
52 | - ->getMock(); |
|
51 | + ->disableOriginalConstructor() |
|
52 | + ->getMock(); |
|
53 | 53 | |
54 | 54 | foreach ($methods as $method => $return) { |
55 | 55 | $db_result->method($method)->willReturn($return); |
@@ -59,9 +59,9 @@ discard block |
||
59 | 59 | |
60 | 60 | public function getMock_CI_DB($return) { |
61 | 61 | $db = $this->getMockBuilder('CI_DB') |
62 | - ->disableOriginalConstructor() |
|
63 | - ->setMethods(array('select', 'from', 'where', 'get')) |
|
64 | - ->getMock(); |
|
62 | + ->disableOriginalConstructor() |
|
63 | + ->setMethods(array('select', 'from', 'where', 'get')) |
|
64 | + ->getMock(); |
|
65 | 65 | |
66 | 66 | $db->expects($this->at(3)) |
67 | 67 | ->method('get') |
@@ -30,8 +30,8 @@ |
||
30 | 30 | $User_Model = $this->User_Model; |
31 | 31 | |
32 | 32 | $ion_auth = $this->getMockBuilder('ion_auth') |
33 | - ->disableOriginalConstructor() |
|
34 | - ->getMock(); |
|
33 | + ->disableOriginalConstructor() |
|
34 | + ->getMock(); |
|
35 | 35 | $ion_auth->method('logged_in')->willReturn(FALSE); |
36 | 36 | |
37 | 37 | $User_Model->ion_auth = $ion_auth; |
@@ -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) { |
@@ -138,10 +138,10 @@ |
||
138 | 138 | private function get_db(string $option, int $userID) { |
139 | 139 | //This function assumes we've already done some basic validation. |
140 | 140 | $query = $this->db->select('value_str, value_int') |
141 | - ->from('user_options') |
|
142 | - ->where('user_id', $userID) |
|
143 | - ->where('name', $option) |
|
144 | - ->limit(1); |
|
141 | + ->from('user_options') |
|
142 | + ->where('user_id', $userID) |
|
143 | + ->where('name', $option) |
|
144 | + ->limit(1); |
|
145 | 145 | return $query->get()->row_array(); |
146 | 146 | } |
147 | 147 | private function set_db(string $option, $value) : bool {} |
@@ -228,8 +228,8 @@ |
||
228 | 228 | //Bato.to is annoying and locks stuff behind auth. See: https://github.com/DakuTree/manga-tracker/issues/14#issuecomment-233830855 |
229 | 229 | $cookies = [ |
230 | 230 | "lang_option={$title_lang}", |
231 | - "member_id=" . $this->config->item('batoto_cookie_member_id'), |
|
232 | - "pass_hash=" . $this->config->item('batoto_cookie_pass_hash') |
|
231 | + "member_id=" . $this->config->item('batoto_cookie_member_id'), |
|
232 | + "pass_hash=" . $this->config->item('batoto_cookie_pass_hash') |
|
233 | 233 | ]; |
234 | 234 | $data = $this->get_content($title_url, implode("; ", $cookies)); |
235 | 235 | if(!$data) { |
@@ -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'); |
@@ -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 |