![](\"/images/")
" : " ";
+ echo isset($v['status']) ? "" : " ") : " ";
+ echo isset($v['got_last_activity']) ? str_replace(" ", "", $v['last_date']) . " " . (isset($v['last_status']) ? "
' . rand(1, 9) . ') ';
} else {
$tmplog_username_aktywnosc = ' (' . ($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 7b8e1e13cf..0000000000
Binary files a/images/oc_logo_1A.png and /dev/null differ
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 @@
- 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/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 @@
- '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/myn.inc.php b/lib/myn.inc.php
index 434bd69c54..68a3585dfe 100644
--- a/lib/myn.inc.php
+++ b/lib/myn.inc.php
@@ -1,6 +1,13 @@
paramQuery($q, $params);
- $rec = $db->dbResultFetch($s);
- if (isset($rec['user_id'])) {
- return true;
- } else {
- return false;
- }
- }
-
+/**
+ * @deprecated
+ *
+ * Don't use this - myn class should be removed soon
+ */
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.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/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("" : " ";
+ echo isset($v['status']) ? "" : " ") : " ";
+ echo isset($v['got_last_activity']) ? str_replace(" ", "
', $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 @@
' . tr('choose_waypoint_type') . '';
// 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 .= '';
+ $types .= '';
}
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 .= '';
+ $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..db23e6782d 100644
--- a/powerTrail/ajaxGetPowerTrailCaches.php
+++ b/powerTrail/ajaxGetPowerTrailCaches.php
@@ -1,6 +1,7 @@
tr('pt244')
);
- $cacheTypesIcons = cache::getCacheIconsSet();
$cacheRows = '