removing depreciated class: cache

Author: kojoty

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()));

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',

lib/cache.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);
         }
     }
 }

lib/myn.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);

lib/search.txt.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;
@@ -73,10 +73,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__\'',

lib/settingsDefault.inc.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);

newcache.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) {