[ADIF Backup] Fix when running backup from inside Cloudlog
这个提交包含在:
父节点
ebe01d938c
当前提交
efb44b1d65
共有 2 个文件被更改,包括 3 次插入 和 3 次删除
|
|
@ -20,7 +20,7 @@ class Backup extends CI_Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Gets all QSOs and Dumps them to logbook.adi */
|
/* Gets all QSOs and Dumps them to logbook.adi */
|
||||||
public function adif($key){
|
public function adif($key = null){
|
||||||
$this->load->helper('file');
|
$this->load->helper('file');
|
||||||
// Set memory limit to unlimited to allow heavy usage
|
// Set memory limit to unlimited to allow heavy usage
|
||||||
ini_set('memory_limit', '-1');
|
ini_set('memory_limit', '-1');
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,11 @@
|
||||||
class adif_data extends CI_Model {
|
class adif_data extends CI_Model {
|
||||||
|
|
||||||
function export_all($api_key = null) {
|
function export_all($api_key = null) {
|
||||||
|
$CI =& get_instance();
|
||||||
|
$CI->load->model('logbooks_model');
|
||||||
if ($api_key != null) {
|
if ($api_key != null) {
|
||||||
$CI =& get_instance();
|
|
||||||
$CI->load->model('api_model');
|
$CI->load->model('api_model');
|
||||||
if (strpos($this->api_model->access($api_key), 'r') !== false) {
|
if (strpos($this->api_model->access($api_key), 'r') !== false) {
|
||||||
$CI->load->model('logbooks_model');
|
|
||||||
$this->api_model->update_last_used($api_key);
|
$this->api_model->update_last_used($api_key);
|
||||||
$user_id = $this->api_model->key_userid($api_key);
|
$user_id = $this->api_model->key_userid($api_key);
|
||||||
$active_station_logbook = $CI->logbooks_model->find_active_station_logbook_from_userid($user_id);
|
$active_station_logbook = $CI->logbooks_model->find_active_station_logbook_from_userid($user_id);
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用