mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

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

pull/372/head
Peter Goodhall 2019-10-08 21:11:19 +01:00
rodzic 2fe45434cc 34540ba7af
commit 39bd4c6fbc
3 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
application/controllers/Clublog.php
Wyświetl plik

@ -135,7 +135,7 @@ class Clublog extends CI_Controller {
function find_dxcc($callsign) {
$clean_callsign = $this->security->xss_clean($callsign);
// 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);
$data = json_decode($json, TRUE);
@ -145,4 +145,4 @@ class Clublog extends CI_Controller {
}
}
}

4
application/controllers/Update.php
Wyświetl plik

@ -148,7 +148,7 @@ class Update extends CI_Controller {
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() {
$this->update_status("Downloading file");
@ -161,7 +161,7 @@ class Update extends CI_Controller {
$this->migration->latest();
// 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');
$data = "";

6
application/views/user/edit.php
Wyświetl plik

@ -122,15 +122,15 @@
</div>
<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; } ?>" />
<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>"; } ?>
</div>
<div class="form-group">
<label>Clublog Password</label>
<label>Club Log Password</label>
<input class="form-control" type="password" name="user_clublog_password" />
<?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>