goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge branch 'master' of https://github.com/magicbug/Cloudlog

浏览代码
这个提交包含在：
Peter Goodhall 2019-10-08 21:11:19 +01:00
当前提交 39bd4c6fbc
共有 3 个文件被更改，包括 7 次插入 和 7 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/controllers/Clublog.php
查看文件

@ -135,7 +135,7 @@ class Clublog extends CI_Controller {
function find_dxcc($callsign) { function find_dxcc($callsign) {
$clean_callsign = $this->security->xss_clean($callsign); $clean_callsign = $this->security->xss_clean($callsign);
// Live lookup against Clublogs API // Live lookup against Clublogs API
$url = "https://secure.clublog.org/dxcc?call=".$clean_callsign."&api=a11c3235cd74b88212ce726857056939d52372bd&full=1"; $url = "https://clublog.org/dxcc?call=".$clean_callsign."&api=a11c3235cd74b88212ce726857056939d52372bd&full=1";
$json = file_get_contents($url); $json = file_get_contents($url);
$data = json_decode($json, TRUE); $data = json_decode($json, TRUE);

4
application/controllers/Update.php
查看文件

@ -148,7 +148,7 @@ class Update extends CI_Controller {
return $count; return $count;
} }
// Updates the DXCC & Exceptions from the Clublog Cty.xml file. // Updates the DXCC & Exceptions from the Club Log Cty.xml file.
public function dxcc() { public function dxcc() {
$this->update_status("Downloading file"); $this->update_status("Downloading file");
@ -161,7 +161,7 @@ class Update extends CI_Controller {
$this->migration->latest(); $this->migration->latest();
// Download latest file. // Download latest file.
$url = "https://secure.clublog.org/cty.php?api=a11c3235cd74b88212ce726857056939d52372bd"; $url = "https://cdn.clublog.org/cty.php?api=a11c3235cd74b88212ce726857056939d52372bd";
$gz = gzopen($url, 'r'); $gz = gzopen($url, 'r');
$data = ""; $data = "";

6
application/views/user/edit.php
查看文件

@ -122,15 +122,15 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Clublog Email/Callsign</label> <label>Club Log Email/Callsign</label>
<input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" /> <input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" />
<div class="small">This is the Email or Callsign you use to login to Clublog</div></td> <div class="small">This is the Email or Callsign you use to login to Club Log</div></td>
<?php if(isset($userclublogname_error)) { echo "<div class=\"small error\">".$userclublogname_error."</div>"; } ?> <?php if(isset($userclublogname_error)) { echo "<div class=\"small error\">".$userclublogname_error."</div>"; } ?>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Clublog Password</label> <label>Club Log Password</label>
<input class="form-control" type="password" name="user_clublog_password" /> <input class="form-control" type="password" name="user_clublog_password" />
<?php if(isset($clublogpassword_error)) { echo "<div class=\"small error\">".$clublogpassword_error."</div>"; } else { ?> <?php if(isset($clublogpassword_error)) { echo "<div class=\"small error\">".$clublogpassword_error."</div>"; } else { ?>
<div class="small">Leave blank to keep existing password</div></td> <div class="small">Leave blank to keep existing password</div></td>