mirror of
https://github.com/magicbug/Cloudlog
synced 2024-11-22 08:13:41 +00:00
Merge branch 'master' of https://github.com/magicbug/Cloudlog into zeroconverter
This commit is contained in:
commit
49fb48a163
@ -63,6 +63,9 @@ class QSO extends CI_Controller {
|
|||||||
'station_profile_id' => $this->input->post('station_profile')
|
'station_profile_id' => $this->input->post('station_profile')
|
||||||
);
|
);
|
||||||
// ];
|
// ];
|
||||||
|
|
||||||
|
setcookie("radio", $qso_data['radio'], time()+3600*24*99);
|
||||||
|
setcookie("station_profile_id", $qso_data['station_profile_id'], time()+3600*24*99);
|
||||||
|
|
||||||
$this->session->set_userdata($qso_data);
|
$this->session->set_userdata($qso_data);
|
||||||
|
|
||||||
|
@ -229,7 +229,9 @@ class User_Model extends CI_Model {
|
|||||||
'user_lotw_name' => $u->row()->user_lotw_name,
|
'user_lotw_name' => $u->row()->user_lotw_name,
|
||||||
'user_eqsl_name' => $u->row()->user_eqsl_name,
|
'user_eqsl_name' => $u->row()->user_eqsl_name,
|
||||||
'user_eqsl_qth_nickname' => $u->row()->user_eqsl_qth_nickname,
|
'user_eqsl_qth_nickname' => $u->row()->user_eqsl_qth_nickname,
|
||||||
'user_hash' => $this->_hash($u->row()->user_id."-".$u->row()->user_type)
|
'user_hash' => $this->_hash($u->row()->user_id."-".$u->row()->user_type),
|
||||||
|
'radio' => isset($_COOKIE["radio"])?$_COOKIE["radio"]:"",
|
||||||
|
'station_profile_id' => isset($_COOKIE["station_profile_id"])?$_COOKIE["station_profile_id"]:""
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->session->set_userdata($userdata);
|
$this->session->set_userdata($userdata);
|
||||||
|
Loading…
Reference in New Issue
Block a user