diff --git a/application/libraries/Amplib.php b/application/libraries/Amplib.php index 0b5929d9..6ed1ccb3 100644 --- a/application/libraries/Amplib.php +++ b/application/libraries/Amplib.php @@ -30,7 +30,7 @@ class Amplib { }else{ $data['last_edit_amp_id'] = ''; } - + $this->CI->load->view('bootstrap3/header', $data); $this->CI->load->view('amp_editor'); $this->CI->load->view('bootstrap3/footer'); @@ -38,6 +38,9 @@ class Amplib { public function auto_create($ic_id) { $data = array(); + if(strtolower($this->CI->config->item('site_code')) == 'cht'){ + $this->CI->Information_model->ic_type = "AND ic.ic_type != 'none'"; + } $data['information'] = $this->CI->Information_model->detail_by_ic_id($ic_id); if ($data['information'] == FALSE) { return json_encode(array('result' => 'no', 'data' => '找不到这个页面')); @@ -54,7 +57,7 @@ class Amplib { break; case 'cht': $websitehost = 'https://data.chinahighlights.com'; - $html_source_url = 'http://192.155.224.195:2222' . $data['information']->ic_url; + $html_source_url = 'http://169.54.172.35:3588' . $data['information']->ic_url; break; case 'gm': $websitehost = 'https://data.chinarundreisen.com'; @@ -110,7 +113,7 @@ class Amplib { //备份修改的代码 $this->CI->Logs_model->write('backup_amp', $ic_id, $textarea_htmlcode); - + //AMP格式验证 if ($amp_status !== '0') {//只有发布的时候才需要验证 //把AMP网页内容到purifycss处理，内置了AMP-Validator diff --git a/application/models/information_model.php b/application/models/information_model.php index f1e2ef23..8a2cb0f6 100644 --- a/application/models/information_model.php +++ b/application/models/information_model.php @@ -35,7 +35,6 @@ class Information_model extends CI_Model { $this->ic_url_is_id = false; $this->ic_ht_area_type = false; $this->ic_ht_area_id = false; - $this->ic_type = false; $this->ic_id = false; } @@ -133,7 +132,7 @@ class Information_model extends CI_Model { } $this->init(); $this->topNum = 1; - $this->ic_url_is_id = " AND ic.ic_id = " . $this->HT->escape($ic_id); + $this->ic_url_is_id = " AND ic.ic_id = " . $this->HT->escape($ic_id); return $this->GetList(); } @@ -200,7 +199,7 @@ class Information_model extends CI_Model { $this->orderBy ? $sql.=$this->orderBy : false; $query = $this->HT->query($sql, array($site_code ? $site_code : $this->config->item('site_code'))); - //print_r($this->HT->queries); + //print_r($this->HT->queries);die(); if ($this->topNum === 1) { if ($query->num_rows() > 0) { $row = $query->row(); diff --git a/application/models/logs_model.php b/application/models/logs_model.php index 5da075e8..c068374f 100644 --- a/application/models/logs_model.php +++ b/application/models/logs_model.php @@ -1,21 +1,24 @@ HT = $this->load->database('HT', TRUE); + $this->HT = $this->load->database('HT', true); } - function init() { + public function init() + { $this->top_num = false; $this->log_res_id = false; $this->log_id = false; @@ -24,8 +27,9 @@ class Logs_model extends CI_Model { $this->order_by = " ORDER BY il.log_id DESC "; } - //获取日志详情 - function read($log_id) { + //获取日志详情. + public function read($log_id) + { $this->init(); $this->top_num = 1; $this->log_id = " AND il.log_id =" . $this->HT->escape($log_id); @@ -33,7 +37,8 @@ class Logs_model extends CI_Model { } //获取备份信息内容 - function get_backup_list($is_id) { + public function get_backup_list($is_id) + { $this->init(); $this->top_num = 16; $this->log_res_id = " AND il.log_res_id =" . $this->HT->escape($is_id); @@ -42,7 +47,8 @@ class Logs_model extends CI_Model { } //获取最近的备份信息内容 - function get_last_backup($is_id) { + public function get_last_backup($is_id) + { $this->init(); $this->top_num = 1; $this->log_res_id = " AND il.log_res_id =" . $this->HT->escape($is_id); @@ -51,27 +57,30 @@ class Logs_model extends CI_Model { } //获取所有备份信息内容 - function get_all_backup_list($is_id,$amp=false) { + public function get_all_backup_list($is_id, $amp = false) + { $this->init(); $this->log_res_id = " AND il.log_res_id =" . $this->HT->escape($is_id); - if($amp){ - $this->log_action = " AND (il.log_action = 'backup_amp')"; - }else{ - $this->log_action = " AND (il.log_action = 'backup_info')"; - } - + if ($amp) { + $this->log_action = " AND (il.log_action = 'backup_amp')"; + } else { + $this->log_action = " AND (il.log_action = 'backup_info')"; + } + return $this->get_list(); } //获取最后操作信息 - function get_last_edit($is_id) { + public function get_last_edit($is_id) + { $this->init(); $this->top_num = 1; $this->log_res_id = " AND il.log_res_id =" . $this->HT->escape($is_id); return $this->get_list(); } - public function get_last_log() { + public function get_last_log() + { $this->init(); $this->top_num = 1; $this->log_action = " AND il.log_action = 'backup_info'"; @@ -79,17 +88,21 @@ class Logs_model extends CI_Model { return $this->get_list(); } - public function get_last_cdn_update_info() { + public function get_last_cdn_update_info() + { $this->init(); $this->top_num = 1; $this->log_action = " AND il.log_action = 'update_cdn'"; return $this->get_list(); } - public function get_uncdn_list($last_id = false) { + public function get_uncdn_list($last_id = false) + { $map = ''; - if ($last_id) + if ($last_id) { $map = " AND log_id > $last_id"; + } + $sql = " SELECT log_id,is_sitecode,ic_url FROM infoLogs LEFT JOIN infoStructures ON is_id=log_res_id @@ -103,7 +116,8 @@ class Logs_model extends CI_Model { return $query->result(); } - public function get_list_by_action() { + public function get_list_by_action() + { $this->init(); $this->top_num = 50; $this->log_action = " AND il.log_action = 'send_mail'"; @@ -111,29 +125,30 @@ class Logs_model extends CI_Model { return $this->get_list(); } - function get_list() { + public function get_list() + { $this->top_num ? $sql = "SELECT TOP " . $this->top_num : $sql = "SELECT "; $sql .= " il.log_id, \n" - . " il.log_action, \n" - . " il.log_res_id, \n" - . " il.log_ht_usercode, \n" - . " il.log_ht_username, \n" - . " il.log_content, \n" - . " il.log_datetime \n" - . "FROM infoLogs il \n" - . "WHERE 1=1 \n"; - $this->log_res_id ? $sql.=$this->log_res_id : false; - $this->log_id ? $sql.=$this->log_id : false; - $this->log_action ? $sql.=$this->log_action : false; - $this->log_datetime ? $sql.=$this->log_datetime : false; - $this->order_by ? $sql.=$this->order_by : false; + . " il.log_action, \n" + . " il.log_res_id, \n" + . " il.log_ht_usercode, \n" + . " il.log_ht_username, \n" + . " il.log_content, \n" + . " il.log_datetime \n" + . "FROM infoLogs il \n" + . "WHERE 1=1 \n"; + $this->log_res_id ? $sql .= $this->log_res_id : false; + $this->log_id ? $sql .= $this->log_id : false; + $this->log_action ? $sql .= $this->log_action : false; + $this->log_datetime ? $sql .= $this->log_datetime : false; + $this->order_by ? $sql .= $this->order_by : false; $query = $this->HT->query($sql); if ($this->top_num == 1) { if ($query->num_rows() > 0) { $row = $query->row(); return $row; } else { - return FALSE; + return false; } } else { return $query->result(); @@ -141,31 +156,36 @@ class Logs_model extends CI_Model { } //备份信息内容 - function backup_project($p_id, $log_content) { + public function backup_project($p_id, $log_content) + { return $this->write('backup_project', $p_id, $log_content); } //备份信息内容 - function backup($is_id, $log_content) { + public function backup($is_id, $log_content) + { return $this->write('backup_info', $is_id, $log_content); } //备份信息meta内容,lmr - 2020/03/12 - function backup_meta($is_id, $log_content, $meta_code) { - $add_icid_time_flug = 'backup_meta_'.$meta_code.'_'. $is_id.'_'.time(); + public function backup_meta($is_id, $log_content, $meta_code) + { + $add_icid_time_flug = 'backup_meta_' . $meta_code . '_' . $is_id . '_' . time(); $this->write($add_icid_time_flug, $is_id, $log_content); return $add_icid_time_flug; } //列表信息meta内容,lmr - 2020/03/23 - function list_backup_meta($is_id, $meta_code) { + public function list_backup_meta($is_id, $meta_code) + { $this->init(); $this->top_num = 100; $this->log_res_id = " AND il.log_res_id =" . $this->HT->escape($is_id); - $this->log_action = " AND il.log_action like 'backup_meta_".$meta_code."_%'"; + $this->log_action = " AND il.log_action like 'backup_meta_" . $meta_code . "_%'"; return $this->get_list(); } //制定读取信息meta内容,lmr - 2020/03/23 - function pick_backup_meta($action) { + public function pick_backup_meta($action) + { $this->init(); $this->top_num = 1; $this->log_action = " AND il.log_action =" . $this->HT->escape($action); @@ -173,28 +193,33 @@ class Logs_model extends CI_Model { } //备份信息简介 - function backup_summary($is_id, $log_content) { + public function backup_summary($is_id, $log_content) + { return $this->write('backup_summary', $is_id, $log_content); } //添加信息 - function add($is_id) { + public function add($is_id) + { return $this->write('add_info', $is_id); } //删除信息 - function delete($is_id, $log_content) { + public function delete($is_id, $log_content) + { return $this->write('delete_info', $is_id, $log_content); } //移动信息 - function move($is_id_array) { + public function move($is_id_array) + { //移动是很多个信息节点变动的，在日志内容中记录所有几点id return $this->write('move_info', 0, $is_id_array); } //写入测试，看看数据库写入是否正常 - function write_test() { + public function write_test() + { $sql = " INSERT INTO infoLogs ( @@ -219,35 +244,37 @@ class Logs_model extends CI_Model { } //写入操作日志 - function write($log_action, $is_id, $log_content = '') { + public function write($log_action, $is_id, $log_content = '') + { $admin_info = $this->session->userdata('session_admin'); $sql = "INSERT INTO infoLogs \n" - . " ( \n" - . " log_action, log_res_id, log_content, log_ht_usercode, log_ht_username, \n" - . " log_datetime \n" - . " ) \n" - . "VALUES \n" - . " ( \n" - . " ?, ?, N?, ?, ?, GETDATE() \n" - . " )"; + . " ( \n" + . " log_action, log_res_id, log_content, log_ht_usercode, log_ht_username, \n" + . " log_datetime \n" + . " ) \n" + . "VALUES \n" + . " ( \n" + . " ?, ?, N?, ?, ?, GETDATE() \n" + . " )"; $query = $this->HT->query($sql, array($log_action, $is_id, $log_content, $admin_info['OPI_Code'], $admin_info['OPI_Name'])); $this->insert_id = $this->HT->last_id('infoLogs'); return $query; //print_r($this->HT->queries); } - function update($log_action, $log_res_id) { + public function update($log_action, $log_res_id) + { $sql = "UPDATE infoLogs SET log_res_id=? WHERE log_action=?"; $query = $this->HT->query($sql, array($log_res_id, $log_action)); return $query; } - - - //查询上一次修改记录 - function get_last_edit_amp($ic_id){ - $sql = 'select top 1 log_id from infoLogs where log_res_id = ? order by log_datetime desc'; - $query = $this->HT->query($sql, array($ic_id)); + + //查询上一次修改记录 + public function get_last_edit_amp($ic_id) + { + $sql = 'select top 1 log_id from infoLogs where log_res_id = ? order by log_datetime desc'; + $query = $this->HT->query($sql, array($ic_id)); return $query->row(); - } + } } diff --git a/application/third_party/searchinfo/models/infos_model.php b/application/third_party/searchinfo/models/infos_model.php index c8c11d18..dea4df09 100644 --- a/application/third_party/searchinfo/models/infos_model.php +++ b/application/third_party/searchinfo/models/infos_model.php @@ -14,7 +14,7 @@ class infos_model extends CI_Model { } function get_emptyamp_pages($sitecode){ - $sql = "select ic_url from infoMetas left join infoContents on im_ic_id = ic_id where im_key = 'amp' and ic_sitecode = ? and im_value like '%%'"; + $sql = "select ic_url from infoMetas left join infoContents on im_ic_id = ic_id where im_key = 'amp' and ic_sitecode = ? and im_value like '%%' and ic_type = 'none'"; $query = $this->HT->query($sql,array($sitecode)); return $query->result(); } diff --git a/application/views/amp_editor.php b/application/views/amp_editor.php index a1aeac26..cbde9bf2 100644 --- a/application/views/amp_editor.php +++ b/application/views/amp_editor.php @@ -66,7 +66,7 @@
- +
- + config->item('site_code') == 'cht') { ?> - 看看 - - + +
@@ -99,7 +99,7 @@
- +
@@ -201,7 +201,7 @@ }); } - + diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 00a08423..1c1ec569 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -329,7 +329,7 @@ //跳转到测试页面 function goto_test_page() { - var site_url = 'http://192.155.224.195:8080/guide-use.php/travelguide/guide/?static_html_url='; + var site_url = 'http://169.54.172.35:3588/guide-use.php/travelguide/guide/?static_html_url='; $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); return true; } diff --git a/info.php b/info.php index fa440314..fb449b91 100644 --- a/info.php +++ b/info.php @@ -1,5 +1,6 @@ - php_value engine off - - - php_value engine off -