@@ -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) { |
@@ -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 |
@@ -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 |
@@ -170,10 +170,10 @@ |
||
| 170 | 170 | //This function assumes we've already done some basic validation. |
| 171 | 171 | if(!($data = $this->session->tempdata("option_{$option}"))) { |
| 172 | 172 | $query = $this->db->select('value_str, value_int') |
| 173 | - ->from('user_options') |
|
| 174 | - ->where('user_id', $userID) |
|
| 175 | - ->where('name', $option) |
|
| 176 | - ->limit(1); |
|
| 173 | + ->from('user_options') |
|
| 174 | + ->where('user_id', $userID) |
|
| 175 | + ->where('name', $option) |
|
| 176 | + ->limit(1); |
|
| 177 | 177 | $data = $query->get()->row_array(); |
| 178 | 178 | $this->session->set_tempdata("option_{$option}", $data, 3600); |
| 179 | 179 | } |
@@ -49,10 +49,10 @@ |
||
| 49 | 49 | |
| 50 | 50 | //We need to add data from the old favourites table |
| 51 | 51 | $query = $this->db->select('tf.id AS id, tc.user_id As user_id, tc.title_id AS title_id, tf.chapter AS chapter, tf.updated_at AS updated_at') |
| 52 | - ->from('tracker_favourites AS tf') |
|
| 53 | - ->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left') |
|
| 54 | - ->order_by('tf.id ASC') |
|
| 55 | - ->get(); |
|
| 52 | + ->from('tracker_favourites AS tf') |
|
| 53 | + ->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left') |
|
| 54 | + ->order_by('tf.id ASC') |
|
| 55 | + ->get(); |
|
| 56 | 56 | if($data = $query->result_array()) { |
| 57 | 57 | $this->db->insert_batch('tracker_favourites_new', $data); |
| 58 | 58 | } |
@@ -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) { |