@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | 'is_unique_email' => 'Email already exists.' |
42 | 42 | )); |
43 | 43 | |
44 | - if ($isValid = ($this->form_validation->run() === TRUE)) { |
|
44 | + if($isValid = ($this->form_validation->run() === TRUE)) { |
|
45 | 45 | $email = $this->Auth->parseEmail($this->input->post('email')); |
46 | 46 | |
47 | 47 | $this->body_data['email'] = $email; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | //login wasn't valid, failed, or this is a fresh login attempt |
57 | - if(!$isValid){ |
|
57 | + if(!$isValid) { |
|
58 | 58 | //display the email validation form |
59 | 59 | $this->body_data['form_email'] = array( |
60 | 60 | 'name' => 'email', |
@@ -89,14 +89,14 @@ discard block |
||
89 | 89 | if(!($email = $this->Auth->verificationCheck($verificationCode))) redirect('user/signup'); |
90 | 90 | |
91 | 91 | //validation is valid, proceed as normal |
92 | - $this->form_validation->set_rules('username', 'Username', 'required|min_length[4]|max_length[15]|valid_username|is_unique_username'); |
|
93 | - $this->form_validation->set_rules('password', 'Password', 'required|valid_password'); |
|
94 | - $this->form_validation->set_rules('password_confirm', 'Confirm Password', 'required|matches[password]'); |
|
95 | - $this->form_validation->set_rules('terms', 'Terms & Conditions', 'required'); |
|
92 | + $this->form_validation->set_rules('username', 'Username', 'required|min_length[4]|max_length[15]|valid_username|is_unique_username'); |
|
93 | + $this->form_validation->set_rules('password', 'Password', 'required|valid_password'); |
|
94 | + $this->form_validation->set_rules('password_confirm', 'Confirm Password', 'required|matches[password]'); |
|
95 | + $this->form_validation->set_rules('terms', 'Terms & Conditions', 'required'); |
|
96 | 96 | //TODO: timezone |
97 | 97 | //TODO: receive email |
98 | 98 | |
99 | - if ($isValid = ($this->form_validation->run() === TRUE)) { |
|
99 | + if($isValid = ($this->form_validation->run() === TRUE)) { |
|
100 | 100 | $username = $this->input->post('username'); |
101 | 101 | $password = $this->input->post('password'); |
102 | 102 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | //signup wasn't valid, failed, or this is a fresh signup attempt |
120 | - if(!$isValid){ |
|
120 | + if(!$isValid) { |
|
121 | 121 | //display the create user form |
122 | 122 | $this->body_data['verificationCode'] = $verificationCode; |
123 | 123 |
@@ -16,12 +16,12 @@ discard block |
||
16 | 16 | $this->header_data['page'] = 'forgot_password'; |
17 | 17 | |
18 | 18 | //TODO (RESEARCH): Should we allow username here too? |
19 | - $this->form_validation->set_rules('email', 'Email', 'required|valid_email', array( |
|
19 | + $this->form_validation->set_rules('email', 'Email', 'required|valid_email', array( |
|
20 | 20 | 'required' => 'Please enter your email.', |
21 | 21 | 'valid_email' => 'The email your entered is invalid.' |
22 | 22 | )); |
23 | 23 | |
24 | - if ($this->form_validation->run() === TRUE) { |
|
24 | + if($this->form_validation->run() === TRUE) { |
|
25 | 25 | //form is valid |
26 | 26 | |
27 | 27 | $identity = $this->ion_auth->where('email', $this->input->post('email'))->users()->row(); |
@@ -67,20 +67,20 @@ discard block |
||
67 | 67 | $this->header_data['page'] = 'reset-password'; |
68 | 68 | |
69 | 69 | $user = $this->ion_auth->forgotten_password_check($code); |
70 | - if ($user) { |
|
70 | + if($user) { |
|
71 | 71 | //code is valid, show reset form or process reset |
72 | 72 | $min_password_length = $this->config->item('min_password_length', 'ion_auth'); |
73 | 73 | $max_password_length = $this->config->item('max_password_length', 'ion_auth'); |
74 | - $this->form_validation->set_rules('new_password', 'Password', 'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']'); |
|
74 | + $this->form_validation->set_rules('new_password', 'Password', 'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']'); |
|
75 | 75 | $this->form_validation->set_rules('new_password_confirm', 'Password Confirm', 'required|matches[new_password]'); |
76 | 76 | |
77 | - if ($this->form_validation->run() === TRUE) { |
|
77 | + if($this->form_validation->run() === TRUE) { |
|
78 | 78 | //form is valid, process the password reset request |
79 | 79 | |
80 | 80 | $identity = $user->{'email'}; |
81 | 81 | $change = $this->ion_auth->reset_password($identity, $this->input->post('new_password')); |
82 | 82 | |
83 | - if ($change) { |
|
83 | + if($change) { |
|
84 | 84 | //password changed successfully, redirect to login |
85 | 85 | redirect('user/login', 'refresh'); |
86 | 86 | } else { //@codeCoverageIgnore |
@@ -13,17 +13,17 @@ discard block |
||
13 | 13 | $this->header_data['title'] = 'Login'; |
14 | 14 | $this->header_data['page'] = 'login'; |
15 | 15 | |
16 | - $this->form_validation->set_rules('identity', 'Identity', 'required|max_length[254]', array( |
|
16 | + $this->form_validation->set_rules('identity', 'Identity', 'required|max_length[254]', array( |
|
17 | 17 | 'required' => 'Please enter your username or email.', |
18 | 18 | 'max_length' => 'Invalid username.' |
19 | 19 | |
20 | 20 | )); |
21 | - $this->form_validation->set_rules('password', 'Password', 'required|max_length[64]', array( |
|
21 | + $this->form_validation->set_rules('password', 'Password', 'required|max_length[64]', array( |
|
22 | 22 | 'required' => 'Please enter your password.', |
23 | 23 | 'max_length' => 'Invalid password.' |
24 | 24 | )); |
25 | 25 | |
26 | - if ($isValid = ($this->form_validation->run() === TRUE)) { |
|
26 | + if($isValid = ($this->form_validation->run() === TRUE)) { |
|
27 | 27 | //form is valid |
28 | 28 | |
29 | 29 | //check if identity is email, if not then attempt to use grab from DB |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | //login wasn't valid, failed, or this is a fresh login attempt |
67 | 67 | if(!$isValid) { |
68 | - $this->body_data['form_create'] = array ( |
|
68 | + $this->body_data['form_create'] = array( |
|
69 | 69 | 'action' => 'user/login', |
70 | 70 | |
71 | 71 | 'role' => 'form' |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function __construct(&$db) { |
76 | 76 | // Assign the main CI object to $this->CI and load the file helper since we use it a lot |
77 | - $this->CI =& get_instance(); |
|
78 | - $this->db =& $db; |
|
77 | + $this->CI = & get_instance(); |
|
78 | + $this->db = & $db; |
|
79 | 79 | $this->CI->load->helper('file'); |
80 | 80 | |
81 | 81 | $this->check_path(); |
@@ -102,18 +102,18 @@ discard block |
||
102 | 102 | |
103 | 103 | // Add a trailing slash to the path if needed |
104 | 104 | $path = realpath($path) |
105 | - ? rtrim(realpath($path), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR |
|
106 | - : rtrim($path, '/') . '/'; |
|
105 | + ? rtrim(realpath($path), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR |
|
106 | + : rtrim($path, '/').'/'; |
|
107 | 107 | |
108 | 108 | if(!is_dir($path)) { |
109 | - log_message('debug', 'DB cache path error: ' . $path); |
|
109 | + log_message('debug', 'DB cache path error: '.$path); |
|
110 | 110 | |
111 | 111 | // If the path is wrong we'll turn off caching |
112 | 112 | return $this->db->cache_off(); |
113 | 113 | } |
114 | 114 | |
115 | 115 | if(!is_really_writable($path)) { |
116 | - log_message('debug', 'DB cache dir not writable: ' . $path); |
|
116 | + log_message('debug', 'DB cache dir not writable: '.$path); |
|
117 | 117 | |
118 | 118 | // If the path is not really writable we'll turn off caching |
119 | 119 | return $this->db->cache_off(); |
@@ -143,11 +143,11 @@ discard block |
||
143 | 143 | // BEGIN --- modification for supporting multi-level cache folders |
144 | 144 | |
145 | 145 | if(is_array($this->CI->config->item('multi_level_cache_folders'))) { |
146 | - $uri_md5 = md5($segment_one . '+' . $segment_two); |
|
146 | + $uri_md5 = md5($segment_one.'+'.$segment_two); |
|
147 | 147 | $layer = $this->get_folder_layers($uri_md5); |
148 | - $filepath = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . trim(implode('/', $layer), '/') . '/' . $uri_md5; |
|
148 | + $filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(implode('/', $layer), '/').'/'.$uri_md5; |
|
149 | 149 | } else { |
150 | - $filepath = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . md5($sql); |
|
150 | + $filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.md5($sql); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | // END --- modification for supporting multi-level cache folders |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | // BEGIN --- modification for supporting multi-level cache folders |
179 | 179 | |
180 | 180 | if(is_array($this->CI->config->item('multi_level_cache_folders'))) { |
181 | - $uri_md5 = md5($segment_one . '+' . $segment_two); |
|
181 | + $uri_md5 = md5($segment_one.'+'.$segment_two); |
|
182 | 182 | $layer = $this->get_folder_layers($uri_md5); |
183 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . trim(implode('/', $layer), '/') . '/'; |
|
183 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(implode('/', $layer), '/').'/'; |
|
184 | 184 | |
185 | 185 | if(!is_dir($dir_path)) { |
186 | 186 | $old = umask(0); |
@@ -188,18 +188,18 @@ discard block |
||
188 | 188 | umask($old); |
189 | 189 | } |
190 | 190 | } else { |
191 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/'; |
|
191 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'; |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | $filename = md5($sql); |
195 | 195 | |
196 | 196 | // END --- modification for supporting multi-level cache folders |
197 | 197 | |
198 | - if(write_file($dir_path . $filename, serialize($object)) === FALSE) { |
|
198 | + if(write_file($dir_path.$filename, serialize($object)) === FALSE) { |
|
199 | 199 | return FALSE; |
200 | 200 | } |
201 | 201 | |
202 | - chmod($dir_path . $filename, 0640); |
|
202 | + chmod($dir_path.$filename, 0640); |
|
203 | 203 | return TRUE; |
204 | 204 | } |
205 | 205 | |
@@ -223,11 +223,11 @@ discard block |
||
223 | 223 | } |
224 | 224 | |
225 | 225 | if(is_array($this->CI->config->item('multi_level_cache_folders'))) { |
226 | - $uri_md5 = md5($segment_one . '+' . $segment_two); |
|
226 | + $uri_md5 = md5($segment_one.'+'.$segment_two); |
|
227 | 227 | $layer = $this->get_folder_layers($uri_md5); |
228 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . trim(implode('/', $layer), '/') . '/'; |
|
228 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(implode('/', $layer), '/').'/'; |
|
229 | 229 | } else { |
230 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/'; |
|
230 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'; |
|
231 | 231 | } |
232 | 232 | delete_files($dir_path, TRUE); |
233 | 233 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed'); |
2 | 2 | |
3 | -require_once APPPATH . '../vendor/erusev/parsedown/Parsedown.php'; |
|
3 | +require_once APPPATH.'../vendor/erusev/parsedown/Parsedown.php'; |
|
4 | 4 | class CustomParsedown extends Parsedown { |
5 | 5 | public function __construct() { |
6 | 6 | $this->setSafeMode(TRUE); |
@@ -108,7 +108,7 @@ |
||
108 | 108 | */ |
109 | 109 | public function isRuleValid(string $ruleName) : bool { |
110 | 110 | $isValid = FALSE; |
111 | - if(is_string($ruleName) && $this->has_rule($ruleName)){ |
|
111 | + if(is_string($ruleName) && $this->has_rule($ruleName)) { |
|
112 | 112 | $isValid = !array_key_exists($ruleName, $this->error_array()); |
113 | 113 | } |
114 | 114 | return $isValid; |
@@ -134,9 +134,9 @@ |
||
134 | 134 | $config['composer_autoload'] = FALSE; |
135 | 135 | |
136 | 136 | //NOTE: This doesn't work in autoload.php as it is loaded after we need it. |
137 | -spl_autoload_register(function ($class) { |
|
138 | - $fileMono = APPPATH . '../vendor/monolog/monolog/src/'. str_replace('\\', '/', $class) .'.php'; |
|
139 | - $filePsr = APPPATH . '../vendor/psr/log/'. str_replace('\\', '/', $class) .'.php'; |
|
137 | +spl_autoload_register(function($class) { |
|
138 | + $fileMono = APPPATH.'../vendor/monolog/monolog/src/'.str_replace('\\', '/', $class).'.php'; |
|
139 | + $filePsr = APPPATH.'../vendor/psr/log/'.str_replace('\\', '/', $class).'.php'; |
|
140 | 140 | if(file_exists($fileMono)) { |
141 | 141 | require $fileMono; |
142 | 142 | return TRUE; |
@@ -18,26 +18,26 @@ discard block |
||
18 | 18 | $file = ($file === '') ? 'config' : str_replace('.php', '', $file); |
19 | 19 | $loaded = FALSE; |
20 | 20 | |
21 | - foreach ($this->_config_paths as $path) |
|
21 | + foreach($this->_config_paths as $path) |
|
22 | 22 | { |
23 | - foreach (array($file, '_secure'.DIRECTORY_SEPARATOR.$file, ENVIRONMENT.DIRECTORY_SEPARATOR.$file) as $location) |
|
23 | + foreach(array($file, '_secure'.DIRECTORY_SEPARATOR.$file, ENVIRONMENT.DIRECTORY_SEPARATOR.$file) as $location) |
|
24 | 24 | { |
25 | 25 | $file_path = $path.'config/'.$location.'.php'; |
26 | - if (in_array($file_path, $this->is_loaded, TRUE)) |
|
26 | + if(in_array($file_path, $this->is_loaded, TRUE)) |
|
27 | 27 | { |
28 | 28 | return TRUE; |
29 | 29 | } |
30 | 30 | |
31 | - if ( ! file_exists($file_path)) |
|
31 | + if(!file_exists($file_path)) |
|
32 | 32 | { |
33 | 33 | continue; |
34 | 34 | } |
35 | 35 | |
36 | 36 | include($file_path); |
37 | 37 | |
38 | - if ( ! isset($config) OR ! is_array($config)) |
|
38 | + if(!isset($config) OR !is_array($config)) |
|
39 | 39 | { |
40 | - if ($fail_gracefully === TRUE) |
|
40 | + if($fail_gracefully === TRUE) |
|
41 | 41 | { |
42 | 42 | return FALSE; |
43 | 43 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | show_error('Your '.$file_path.' file does not appear to contain a valid configuration array.'); |
46 | 46 | } |
47 | 47 | |
48 | - if ($use_sections === TRUE) |
|
48 | + if($use_sections === TRUE) |
|
49 | 49 | { |
50 | 50 | $this->config[$file] = isset($this->config[$file]) |
51 | 51 | ? array_merge($this->config[$file], $config) |
@@ -63,11 +63,11 @@ discard block |
||
63 | 63 | } |
64 | 64 | } |
65 | 65 | |
66 | - if ($loaded === TRUE) |
|
66 | + if($loaded === TRUE) |
|
67 | 67 | { |
68 | 68 | return TRUE; |
69 | 69 | } |
70 | - elseif ($fail_gracefully === TRUE) |
|
70 | + elseif($fail_gracefully === TRUE) |
|
71 | 71 | { |
72 | 72 | return FALSE; |
73 | 73 | } |
@@ -48,22 +48,22 @@ discard block |
||
48 | 48 | public function __construct() { |
49 | 49 | $file_path = APPPATH.'config/monolog.php'; |
50 | 50 | $found = FALSE; |
51 | - if (file_exists($file_path)) { |
|
51 | + if(file_exists($file_path)) { |
|
52 | 52 | $found = TRUE; |
53 | 53 | require($file_path); |
54 | 54 | } |
55 | 55 | |
56 | 56 | // Is the config file in the environment folder? |
57 | - if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) { |
|
57 | + if(file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) { |
|
58 | 58 | require($file_path); |
59 | - } elseif (!$found) { |
|
59 | + } elseif(!$found) { |
|
60 | 60 | exit('monolog.php config does not exist'); |
61 | 61 | } |
62 | 62 | |
63 | 63 | // Is the config file in the _secure folder? |
64 | - if (file_exists($file_path = APPPATH.'config/_secure/monolog.php')) { |
|
64 | + if(file_exists($file_path = APPPATH.'config/_secure/monolog.php')) { |
|
65 | 65 | require($file_path); |
66 | - } elseif (!$found) { |
|
66 | + } elseif(!$found) { |
|
67 | 67 | exit('monolog.php config does not exist'); |
68 | 68 | } |
69 | 69 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | // detect and register all PHP errors in this log hence forth |
75 | 75 | ErrorHandler::register($this->log); |
76 | 76 | |
77 | - if ($this->config['introspection_processor']) |
|
77 | + if($this->config['introspection_processor']) |
|
78 | 78 | { |
79 | 79 | // add controller and line number info to each log message |
80 | 80 | // 2 = depth in the stacktrace to ignore. This gives us the file |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | // decide which handler(s) to use |
86 | - foreach ($this->config['handlers'] as $value) |
|
86 | + foreach($this->config['handlers'] as $value) |
|
87 | 87 | { |
88 | - switch ($value) |
|
88 | + switch($value) |
|
89 | 89 | { |
90 | 90 | case 'file': |
91 | 91 | $handler = new RotatingFileHandler($this->config['file_logfile']); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | break; |
131 | 131 | |
132 | 132 | default: |
133 | - exit('log handler not supported: ' . $value . "\n"); |
|
133 | + exit('log handler not supported: '.$value."\n"); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | $this->log->pushHandler($handler); |
@@ -152,19 +152,19 @@ discard block |
||
152 | 152 | $level = strtoupper($level); |
153 | 153 | |
154 | 154 | // verify error level |
155 | - if (!isset($this->_levels[$level])) |
|
155 | + if(!isset($this->_levels[$level])) |
|
156 | 156 | { |
157 | - $this->log->addError('unknown error level: ' . $level); |
|
157 | + $this->log->addError('unknown error level: '.$level); |
|
158 | 158 | $level = 'ALL'; |
159 | 159 | } |
160 | 160 | |
161 | 161 | // filter out anything in $this->config['exclusion_list'] |
162 | - if (!empty($this->config['exclusion_list'])) |
|
162 | + if(!empty($this->config['exclusion_list'])) |
|
163 | 163 | { |
164 | - foreach ($this->config['exclusion_list'] as $findme) |
|
164 | + foreach($this->config['exclusion_list'] as $findme) |
|
165 | 165 | { |
166 | 166 | $pos = strpos($msg, $findme); |
167 | - if ($pos !== false) |
|
167 | + if($pos !== false) |
|
168 | 168 | { |
169 | 169 | // just exit now - we don't want to log this error |
170 | 170 | return true; |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | } |
173 | 173 | } |
174 | 174 | |
175 | - if ($this->_levels[$level] <= $this->config['threshold']) |
|
175 | + if($this->_levels[$level] <= $this->config['threshold']) |
|
176 | 176 | { |
177 | - switch ($level) |
|
177 | + switch($level) |
|
178 | 178 | { |
179 | 179 | case 'ERROR': |
180 | 180 | $this->log->addError($msg); |