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

Revert "Merge pull request #369 from g7vjr/master" 

This reverts commit 1beb0613d6, reversing
changes made to 51419ad9e0.
pull/372/head
Peter Goodhall 2019-10-11 13:58:43 +01:00
rodzic 1beb0613d6
commit 576442a5cb
2 zmienionych plików z 6 dodań i 59 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

28
application/controllers/Lookup.php
Wyświetl plik

@ -33,7 +33,7 @@ class Lookup extends CI_Controller {
echo $log_calls ." ";
}
$arCalls = array();
// SCP results from master scp db
$file = 'updates/masterscp.txt';
@ -46,30 +46,10 @@ class Lookup extends CI_Controller {
$result = preg_grep('~' . $input . '~', $lines, 0);
foreach ($result as &$value) {
$arCalls[] = $value;
echo " ".$value. " ";
}
}
// SCP from Club Log
$file = "updates/clublog_scp.txt";
if (is_readable($file)) {
$lines = file($file, FILE_IGNORE_NEW_LINES);
foreach ($lines as $strCall)
{
if (in_array($strCall, $arCalls) == false)
{
$arCalls[] = $value;
}
}
}
sort($arCalls);
foreach ($arCalls as $strCall)
{
echo " " . $strCall . " ";
}
}
}

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

@ -148,40 +148,6 @@ class Update extends CI_Controller {
return $count;
}
public function update_clublog_scp() {
$strFile = "./updates/clublog_scp.txt";
$url = "https://cdn.clublog.org/clublog.scp.gz";
set_time_limit(300);
$this->update_status("Downloading Club Log SCP file");
$gz = gzopen($url, 'r');
if ($gz)
{
$data = "";
while (!gzeof($gz)) {
$data .= gzgetc($gz);
}
gzclose($gz);
file_put_contents($strFile, $data);
if (file_exists($strFile))
{
$nCount = count(file($strFile));
if ($nCount > 0)
{
$this->update_status("DONE: " . number_format($nCount) . " callsigns loaded" );
} else {
$this->update_status("FAILED: Empty file");
}
} else {
$this->update_status("FAILED: Could not create Club Log SCP file locally");
}
} else {
$this->update_status("FAILED: Could not connect to Club Log");
}
}
// Updates the DXCC & Exceptions from the Club Log Cty.xml file.
public function dxcc() {
$this->update_status("Downloading file");
@ -206,7 +172,7 @@ class Update extends CI_Controller {
file_put_contents('./updates/cty.xml', $data);
// Clear the tables, ready for new data
// Clear the tables, ready for new data
$this->db->empty_table("dxcc_entities");
$this->db->empty_table("dxcc_exceptions");
$this->db->empty_table("dxcc_prefixes");
@ -240,6 +206,7 @@ class Update extends CI_Controller {
file_put_contents('./updates/status.html', $html);
}
private function fix_migrations(){
$res = $this->db->query("select version from migrations");
if ($res->num_rows() >0){