From 576442a5cbc4ecf211596a729d43f5763162af4f Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Fri, 11 Oct 2019 13:58:43 +0100
Subject: [PATCH] Revert "Merge pull request #369 from g7vjr/master"

This reverts commit 1beb0613d6bb922a2b7abe7b7f4cdcc6acce7e1e, reversing
changes made to 51419ad9e0500fbece74816b4003a333395cd1f1.
---
 application/controllers/Lookup.php | 28 ++++------------------
 application/controllers/Update.php | 37 ++----------------------------
 2 files changed, 6 insertions(+), 59 deletions(-)

diff --git a/application/controllers/Lookup.php b/application/controllers/Lookup.php
index 3b18f33c..03e54c9e 100644
--- a/application/controllers/Lookup.php
+++ b/application/controllers/Lookup.php
@@ -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 . " ";
-		}
+		
 	}
+
 }
diff --git a/application/controllers/Update.php b/application/controllers/Update.php
index f833ec3b..fde06ac2 100644
--- a/application/controllers/Update.php
+++ b/application/controllers/Update.php
@@ -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){