diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d8f4eb30d..000000000 --- a/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -/application/config/database.php -/application/config/config.php -/application/logs/*.php -/uploads/*.adi -/uploads/*.ADI -/uploads/*.tq8 -/uploads/*.TQ8 -/install/* -/updates/*.xml -/updates/*.html -/images/eqsl_card_images/*.jpg -/updates/clublog_scp.txt -/assets/qslcard/* -.idea/* -.DS_Store -sync.sh -*.p12 diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index f1e7b1b0d..9bf03a7a7 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -294,13 +294,13 @@ class QSO extends CI_Controller { if(!empty($this->input->get("query"))) { $query = isset($_GET['query']) ? $_GET['query'] : FALSE; - $sota = strtoupper($query); + $dok = strtoupper($query); $file = 'assets/json/dok.txt'; if (is_readable($file)) { $lines = file($file, FILE_IGNORE_NEW_LINES); - $input = preg_quote($sota, '~'); + $input = preg_quote($dok, '~'); $reg = '~^'. $input .'(.*)$~'; $result = preg_grep($reg, $lines); $json = []; diff --git a/application/controllers/Update.php b/application/controllers/Update.php index 2c640c940..fca57ffc3 100644 --- a/application/controllers/Update.php +++ b/application/controllers/Update.php @@ -293,7 +293,7 @@ class Update extends CI_Controller { * Used for autoupdating the DOK file which is used in the QSO entry dialog for autocompletion. */ public function update_dok() { - $contents = file_get_contents('https://www.df2et.de/cqrlog/dok.txt', true); + $contents = file_get_contents('https://www.df2et.de/cqrlog/dok_and_sdok.txt', true); if($contents === FALSE) { echo "Something went wrong with fetching the DOK file."; @@ -307,7 +307,7 @@ class Update extends CI_Controller { $nCount = count(file($file)); if ($nCount > 0) { - echo "DONE: " . number_format($nCount) . " DOK's saved"; + echo "DONE: " . number_format($nCount) . " DOKs and SDOKs saved"; } else { echo"FAILED: Empty file"; } diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 2b23c7d0e..67f233d20 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -404,7 +404,7 @@ $( document ).ready(function() { options: [], create: false, load: function(query, callback) { - if (!query) return callback(); // Only trigger if 3 or more characters are entered + if (!query) return callback(); // Only trigger if at least 1 character is entered $.ajax({ url: baseURL+'index.php/qso/get_dok', type: 'GET',