diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index cdd86e6b4..44d8b7fb7 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 6eaff80b9..1608f3012 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = '注销'; $lang['menu_ffma'] = "弗雷德·菲什纪念奖"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='维护'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index 67f52b074..b9624d109 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Odhlásit se'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index 9e20d4a92..88d36eaf9 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index e044d6f7e..62717b5c7 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Kirjaudu ulos'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index 641e8b977..b82fb62bd 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_forum'] = 'Forum'; $lang['menu_logout'] = 'Logout'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 265358943..1b86e9bf4 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance'] = 'Wartung'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index 301be43a7..9da678ed4 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index 301be43a7..9da678ed4 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index 301be43a7..9da678ed4 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index 2c15ae607..2487d766e 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Выход'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Обслуживание'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index aefe6cbb1..2ada30808 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index 93186c6a4..d149e5cae 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logga ut'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Underhåll'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index 301be43a7..9da678ed4 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -94,3 +94,4 @@ $lang['menu_logout'] = 'Logout'; $lang['menu_ffma'] = "Fred Fish Memorial Award"; $lang['menu_ja_gridmaster'] = 'JA Gridmaster'; $lang['menu_maintenance']='Maintenance'; +$lang['menu_rac'] = 'RAC'; diff --git a/application/models/User_model.php b/application/models/User_model.php index ca4b5372e..3300e42c9 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -200,7 +200,7 @@ class User_Model extends CI_Model { // Add user and insert bandsettings for user $this->db->insert($this->config->item('auth_table'), $data); $insert_id = $this->db->insert_id(); - $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, iota, pota, sig, sota, uscounties, was, wwff, vucc) select bands.id, " . $insert_id . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands;"); + $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja, rac) select bands.id, " . $insert_id . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands;"); $this->db->query("insert into paper_types (user_id,paper_name,metric,width,orientation,height) SELECT ".$insert_id.", paper_name, metric, width, orientation,height FROM paper_types where user_id = -1;"); return OK; } else { @@ -428,7 +428,7 @@ class User_Model extends CI_Model { $data = array( 'last_seen' => date('Y-m-d H:i:s') ); - + $this->db->where('user_id', $user_id); $this->db->update('users', $data); } @@ -469,9 +469,9 @@ class User_Model extends CI_Model { $this->db->select('(SELECT count(*) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id from station_profile WHERE user_id = users.user_id)) as qsocount'); $this->db->select('users.*'); $this->db->from('users'); - + $result = $this->db->get(); - + return $result; }