| @@ -16,7 +16,7 @@ discard block | ||
| 16 | 16 |  	{ | 
| 17 | 17 | return array( | 
| 18 | 18 | 'add_tables' => array( | 
| 19 | - $this->table_prefix . 'tfa_registration' => array( | |
| 19 | + $this->table_prefix.'tfa_registration' => array( | |
| 20 | 20 | 'COLUMNS' => array( | 
| 21 | 21 |  						'registration_id'		=> array('UINT', null, 'auto_increment'), | 
| 22 | 22 |  						'user_id'				=> array('UINT', 0), | 
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 |  	{ | 
| 41 | 41 | return array( | 
| 42 | 42 | 'drop_tables' => array( | 
| 43 | - $this->table_prefix . 'tfa_registration', | |
| 43 | + $this->table_prefix.'tfa_registration', | |
| 44 | 44 | ), | 
| 45 | 45 | ); | 
| 46 | 46 | } | 
| @@ -24,7 +24,7 @@ discard block | ||
| 24 | 24 |  	{ | 
| 25 | 25 | return array( | 
| 26 | 26 | 'add_columns' => array( | 
| 27 | - $this->table_prefix . 'sessions' => array( | |
| 27 | + $this->table_prefix.'sessions' => array( | |
| 28 | 28 |  					'u2f_request'    => array('TEXT', null), | 
| 29 | 29 | ), | 
| 30 | 30 | ), | 
| @@ -35,7 +35,7 @@ discard block | ||
| 35 | 35 |  	{ | 
| 36 | 36 | return array( | 
| 37 | 37 | 'drop_columns' => array( | 
| 38 | - $this->table_prefix . 'sessions' => array( | |
| 38 | + $this->table_prefix.'sessions' => array( | |
| 39 | 39 | 'u2f_request', | 
| 40 | 40 | ), | 
| 41 | 41 | ), | 
| @@ -16,7 +16,7 @@ discard block | ||
| 16 | 16 |  	{ | 
| 17 | 17 | return array( | 
| 18 | 18 | 'add_tables' => array( | 
| 19 | - $this->table_prefix . 'tfa_back_reg' => array( | |
| 19 | + $this->table_prefix.'tfa_back_reg' => array( | |
| 20 | 20 | 'COLUMNS' => array( | 
| 21 | 21 |  						'registration_id'		=> array('UINT', null, 'auto_increment'), | 
| 22 | 22 |  						'user_id'				=> array('UINT', 0), | 
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 |  	{ | 
| 39 | 39 | return array( | 
| 40 | 40 | 'drop_tables' => array( | 
| 41 | - $this->table_prefix . 'tfa_back_reg', | |
| 41 | + $this->table_prefix.'tfa_back_reg', | |
| 42 | 42 | ), | 
| 43 | 43 | ); | 
| 44 | 44 | } | 
| @@ -16,7 +16,7 @@ discard block | ||
| 16 | 16 |  	{ | 
| 17 | 17 | return array( | 
| 18 | 18 | 'add_tables' => array( | 
| 19 | - $this->table_prefix . 'tfa_otp_reg' => array( | |
| 19 | + $this->table_prefix.'tfa_otp_reg' => array( | |
| 20 | 20 | 'COLUMNS' => array( | 
| 21 | 21 |  						'registration_id'		=> array('UINT', null, 'auto_increment'), | 
| 22 | 22 |  						'user_id'				=> array('UINT', 0), | 
| @@ -37,7 +37,7 @@ discard block | ||
| 37 | 37 |  	{ | 
| 38 | 38 | return array( | 
| 39 | 39 | 'drop_tables' => array( | 
| 40 | - $this->table_prefix . 'tfa_otp_reg', | |
| 40 | + $this->table_prefix.'tfa_otp_reg', | |
| 41 | 41 | ), | 
| 42 | 42 | ); | 
| 43 | 43 | } | 
| @@ -101,7 +101,7 @@ discard block | ||
| 101 | 101 |  				{ | 
| 102 | 102 | $module->register(); | 
| 103 | 103 | meta_refresh(3, $this->u_action); | 
| 104 | -					$message = $this->user->lang('TFA_KEY_ADDED') . '<br /><br />' . $this->user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>'); | |
| 104 | +					$message = $this->user->lang('TFA_KEY_ADDED').'<br /><br />'.$this->user->lang('RETURN_UCP', '<a href="'.$this->u_action.'">', '</a>'); | |
| 105 | 105 | trigger_error($message); | 
| 106 | 106 | } | 
| 107 | 107 | if ($module->can_register()) | 
| @@ -227,7 +227,7 @@ discard block | ||
| 227 | 227 | } | 
| 228 | 228 | } | 
| 229 | 229 | meta_refresh(3, $this->u_action); | 
| 230 | -		$message = $this->user->lang('TFA_KEYS_DELETED') . '<br /><br />' . $this->user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>'); | |
| 230 | +		$message = $this->user->lang('TFA_KEYS_DELETED').'<br /><br />'.$this->user->lang('RETURN_UCP', '<a href="'.$this->u_action.'">', '</a>'); | |
| 231 | 231 | trigger_error($message); | 
| 232 | 232 | } | 
| 233 | 233 | } | 
| @@ -42,8 +42,8 @@ | ||
| 42 | 42 | protected function role_exists($role) | 
| 43 | 43 |  	{ | 
| 44 | 44 | $sql = 'SELECT role_id | 
| 45 | - FROM ' . ACL_ROLES_TABLE . " | |
| 46 | - WHERE role_name = '" . $this->db->sql_escape($role) . "'"; | |
| 45 | + FROM ' . ACL_ROLES_TABLE." | |
| 46 | + WHERE role_name = '" . $this->db->sql_escape($role)."'"; | |
| 47 | 47 | $result = $this->db->sql_query_limit($sql, 1); | 
| 48 | 48 |  		$role_id = $this->db->sql_fetchfield('role_id'); | 
| 49 | 49 | $this->db->sql_freeresult($result); | 
| @@ -38,8 +38,8 @@ discard block | ||
| 38 | 38 | protected function show_ucp_complete($table, $where = '') | 
| 39 | 39 |  	{ | 
| 40 | 40 | $sql = 'SELECT * | 
| 41 | - FROM ' . $this->db->sql_escape($table) . ' | |
| 42 | - WHERE user_id = ' . (int) $this->user->data['user_id'] . ' ' . $where . ' | |
| 41 | + FROM ' . $this->db->sql_escape($table).' | |
| 42 | + WHERE user_id = ' . (int) $this->user->data['user_id'].' '.$where.' | |
| 43 | 43 | ORDER BY registration_id ASC'; | 
| 44 | 44 | |
| 45 | 45 | $result = $this->db->sql_query($sql); | 
| @@ -69,8 +69,8 @@ discard block | ||
| 69 | 69 | protected function check_table_for_user($table, $user_id, $where = '') | 
| 70 | 70 |  	{ | 
| 71 | 71 | $sql = 'SELECT COUNT(registration_id) as reg_id | 
| 72 | - FROM ' . $this->db->sql_escape($table) . ' | |
| 73 | - WHERE user_id = ' . (int) $user_id . ' ' . $where; | |
| 72 | + FROM ' . $this->db->sql_escape($table).' | |
| 73 | + WHERE user_id = ' . (int) $user_id.' '.$where; | |
| 74 | 74 | $result = $this->db->sql_query($sql); | 
| 75 | 75 | $row = $this->db->sql_fetchrow($result); | 
| 76 | 76 | $this->db->sql_freeresult($result); | 
| @@ -181,8 +181,8 @@ discard block | ||
| 181 | 181 | 'last_used' => time(), | 
| 182 | 182 | 'valid' => false, | 
| 183 | 183 | ); | 
| 184 | - $sql = 'UPDATE ' . $this->backup_registration_table . ' | |
| 185 | -					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '  | |
| 184 | + $sql = 'UPDATE '.$this->backup_registration_table.' | |
| 185 | +					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'  | |
| 186 | 186 | WHERE | 
| 187 | 187 | registration_id = ' . (int) $registration['registration_id']; | 
| 188 | 188 | $this->db->sql_query($sql); | 
| @@ -263,8 +263,8 @@ discard block | ||
| 263 | 263 | */ | 
| 264 | 264 | public function delete($key) | 
| 265 | 265 |  	{ | 
| 266 | - $sql = 'DELETE FROM ' . $this->backup_registration_table . ' | |
| 267 | - WHERE user_id = ' . (int) $this->user->data['user_id'] . ' | |
| 266 | + $sql = 'DELETE FROM '.$this->backup_registration_table.' | |
| 267 | + WHERE user_id = ' . (int) $this->user->data['user_id'].' | |
| 268 | 268 | AND registration_id =' . (int) $key; | 
| 269 | 269 | |
| 270 | 270 | $this->db->sql_query($sql); | 
| @@ -277,7 +277,7 @@ discard block | ||
| 277 | 277 | */ | 
| 278 | 278 | private function getRegistrations($user_id) | 
| 279 | 279 |  	{ | 
| 280 | - $sql = 'SELECT * FROM ' . $this->backup_registration_table . ' WHERE user_id = ' . (int) $user_id; | |
| 280 | + $sql = 'SELECT * FROM '.$this->backup_registration_table.' WHERE user_id = '.(int) $user_id; | |
| 281 | 281 | $result = $this->db->sql_query($sql); | 
| 282 | 282 | $rows = $this->db->sql_fetchrowset($result); | 
| 283 | 283 | |
| @@ -24,7 +24,7 @@ discard block | ||
| 24 | 24 |  	{ | 
| 25 | 25 | return array( | 
| 26 | 26 | 'add_columns' => array( | 
| 27 | - $this->table_prefix . 'sessions' => array( | |
| 27 | + $this->table_prefix.'sessions' => array( | |
| 28 | 28 |  					'tfa_random'    => array('TEXT', null), | 
| 29 | 29 |  					'tfa_uid'		=> array('UINT', 0), | 
| 30 | 30 | ), | 
| @@ -36,7 +36,7 @@ discard block | ||
| 36 | 36 |  	{ | 
| 37 | 37 | return array( | 
| 38 | 38 | 'drop_columns' => array( | 
| 39 | - $this->table_prefix . 'sessions' => array( | |
| 39 | + $this->table_prefix.'sessions' => array( | |
| 40 | 40 | 'tfa_random', | 
| 41 | 41 | ), | 
| 42 | 42 | ), |