From 469015fff2b4e560282f41cee925007d4041615e Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Fri, 27 Sep 2019 22:03:13 +0200
Subject: [PATCH 1/8] #368: remove depreciated cache location update script
 from util.sec

---
 .../cache_locations/cache_location.class.php  | 140 ------------------
 1 file changed, 140 deletions(-)
 delete mode 100644 util.sec/cache_locations/cache_location.class.php

diff --git a/util.sec/cache_locations/cache_location.class.php b/util.sec/cache_locations/cache_location.class.php
deleted file mode 100644
index 07e368728f..0000000000
--- a/util.sec/cache_locations/cache_location.class.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * This script sets cache location based on "nuts" data tables
- */
-
-use src\Utils\Database\XDb;
-use src\Utils\Gis\Gis;
-use src\Utils\I18n\I18n;
-use src\Utils\Debug\Debug;
-
-/*
- *
- * Cleanup the table sys_temptables from entries of dead threads
- *
- * sql_dropTrigger('cacheLocationBeforeInsert');
- * sql("CREATE TRIGGER `cacheLocationBeforeInsert` BEFORE INSERT ON `cache_location`
- * FOR EACH ROW
- * BEGIN
- * SET NEW.`last_modified`=NOW();
- * END;");
- *
- * sql_dropTrigger('cacheLocationBeforeUpdate');
- * sql("CREATE TRIGGER `cacheLocationBeforeUpdate` BEFORE UPDATE ON `cache_location`
- * FOR EACH ROW
- * BEGIN
- * SET NEW.`last_modified`=NOW();
- * END;");
- *
- * run it once a day
- *
- */
-require_once (__DIR__.'/../../lib/common.inc.php');
-
-// select caches which don't have cache_location record
-// OR modification time is later cache location mod.time
-$rsCache = XDb::xSql(
-    "SELECT `caches`.`cache_id`, `caches`.`latitude`, `caches`.`longitude`
-    FROM `caches`
-        LEFT JOIN `cache_location` ON `caches`.`cache_id`=`cache_location`.`cache_id`
-    WHERE ISNULL(`cache_location`.`cache_id`)
-    UNION
-    SELECT `caches`.`cache_id`, `caches`.`latitude`, `caches`.`longitude`
-    FROM `caches`
-        INNER JOIN `cache_location` ON `caches`.`cache_id`=`cache_location`.`cache_id`
-    WHERE `caches`.`country`!='PL'
-        AND `caches`.`last_modified`>`cache_location`.`last_modified`");
-
-while ($rCache = XDb::xFetchArray($rsCache)) {
-    $sCode = '';
-
-    $rsLayers = XDb::xSql(
-        "SELECT `level`, `code`, AsText(`shape`) AS `geometry` FROM `nuts_layer`
-        WHERE ST_WITHIN(GeomFromText( ? ), `shape`)
-        ORDER BY `level` DESC", 'POINT(' . $rCache['longitude'] . ' ' . $rCache['latitude'] . ')');
-
-    while ($rLayers = XDb::xFetchArray($rsLayers)) {
-
-        if ( Gis::ptInLineRing(
-                $rLayers['geometry'],
-                'POINT(' . $rCache['longitude'] . ' ' . $rCache['latitude'] . ')') ) {
-            $sCode = $rLayers['code'];
-            break;
-        }
-    }
-    XDb::xFreeResults($rsLayers);
-
-    if ($sCode != '') {
-        $adm1 = null;
-        $code1 = null;
-        $adm2 = null;
-        $code2 = null;
-        $adm3 = null;
-        $code3 = null;
-        $adm4 = null;
-        $code4 = null;
-
-        if (mb_strlen($sCode) > 5)
-            $sCode = mb_substr($sCode, 0, 5);
-
-        if (mb_strlen($sCode) == 5) {
-            $code4 = $sCode;
-            $adm4 = XDb::xSimpleQueryValue(
-                "SELECT `name` FROM `nuts_codes` WHERE `code`='$sCode'", 0);
-            $sCode = mb_substr($sCode, 0, 4);
-        }
-
-        if (mb_strlen($sCode) == 4) {
-            $code3 = $sCode;
-            $adm3 = XDb::xSimpleQueryValue(
-                "SELECT `name` FROM `nuts_codes` WHERE `code`='$sCode'", 0);
-            $sCode = mb_substr($sCode, 0, 3);
-        }
-
-        if (mb_strlen($sCode) == 3) {
-            $code2 = $sCode;
-            $adm2 = XDb::xSimpleQueryValue(
-                "SELECT `name` FROM `nuts_codes` WHERE `code`='$sCode'", 0);
-            $sCode = mb_substr($sCode, 0, 2);
-        }
-
-        if (mb_strlen($sCode) == 2) {
-            $code1 = $sCode;
-
-            if (I18n::isTranslationAvailable($sCode)){
-                $adm1 = tr($sCode);
-            } else {
-                Debug::errorLog("No country translation for: $sCode");
-                $adm1 = XDb::xSimpleQueryValue(
-                    "SELECT `name` FROM `nuts_codes` WHERE `code`='$sCode'", 0);
-            }
-        }
-
-        XDb::xSql(
-            "INSERT INTO `cache_location` (`cache_id`, `adm1`, `adm2`, `adm3`, `adm4`, `code1`, `code2`, `code3`, `code4`)
-            VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            ON DUPLICATE KEY UPDATE `adm1`= ?, `adm2`= ?, `adm3`= ?, `adm4`= ?,
-                                    `code1`= ?, `code2`= ?, `code3`= ?, `code4`= ?",
-            $rCache['cache_id'], $adm1, $adm2, $adm3, $adm4, $code1, $code2, $code3, $code4,
-            $adm1, $adm2, $adm3, $adm4, $code1, $code2, $code3, $code4);
-
-    } else {
-        $sCountry = XDb::xSimpleQueryValue(
-            "SELECT `countries`.`pl` FROM `caches`
-            INNER JOIN `countries` ON `caches`.`country`=`countries`.`short`
-            WHERE `caches`.`cache_id`='$rCache[cache_id]'", 0);
-
-        $sCode1 = XDb::xMultiVariableQueryValue(
-            "SELECT `caches`.`country` FROM `caches`
-            WHERE `caches`.`cache_id`=:1", null, $rCache['cache_id']);
-
-        XDb::xSql(
-            "INSERT INTO `cache_location` (`cache_id`, `adm1`, `code1`)
-            VALUES ( ?,  ?,  ?) ON DUPLICATE KEY UPDATE
-            `adm1`= ?, `adm2`=NULL, `adm3`=NULL, `adm4`=NULL, `code1`= ?,
-            `code2`=NULL, `code3`=NULL, `code4`=NULL",
-            $rCache['cache_id'], $sCountry, $sCode1, $sCountry, $sCode1);
-
-    }
-}
-XDb::xFreeResults($rsCache);

From 3b22155b1e7e3c811686d7e6ae0fc574249c3d72 Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Fri, 27 Sep 2019 22:44:56 +0200
Subject: [PATCH 2/8] #576: fix - waypoint coords are hidden for not logged
 users

---
 src/Views/viewcache/viewcache.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/viewcache/viewcache.tpl.php b/src/Views/viewcache/viewcache.tpl.php
index 3f9e953f44..ea1c212d65 100644
--- a/src/Views/viewcache/viewcache.tpl.php
+++ b/src/Views/viewcache/viewcache.tpl.php
@@ -632,7 +632,7 @@ function eventAttendancePopup() {
                         <?=tr($wp->getTypeTranslationKey())?>
                     </td>
                     <td>
-                            <?php if (!$wp->areCoordsHidden()) { ?>
+                            <?php if ($view->isUserAuthorized && !$wp->areCoordsHidden()) { ?>
 
                               <?=$wp->getCoordinates()->getLatitudeString()?><br><?=$wp->getCoordinates()->getLongitudeString()?>
 

From 00b3d3c154e89df4e714fb0d0dc60c46e3e88e62 Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Sat, 28 Sep 2019 11:30:37 +0200
Subject: [PATCH 3/8] #1514: config files for prima aprilis settings

---
 config/primaAprilis.default.php               |  28 +++++++
 getLogEntries.php                             |   5 +-
 images/oc_logo_1A.png                         | Bin 4278 -> 0 bytes
 lib/settingsDefault.inc.php                   |   2 -
 .../PageLayout/MainLayoutController.php       |   7 +-
 src/Models/OcConfig/OcConfig.php              |   1 +
 src/Models/OcConfig/PrimaAprilisTrait.php     |  72 ++++++++++++++++++
 src/Utils/DateTime/Year.php                   |   6 ++
 viewlogs.php                                  |   7 +-
 viewprofile.php                               |   6 +-
 10 files changed, 120 insertions(+), 14 deletions(-)
 create mode 100644 config/primaAprilis.default.php
 delete mode 100644 images/oc_logo_1A.png
 create mode 100644 src/Models/OcConfig/PrimaAprilisTrait.php

diff --git a/config/primaAprilis.default.php b/config/primaAprilis.default.php
new file mode 100644
index 0000000000..45eac6c3ea
--- /dev/null
+++ b/config/primaAprilis.default.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * DEFAULT general site properties for ALL nodes
+ */
+
+$config = [];
+
+/**
+ * Completly disable all prima-aprilis activities
+ */
+$config['disableAllPrimaAprilisChanges'] = false;
+
+/**
+ * Enable "dance" of start page elements
+ */
+$config['danceEnabled'] = true;
+
+
+/**
+ * Enable randomization of user stats
+ */
+$config['randUserStats'] = true;
+
+/**
+ * Change username in user profile
+ */
+$config['fakeUserNameInProfile'] = true;
diff --git a/getLogEntries.php b/getLogEntries.php
index 07a12dbcdd..9995f20059 100644
--- a/getLogEntries.php
+++ b/getLogEntries.php
@@ -10,6 +10,7 @@
 use src\Models\GeoCache\GeoCache;
 use src\Models\OcConfig\OcConfig;
 use src\Models\Coordinates\Coordinates;
+use src\Utils\DateTime\Year;
 
 require_once (__DIR__.'/lib/common.inc.php');
 require(__DIR__.'/src/Views/lib/icons.inc.php');
@@ -164,8 +165,8 @@
     $dateTimeTmpArray = explode(' ', $record['date']);
     $tmplog = mb_ereg_replace('{time}', substr($dateTimeTmpArray[1], 0, -3), $tmplog);
 
-    // display user activity (by Łza 2012)
-    if ((date('m') == 4) and ( date('d') == 1)) {
+    // display user activity
+    if (Year::isPrimaAprilisToday() && OcConfig::isPAUserStatsRandEnabled()) {
         $tmplog_username_aktywnosc = ' (<img src="/images/blue/thunder_ico.png" alt="user activity" width="13" height="13" border="0" title="' . tr('viewlog_aktywnosc') . '"/>' . rand(1, 9) . ') ';
     } else {
         $tmplog_username_aktywnosc = ' (<img src="/images/blue/thunder_ico.png" alt="user activity" width="13" height="13" border="0" title="' . tr('viewlog_aktywnosc') . ' [' . $record['znalezione'] . '+' . $record['nieznalezione'] . '+' . $record['ukryte'] . ']"/>' . ($record['ukryte'] + $record['znalezione'] + $record['nieznalezione']) . ') ';
diff --git a/images/oc_logo_1A.png b/images/oc_logo_1A.png
deleted file mode 100644
index 7b8e1e13cf4a44ae3b30db268d75a4113dbd790c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4278
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
YFG6V(^soK+tN;K207*qoM6N<$f)iOuR{#J2

diff --git a/lib/settingsDefault.inc.php b/lib/settingsDefault.inc.php
index 6d0c9e8f37..3a2c869dd3 100644
--- a/lib/settingsDefault.inc.php
+++ b/lib/settingsDefault.inc.php
@@ -40,8 +40,6 @@
     'headerLogo' => 'oc_logo.png',
     /** main logo; winter version, displayed during december and january. */
     'headerLogoWinter' => 'oc_logo_winter.png',
-    /** main logo; prima aprilis version (april fools), displayed only on april 1st. */
-    'headerLogo1stApril' => 'oc_logo_1A.png',
     /** qrcode logo: show qrcode image and link the prefered way.  */
     'qrCodeLogo' => 'qrcode_bg.jpg',
     'qrCodeUrl' => 'https://opencaching.pl/viewcache.php?wp=OP3C90',
diff --git a/src/Controllers/PageLayout/MainLayoutController.php b/src/Controllers/PageLayout/MainLayoutController.php
index f6e6d73b64..c5bf5759b8 100644
--- a/src/Controllers/PageLayout/MainLayoutController.php
+++ b/src/Controllers/PageLayout/MainLayoutController.php
@@ -112,7 +112,7 @@ private function initMainLayout()
                 '/views/common/mainLayout.css'));
         }
 
-        if (Year::isPrimaAprilisToday()) {
+        if (Year::isPrimaAprilisToday() && OcConfig::isPADanceEnabled()) {
             // add rythm JS
             $this->view->addLocalJs(
                 Uri::getLinkWithModificationTime(
@@ -124,15 +124,14 @@ private function initMainLayout()
 
             $this->view->addLocalJs(Uri::getLinkWithModificationTime(
                 '/vendor/js-cookie/js-cookie/src/js.cookie.js'));
-
         }
 
-        if (Year::isPrimaAprilisToday()) {
+        if (Year::isPrimaAprilisToday() && OcConfig::isPADanceEnabled()) {
             $this->view->loadJQuery();
             $logo = $config['headerLogo'];
             $logoTitle = 'discoCaching';
             $logoSubtitle = 'The first discoCaching site!';
-        } else if (date('m') == 12 || date('m') == 1) {
+        } else if (Year::isChristmassTime()) {
             $logo = $config['headerLogoWinter'];
             $logoTitle = tr('oc_on_all_pages_top_' . $config['ocNode']);
             $logoSubtitle = tr('oc_subtitle_on_all_pages_' . $config['ocNode']);
diff --git a/src/Models/OcConfig/OcConfig.php b/src/Models/OcConfig/OcConfig.php
index 4efcd3f35d..da461eec01 100644
--- a/src/Models/OcConfig/OcConfig.php
+++ b/src/Models/OcConfig/OcConfig.php
@@ -5,6 +5,7 @@
 final class OcConfig extends ConfigReader
 {
     use EmailConfigTrait, SiteConfigTrait, I18nConfigTrait, PicturesConfigTrait, MapConfigTrait;
+    use PrimaAprilisTrait;
 
 /*
     const OCNODE_GERMANY    = 1;  // Opencaching Germany http://www.opencaching.de OC
diff --git a/src/Models/OcConfig/PrimaAprilisTrait.php b/src/Models/OcConfig/PrimaAprilisTrait.php
new file mode 100644
index 0000000000..b615827f07
--- /dev/null
+++ b/src/Models/OcConfig/PrimaAprilisTrait.php
@@ -0,0 +1,72 @@
+<?php
+namespace src\Models\OcConfig;
+
+/**
+ * This trait group access to email settings stored in /config/primaAprilis.* conf. files
+ * BEWARE OF FUNCTIONS NAME COLLISION BETWEEN CONFIG TRAITS!
+ */
+trait PrimaAprilisTrait {
+
+    protected $primaAprilisConfig = null;
+
+    private static function isPAEnabled()
+    {
+        return !self::getPAVar('disableAllPrimaAprilisChanges');
+    }
+
+    /**
+     * Returns TRUE if dane shoudl be activated
+     * @return string
+     */
+    public static function isPADanceEnabled()
+    {
+        return self::isPAEnabled() && self::getPAVar('danceEnabled');
+    }
+
+    /**
+     * Returns TRUE if dane shoudl be activated
+     * @return string
+     */
+    public static function isPAUserStatsRandEnabled()
+    {
+        return self::isPAEnabled() && self::getPAVar('randUserStats');
+    }
+
+    /**
+     * Returns TRUE if dane shoudl be activated
+     * @return string
+     */
+    public static function isPAFakeUserNameEnabled()
+    {
+        return self::isPAEnabled() && self::getPAVar('fakeUserNameInProfile');
+    }
+
+    /**
+     * Returns site properties
+     *
+     * @return array site properties
+     */
+    protected function getPAConfig()
+    {
+        if (!$this->primaAprilisConfig) {
+            $this->primaAprilisConfig = self::getConfig("primaAprilis", "config");
+        }
+        return $this->primaAprilisConfig;
+    }
+
+    /**
+     * Get Var from site.* files
+     *
+     * @param string $varName
+     * @throws \Exception
+     * @return string|array
+     */
+    private static function getPAVar($varName)
+    {
+        $config = self::instance()->getPAConfig();
+        if (!is_array($config)) {
+            throw new \Exception("Invalid $varName setting: see /config/primaAprilis.*");
+        }
+        return $config[$varName];
+    }
+}
diff --git a/src/Utils/DateTime/Year.php b/src/Utils/DateTime/Year.php
index 5896b8e930..5ccdaedfe4 100644
--- a/src/Utils/DateTime/Year.php
+++ b/src/Utils/DateTime/Year.php
@@ -23,4 +23,10 @@ public static function current()
     {
         return date("Y");
     }
+
+    public static function isChristmassTime()
+    {
+        $month = date('m');
+        return ($month == 12 || $month == 1);
+    }
 }
diff --git a/viewlogs.php b/viewlogs.php
index cc697e1246..4101333f25 100644
--- a/viewlogs.php
+++ b/viewlogs.php
@@ -10,6 +10,7 @@
 use src\Utils\Text\UserInputFilter;
 use src\Models\OcConfig\OcConfig;
 use src\Models\Coordinates\Coordinates;
+use src\Utils\DateTime\Year;
 
 require_once (__DIR__.'/lib/common.inc.php');
 
@@ -303,8 +304,8 @@
             $dateTimeTmpArray = explode(' ', $record['date']);
             $tmplog = mb_ereg_replace('{time}', substr($dateTimeTmpArray[1], 0, -3), $tmplog);
 
-            // display user activity (by Łza 2012)
-            if ((date('m') == 4) and ( date('d') == 1)) {
+            // display user activity
+            if (Year::isPrimaAprilisToday() && OcConfig::isPAUserStatsRandEnabled()) {
                 $tmplog_username_aktywnosc = ' (<img src="/images/blue/thunder_ico.png" alt="user activity" width="13" height="13" border="0" title="' . tr('viewlog_aktywnosc') . '"/>' . rand(1, 9) . ') ';
             } else {
                 $tmplog_username_aktywnosc = ' (<img src="/images/blue/thunder_ico.png" alt="user activity" width="13" height="13" border="0" title="' . tr('viewlog_aktywnosc') . ' [' . $record['znalezione'] . '+' . $record['nieznalezione'] . '+' . $record['ukryte'] . ']"/>' . ($record['ukryte'] + $record['znalezione'] + $record['nieznalezione']) . ') ';
@@ -319,7 +320,7 @@
 
             $tmplog = mb_ereg_replace('{username_aktywnosc}', $tmplog_username_aktywnosc, $tmplog);
 
-            // mobile caches by Łza
+            // mobile caches
             if (($record['type'] == 4) && ($record['mobile_latitude'] != 0) && ! $disable_spoiler_view) {
                 $tmplog_kordy_mobilnej = mb_ereg_replace(" ", "&nbsp;", htmlspecialchars(Coordinates::donNotUse_latToDegreeStr($record['mobile_latitude']), ENT_COMPAT, 'UTF-8')) . '&nbsp;' . mb_ereg_replace(" ", "&nbsp;", htmlspecialchars(Coordinates::donNotUse_lonToDegreeStr($record['mobile_longitude']), ENT_COMPAT, 'UTF-8'));
                 $tmplog = mb_ereg_replace('{kordy_mobilniaka}', $record['km'] . ' km [<img src="/images/blue/arrow_mobile.png" title="' . tr('viewlog_kordy') . '" />' . $tmplog_kordy_mobilnej . ']', $tmplog);
diff --git a/viewprofile.php b/viewprofile.php
index f61c929f00..468e2baeab 100644
--- a/viewprofile.php
+++ b/viewprofile.php
@@ -97,7 +97,7 @@
 StopWatch::click(__LINE__);
 
 tpl_set_var('username', htmlspecialchars($user->getUserName()));
-if ((date('m') == 4) and ( date('d') == 1)) {
+if (Year::isPrimaAprilisToday() && OcConfig::isPAFakeUserNameEnabled()) {
     tpl_set_var('username', tr('primaAprilis1'));
 }
 tpl_set_var('registered', Formatter::date($user->getDateCreated()));
@@ -211,7 +211,7 @@
     $content .= '<a href="' . SimpleRouter::getLink('Admin.UserAdmin', 'index', $user_id) . '" class="btn btn-default btn-sm">' . tr('more') . '</a>';
 }
 
-if (Year::isPrimaAprilisToday()) {
+if (Year::isPrimaAprilisToday() && OcConfig::isPAUserStatsRandEnabled()) {
     $act = rand(-10, 10);
 } else {
     $act = $user->getFoundGeocachesCount() + $user->getNotFoundGeocachesCount() + $user->getHiddenGeocachesCount();
@@ -327,7 +327,7 @@
     }
 
 
-    if (Year::isPrimaAprilisToday()) {
+    if (Year::isPrimaAprilisToday() && OcConfig::isPAUserStatsRandEnabled()) {
         $found = rand(-10, 10);
         $userNotFounds = rand(666, 9999);
     }

From 7d6837ef771a6d49f7f1020e85ef9262d846a95b Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Sat, 28 Sep 2019 21:56:12 +0200
Subject: [PATCH 4/8] forbiddenCacheTypes moved to /config

---
 config/geocache.default.php                 |  9 +++-
 config/geocache.nl.php                      |  1 +
 config/geocache.pl.php                      | 13 +++++
 config/geocache.ro.php                      | 10 +++-
 config/geocache.uk.php                      | 13 +++++
 editcache.php                               |  4 +-
 lib/settingsDefault.inc.php                 | 10 ----
 newcache.php                                |  6 +--
 src/Models/OcConfig/GeocacheConfigTrait.php | 58 +++++++++++++++++++++
 src/Models/OcConfig/OcConfig.php            | 18 +------
 src/Models/OcConfig/PrimaAprilisTrait.php   |  2 +-
 11 files changed, 109 insertions(+), 35 deletions(-)
 create mode 100644 config/geocache.pl.php
 create mode 100644 config/geocache.uk.php
 create mode 100644 src/Models/OcConfig/GeocacheConfigTrait.php

diff --git a/config/geocache.default.php b/config/geocache.default.php
index c1ff3ce536..f00b3bf909 100644
--- a/config/geocache.default.php
+++ b/config/geocache.default.php
@@ -16,7 +16,7 @@
  *
  * (All other size-related features will automatically adjust to the sizes
  * which are in use for existing caches.)
- * 
+ *
  * The order does not matter.
  */
 $geocache['enabledSizes'] = [
@@ -27,3 +27,10 @@
     GeoCacheCommons::SIZE_XLARGE,
     GeoCacheCommons::SIZE_NONE,
 ];
+
+/**
+ * Types of geocache which are forbidden on creation (it is possible thatsuch geocaches are still in DB,
+ * but no NEW caches of this can be created
+ */
+$geocache['noNewCachesOfTypes'] = [];
+
diff --git a/config/geocache.nl.php b/config/geocache.nl.php
index a6c78b1781..fc45dddab1 100644
--- a/config/geocache.nl.php
+++ b/config/geocache.nl.php
@@ -7,3 +7,4 @@
  */
 
 $geocache['enabledSizes'][] = GeoCacheCommons::SIZE_NANO;
+
diff --git a/config/geocache.pl.php b/config/geocache.pl.php
new file mode 100644
index 0000000000..0a067def09
--- /dev/null
+++ b/config/geocache.pl.php
@@ -0,0 +1,13 @@
+<?php
+
+use src\Models\GeoCache\GeoCacheCommons;
+
+/**
+  * Configuration of geocache properties for OCPL
+ */
+
+/**
+ * Types of geocache which are forbidden on creation (it is possible thatsuch geocaches are still in DB,
+ * but no NEW caches of this can be created
+ */
+$geocache['noNewCachesOfTypes'][] = GeoCacheCommons::TYPE_MOVING;
\ No newline at end of file
diff --git a/config/geocache.ro.php b/config/geocache.ro.php
index cd46deb70b..84b919d4de 100644
--- a/config/geocache.ro.php
+++ b/config/geocache.ro.php
@@ -3,8 +3,16 @@
 use src\Models\GeoCache\GeoCacheCommons;
 
 /**
-  * Configuration of geocache properties for OC RO
+ * Configuration of geocache properties for OC RO
  */
 
 $geocache['enabledSizes'][] = GeoCacheCommons::SIZE_NANO;
 $geocache['enabledSizes'][] = GeoCacheCommons::SIZE_OTHER;
+
+
+
+/**
+ * Types of geocache which are forbidden on creation (it is possible thatsuch geocaches are still in DB,
+ * but no NEW caches of this can be created
+ */
+$geocache['noNewCachesOfTypes'][] = GeoCacheCommons::TYPE_GEOPATHFINAL;
\ No newline at end of file
diff --git a/config/geocache.uk.php b/config/geocache.uk.php
new file mode 100644
index 0000000000..f2c5bf7005
--- /dev/null
+++ b/config/geocache.uk.php
@@ -0,0 +1,13 @@
+<?php
+
+use src\Models\GeoCache\GeoCacheCommons;
+
+/**
+ * Configuration of geocache properties for OCUK
+ */
+
+/**
+ * Types of geocache which are forbidden on creation (it is possible thatsuch geocaches are still in DB,
+ * but no NEW caches of this can be created
+ */
+$geocache['noNewCachesOfTypes'][] = GeoCacheCommons::TYPE_GEOPATHFINAL;
diff --git a/editcache.php b/editcache.php
index 9de668952f..4c0b3b757c 100644
--- a/editcache.php
+++ b/editcache.php
@@ -742,7 +742,7 @@ function build_drop_seq($item_row, $selected_seq, $max_drop, $thisid, $drop_type
                 foreach (get_cache_types_from_database() as $type) {
 
                     // blockforbidden cache types
-                    if (($type['id'] != $cache_type) && in_array($type['id'], $config['forbidenCacheTypes']) && !$usr['admin']) {
+                    if (($type['id'] != $cache_type) && in_array($type['id'], OcConfig::getNoNewCacheOfTypesArray()) && !$usr['admin']) {
                         continue;
                     }
                     if (isset($config['cacheLimitByTypePerUser'][$cache_type]) && $cacheLimitByTypePerUser[$cache_type] >= $config['cacheLimitByTypePerUser'][$cache_type] && !$usr['admin']) {
@@ -766,7 +766,7 @@ function build_drop_seq($item_row, $selected_seq, $max_drop, $thisid, $drop_type
 
                     // blockforbidden cache sizes
                     if ($size != $sel_size
-                        && !in_array($size, OcConfig::instance()->getGeocacheConfig('enabledSizes'))
+                        && !in_array($size, OcConfig::getEnabledCacheSizesArray())
                     ) {
                         continue;
                     }
diff --git a/lib/settingsDefault.inc.php b/lib/settingsDefault.inc.php
index 3a2c869dd3..377da61af8 100644
--- a/lib/settingsDefault.inc.php
+++ b/lib/settingsDefault.inc.php
@@ -63,16 +63,6 @@
      * another site.
      */
     'otherSites_minfinds' => 100,
-    /**
-     * not allowed cache types (user cannot create caches of this types).
-     *
-     * Cachetypes must be lib/cache.php constant TYPE_*
-     */
-    'forbidenCacheTypes' => array(
-        cache::TYPE_VIRTUAL,
-        cache::TYPE_WEBCAM,
-        cache::TYPE_GEOPATHFINAL
-    ),
     /**
      * cache limits for user. If user is allowed to place limited nomber of specified cache type,
      * place cachetype and limit here.
diff --git a/newcache.php b/newcache.php
index d67541ac91..04a3b04616 100644
--- a/newcache.php
+++ b/newcache.php
@@ -323,7 +323,7 @@
 $types = '<option value="-1" disabled selected="selected">' . tr('select_one') . '</option>';
 foreach ($cacheTypes as $typeId => $type) {
     /* block creating forbidden cache types */
-    if (in_array($typeId, $config['forbidenCacheTypes'])) {
+    if (in_array($typeId, OcConfig::getNoNewCacheOfTypesArray())) {
         continue;
     }
     /* apply cache limit by type per user */
@@ -607,7 +607,7 @@
     // cache-type
     $type_not_ok = false;
     // block forbiden cache types
-    if ($sel_type == - 1 || in_array($sel_type, $config['forbidenCacheTypes'])) {
+    if ($sel_type == - 1 || in_array($sel_type, OcConfig::getNoNewCacheOfTypesArray())) {
         tpl_set_var('type_message', $type_not_ok_message);
         $error = true;
         $type_not_ok = true;
@@ -773,7 +773,7 @@ function buildCacheSizeSelector($sel_type, $sel_size)
     $sizes = '<option value="-1" disabled selected="selected">' . tr('select_one') . '</option>';
     foreach (GeoCacheCommons::CacheSizesArray() as $size) {
 
-        if (!in_array($size, OcConfig::instance()->getGeoCacheConfig('enabledSizes'))) {
+        if (!in_array($size, OcConfig::getEnabledCacheSizesArray())) {
             continue;
         }
 
diff --git a/src/Models/OcConfig/GeocacheConfigTrait.php b/src/Models/OcConfig/GeocacheConfigTrait.php
new file mode 100644
index 0000000000..b24ce9084f
--- /dev/null
+++ b/src/Models/OcConfig/GeocacheConfigTrait.php
@@ -0,0 +1,58 @@
+<?php
+namespace src\Models\OcConfig;
+
+/**
+ * This trait group access to email settings stored in /config/geocache.* conf. files
+ * BEWARE OF FUNCTIONS NAME COLLISION BETWEEN CONFIG TRAITS!
+ */
+trait GeocacheConfigTrait {
+
+    protected $geocacheConfig = null;
+
+    /**
+     * Returns array of types enabled on this OC node
+     * @return array
+     */
+    public static function getEnabledCacheSizesArray()
+    {
+        return self::getGeocacheConfigVar('enabledSizes');
+    }
+
+    /**
+     * Returns array of types which can't be created on this OC node (former forbiddenTypes)
+     * @return array
+     */
+    public static function getNoNewCacheOfTypesArray()
+    {
+        return self::getGeocacheConfigVar('noNewCachesOfTypes');
+    }
+
+    /**
+     * Returns site properties
+     *
+     * @return array site properties
+     */
+    protected function getGeocacheConfig()
+    {
+        if (!$this->geocacheConfig) {
+            $this->geocacheConfig = self::getConfig("geocache", "geocache");
+        }
+        return $this->geocacheConfig;
+    }
+
+    /**
+     * Get Var from geocache.* files
+     *
+     * @param string $varName
+     * @throws \Exception
+     * @return string|array
+     */
+    private static function getGeocacheConfigVar($varName)
+    {
+        $config = self::instance()->getGeocacheConfig();
+        if (!is_array($config)) {
+            throw new \Exception("Invalid $varName setting: see /config/geocache.*");
+        }
+        return $config[$varName];
+    }
+}
diff --git a/src/Models/OcConfig/OcConfig.php b/src/Models/OcConfig/OcConfig.php
index da461eec01..4c91cb13a7 100644
--- a/src/Models/OcConfig/OcConfig.php
+++ b/src/Models/OcConfig/OcConfig.php
@@ -5,7 +5,7 @@
 final class OcConfig extends ConfigReader
 {
     use EmailConfigTrait, SiteConfigTrait, I18nConfigTrait, PicturesConfigTrait, MapConfigTrait;
-    use PrimaAprilisTrait;
+    use PrimaAprilisTrait, GeocacheConfigTrait;
 
 /*
     const OCNODE_GERMANY    = 1;  // Opencaching Germany http://www.opencaching.de OC
@@ -51,9 +51,6 @@ final class OcConfig extends ConfigReader
     /** @var array the \src\Utils\Lock objects configuration array */
     private $lockConfig;
 
-    /** @var array the watchlist configuration array */
-    private $geoCacheConfig;
-
     /** @var array the watchlist configuration array */
     private $watchlistConfig;
 
@@ -289,19 +286,6 @@ public function getLockConfig()
         return $this->lockConfig;
     }
 
-
-    public function getGeoCacheConfig($setting = null)
-    {
-        if ($this->geoCacheConfig == null) {
-            $this->geoCacheConfig = self::getConfig("geocache", "geocache");
-        }
-        if ($setting !== null) {
-            return $this->geoCacheConfig[$setting];
-        } else {
-            return $this->geoCacheConfig;
-        }
-    }
-
     /**
      * Gives watchlist configuration, tries to initialize it if null
      *
diff --git a/src/Models/OcConfig/PrimaAprilisTrait.php b/src/Models/OcConfig/PrimaAprilisTrait.php
index b615827f07..e9faa7bafb 100644
--- a/src/Models/OcConfig/PrimaAprilisTrait.php
+++ b/src/Models/OcConfig/PrimaAprilisTrait.php
@@ -55,7 +55,7 @@ protected function getPAConfig()
     }
 
     /**
-     * Get Var from site.* files
+     * Get Var from geocache.* files
      *
      * @param string $varName
      * @throws \Exception

From 4e23e6f3113eb9a64cf460127dff3c7186223d98 Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Sun, 29 Sep 2019 00:31:23 +0200
Subject: [PATCH 5/8] removing depreciated caches.inc.php from the code

---
 cacheratings.php                           |   1 -
 editcache.php                              |  23 +++--
 editlog.php                                |  97 +++++++++++++-----
 editwp.php                                 |  10 +-
 lib/caches.inc.php                         |  54 ----------
 lib/languages/en.php                       |   6 --
 lib/search.html.inc.php                    |   3 +-
 log.php                                    | 112 ++++++++++++---------
 log_cache_multi.php                        |   1 -
 log_cache_multi_panel.php                  |  30 ++----
 my_logs.php                                |   4 +-
 myroutes_search.php                        |   1 -
 newcache.php                               |   1 -
 newcaches.php                              |   4 +-
 newwp.php                                  |  17 ++--
 search.php                                 |   1 -
 src/Models/GeoCache/GeoCacheLogCommons.php |   2 +-
 src/Models/GeoCache/Waypoint.php           |  24 +----
 src/Models/GeoCache/WaypointCommons.php    |  64 ++++++++++++
 src/Views/log_cache_multi.tpl.php          |  30 ++----
 20 files changed, 255 insertions(+), 230 deletions(-)
 delete mode 100644 lib/caches.inc.php
 create mode 100644 src/Models/GeoCache/WaypointCommons.php

diff --git a/cacheratings.php b/cacheratings.php
index 5b89217548..cfce4cd043 100644
--- a/cacheratings.php
+++ b/cacheratings.php
@@ -4,7 +4,6 @@
 
 //prepare the templates and include all necessary
 require_once(__DIR__.'/lib/common.inc.php');
-require_once(__DIR__.'/lib/caches.inc.php');
 require_once(__DIR__.'/src/Views/lib/icons.inc.php');
 
 global $usr;
diff --git a/editcache.php b/editcache.php
index 4c0b3b757c..ebd97c90b4 100644
--- a/editcache.php
+++ b/editcache.php
@@ -14,6 +14,7 @@
 use src\Utils\Gis\Countries;
 use src\Utils\Uri\SimpleRouter;
 use src\Controllers\PictureController;
+use src\Models\GeoCache\GeoCacheCommons;
 
 require_once(__DIR__.'/lib/common.inc.php');
 
@@ -84,7 +85,6 @@ function build_drop_seq($item_row, $selected_seq, $max_drop, $thisid, $drop_type
         if ($cache_record = $dbc->dbResultFetch($s)) {
 
             if ($cache_record['user_id'] == $usr['userid'] || $usr['admin']) {
-                require_once(__DIR__.'/lib/caches.inc.php');
 
                 // from deleted editcache.inc.php:
                 $submit = 'Zapisz';
@@ -739,23 +739,30 @@ function build_drop_seq($item_row, $selected_seq, $max_drop, $thisid, $drop_type
 
                 //build typeoptions
                 $types = '';
-                foreach (get_cache_types_from_database() as $type) {
+                foreach (GeoCacheCommons::CacheTypesArray() as $type) {
 
                     // blockforbidden cache types
-                    if (($type['id'] != $cache_type) && in_array($type['id'], OcConfig::getNoNewCacheOfTypesArray()) && !$usr['admin']) {
+                    if (($type != $cache_type) && in_array($type, OcConfig::getNoNewCacheOfTypesArray()) && !$usr['admin']) {
                         continue;
                     }
-                    if (isset($config['cacheLimitByTypePerUser'][$cache_type]) && $cacheLimitByTypePerUser[$cache_type] >= $config['cacheLimitByTypePerUser'][$cache_type] && !$usr['admin']) {
+                    if (isset($config['cacheLimitByTypePerUser'][$cache_type]) &&
+                        $cacheLimitByTypePerUser[$cache_type] >= $config['cacheLimitByTypePerUser'][$cache_type] &&
+                        !$usr['admin']) {
                         continue;
                     }
-                    if (isset($cacheLimitByTypePerUser[$type['id']]) && isset($config['cacheLimitByTypePerUser'][$type['id']]) && $cacheLimitByTypePerUser[$type['id']] >= $config['cacheLimitByTypePerUser'][$type['id']] && !$usr['admin']) {
+                    if (isset($cacheLimitByTypePerUser[$type]) &&
+                        isset($config['cacheLimitByTypePerUser'][$type]) &&
+                        $cacheLimitByTypePerUser[$type] >= $config['cacheLimitByTypePerUser'][$type] &&
+                        !$usr['admin']) {
                         continue;
                     }
 
-                    if ($type['id'] == $cache_type) {
-                        $types .= '<option value="' . $type['id'] . '" selected="selected">' . htmlspecialchars($type[I18n::getCurrentLang()], ENT_COMPAT, 'UTF-8') . '</option>';
+                    if ($type == $cache_type) {
+                        $types .= '<option value="' . $type . '" selected="selected">' .
+                            htmlspecialchars( tr(GeoCacheCommons::CacheTypeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>';
                     } else {
-                        $types .= '<option value="' . $type['id'] . '">' . htmlspecialchars($type[I18n::getCurrentLang()], ENT_COMPAT, 'UTF-8') . '</option>';
+                        $types .= '<option value="' . $type . '">' .
+                            htmlspecialchars( tr( GeoCacheCommons::CacheTypeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>';
                     }
                 }
                 tpl_set_var('typeoptions', $types);
diff --git a/editlog.php b/editlog.php
index 6809a423cf..e074455743 100644
--- a/editlog.php
+++ b/editlog.php
@@ -12,6 +12,8 @@
 use src\Models\GeoCache\MobileCacheMove;
 use src\Models\OcConfig\OcConfig;
 use src\Utils\I18n\I18n;
+use src\Models\GeoCache\GeoCacheLogCommons;
+use src\Models\GeoCache\GeoCache;
 +
 //prepare the templates and include all neccessary
 require_once(__DIR__.'/lib/common.inc.php');
@@ -44,7 +46,6 @@
         if ($log_record) {
 
             require(__DIR__.'/src/Views/editlog.inc.php');
-            require_once(__DIR__.'/lib/caches.inc.php');
             require(__DIR__.'/src/Views/rating.inc.php');
 
             if ($log_record['node'] != OcConfig::getSiteNodeId()) {
@@ -432,51 +433,93 @@
 
                 //build logtypeoptions
                 $logtypeoptions = '';
-                foreach (get_log_types_from_database() AS $type) {
-                    // skip if permission=O ???? and not owner or COG
-                    if ($type['permission'] == 'B' && $log_record['user_id'] != $cache_user_id && !($usr['admin']))
+                foreach (GeoCacheLogCommons::logTypesArray() as $type) {
+
+                    // skip types allowed only for cacheOwner (9,10,11)
+                    $allowedOnlyForOwner = [GeoCacheLogCommons::LOGTYPE_READYTOSEARCH,
+                                            GeoCacheLogCommons::LOGTYPE_ARCHIVED,
+                                            GeoCacheLogCommons::LOGTYPE_TEMPORARYUNAVAILABLE];
+                    if (in_array($type,$allowedOnlyForOwner) &&
+                        $log_record['user_id'] != $cache_user_id && !($usr['admin'])) {
                         continue;
+                    }
+
                     // Only COG can write or edit COG comment
-                    if ($type['id'] == 12 && !($usr['admin'])) {
+                    if ($type == GeoCacheLogCommons::LOGTYPE_ADMINNOTE && !($usr['admin'])) {
                         continue;
                     }
-                    if ($log_record['logtype'] != $type['id'] && $log_record['cachestatus'] != 1)
-                        continue;
-                    if ($log_record['logtype'] != $type['id'] && $log_record['cachestatus'] == 1 && $log_record['user_id'] == $cache_user_id && $type['id'] != 3 && $type['id'] != 6)
+
+                    // skip current type of log
+                    if ($log_record['logtype'] != $type && $log_record['cachestatus'] != GeoCacheCommons::STATUS_READY) {
                         continue;
+                    }
+
+                    if ($log_record['logtype'] != $type &&                                // not same as current type
+                        $log_record['cachestatus'] == GeoCacheCommons::STATUS_READY &&    // not ready-to-search
+                        $log_record['user_id'] == $cache_user_id &&                       // is owner
+                        $type != GeoCacheLogCommons::LOGTYPE_COMMENT &&
+                        $type != GeoCacheLogCommons::LOGTYPE_MADEMAINTENANCE) {
+
+                            continue;
+                    }
+
                     if ($already_found_in_other_comment) {
-                        if ($type['id'] == 1 || $type['id'] == 2 || $type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11) {
+                        if ($type == GeoCacheLogCommons::LOGTYPE_FOUNDIT        ||
+                            $type == GeoCacheLogCommons::LOGTYPE_DIDNOTFIND     ||
+                            $type == GeoCacheLogCommons::LOGTYPE_ATTENDED       ||
+                            $type == GeoCacheLogCommons::LOGTYPE_WILLATTENDED   ||
+                            $type == GeoCacheLogCommons::LOGTYPE_ARCHIVED       ||
+                            $type == GeoCacheLogCommons::LOGTYPE_READYTOSEARCH  ||
+                            $type == GeoCacheLogCommons::LOGTYPE_TEMPORARYUNAVAILABLE) {
                             continue;
                         }
                     }
-                    if ($cache_type == 6 || $cache_type == 8) {
-                        // Event cache
-                        if ($cache_type == 6) {
-                            if ($type['id'] == 1 || $type['id'] == 2 || $type['id'] == 4 || $type['id'] == 5 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11) {
-                                continue;
-                            }
+
+                    if ($cache_type == GeoCache::TYPE_EVENT) {
+                        if ($type == GeoCacheLogCommons::LOGTYPE_FOUNDIT            ||
+                            $type == GeoCacheLogCommons::LOGTYPE_DIDNOTFIND         ||
+                            $type == GeoCacheLogCommons::LOGTYPE_MOVED              ||
+                            $type == GeoCacheLogCommons::LOGTYPE_NEEDMAINTENANCE    ||
+                            $type == GeoCacheLogCommons::LOGTYPE_ARCHIVED           ||
+                            $type == GeoCacheLogCommons::LOGTYPE_READYTOSEARCH      ||
+                            $type == GeoCacheLogCommons::LOGTYPE_TEMPORARYUNAVAILABLE) {
+                            continue;
                         }
-                        // Mobile cache
-                        if ($cache_type == 8) {
-                            if ($type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9) {
-                                continue;
-                            }
+                    } else if ($cache_type == GeoCache::TYPE_MOVING) {
+                        if ($type == GeoCacheLogCommons::LOGTYPE_ATTENDED       ||
+                            $type == GeoCacheLogCommons::LOGTYPE_WILLATTENDED   ||
+                            $type == GeoCacheLogCommons::LOGTYPE_ARCHIVED) {
+                            continue;
                         }
                     } else {
-                        if ($log_record['user_id'] == $cache_user_id && ($type['id'] == 1 || $type['id'] == 2 || $type['id'] == 4 || $type['id'] == 5 || $type['id'] == 7 || $type['id'] == 8)) {
+
+                        if ($log_record['user_id'] == $cache_user_id && // is owner
+                           ($type == GeoCacheLogCommons::LOGTYPE_FOUNDIT            ||
+                            $type == GeoCacheLogCommons::LOGTYPE_DIDNOTFIND         ||
+                            $type == GeoCacheLogCommons::LOGTYPE_MOVED              ||
+                            $type == GeoCacheLogCommons::LOGTYPE_NEEDMAINTENANCE    ||
+                            $type == GeoCacheLogCommons::LOGTYPE_ATTENDED           ||
+                            $type == GeoCacheLogCommons::LOGTYPE_WILLATTENDED)) {
                             continue;
                         }
-                        if ($log_record['user_id'] != $cache_user_id && ($type['id'] == 4 || $type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11)) {
+
+                        if ($log_record['user_id'] != $cache_user_id &&
+                           ($type == GeoCacheLogCommons::LOGTYPE_MOVED         ||
+                            $type == GeoCacheLogCommons::LOGTYPE_ATTENDED       ||
+                            $type == GeoCacheLogCommons::LOGTYPE_WILLATTENDED   ||
+                            $type == GeoCacheLogCommons::LOGTYPE_ARCHIVED       ||
+                            $type == GeoCacheLogCommons::LOGTYPE_READYTOSEARCH  ||
+                            $type == GeoCacheLogCommons::LOGTYPE_TEMPORARYUNAVAILABLE)) {
                             continue;
                         }
                     }
 
-                    $lang_db = I18n::getLangForDbTranslations('log_types');
-
-                    if ($type['id'] == $log_type) {
-                        $logtypeoptions .= '<option value="' . $type['id'] . '" selected="selected">' . htmlspecialchars($type[$lang_db], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    if ($type == $log_type) {
+                        $logtypeoptions .= '<option value="' . $type . '" selected="selected">' .
+                            htmlspecialchars(tr(GeoCacheLogCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
                     } else {
-                        $logtypeoptions .= '<option value="' . $type['id'] . '">' . htmlspecialchars($type[$lang_db], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                        $logtypeoptions .= '<option value="' . $type . '">' .
+                            htmlspecialchars(tr(GeoCacheLogCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
                     }
                 }
 
diff --git a/editwp.php b/editwp.php
index 33dee72250..cf62025057 100644
--- a/editwp.php
+++ b/editwp.php
@@ -2,6 +2,7 @@
 
 use src\Utils\Database\XDb;
 use src\Utils\I18n\I18n;
+use src\Models\GeoCache\WaypointCommons;
 
 //prepare the templates and include all neccessary
 require_once(__DIR__.'/lib/common.inc.php');
@@ -67,18 +68,19 @@
 
 
                 $tplname = 'editwp';
-                require_once(__DIR__.'/lib/caches.inc.php');
                 require(__DIR__.'/src/Views/newcache.inc.php');
 
                 $wp_type = isset($_POST['type']) ? $_POST['type'] : $wp_record['type'];
                 //build typeoptions
                 $types = '<option disabled selected="selected">' . tr('choose_waypoint_type') . '</options>';
-                foreach (get_wp_types_from_database($cache_record['type']) as $type) {
+                foreach (WaypointCommons::getTypesArray($cache_record['type']) as $type) {
 
                     if ($type['id'] == $wp_type) {
-                        $types .= '<option value="' . $type['id'] . '" selected="selected">' . htmlspecialchars($type[I18n::getCurrentLang()], ENT_COMPAT, 'UTF-8') . '</option>';
+                        $types .= '<option value="' . $type . '" selected="selected">' .
+                            htmlspecialchars(tr (WaypointCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>';
                     } else {
-                        $types .= '<option value="' . $type['id'] . '">' . htmlspecialchars($type[I18n::getCurrentLang()], ENT_COMPAT, 'UTF-8') . '</option>';
+                        $types .= '<option value="' . $type . '">' .
+                            htmlspecialchars(tr (WaypointCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>';
                     }
                 }
                 tpl_set_var('typeoptions', $types);
diff --git a/lib/caches.inc.php b/lib/caches.inc.php
deleted file mode 100644
index 339fbaf7e9..0000000000
--- a/lib/caches.inc.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-use src\Utils\Database\XDb;
-use src\Utils\I18n\I18n;
-
-function get_log_types_from_database()
-{
-    $log_types = array();
-
-    $resp = XDb::xSql("SELECT * FROM log_types ORDER BY id ASC");
-    while ($row = XDb::xFetchArray($resp)) {
-        $log_types[] = $row;
-    }
-    return $log_types;
-}
-
-function get_cache_types_from_database()
-{
-    $cache_types = array();
-
-    $resp = XDb::xSql("SELECT * FROM cache_type ORDER BY sort ASC");
-    while ($row = XDb::xFetchArray($resp)) {
-        $cache_types[] = $row;
-    }
-    return $cache_types;
-}
-
-function get_wp_types_from_database($cachetype)
-{
-    $wp_types = array();
-    if ($cachetype == '2' || $cachetype == '4' || $cachetype == '5' || $cachetype == '6' || $cachetype == '9') {
-        $param = "id=-1 OR id=4 OR id=5 OR id=6";
-    } else {
-        $param = "id=-1 OR id=1 OR id=2 OR id=3 OR id=4 OR id=5 OR id=6";
-    }
-    $resp = XDb::xSql("SELECT * FROM waypoint_type WHERE $param ORDER BY id ASC");
-    while ($row = XDb::xFetchArray($resp)) {
-        $wp_types[] = $row;
-    }
-    return $wp_types;
-}
-
-
-
-function cache_type_from_id($id)
-{
-    $lang_db = I18n::getLangForDbTranslations('cache_type');
-
-    foreach (get_cache_types_from_database() AS $cache_type) {
-        if ($cache_type['id'] == $id) {
-            return $cache_type[$lang_db];
-        }
-    }
-}
diff --git a/lib/languages/en.php b/lib/languages/en.php
index 8b71434b1b..1925740831 100644
--- a/lib/languages/en.php
+++ b/lib/languages/en.php
@@ -845,8 +845,6 @@
     'new_coords' => 'New coordinates',
     'viewlog_aktywnosc' => 'Total user activity (total of caches found, not found and hidden)',
     'viewlog_kordy' => 'Cache coordinates after moving',
-    'log_type_temp_unavailable' => 'Temporarily unavailable',
-    'log_type_available' => 'Ready to find',
     'log_mobile_init' => 'Starting coordinates',
     'error_coords_not_ok' => 'Wrong coordinates!',
     'error_nofulltext' => 'Invalid entry. Change the name to search.',
@@ -1021,11 +1019,7 @@
     'lxg01' => 'Wrong date. Please enter correct date: DD-MM-YYYY',
     'lxg02' => 'Rate cache, or select you do not want rate this cache.',
     'lxg05' => 'Send log entry',
-    'lxg08' => 'Write a note',
-    'lxg09' => 'Moved',
-    'lxg10' => 'Needs maintenance',
     'lxg11' => 'OC Team Comment',
-    'made_service' => 'Maintenance performed',
     'remove_desc_01' => 'Should the description in',
     'remove_desc_02' => 'from the cache',
     'remove_desc_03' => 'be removed?',
diff --git a/lib/search.html.inc.php b/lib/search.html.inc.php
index 48b2560c2b..5c80f7d536 100644
--- a/lib/search.html.inc.php
+++ b/lib/search.html.inc.php
@@ -7,6 +7,7 @@
 use src\Utils\Uri\OcCookie;
 use src\Models\Coordinates\Coordinates;
 use src\Utils\I18n\I18n;
+use src\Models\GeoCache\GeoCacheCommons;
 
 /**
  * This script is used (can be loaded) by /search.php
@@ -405,7 +406,7 @@ function fHideColumn($nr, $set)
         }
     }
     ;
-    $tmpline = str_replace('{cachetype}', htmlspecialchars(cache_type_from_id($caches_record['cache_type']), ENT_COMPAT, 'UTF-8'), $tmpline);
+    $tmpline = str_replace('{cachetype}', tr(GeoCacheCommons::CacheTypeTranslationKey($caches_record['cache_type'])), $tmpline);
 
     // sp2ong short_desc ermitteln TODO: nicht die erste sondern die richtige wählen
     $tmpline = str_replace('{wp_oc}', htmlspecialchars($caches_record['wp_oc'], ENT_COMPAT, 'UTF-8'), $tmpline);
diff --git a/log.php b/log.php
index 93404de943..4f720a0c44 100644
--- a/log.php
+++ b/log.php
@@ -37,7 +37,6 @@
 $view->loadJquery();
 
 
-require_once(__DIR__.'/lib/caches.inc.php');
 require(__DIR__.'/src/Views/rating.inc.php');
 
 if(!isset($_REQUEST['cacheid'])){
@@ -661,7 +660,7 @@
         tpl_set_var('display', "none");
     }
 
-    foreach (get_log_types_from_database() AS $type) {
+    foreach (GeoCacheLogCommons::logTypesArray() AS $type) {
         // do not allow 'finding' or 'not finding' own or archived cache
         // (events can be logged) $geoCache->getStatus() == 2 || $geoCache->getStatus() == 3
 
@@ -674,37 +673,44 @@
 
             //3 = Write a note;
             if ($user->hasOcTeamRole() && $geoCache->getStatus() == GeoCache::STATUS_WAITAPPROVERS){
-                $logtypeoptions .= '<option selected="selected" value="3">' . tr('lxg08') . '</option>' . "\n";
+                $logtypeoptions .= '<option selected="selected" value="'.GeoCacheLog::LOGTYPE_COMMENT.'">' .
+                    tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_COMMENT)) . '</option>' . "\n";
             } else {
-                $logtypeoptions .= '<option value="3">' . tr('lxg08') . '</option>' . "\n";
+                $logtypeoptions .= '<option value="'.GeoCacheLog::LOGTYPE_COMMENT.'">' .
+                    tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_COMMENT)) . '</option>' . "\n";
             }
 
             //4 = Moved
             if ($geoCache->getCacheType() == GeoCache::TYPE_MOVING ||
                 $geoCache->getCacheType() == GeoCache::TYPE_OWNCACHE ) {
 
-                $logtypeoptions .= '<option value="4">' . tr('lxg09') . '</option>' . "\n";
+                    $logtypeoptions .= '<option value="'.GeoCacheLog::LOGTYPE_MOVED.'">' .
+                        tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_MOVED)) . '</option>' . "\n";
             }
 
             //5 = Needs maintenace
             if ($user->getUserId() != $geoCache->getOwnerId()) {
-                $logtypeoptions .= '<option value="5">' . tr('lxg10') . '</option>' . "\n";
+                $logtypeoptions .= '<option value="'.GeoCacheLog::LOGTYPE_NEEDMAINTENANCE.'">' .
+                    tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_NEEDMAINTENANCE)) . '</option>' . "\n";
             }
-            $logtypeoptions .= '<option value="6">' . tr('made_service') . '</option>' . "\n";
+
+            $logtypeoptions .= '<option value="'.GeoCacheLog::LOGTYPE_MADEMAINTENANCE.'">' .
+                tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_MADEMAINTENANCE)) . '</option>' . "\n";
 
             //12 = OC Team Comment
             if ($user->hasOcTeamRole()) {
-                $logtypeoptions .= '<option value="12">' . tr('lxg11') . '</option>' . "\n";
+                $logtypeoptions .= '<option value="'.GeoCacheLog::LOGTYPE_ADMINNOTE.'">' .
+                    tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_ADMINNOTE)) . '</option>' . "\n";
             }
 
             // service log by Łza
             // if curently logged user is a cache owner and cache status is "avilable"
             // then add log type option "temp. unavailable";
             //11 = Temporarily unavailable
-            if ($user->getUserId() == $geoCache->getOwnerId() &&
-                $geoCache->getStatus() == GeoCache::STATUS_READY) {
+            if ($user->getUserId() == $geoCache->getOwnerId() && $geoCache->getStatus() == GeoCache::STATUS_READY) {
 
-                $logtypeoptions .= '<option value="11">' . tr("log_type_temp_unavailable") . '</option>' . "\n";
+                $logtypeoptions .= '<option value="'.GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE.'">' .
+                    tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE)) . '</option>' . "\n";
             }
 
             // if curently logged user is a cache owner and cache status is "temp. unavailable"
@@ -713,28 +719,18 @@
             if ( $user->getUserId() == $geoCache->getOwnerId() &&
                  $geoCache->getStatus() == GeoCache::STATUS_UNAVAILABLE ) {
 
-                $logtypeoptions .= '<option value="10">' . tr("log_type_available") . '</option>' . "\n";
+                     $logtypeoptions .= '<option value="'.GeoCacheLog::LOGTYPE_READYTOSEARCH.'">' .
+                         tr(GeoCacheLogCommons::typeTranslationKey(GeoCacheLog::LOGTYPE_READYTOSEARCH)) . '</option>' . "\n";
             }
             break;
         }
 
-
-
-        // skip if permission=O and not owner
-        if ($type['permission'] == 'O' &&
-            $user->getUserId() != $geoCache->getOwnerId() &&
-            $type['permission']){
-
-            continue;
-        }
-
-
         // if virtual, webcam = archived -> allow only comment log type
         if (($geoCache->getCacheType() == GeoCache::TYPE_VIRTUAL ||
              $geoCache->getCacheType() == GeoCache::TYPE_WEBCAM )
             && $geoCache->getStatus() == GeoCache::STATUS_ARCHIVED) {
 
-            if ($type['id'] != 3) {
+            if ($type != GeoCacheLog::LOGTYPE_COMMENT) {
                 continue;
             }
         }
@@ -746,7 +742,7 @@
             //so zero time here to allow logging WILLATTENDED or ATTENDED in the day of event
 
             // if user logged event as willattended before or event it's over, do not display logtype 'attended'
-            if ($type['id'] == GeoCacheLog::LOGTYPE_WILLATTENDED) {
+            if ($type == GeoCacheLog::LOGTYPE_WILLATTENDED) {
                 if ($geoCache->hasUserLogByType($user, GeoCacheLog::LOGTYPE_WILLATTENDED) ||
                     $now > $geoCache->getDatePlaced()) {
                     continue;
@@ -754,60 +750,86 @@
             }
             // if user logged event as attended before or event has not happened yet,
             //do not display logtype 'attended'
-            if ($type['id'] == GeoCacheLog::LOGTYPE_ATTENDED) {
+            if ($type == GeoCacheLog::LOGTYPE_ATTENDED) {
                 if ($geoCache->hasUserLogByType($user, GeoCacheLog::LOGTYPE_ATTENDED) ||
                 $now < $geoCache->getDatePlaced()) {
                     continue;
                 }
             }
             if ($user->hasOcTeamRole()) {
-                if ($type['id'] == 1 || $type['id'] == 2 || $type['id'] == 4 ||
-                    $type['id'] == 5 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11) {
+                if ($type == GeoCacheLog::LOGTYPE_FOUNDIT           ||
+                    $type == GeoCacheLog::LOGTYPE_DIDNOTFIND        ||
+                    $type == GeoCacheLog::LOGTYPE_MOVED             ||
+                    $type == GeoCacheLog::LOGTYPE_NEEDMAINTENANCE   ||
+                    $type == GeoCacheLog::LOGTYPE_ARCHIVED          ||
+                    $type == GeoCacheLog::LOGTYPE_READYTOSEARCH     ||
+                    $type == GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE) {
                     continue;
                 }
             } else {
-                if ($type['id'] == 1 || $type['id'] == 2 || $type['id'] == 4 ||
-                    $type['id'] == 5 || $type['id'] == 9 || $type['id'] == 10 ||
-                    $type['id'] == 11 || $type['id'] == 12) {
+                if ($type == GeoCacheLog::LOGTYPE_FOUNDIT           ||
+                    $type == GeoCacheLog::LOGTYPE_DIDNOTFIND        ||
+                    $type == GeoCacheLog::LOGTYPE_MOVED             ||
+                    $type == GeoCacheLog::LOGTYPE_NEEDMAINTENANCE   ||
+                    $type == GeoCacheLog::LOGTYPE_ARCHIVED          ||
+                    $type == GeoCacheLog::LOGTYPE_READYTOSEARCH     ||
+                    $type == GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE ||
+                    $type == GeoCacheLog::LOGTYPE_ADMINNOTE) {
                     continue;
                 }
             }
-        } else {
+        } else { // NOT-EVENT
             if ($geoCache->getCacheType() == GeoCache::TYPE_MOVING) {
                 if ($user->hasOcTeamRole()) {
                     // skip will attend/attended if the cache no event
-                    if ($type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11) {
+                    if ($type == GeoCacheLog::LOGTYPE_ATTENDED          ||
+                        $type == GeoCacheLog::LOGTYPE_WILLATTENDED      ||
+                        $type == GeoCacheLog::LOGTYPE_ARCHIVED          ||
+                        $type == GeoCacheLog::LOGTYPE_READYTOSEARCH     ||
+                        $type == GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE) {
                         continue;
                     }
                 } else {
-                    if ($type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11 || $type['id'] == 12) {
+                    if ($type == GeoCacheLog::LOGTYPE_ATTENDED          ||
+                        $type == GeoCacheLog::LOGTYPE_WILLATTENDED      ||
+                        $type == GeoCacheLog::LOGTYPE_ARCHIVED          ||
+                        $type == GeoCacheLog::LOGTYPE_READYTOSEARCH     ||
+                        $type == GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE    ||
+                        $type == GeoCacheLog::LOGTYPE_ADMINNOTE) {
                         continue;
                     }
                 }
             } else {
                 // skip will attend/attended/Moved  if the cache no event and Mobile
                 if ($user->hasOcTeamRole()) {
-                    if ($type['id'] == 4 || $type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11) {
+                    if ($type == GeoCacheLog::LOGTYPE_MOVED ||
+                        $type == GeoCacheLog::LOGTYPE_ATTENDED ||
+                        $type == GeoCacheLog::LOGTYPE_WILLATTENDED ||
+                        $type == GeoCacheLog::LOGTYPE_ARCHIVED ||
+                        $type == GeoCacheLog::LOGTYPE_READYTOSEARCH ||
+                        $type == GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE) {
                         continue;
                     }
                 } else {
-                    if ($type['id'] == 4 || $type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11 || $type['id'] == 12) {
+                    if ($type == GeoCacheLog::LOGTYPE_MOVED ||
+                        $type == GeoCacheLog::LOGTYPE_ATTENDED ||
+                        $type == GeoCacheLog::LOGTYPE_WILLATTENDED ||
+                        $type == GeoCacheLog::LOGTYPE_ARCHIVED ||
+                        $type == GeoCacheLog::LOGTYPE_READYTOSEARCH ||
+                        $type == GeoCacheLog::LOGTYPE_TEMPORARYUNAVAILABLE ||
+                        $type == GeoCacheLog::LOGTYPE_ADMINNOTE) {
                         continue;
                     }
                 }
             }
         }
 
-        if (isset($type[I18n::getCurrentLang()])){
-            $lang_db = I18n::getCurrentLang();
-        } else {
-            $lang_db = "en";
-        }
-
-        if ($type['id'] == $log_type) {
-            $logtypeoptions .= '<option value="' . $type['id'] . '" selected="selected">' . htmlspecialchars($type[$lang_db], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+        if ($type == $log_type) {
+            $logtypeoptions .= '<option value="' . $type . '" selected="selected">' .
+                htmlspecialchars(tr(GeoCacheLogCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
         } else {
-            $logtypeoptions .= '<option value="' . $type['id'] . '">' . htmlspecialchars($type[$lang_db], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+            $logtypeoptions .= '<option value="' . $type . '">' .
+                htmlspecialchars(tr(GeoCacheLogCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
         }
     }
 
diff --git a/log_cache_multi.php b/log_cache_multi.php
index 7b01b7af8c..8bb7489076 100644
--- a/log_cache_multi.php
+++ b/log_cache_multi.php
@@ -97,7 +97,6 @@
 if ($usr == false || (!isset($_FILES['userfile']) && !isset($_SESSION['log_cache_multi_data']))) {
     tpl_redirect('log_cache_multi_send.php');
 } else {
-    require_once(__DIR__.'/lib/caches.inc.php');
 
     $tplname = 'log_cache_multi';
     $myHtml = "";
diff --git a/log_cache_multi_panel.php b/log_cache_multi_panel.php
index 8133c97c49..e9845e16c5 100644
--- a/log_cache_multi_panel.php
+++ b/log_cache_multi_panel.php
@@ -1,5 +1,7 @@
 <?php
 
+use src\Models\GeoCache\GeoCacheCommons;
+use src\Models\GeoCache\GeoCacheLogCommons;
 use src\Utils\Database\XDb;
 
 require_once (__DIR__.'/lib/common.inc.php');
@@ -8,7 +10,6 @@
 if ($usr == false || (!isset($_FILES['userfile']) && !isset($_SESSION['log_cache_multi_data']))) {
     tpl_redirect('log_cache_multi_send.php');
 } else {
-    require_once(__DIR__.'/lib/caches.inc.php');
     ?>
     <html>
         <head>
@@ -99,14 +100,16 @@
                             }
                             ?>
                             <tr class="<?php echo $styl; ?>">
-                                <td width=210><?php echo isset($v['cache_name']) ? "<img src=\"/images/" . get_icon_for_cache_type($v['cache_type']) . "\" /> " . $v['kod_str'] . " " . $v['cache_name'] : " "; ?></td>
+                                <td width=210><?php echo isset($v['cache_name']) ?
+                                "<img src=\"" . GeoCacheCommons::CacheIconByType($v['cache_type'], GeoCacheCommons::STATUS_READY) . "\" /> " .
+                                        $v['kod_str'] . " " . $v['cache_name'] : " "; ?></td>
                                 <td width=70 style="text-align: right"><?php
                                     echo isset($v['data']) ? str_replace(" ", "<br />", $v['data']) : " ";
                                     echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-                                    echo isset($v['status']) ? "<img src=\"/images/" . get_icon_for_status($v['status']) . "\" />" : " ";
+                                    echo isset($v['status']) ? "<img src=\"" . GeoCacheLogCommons::GetIconForType($v['status']) . "\" />" : " ";
                                     ?></td>
                                 <td width=70 style="text-align: right"><?php
-                                    echo isset($v['got_last_activity']) ? str_replace(" ", "<br />", $v['last_date']) . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . (isset($v['last_status']) ? "<img src=\"/images/" . get_icon_for_status($v['last_status']) . "\" />" : " ") : " ";
+                                echo isset($v['got_last_activity']) ? str_replace(" ", "<br />", $v['last_date']) . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . (isset($v['last_status']) ? "<img src=\"" . GeoCacheLogCommons::GetIconForType($v['last_status']) . "\" />" : " ") : " ";
                                     ?></td>
                             </tr><tr class="<?php echo $styl; ?>">
                                 <td width="280" colspan=2><?php echo isset($v['koment']) ? $v['koment'] : " "; ?>&nbsp;</td>
@@ -124,22 +127,3 @@
             }
 }
 
-function get_icon_for_status($status)
-{
-    $typyStatusow = get_log_types_from_database();
-    foreach ($typyStatusow as $k => $v) {
-        if ($v['id'] == $status) {
-            return $v['icon_small'];
-        }
-    }
-}
-
-function get_icon_for_cache_type($type)
-{
-    $typySkrzynek = get_cache_types_from_database();
-    foreach ($typySkrzynek as $k => $v) {
-        if ($v['id'] == $type) {
-            return $v['icon_large'];
-        }
-    }
-}
diff --git a/my_logs.php b/my_logs.php
index 27e198dd87..9555842aab 100644
--- a/my_logs.php
+++ b/my_logs.php
@@ -22,7 +22,7 @@
         tpl_set_var('userid', $user_id);
     }
 
-    $logTypes = GeoCacheLog::logTypes();
+    $logTypes = GeoCacheLog::logTypesArray();
     if (isset($_REQUEST['logtypes'])) {
         $logTypes = array_intersect($logTypes, explode(',', $_REQUEST['logtypes']));
     }
@@ -61,7 +61,7 @@
     $startat = max(0, floor((($start / $LOGS_PER_PAGE) + 1) / $PAGES_LISTED) * $PAGES_LISTED);
 
     $logsPage = 'my_logs.php?userid='.$user_id;
-    if (array_diff(GeoCacheLog::logTypes(), $logTypes)) {
+    if (array_diff(GeoCacheLog::logTypesArray(), $logTypes)) {
         $logsPage .= '&amp;logtypes='.implode(',',$logTypes);
     }
     $logsPage .= '&amp;start=';
diff --git a/myroutes_search.php b/myroutes_search.php
index e22a4793c2..8b0244df16 100644
--- a/myroutes_search.php
+++ b/myroutes_search.php
@@ -13,7 +13,6 @@
 require_once (__DIR__.'/lib/export.inc.php');
 require_once (__DIR__.'/lib/format.gpx.inc.php');
 require_once (__DIR__.'/lib/calculation.inc.php');
-require_once (__DIR__.'/lib/caches.inc.php');
 require_once (__DIR__.'/src/Views/lib/icons.inc.php');
 
 global $content, $bUseZip, $usr, $config;
diff --git a/newcache.php b/newcache.php
index 04a3b04616..082adaa355 100644
--- a/newcache.php
+++ b/newcache.php
@@ -50,7 +50,6 @@
     exit();
 }
 
-require_once (__DIR__.'/lib/caches.inc.php');
 require_once (__DIR__.'/src/Views/newcache.inc.php');
 
 $errors = false; // set if there was any errors
diff --git a/newcaches.php b/newcaches.php
index a6e9d87dfc..866f952c54 100644
--- a/newcaches.php
+++ b/newcaches.php
@@ -3,9 +3,9 @@
 use src\Utils\Database\XDb;
 use src\Utils\Text\Formatter;
 use src\Utils\View\View;
+use src\Models\GeoCache\GeoCacheCommons;
 
 require_once (__DIR__.'/lib/common.inc.php');
-require_once (__DIR__.'/lib/caches.inc.php');
 require_once (__DIR__.'/src/Views/lib/icons.inc.php');
 require_once (__DIR__.'/src/Views/newcaches.inc.php');
 
@@ -110,7 +110,7 @@
         $thisline = mb_ereg_replace('{GPicon}', '<img src="images/rating-star-empty.png" class="icon16" alt="" title="">', $thisline);
     };
 
-    $thisline = mb_ereg_replace('{cachetype}', htmlspecialchars(cache_type_from_id($r['type']), ENT_COMPAT, 'UTF-8'), $thisline);
+    $thisline = mb_ereg_replace('{cachetype}', GeoCacheCommons::CacheTypeTranslationKey($r['type']), $thisline);
     $thisline = mb_ereg_replace('{cachename}', htmlspecialchars($r['cachename'], ENT_COMPAT, 'UTF-8'), $thisline);
     $thisline = mb_ereg_replace('{username}', htmlspecialchars($r['username'], ENT_COMPAT, 'UTF-8'), $thisline);
     $thisline = mb_ereg_replace('{region}', htmlspecialchars($r['region'], ENT_COMPAT, 'UTF-8'), $thisline);
diff --git a/newwp.php b/newwp.php
index d3a5e6650a..22f5d2b1cb 100644
--- a/newwp.php
+++ b/newwp.php
@@ -1,5 +1,6 @@
 <?php
 
+use src\Models\GeoCache\WaypointCommons;
 use src\Utils\Database\XDb;
 use src\Utils\I18n\I18n;
 
@@ -68,7 +69,6 @@
             if ($cache_record['user_id'] == $usr['userid'] || $usr['admin']) {
                 $tplname = 'newwp';
 
-                require_once(__DIR__.'/lib/caches.inc.php');
                 require_once(__DIR__.'/src/Views/newcache.inc.php');
 
                 //set template replacements
@@ -81,7 +81,6 @@
 
                 //build typeoptions
                 $sel_type = isset($_POST['type']) ? $_POST['type'] : -1;
-                $lang_db = I18n::getLangForDbTranslations('waypoint_type');
 
                 $types = '<option disabled selected="selected">' . tr('choose_waypoint_type') . '</options>';
 //                  if ($cache_record['type'] == '2' || $cache_record['type'] == '6' || $cache_record['type'] == '8' || $cache_record['type'] == '9')
@@ -95,22 +94,22 @@
                 else
                     $pomin = 0;
 
-                foreach ( get_wp_types_from_database($cache_record['type']) as $type ) {
-                    if ($type['id'] == $sel_type) {
-                        if (($type['id'] == 3) && ($pomin == 1)) {
+                    foreach ( WaypointCommons::getTypesArray($cache_record['type']) as $type ) {
+                    if ($type == $sel_type) {
+                        if (($type == WaypointCommons::TYPE_FINAL) && ($pomin == 1)) {
 
                         } // if final waypoint alreday exist for this cache do not allow create new waypoint type "final location"
                         else
-                            $types .= '<option value="' . $type['id'] . '" selected="selected">' .
-                                      htmlspecialchars($type[$lang_db], ENT_COMPAT, 'UTF-8') . '</option>';
+                            $types .= '<option value="' . $type . '" selected="selected">' .
+                                htmlspecialchars(tr (WaypointCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>';
                     }
                     else {
                         if (($type['id'] == 3) && ($pomin == 1)) {
 
                         } //// if final waypoint alreday exist for this cache do not allow create new waypoint type "final location"
                         else
-                            $types .= '<option value="' . $type['id'] . '">' .
-                                      htmlspecialchars($type[$lang_db], ENT_COMPAT, 'UTF-8') . '</option>';
+                            $types .= '<option value="' . $type . '">' .
+                                htmlspecialchars(tr (WaypointCommons::typeTranslationKey($type)), ENT_COMPAT, 'UTF-8') . '</option>';
                     }
                 }
 
diff --git a/search.php b/search.php
index de8f6250d4..dd3760bbe2 100644
--- a/search.php
+++ b/search.php
@@ -50,7 +50,6 @@ function sanitize(&$array)
         $tplname = 'search';
         $view->loadJQueryUI();
         require(__DIR__.'/src/Views/search.inc.php');
-        require(__DIR__.'/lib/caches.inc.php');
 
         sanitize($_REQUEST);
 
diff --git a/src/Models/GeoCache/GeoCacheLogCommons.php b/src/Models/GeoCache/GeoCacheLogCommons.php
index 3bef4b6f57..bf5b80837d 100644
--- a/src/Models/GeoCache/GeoCacheLogCommons.php
+++ b/src/Models/GeoCache/GeoCacheLogCommons.php
@@ -107,7 +107,7 @@ public static function typeTranslationKey($logType)
         }
     }
 
-    public static function logTypes()
+    public static function logTypesArray()
     {
         return array(
             self::LOGTYPE_FOUNDIT,
diff --git a/src/Models/GeoCache/Waypoint.php b/src/Models/GeoCache/Waypoint.php
index 78f5776192..3ed3ea21e5 100644
--- a/src/Models/GeoCache/Waypoint.php
+++ b/src/Models/GeoCache/Waypoint.php
@@ -8,22 +8,9 @@
 /**
  * Geocache Waypoint (place of interest)
  * represented in db by waypoints table
- *
- * @author Łza
  */
-class Waypoint
+class Waypoint extends WaypointCommons
 {
-    const TYPE_PHYSICAL = 1;
-    const TYPE_VIRTUAL = 2;
-    const TYPE_FINAL = 3;
-    const TYPE_INTERESTING = 4;
-    const TYPE_PARKING = 5;
-    const TYPE_TRAILHEAD = 6;
-
-    const STATUS_VISIBLE = 1;
-    const STATUS_VISIBLE_HIDDEN_COORDS = 2;
-    const STATUS_HIDDEN = 3;
-
     const OPENCHECKER_ENABLED = 1;
 
     private $id;
@@ -40,14 +27,7 @@ class Waypoint
     private $cacheId;
     private $openChecker;
 
-    private $iconNames = array(
-        self::TYPE_PHYSICAL => 'images/waypoints/wp_physical.png',
-        self::TYPE_VIRTUAL => 'images/waypoints/wp_virtual.png',
-        self::TYPE_FINAL => 'images/waypoints/wp_final.png',
-        self::TYPE_INTERESTING => 'images/waypoints/wp_reference.png',
-        self::TYPE_PARKING => 'images/waypoints/wp_parking.png',
-        self::TYPE_TRAILHEAD => 'images/waypoints/wp_trailhead.png'
-    );
+
 
 
 
diff --git a/src/Models/GeoCache/WaypointCommons.php b/src/Models/GeoCache/WaypointCommons.php
new file mode 100644
index 0000000000..e587fbe2a5
--- /dev/null
+++ b/src/Models/GeoCache/WaypointCommons.php
@@ -0,0 +1,64 @@
+<?php
+namespace src\Models\GeoCache;
+
+use src\Models\BaseObject;
+
+
+class WaypointCommons extends BaseObject {
+
+    const TYPE_PHYSICAL = 1;
+    const TYPE_VIRTUAL = 2;
+    const TYPE_FINAL = 3;
+    const TYPE_INTERESTING = 4;
+    const TYPE_PARKING = 5;
+    const TYPE_TRAILHEAD = 6;
+
+    const STATUS_VISIBLE = 1;
+    const STATUS_VISIBLE_HIDDEN_COORDS = 2;
+    const STATUS_HIDDEN = 3;
+
+    const ICONS = array(
+        self::TYPE_PHYSICAL => 'images/waypoints/wp_physical.png',
+        self::TYPE_VIRTUAL => 'images/waypoints/wp_virtual.png',
+        self::TYPE_FINAL => 'images/waypoints/wp_final.png',
+        self::TYPE_INTERESTING => 'images/waypoints/wp_reference.png',
+        self::TYPE_PARKING => 'images/waypoints/wp_parking.png',
+        self::TYPE_TRAILHEAD => 'images/waypoints/wp_trailhead.png'
+    );
+
+    public static function typeTranslationKey($type)
+    {
+        return 'wayPointType'.$type;
+    }
+
+    public static function getTypesArray($forCacheType=null)
+    {
+        $cacheTypesWithSimpleWps = [
+            GeoCacheCommons::TYPE_TRADITIONAL, GeoCacheCommons::TYPE_VIRTUAL,
+            GeoCacheCommons::TYPE_WEBCAM, GeoCacheCommons::TYPE_EVENT,
+            GeoCacheCommons::TYPE_GEOPATHFINAL
+        ];
+
+        if ($forCacheType && in_array($forCacheType, $cacheTypesWithSimpleWps) ) {
+            return [
+                self::TYPE_INTERESTING,
+                self::TYPE_PARKING,
+                self::TYPE_TRAILHEAD
+            ];
+        } else {
+            return [
+                self::TYPE_PHYSICAL,
+                self::TYPE_VIRTUAL,
+                self::TYPE_FINAL,
+                self::TYPE_INTERESTING,
+                self::TYPE_PARKING,
+                self::TYPE_TRAILHEAD
+            ];
+        }
+    }
+
+    public static function getIcon($type){
+        self::ICONS[$type];
+    }
+
+}
diff --git a/src/Views/log_cache_multi.tpl.php b/src/Views/log_cache_multi.tpl.php
index f3ba1449d5..9668f2911a 100644
--- a/src/Views/log_cache_multi.tpl.php
+++ b/src/Views/log_cache_multi.tpl.php
@@ -1,24 +1,8 @@
 <?php
 
-function get_icon_for_status($status)
-{
-    $typyStatusow = get_log_types_from_database();
-    foreach ($typyStatusow as $k => $v) {
-        if ($v['id'] == $status) {
-            return $v['icon_small'];
-        }
-    }
-}
+use src\Models\GeoCache\GeoCacheLogCommons;
+use src\Models\GeoCache\GeoCacheCommons;
 
-function get_icon_for_cache_type($type)
-{
-    $typySkrzynek = get_cache_types_from_database();
-    foreach ($typySkrzynek as $k => $v) {
-        if ($v['id'] == $type) {
-            return $v['icon_large'];
-        }
-    }
-}
 ?>
 <style>
     a:link {
@@ -95,21 +79,25 @@ function get_icon_for_cache_type($type)
                         }
                         ?>
                         <tr class="<?php echo $styl; ?>">
-                            <td width=560><?php echo isset($v['cache_name']) ? "<A href=\"viewcache.php?cacheid=" . $v['cache_id'] . "\" target=\"_blank\">" . "<img src=\"/images/" . get_icon_for_cache_type($v['cache_type']) . "\" /> " . $v['kod_str'] . " " . $v['cache_name'] . "</a>" : " "; ?></td>
+                            <td width=560><?php echo isset($v['cache_name']) ?
+                                "<a href=\"viewcache.php?cacheid=" . $v['cache_id'] . "\" target=\"_blank\">" .
+                                    "<img src=\"" . GeoCacheCommons::CacheIconByType($v['cache_type'], GeoCacheCommons::STATUS_READY) . "\" /> " .
+                                        $v['kod_str'] . " " . $v['cache_name'] . "</a>" : " "; ?></td>
+
                             <td width=70 style="text-align: right"><?php
                                 $v['data'] = date($datetimeFormat, strtotime($v['data']));
 
 
                                 echo isset($v['data']) ? str_replace(" ", "<br />", $v['data']) : " ";
                                 echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-                                echo isset($v['status']) ? "<img src=\"/images/" . get_icon_for_status($v['status']) . "\" />" : " ";
+                                echo isset($v['status']) ? "<img src=\"".GeoCacheLogCommons::GetIconForType($v['status'])."\" />" : " ";
                                 ?></td>
                             <td width=70 style="text-align: right"><?php
                                 if (isset($v['got_last_activity'])) {
                                     $v['last_date'] = date($datetimeFormat, strtotime($v['last_date']));
                                     echo str_replace(" ", "<br />", $v['last_date']) . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
                                     if (isset($v['last_status'])) {
-                                        echo "<img src=\"/images/" . get_icon_for_status($v['last_status']) . "\" />";
+                                        echo "<img src=\"" . GeoCacheLogCommons::GetIconForType($v['last_status']) . "\" />";
                                     } else {
                                         echo " ";
                                     }

From bc455635f65a7605d216969716c4f396c5920eec Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Sun, 29 Sep 2019 15:29:54 +0200
Subject: [PATCH 6/8] removing depreciated class: cache

---
 badge_positions_list.php               |   5 +-
 lib/ClassPathDictionary.php            |   1 -
 lib/cache.php                          | 192 -------------------------
 lib/myn.inc.php                        |  47 ++----
 lib/search.txt.inc.php                 |   9 +-
 lib/settingsDefault.inc.php            |   6 +-
 newcache.php                           |  16 ++-
 powerTrail.php                         |   2 -
 powerTrail/ajaxGetPowerTrailCaches.php |  18 ++-
 src/Models/GeoCache/GeoCache.php       |   5 -
 10 files changed, 42 insertions(+), 259 deletions(-)
 delete mode 100644 lib/cache.php

diff --git a/badge_positions_list.php b/badge_positions_list.php
index 9070d5acbf..6dec79464a 100644
--- a/badge_positions_list.php
+++ b/badge_positions_list.php
@@ -3,6 +3,7 @@
 use src\Utils\Text\Formatter;
 use src\Controllers\MeritBadgeController;
 use src\Controllers\ViewBadgeHeadController;
+use src\Models\GeoCache\GeoCacheCommons;
 
 require_once(__DIR__.'/lib/common.inc.php');
 
@@ -33,7 +34,6 @@
 $content = "";
 
 $positionsMeritBadge = $meritBadgeCtrl->buildArrayGainedPositions($userid, $badge_id);
-$cacheTypesIcons = cache::getCacheIconsSet();
 
 foreach( $positionsMeritBadge as $onePositionBadge ){
 
@@ -55,8 +55,7 @@
 
     $typeIcon ='<img src="{src}" />';
     $typeIcon = str_replace( "{src}",
-            $cacheTypesIcons[$onePositionBadge->getType()]['iconSet'][1]['iconSmallFound'],
-            $typeIcon );
+        GeoCacheCommons::CacheIconByType($onePositionBadge->getType(), GeoCacheCommons::STATUS_READY), $typeIcon);
 
     $date = Formatter::date($onePositionBadge->getGainDate());
     $dateSort = date("y.m.d", strtotime($onePositionBadge->getGainDate()));
diff --git a/lib/ClassPathDictionary.php b/lib/ClassPathDictionary.php
index c6b8f52a33..052e09096c 100644
--- a/lib/ClassPathDictionary.php
+++ b/lib/ClassPathDictionary.php
@@ -42,7 +42,6 @@ class ClassPathDictionary
      * !!! please preserve alphabetical order. !!!
      */
     private static $classDictionary = array(
-        'cache' => 'lib/cache.php',
         'myninc' => 'lib/myn.inc.php',
         'powerTrailBase' => 'powerTrail/powerTrailBase.php',
         'powerTrailController' => 'powerTrail/powerTrailController.php',
diff --git a/lib/cache.php b/lib/cache.php
deleted file mode 100644
index ef469891dd..0000000000
--- a/lib/cache.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-final class cache
-{
-
-    const TYPE_OTHERTYPE = 1;
-    const TYPE_TRADITIONAL = 2;
-    const TYPE_MULTICACHE = 3;
-    const TYPE_VIRTUAL = 4;
-    const TYPE_WEBCAM = 5;
-    const TYPE_EVENT = 6;
-    const TYPE_QUIZ = 7;
-    const TYPE_MOVING = 8;
-    const TYPE_GEOPATHFINAL = 9;
-    const TYPE_OWNCACHE = 10;
-
-    const SIZE_MICRO = 2;
-    const SIZE_SMALL = 3;
-    const SIZE_NORMAL = 4;
-    const SIZE_LARGE = 5;
-    const SIZE_VERYLARGE = 6;
-    const SIZE_NOCONTAINER = 7;
-
-    const STATUS_READY = 1;
-    const STATUS_UNAVAILABLE = 2;
-    const STATUS_ARCHIVED = 3;
-    const STATUS_WAITAPPROVERS = 4;
-    const STATUS_NOTYETAVAILABLE = 5;
-    const STATUS_BLOCKED = 6;
-
-    private $cacheTypeIcons = null;
-    private $status = array(
-        self::STATUS_READY => array(
-            'description' => 'Ready for search',
-            'translation' => 'cacheStatus_1',
-        ),
-        self::STATUS_UNAVAILABLE => array(
-            'description' => 'Temporarily unavailable',
-            'translation' => 'cacheStatus_2',
-        ),
-        self::STATUS_ARCHIVED => array(
-            'description' => 'Archived',
-            'translation' => 'cacheStatus_3',
-        ),
-        self::STATUS_WAITAPPROVERS => array(
-            'description' => 'Hidden by approvers to check',
-            'translation' => 'cacheStatus_4',
-        ),
-        self::STATUS_NOTYETAVAILABLE => array(
-            'description' => 'Not yet available',
-            'translation' => 'cacheStatus_5',
-        ),
-        self::STATUS_BLOCKED => array(
-            'description' => 'Blocked by COG',
-            'translation' => 'cacheStatus_6',
-        ),
-    );
-    private static $type = array(
-        self::TYPE_OTHERTYPE => array(
-            'name' => 'other',
-            'icon' => 'unknown.png',
-            'translation' => 'cacheType_5'
-        ),
-        self::TYPE_TRADITIONAL => array(
-            'name' => 'traditional',
-            'icon' => 'traditional.png',
-            'translation' => 'cacheType_1'
-        ),
-        self::TYPE_MULTICACHE => array(
-            'name' => 'multicache',
-            'icon' => 'multi.png',
-            'translation' => 'cacheType_2',
-        ),
-        self::TYPE_VIRTUAL => array(
-            'name' => 'virtual',
-            'icon' => 'virtual.png',
-            'translation' => 'cacheType_8'
-        ),
-        self::TYPE_WEBCAM => array(
-            'name' => 'webcam',
-            'icon' => 'webcam.png',
-            'translation' => 'cacheType_7'
-        ),
-        self::TYPE_EVENT => array(
-            'name' => 'event',
-            'icon' => 'event.png',
-            'translation' => 'cacheType_6'
-        ),
-        self::TYPE_QUIZ => array(
-            'name' => 'quiz',
-            'icon' => 'quiz.png',
-            'translation' => 'cacheType_3'
-        ),
-        self::TYPE_MOVING => array(
-            'name' => 'moving',
-            'icon' => 'moving.png',
-            'translation' => 'cacheType_4'
-        ),
-        self::TYPE_GEOPATHFINAL => array(
-            'name' => 'podcast',
-            'icon' => 'podcache.png',
-            'translation' => 'cacheType_9'
-        ),
-        self::TYPE_OWNCACHE => array(
-            'name' => 'own-cache',
-            'icon' => 'owncache.png',
-            'translation' => 'cacheType_10',
-        ),
-    );
-    private static $iconPath = 'images/cache/';
-    private static $iconSmallStr = '16x16-';
-    private static $iconFoundStr = '-found';
-    private static $iconArchivedStr = '-a';
-    private static $iconTmpUnavStr = '-n';
-
-    private function __construct()
-    {
-        $this->cacheTypeIcons = self::getCacheIconsSet();
-    }
-
-    public static function instance()
-    {
-        static $inst = null;
-        if ($inst === null) {
-            $inst = new cache();
-        }
-        return $inst;
-    }
-
-    /**
-     * prepare array contain set of icons for diffrent cachetypes
-     */
-    public static function getCacheIconsSet()
-    {
-        $cacheTypeIcons = self::$type;
-        foreach ($cacheTypeIcons as $cacheTypeId => $cacheType) {
-            $cacheTypeIcons[$cacheTypeId]['iconSet'] = array(
-                1 => array(//active, published
-                    'iconFound' => self::$iconPath . self::getFoundCacheIcon($cacheType['icon']),
-                    'iconSmall' => self::$iconPath . self::$iconSmallStr . $cacheType['icon'],
-                    'iconSmallFound' => self::$iconPath . self::getFoundCacheIcon(self::$iconSmallStr . $cacheType['icon']),
-                    'iconSmallOwner' => self::$iconPath . self::getOwnerCacheIcon(self::$iconSmallStr . $cacheType['icon']),
-                ),
-                2 => array(//tempUnavailable
-                    'iconFound' => self::$iconPath . self::getFoundCacheIcon($cacheType['icon'], self::$iconTmpUnavStr),
-                    'iconSmall' => self::$iconPath . self::$iconSmallStr . $cacheType['icon'],
-                    'iconSmallFound' => self::$iconPath . self::getFoundCacheIcon(self::$iconSmallStr . $cacheType['icon'], self::$iconTmpUnavStr),
-                    'iconSmallOwner' => self::$iconPath . self::getOwnerCacheIcon(self::$iconSmallStr . $cacheType['icon'], self::$iconTmpUnavStr),
-                ),
-                3 => array(// archived
-                    'iconFound' => self::$iconPath . self::getFoundCacheIcon($cacheType['icon'], self::$iconArchivedStr),
-                    'iconSmall' => self::$iconPath . self::$iconSmallStr . $cacheType['icon'],
-                    'iconSmallFound' => self::$iconPath . self::getFoundCacheIcon(self::$iconSmallStr . $cacheType['icon'], self::$iconArchivedStr),
-                    'iconSmallOwner' => self::$iconPath . self::getOwnerCacheIcon(self::$iconSmallStr . $cacheType['icon'], self::$iconArchivedStr),
-                ),
-            );
-        }
-        return $cacheTypeIcons;
-    }
-
-    private static function getFoundCacheIcon($cacheIcon, $statusStr = '')
-    {
-        $tmp = explode('.', $cacheIcon);
-        $tmp[0] = $tmp[0] . $statusStr . '-found';
-        return implode('.', $tmp);
-    }
-
-    private static function getOwnerCacheIcon($cacheIcon, $statusStr = '')
-    {
-        $tmp = explode('.', $cacheIcon);
-        $tmp[0] = $tmp[0] . $statusStr . '-s-owner';
-        return implode('.', $tmp);
-    }
-
-    public function getCacheTypeIcons()
-    {
-        return $this->cacheTypeIcons;
-    }
-
-
-
-    public function getCacheTypes()
-    {
-        return self::$type;
-    }
-
-    public function getCacheStatuses()
-    {
-        return $this->status;
-    }
-
-}
diff --git a/lib/myn.inc.php b/lib/myn.inc.php
index 434bd69c54..85433e8d7a 100644
--- a/lib/myn.inc.php
+++ b/lib/myn.inc.php
@@ -1,4 +1,6 @@
 <?php
+use src\Models\GeoCache\GeoCacheCommons;
+use src\Models\GeoCache\GeoCacheLog;
 use src\Utils\Database\OcDb;
 
 class myninc
@@ -34,45 +36,20 @@ private static function is_cache_found($cache_id, $user_id)
         }
     }
 
-    /**
-     * =====================================================================================
-     * Funkcja sprawdzająca czy użytkownik uczestniczył w wydarzeniu
-     *
-     * dane wejściowe:
-     * id skrzynki
-     * id zalogowanego użytkownika
-     *
-     * zwraca true lub false
-     *
-     * =====================================================================================
-     */
-    private static function is_event_attended($cache_id, $user_id)
-    {
-        $q = 'SELECT user_id FROM cache_logs WHERE cache_id =:v1 AND user_id =:v2 AND type = 7 AND Deleted=0';
-        $db = OcDb::instance();
-        $params = [];
-        $params['v1']['value'] = (integer) $cache_id;
-        $params['v1']['data_type'] = 'integer';
-        $params['v2']['value'] = (integer) $user_id;
-        $params['v2']['data_type'] = 'integer';
-        $s = $db->paramQuery($q, $params);
-        $rec = $db->dbResultFetch($s);
-        if (isset($rec['user_id'])) {
-            return true;
-        } else {
-            return false;
-        }
-    }
 
     public static function checkCacheStatusByUser($record, $userId)
     {
-        $cacheTypesIcons = cache::getCacheIconsSet();
-        if (isset($record['user_id']) && $record['user_id'] == $userId) {
-            return $cacheTypesIcons[$record['cache_type']]['iconSet'][1]['iconSmallOwner'];
-        } elseif (isset($record['cache_id']) && self::is_cache_found($record['cache_id'], $userId)) {
-            return $cacheTypesIcons[$record['cache_type']]['iconSet'][1]['iconSmallFound'];
+        if (isset($record['user_id']) && $record['user_id'] == $userId) { //for owner
+            return GeoCacheCommons::CacheIconByType(
+                $record['cache_type'], GeoCacheCommons::STATUS_READY, null, false, true);
+
+        } else if (isset($record['cache_id']) && self::is_cache_found($record['cache_id'], $userId)){
+            return GeoCacheCommons::CacheIconByType(
+                $record['cache_type'], GeoCacheCommons::STATUS_READY, GeoCacheLog::LOGTYPE_FOUNDIT, false, false);
+
         } else {
-            return $cacheTypesIcons[$record['cache_type']]['iconSet'][1]['iconSmall'];
+
+            return GeoCacheCommons::CacheIconByType($record['cache_type'], GeoCacheCommons::STATUS_READY);
         }
     }
 }
diff --git a/lib/search.txt.inc.php b/lib/search.txt.inc.php
index 452fa64758..6317200db0 100644
--- a/lib/search.txt.inc.php
+++ b/lib/search.txt.inc.php
@@ -18,11 +18,6 @@
 
 require_once (__DIR__.'/../lib/calculation.inc.php');
 
-
-$cache = cache::instance();
-$cacheTypesArr = $cache->getCacheTypeIcons();
-$cacheStatusArr = $cache->getCacheStatuses();
-
     $txtLine = chr(239) . chr(187) . chr(191) .tr('search_text_01')." {mod_suffix}{cachename} ".tr('search_text_02')." {owner}
 ".tr('search_text_03')." {lat} {lon}
 ".tr('search_text_04')." {status}
@@ -253,9 +248,9 @@
         } else {
             $thisline = str_replace('{rr_comment}', html2txt("<br /><br />--------<br />".$r['rr_comment']), $thisline);
         }
-        $thisline = str_replace('{type}', tr($cacheTypesArr[$r['type_id']]['translation']), $thisline);
+        $thisline = str_replace('{type}', tr(GeoCacheCommons::CacheTypeTranslationKey($r['type_id']), $thisline);
         $thisline = str_replace('{container}', tr(GeoCacheCommons::CacheSizeTranslationKey($r['size'])), $thisline);
-        $thisline = str_replace('{status}', tr($cacheStatusArr[$r['status']]['translation']), $thisline);
+        $thisline = str_replace('{status}', tr(GeoCacheCommons::CacheStatusTranslationKey($r['status'])), $thisline);
 
         $difficulty = sprintf('%01.1f', $r['difficulty'] / 2);
         $thisline = str_replace('{difficulty}', $difficulty, $thisline);
diff --git a/lib/settingsDefault.inc.php b/lib/settingsDefault.inc.php
index 377da61af8..865d8e4273 100644
--- a/lib/settingsDefault.inc.php
+++ b/lib/settingsDefault.inc.php
@@ -5,7 +5,7 @@
  * settings.inc.php file (e.g. $config['debugDB'] = true;).
  */
 
-require_once (__DIR__.'/cache.php');
+use src\Models\GeoCache\GeoCacheCommons;
 
 // enable detailed cache access logging
 $enable_cache_access_logs = false;
@@ -67,10 +67,10 @@
      * cache limits for user. If user is allowed to place limited nomber of specified cache type,
      * place cachetype and limit here.
      *
-     * Cachetypes must be lib/cache.php constant TYPE_*
+     * Cachetypes must be GeoCacheCommons constant TYPE_*
      */
     'cacheLimitByTypePerUser' => array(
-        cache::TYPE_OWNCACHE => 1,
+        GeoCacheCommons::TYPE_OWNCACHE => 1,
     ),
     /** The filter fragment selecting provinces from nuts_codes table. */
     'provinceNutsCondition' => '`code` like \'PL__\'',
diff --git a/newcache.php b/newcache.php
index 082adaa355..3040792d90 100644
--- a/newcache.php
+++ b/newcache.php
@@ -316,23 +316,25 @@
 }
 
 // typeoptions
-
-$cache = cache::instance();
-$cacheTypes = $cache->getCacheTypes();
 $types = '<option value="-1" disabled selected="selected">' . tr('select_one') . '</option>';
-foreach ($cacheTypes as $typeId => $type) {
+foreach (GeoCacheCommons::CacheTypesArray() as $typeId) {
     /* block creating forbidden cache types */
     if (in_array($typeId, OcConfig::getNoNewCacheOfTypesArray())) {
         continue;
     }
+
     /* apply cache limit by type per user */
-    if (isset($config['cacheLimitByTypePerUser'][$typeId]) && isset($cacheLimitByTypePerUser[$typeId]) && $cacheLimitByTypePerUser[$typeId] >= $config['cacheLimitByTypePerUser'][$typeId]) {
+    if (isset($config['cacheLimitByTypePerUser'][$typeId]) &&
+        isset($cacheLimitByTypePerUser[$typeId]) &&
+        $cacheLimitByTypePerUser[$typeId] >= $config['cacheLimitByTypePerUser'][$typeId]) {
         continue;
     }
     if ($typeId == $sel_type) {
-        $types .= '<option value="' . $typeId . '" selected="selected">' . tr($type['translation']) . '</option>';
+        $types .= '<option value="' . $typeId . '" selected="selected">' .
+            tr(GeoCacheCommons::CacheTypeTranslationKey($typeId)) . '</option>';
     } else {
-        $types .= '<option value="' . $typeId . '">' . tr($type['translation']) . '</option>';
+        $types .= '<option value="' . $typeId . '">' .
+            tr(GeoCacheCommons::CacheTypeTranslationKey($typeId)) . '</option>';
     }
 }
 tpl_set_var('typeoptions', $types);
diff --git a/powerTrail.php b/powerTrail.php
index 186890ef7f..9fee230e9e 100644
--- a/powerTrail.php
+++ b/powerTrail.php
@@ -30,8 +30,6 @@
 $ocConfig = OcConfig::instance();
 $appContainer = ApplicationContainer::Instance();
 
-require_once(__DIR__.'/lib/cache.php');
-
 $_SESSION['powerTrail']['userFounds'] = $usr['userFounds'];
 
 if ($ocConfig->isPowerTrailModuleSwitchOn() === false) {
diff --git a/powerTrail/ajaxGetPowerTrailCaches.php b/powerTrail/ajaxGetPowerTrailCaches.php
index c6b28d150e..5db5a5060d 100644
--- a/powerTrail/ajaxGetPowerTrailCaches.php
+++ b/powerTrail/ajaxGetPowerTrailCaches.php
@@ -1,6 +1,7 @@
 <?php
 
 use src\Models\GeoCache\GeoCacheCommons;
+use src\Models\GeoCache\GeoCacheLog;
 use src\Models\PowerTrail\PowerTrail;
 use src\Models\GeoCache\GeoCache;
 
@@ -50,7 +51,6 @@ function displayAllCachesOfPowerTrail(PowerTrail $powerTrail, $choseFinalCaches)
         6 => tr('pt244')
     );
 
-    $cacheTypesIcons = cache::getCacheIconsSet();
     $cacheRows = '<table class="ptCacheTable" align="center" width="90%"><tr>
         <th>' . tr('pt075') . '</th>
         <th>' . tr('pt076') . '</th>';
@@ -95,12 +95,22 @@ function displayAllCachesOfPowerTrail(PowerTrail $powerTrail, $choseFinalCaches)
         $cacheRows .= '<tr bgcolor="' . $bgcolor . '">';
         //display icon found/not found depend on current user
         if (isset($geocacheFoundArr[$geocache->getCacheId()])) {
-            $cacheRows .= '<td align="center"><img src="' . $cacheTypesIcons[$geocache->getCacheType()]['iconSet'][1]['iconSmallFound'] . '" /></td>';
+            $iconSrc = GeoCacheCommons::CacheIconByType(
+                $geocache->getCacheType(),
+                GeoCacheCommons::STATUS_READY,
+                GeoCacheLog::LOGTYPE_FOUNDIT);
+
         } elseif ($geocache->getOwner()->getUserId() == $userId) {
-            $cacheRows .= '<td align="center"><img src="' . $cacheTypesIcons[$geocache->getCacheType()]['iconSet'][1]['iconSmallOwner'] . '" /></td>';
+            $iconSrc = GeoCacheCommons::CacheIconByType(
+                $geocache->getCacheType(),
+                GeoCacheCommons::STATUS_READY,
+                null, false, true);
         } else {
-            $cacheRows .= '<td align="center"><img src="' . $cacheTypesIcons[$geocache->getCacheType()]['iconSet'][1]['iconSmall'] . '" /></td>';
+            $iconSrc = GeoCacheCommons::CacheIconByType(
+                $geocache->getCacheType(), GeoCacheCommons::STATUS_READY);
         }
+        $cacheRows .= '<td align="center"><img src="'.$iconSrc.'" /></td>';
+
         //cachename, username
         $cacheRows .= '<td><b>'.
                            '<a href="' . $geocache->getWaypointId() . '">'.
diff --git a/src/Models/GeoCache/GeoCache.php b/src/Models/GeoCache/GeoCache.php
index e548cb857a..fc42a5275d 100644
--- a/src/Models/GeoCache/GeoCache.php
+++ b/src/Models/GeoCache/GeoCache.php
@@ -81,9 +81,6 @@ class GeoCache extends GeoCacheCommons
      */
     private $distance = -1;
 
-    /** @var $dictionary \cache */
-    public $dictionary;
-
     private $ownerId;
 
     /** @var $owner User */
@@ -182,8 +179,6 @@ public function __construct(array $params = array())
         } elseif (isset($params['cacheUUID'])) {
             $this->loadByUUID($params['cacheUUID']);
         }
-
-        $this->dictionary = \cache::instance();
     }
 
     /**

From 36d3c25dbd475b6a1725eb66b1fbcf259675c516 Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Sun, 29 Sep 2019 18:01:44 +0200
Subject: [PATCH 7/8] just comments in rare-used files

---
 lib/ftsearch.inc.php |  4 ++++
 lib/myn.inc.php      | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/ftsearch.inc.php b/lib/ftsearch.inc.php
index 8b88ff436d..5579d6669c 100644
--- a/lib/ftsearch.inc.php
+++ b/lib/ftsearch.inc.php
@@ -1,5 +1,9 @@
 <?php
 
+/*
+ * THIS CODE IS USED by search.* only
+ */
+
 use src\Utils\Database\XDb;
 
 /* begin conversion rules */
diff --git a/lib/myn.inc.php b/lib/myn.inc.php
index 85433e8d7a..68a3585dfe 100644
--- a/lib/myn.inc.php
+++ b/lib/myn.inc.php
@@ -3,6 +3,11 @@
 use src\Models\GeoCache\GeoCacheLog;
 use src\Utils\Database\OcDb;
 
+/**
+ * @deprecated
+ *
+ * Don't use this - myn class should be removed soon
+ */
 class myninc
 {
 
@@ -36,7 +41,11 @@ private static function is_cache_found($cache_id, $user_id)
         }
     }
 
-
+/**
+ * @deprecated
+ *
+ * Don't use this - myn class should be removed soon
+ */
     public static function checkCacheStatusByUser($record, $userId)
     {
         if (isset($record['user_id']) && $record['user_id'] == $userId) { //for owner

From 9bc4e0586b0f87ed84b071a6a40a45d3ac6d25f0 Mon Sep 17 00:00:00 2001
From: kojoty <p.juzwiak@gmail.com>
Date: Sat, 15 Feb 2020 19:47:40 +0100
Subject: [PATCH 8/8] geopath cache types chart fix

---
 powerTrail/ajaxGetPowerTrailCaches.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/powerTrail/ajaxGetPowerTrailCaches.php b/powerTrail/ajaxGetPowerTrailCaches.php
index 5db5a5060d..db23e6782d 100644
--- a/powerTrail/ajaxGetPowerTrailCaches.php
+++ b/powerTrail/ajaxGetPowerTrailCaches.php
@@ -175,7 +175,7 @@ function displayAllCachesOfPowerTrail(PowerTrail $powerTrail, $choseFinalCaches)
 
         // count the rest of types
         $restOfTypes = 0;
-        foreach (array_diff_key(GeoCache::CacheTypesArray(), $typesToShow) as $type) {
+        foreach (array_diff(GeoCache::CacheTypesArray(), $typesToShow) as $type) {
             $restOfTypes += $cachetypes[$type];
         }
         if ($restOfTypes > 0) {