events:

- added relTabs to detail page

achievements:
 - implemented event-filter
 - filter will now always apply

 - years are now one day shorter (and time formating will no longer bug out)

includes/defines.php

@@ -59,7 +59,7 @@ define('HOUR',                              60  * MINUTE);
 define('DAY',                               24  * HOUR);
 define('WEEK',                              7   * DAY);
 define('MONTH',                             30  * DAY);
-define('YEAR',                              365 * DAY);
+define('YEAR',                              364 * DAY);
 
 // User Groups
 define('U_GROUP_NONE',                      0x0000);

includes/types/achievement.class.php

@@ -228,7 +228,28 @@ class AchievementList extends BaseType
 
 class AchievementListFilter extends Filter
 {
-    // cr => [type, field, misc, extraCol]
+
+    protected $enums         = array(
+        11 => array(
+              327 => 160,                                   // Lunar Festival
+              335 => 187,                                   // Love is in the Air
+              181 => 159,                                   // Noblegarden
+              201 => 163,                                   // Children's Week
+              341 => 161,                                   // Midsummer Fire Festival
+              372 => 162,                                   // Brewfest
+              324 => 158,                                   // Hallow's End
+              404 => 14981,                                 // Pilgrim's Bounty
+              141 => 156,                                   // Feast of Winter Veil
+              409 => -3456,                                 // Day of the Dead
+              398 => -3457,                                 // Pirates' Day
+            -2323 => true,
+            -2324 => false,
+              283 => -1,                                    // valid events without achievements
+              285 => -1,   353 => -1,   420 => -1,
+              400 => -1,   284 => -1,   374 => -1,
+              321 => -1,   424 => -1,   301 => -1
+        )
+    );
     protected $genericFilter = array(                       // misc (bool): _NUMERIC => useFloat; _STRING => localized; _FLAG => match Value; _BOOLEAN => stringSet
          2 => [FILTER_CR_BOOLEAN,   'reward_loc0', true      ], // givesreward
          3 => [FILTER_CR_STRING,    'reward',      true      ], // rewardtext
@@ -259,7 +280,21 @@ class AchievementListFilter extends Filter
             case 6:                                         // last in series [yn]
                 return $this->int2Bool($cr[1]) ? ['AND', ['series', 0, '!'], [['series', 0xFFFF, '&'], 0]] : [['series', 0xFFFF, '&'], 0, '!'];
             case 11:                                        // Related Event [enum]
-/* todo */      return [1];                                 // >0:holidayId; -2323:any; -2324:none .. not quite like the subcategories
+                $_ = @$this->enums[$cr[0]][$cr[1]];
+                if ($_ !== null)
+                {
+                    if (is_int($_))
+                        return ($_ > 0) ? ['category', $_] : ['id', abs($_)];
+                    else
+                    {
+                        $ids = array_filter($this->enums[$cr[0]], function($x) {
+                            return is_int($x) && $x > 0;
+                        });
+
+                        return ['category', $ids, $_ ? null : '!'];
+                    }
+                }
+                break;
             case 14:                                        // hascomments [yn]
 /* todo */      return [1];
             case 15:                                        // hasscreenshots [yn]

includes/utilities.php

@@ -1099,7 +1099,7 @@ class Util
 
         if ($short)
         {
-            if ($_ = round($s['d'] / 365))
+            if ($_ = round($s['d'] / 364))
                 return $_." ".Lang::$timeUnits['ab'][0];
             if ($_ = round($s['d'] / 30))
                 return $_." ".Lang::$timeUnits['ab'][1];
@@ -1120,14 +1120,13 @@ class Util
         }
         else
         {
-            $_ = $s['d'] + $s['h'];
+            $_ = $s['d'] + $s['h'] / 24;
-
+            if ($_ && !($_ % 364))                          // whole years
-            if ($_ && !($_ % 365))                          // whole years
+                return round(($s['d'] + $s['h'] / 24) / 364, 2)." ".Lang::$timeUnits[$s['d'] / 364 == 1 && !$s['h'] ? 'sg' : 'pl'][0];
-                return round(($s['d'] + $s['h'] *24) / 365, 2)." ".Lang::$timeUnits[$s['d'] / 365 == 1 && !$s['h'] ? 'sg' : 'pl'][0];
             if ($_ && !($_ % 30))                           // whole month
-                return round(($s['d'] + $s['h'] * 24) / 30, 2)." ".Lang::$timeUnits[$s['d'] / 30 == 1 && !$s['h'] ? 'sg' : 'pl'][1];
+                return round(($s['d'] + $s['h'] / 24) /  30, 2)." ".Lang::$timeUnits[$s['d'] /  30 == 1 && !$s['h'] ? 'sg' : 'pl'][1];
             if ($_ && !($_ % 7))                            // whole weeks
-                return round(($s['d'] + $s['h'] * 24) / 7, 2)." ".Lang::$timeUnits[$s['d'] / 7 == 1 && !$s['h'] ? 'sg' : 'pl'][2];
+                return round(($s['d'] + $s['h'] / 24) /   7, 2)." ".Lang::$timeUnits[$s['d'] /   7 == 1 && !$s['h'] ? 'sg' : 'pl'][2];
             if ($s['d'])
                 return round($s['d'] + $s['h']  /   24, 2)." ".Lang::$timeUnits[$s['d'] == 1 && !$s['h']  ? 'sg' : 'pl'][3];
             if ($s['h'])

pages/achievements.php

@@ -44,8 +44,9 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
     // include child categories if current category is empty
     $condition = !empty($cats) ? [['category', (int)end($cats)]] : [];
 
-    if ($_ = $acvFilter->getConditions())
+    $fiCnd = $acvFilter->getConditions();
-        $condition[] = $_;
+    if ($fiCnd)
+        $condition[] = $fiCnd;
 
     $acvList   = new AchievementList($condition);
     if (!$acvList->getMatches())
@@ -56,7 +57,13 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
             $curCats = DB::Aowow()->SelectCol('SELECT Id FROM ?_achievementCategory WHERE parentCategory IN (?a)', $curCats);
             $catList = array_merge($catList, $curCats);
         }
-        $acvList = new AchievementList($catList ? [['category', $catList]] : []);
+        $condition = [];
+        if ($fiCnd)
+            $condition[] = $fiCnd;
+        if ($catList)
+            $condition[] = ['category', $catList];
+
+        $acvList = new AchievementList($condition);
     }
 
     // recreate form selection

pages/event.php

@@ -23,13 +23,16 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
     if ($event->error)
         $smarty->notFound(Lang::$game['event'], $_id);
 
-    $hId = $event->getField('holidayId');
+    $_hId = $event->getField('holidayId');
+    $_eId = $event->getField('eventBak');
 
     // redirect if associated with a holiday
-    if ($hId && $_id != $hId)
+    if ($_hId && $_id != $_hId)
-        header('Location: '.STATIC_URL.'?event='.$hId);
+        header('Location: '.HOST_URL.'?event='.$_hId);
 
-    if ($hId)
+    $hasFilter = in_array($_hId, [372, 283, 285, 353, 420, 400, 284, 201, 374, 409, 141, 324, 321, 424, 335, 327, 341, 181, 404, 398, 301]);
+
+    if ($_hId)
     {
         switch ($event->getField('scheduleType'))
         {
@@ -48,8 +51,12 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
 
     $infobox = [];
 
-    // - boss
+    // boss
-    // - faction (only darkmoon faire)
+    if ($_ = $event->getField('bossCreature'))
+    {
+        Util::$pageTemplate->extendGlobalIds(TYPE_NPC, $_);
+        $infobox[] = Lang::$npc['rank'][3].Lang::$colon.'[npc='.$_.']';
+    }
 
     // finalized after the cache is handled
 
@@ -87,17 +94,134 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
     /* Extra Tabs */
     /**************/
 
-    // NPC spawns
+    // tab: npcs
+    if ($npcIds = DB::Aowow()->selectCol('SELECT id AS ARRAY_KEY, IF(ec.eventEntry > 0, 1, 0) AS added FROM creature c, game_event_creature ec WHERE ec.guid = c.guid AND ABS(ec.eventEntry) = ?d', $_eId))
+    {
+        $creatures = new CreatureList(array(['id', array_keys($npcIds)]));
+        if (!$creatures->error)
+        {
+            $data = $creatures->getListviewData();
 
-    // GO spawns
+            foreach ($data as &$d)
+                $d['method'] = $npcIds[$d['id']];
 
-    // Quests
+            $pageData['relTabs'][] = array(
+                'file'   => CreatureList::$brickFile,
+                'data'   => $data,
+                'params' => array(
+                    'tabs' => '$tabsRelated',
+                    'note' => $hasFilter ? sprintf(Util::$filterResultString, '?npcs&filter=cr=38;crs='.$_hId.';crv=0') : null
+                )
+            );
+        }
+    }
 
-    // Items requiring Holiday
+    // tab: objects
+    if ($objectIds = DB::Aowow()->selectCol('SELECT id AS ARRAY_KEY, IF(eg.eventEntry > 0, 1, 0) AS added FROM gameobject g, game_event_gameobject eg WHERE eg.guid = g.guid AND ABS(eg.eventEntry) = ?d', $_eId))
+    {
+        $objects = new GameObjectList(array(['id', array_keys($objectIds)]));
+        if (!$objects->error)
+        {
+            $data = $objects->getListviewData();
+            foreach ($data as &$d)
+                $d['method'] = $objectIds[$d['id']];
+
+            $pageData['relTabs'][] = array(
+                'file'   => GameObjectList::$brickFile,
+                'data'   => $data,
+                'params' => array(
+                    'tabs' => '$tabsRelated',
+                    'note' => $hasFilter ? sprintf(Util::$filterResultString, '?objects&filter=cr=16;crs='.$_hId.';crv=0') : null
+                )
+            );
+        }
+    }
+
+    // tab: quests (by table, go & creature)
+    $quests = new QuestList(array(['holidayId', $_hId]));
+    if (!$quests->error)
+    {
+        $quests->addGlobalsToJScript(GLOBALINFO_SELF | GLOBALINFO_REWARDS);
+
+        $pageData['relTabs'][] = array(
+            'file'   => QuestList::$brickFile,
+            'data'   => $quests->getListviewData(),
+            'params' => array(
+                'tabs' => '$tabsRelated',
+                'note' => $hasFilter ? sprintf(Util::$filterResultString, '?quests&filter=cr=33;crs='.$_hId.';crv=0') : null
+            )
+        );
+    }
+
+    // tab: achievements
+    if ($_ = $event->getField('achievementCatOrId'))
+    {
+        $condition = $_ > 0 ? [['category', $_]] : [['id', -$_]];
+        $acvs = new AchievementList($condition);
+        if (!$acvs->error)
+        {
+            $acvs->addGlobalsToJScript(GLOBALINFO_SELF | GLOBALINFO_RELATED);
+
+            $pageData['relTabs'][] = array(
+                'file'   => AchievementList::$brickFile,
+                'data'   => $acvs->getListviewData(),
+                'params' => array(
+                    'tabs'        => '$tabsRelated',
+                    'note'        => $hasFilter ? sprintf(Util::$filterResultString, '?achievements&filter=cr=11;crs='.$_hId.';crv=0') : null,
+                    'visibleCols' => "$['category']"
+                )
+            );
+        }
+    }
+
+    // tab: items
+    $conditions = array(
+        'OR',
+        ['holidayId', $_hId],                               // direct requirement on item
+    );
+
+    // items from quests
+    if (!$quests->error)
+    {
+        $questItems = [];
+        foreach (array_column($quests->rewards, TYPE_ITEM) as $arr)
+            $questItems = array_merge($questItems, $arr);
+
+        foreach (array_column($quests->requires, TYPE_ITEM) as $arr)
+            $questItems = array_merge($questItems, $arr);
+
+        if ($questItems)
+            $conditions[] = ['id', $questItems];
+    }
+
+    // items from creature
+    if ($npcIds && !$creatures->error)
+    {
+        // vendor
+        $cIds = $creatures->getFoundIDs();
+        if ($sells = DB::Aowow()->selectCol('SELECT item FROM npc_vendor nv  WHERE entry IN (?a) UNION SELECT item FROM game_event_npc_vendor genv JOIN creature c ON genv.guid = c.guid WHERE c.id IN (?a)', $cIds, $cIds))
+            $conditions[] = ['id', $sells];
+    }
+
+    // not checking for loot ... cant distinguish between eventLoot and fillerCrapLoot
+
+    $eventItems = new ItemList($conditions);
+    if (!$eventItems->error)
+    {
+        $eventItems->addGlobalsToJScript(GLOBALINFO_SELF);
+
+        $pageData['relTabs'][] = array(
+            'file'   => ItemList::$brickFile,
+            'data'   => $eventItems->getListviewData(),
+            'params' => array(
+                'tabs' => '$tabsRelated',
+                'note' => $hasFilter ? sprintf(Util::$filterResultString, '?items&filter=cr=160;crs='.$_hId.';crv=0') : null
+            )
+        );
+    }
 
     // tab: see also (event conditions)
-    $eId = $event->getField('eventBak');
+    if($rel = DB::Aowow()->selectCol('SELECT IF(eventEntry = prerequisite_event, NULL, IF(eventEntry = ?d, -prerequisite_event, eventEntry)) FROM game_event_prerequisite WHERE prerequisite_event = ?d OR eventEntry = ?d', $_eId, $_eId, $_eId))
-    if($rel = DB::Aowow()->selectCol('SELECT IF(eventEntry = prerequisite_event, NULL, IF(eventEntry = ?d, -prerequisite_event, eventEntry)) FROM game_event_prerequisite WHERE prerequisite_event = ?d OR eventEntry = ?d', $eId, $eId, $eId))
     {
         $list = [];
         array_walk($rel, function(&$v, $k) use (&$list) {
@@ -108,7 +232,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
         });
 
         $relEvents = new WorldEventList(array(['id', $list]));
-        $relEvents->addGlobalsToJscript(Util::$pageTemplate);
+        $relEvents->addGlobalsToJscript();
         $relData   = $relEvents->getListviewData(true);
         foreach ($relEvents->iterate() as $id => $__)
         {
@@ -119,7 +243,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
             );
         }
 
-        $event->addGlobalsToJscript(Util::$pageTemplate);
+        $event->addGlobalsToJscript();
         foreach ($rel as $r)
         {
             if ($r >= 0)
@@ -138,7 +262,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
         }
 
         $pageData['relTabs'][] = array(
-            'file'   => 'event',
+            'file'   => WorldEventList::$brickFile,
             'data'   => $relData,
             'params' => array(
                 'id'         => 'see-also',
@@ -160,21 +284,21 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
 
 $updated = WorldEventList::updateDates($pageData['dates']);
 
-// in progress
+// start
-if ($updated['start'] < time() && $updated['end'] > time())
+if ($updated['end'])
-    array_unshift($pageData['page']['infobox'], '[span class=q2]'.Lang::$event['inProgress'].'[/span]');
+    array_push($pageData['page']['infobox'], Lang::$event['start'].Lang::$colon.date(Lang::$dateFmtLong, $updated['start']));
-
-// occurence
-if ($updated['rec'] > 0)
-    array_unshift($pageData['page']['infobox'], Lang::$event['interval'].Lang::$colon.Util::formatTime($updated['rec'] * 1000));
 
 // end
 if ($updated['end'])
-    array_unshift($pageData['page']['infobox'], Lang::$event['end'].Lang::$colon.date(Lang::$dateFmtLong, $updated['end']));
+    array_push($pageData['page']['infobox'], Lang::$event['end'].Lang::$colon.date(Lang::$dateFmtLong, $updated['end']));
 
-// start
+// occurence
-if ($updated['end'])
+if ($updated['rec'] > 0)
-    array_unshift($pageData['page']['infobox'], Lang::$event['start'].Lang::$colon.date(Lang::$dateFmtLong, $updated['start']));
+    array_push($pageData['page']['infobox'], Lang::$event['interval'].Lang::$colon.Util::formatTime($updated['rec'] * 1000));
+
+// in progress
+if ($updated['start'] < time() && $updated['end'] > time())
+    array_push($pageData['page']['infobox'], '[span class=q2]'.Lang::$event['inProgress'].'[/span]');
 
 $pageData['page']['infobox'] = '[ul][li]'.implode('[/li][li]', $pageData['page']['infobox']).'[/li][/ul]';