Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions app/Config/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,17 @@

// Setup a 'default' cache configuration for use in the application.
Cache::config('default', array(
'engine' => 'File',
'duration'=> '+1 hours',
'path' => CACHE,
'prefix' => 'cake_'
'engine' => 'File',
'duration'=> '+1 hours',
'path' => CACHE,
'prefix' => 'cake_'
));

Cache::config('crew', array(
'engine' => 'File',
'duration'=> '+1 week',
'path' => CACHE,
'prefix' => 'cake_long_'
));

// Enable the Dispatcher filters for plugin assets, and
Expand Down
36 changes: 18 additions & 18 deletions app/Model/Crew.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function getAllCrews($selectTag=false, $crew_id=0, $hidden=false) {
if($hidden) {
$hiddentext = '-hidden';
}
$crews = Cache::read(WB::$event->reference.'-crews-'.$type.$hiddentext);
$crews = Cache::read(WB::$event->reference.'-crews-'.$type.$hiddentext, 'crew');
if($crews === false) {
$conditions = array('event_id' => WB::$event->id);
if(!$hidden) {
Expand All @@ -115,7 +115,7 @@ public function getAllCrews($selectTag=false, $crew_id=0, $hidden=false) {
'order' => 'name',
'recursive' => -1
));
Cache::write(WB::$event->reference.'-crews-'.$type.$hiddentext, $crews);
Cache::write(WB::$event->reference.'-crews-'.$type.$hiddentext, $crews, 'crew');
}
return($crews);
}
Expand Down Expand Up @@ -144,7 +144,7 @@ public function getCrewHierarchy($select=false, $excludeHidden=true) {
if($select) {
$type = 'list';
}
$crews = Cache::read(WB::$event->reference.'-crew-hierarchy-'.$type.$hiddenCachePrefix);
$crews = Cache::read(WB::$event->reference.'-crew-hierarchy-'.$type.$hiddenCachePrefix, 'crew');
if($crews === false) {
$crews = array();
if($excludeHidden) {
Expand Down Expand Up @@ -174,7 +174,7 @@ public function getCrewHierarchy($select=false, $excludeHidden=true) {
}
}
}
Cache::write(WB::$event->reference.'-crew-hierarchy-'.$type.$hiddenCachePrefix, $crews);
Cache::write(WB::$event->reference.'-crew-hierarchy-'.$type.$hiddenCachePrefix, $crews, 'crew');
}
return $crews;
}
Expand All @@ -189,7 +189,7 @@ public function getChildCrews($parent_id, $select=false, $excludeHidden=true) {
if($select) {
$type = 'list';
}
$crews = Cache::read(WB::$event->reference.'-crew-childs-'.$parent_id.$hiddenCachePrefix);
$crews = Cache::read(WB::$event->reference.'-crew-childs-'.$parent_id.$hiddenCachePrefix, 'crew');
if($crews === false) {
$this->unbindModel(array(
'hasMany' => array(
Expand All @@ -204,7 +204,7 @@ public function getChildCrews($parent_id, $select=false, $excludeHidden=true) {
} else {
$crews = $this->query("SELECT * FROM (SELECT * FROM wb4_crews order by crew_id, id) Crew, (SELECT @pv := '".$parent_id."') initialisation WHERE find_in_set(crew_id, @pv) > 0 AND @pv := concat(@pv, ',', id) ORDER BY sorted_weight, name");
}
Cache::write(WB::$event->reference.'-crew-childs-'.$parent_id.$hiddenCachePrefix, $crews);
Cache::write(WB::$event->reference.'-crew-childs-'.$parent_id.$hiddenCachePrefix, $crews, 'crew');
}
return $crews;
}
Expand Down Expand Up @@ -420,17 +420,17 @@ public function clearCrewCache($crew_id) {
));
if ($crew) {
$crew_id = $crew['Crew']['crew_id']?$crew['Crew']['crew_id']:$crew_id;
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id);
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id.'hidden');
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id, 'crew');
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id.'hidden', 'crew');
}
Cache::delete(WB::$event->reference.'-crew-hierarchy-listhidden');
Cache::delete(WB::$event->reference.'-crew-hierarchy-list');
Cache::delete(WB::$event->reference.'-crew-hierarchy-allhidden');
Cache::delete(WB::$event->reference.'-crew-hierarchy-all');
Cache::delete(WB::$event->reference.'-crews-list');
Cache::delete(WB::$event->reference.'-crews-list-hidden');
Cache::delete(WB::$event->reference.'-crews-all');
Cache::delete(WB::$event->reference.'-crews-all-hidden');
Cache::delete(WB::$event->reference.'-crew-hierarchy-listhidden', 'crew');
Cache::delete(WB::$event->reference.'-crew-hierarchy-list', 'crew');
Cache::delete(WB::$event->reference.'-crew-hierarchy-allhidden', 'crew');
Cache::delete(WB::$event->reference.'-crew-hierarchy-all', 'crew');
Cache::delete(WB::$event->reference.'-crews-list', 'crew');
Cache::delete(WB::$event->reference.'-crews-list-hidden', 'crew');
Cache::delete(WB::$event->reference.'-crews-all', 'crew');
Cache::delete(WB::$event->reference.'-crews-all-hidden', 'crew');
}
public function clearCrewListCache($crew_id) {
$crew = $this->find('first', array(
Expand All @@ -442,8 +442,8 @@ public function clearCrewListCache($crew_id) {
return;
}
$crew_id = $crew['Crew']['crew_id']?$crew['Crew']['crew_id']:$crew_id;
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id);
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id.'hidden');
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id, 'crew');
Cache::delete(WB::$event->reference.'-crew-childs-'.$crew_id.'hidden', 'crew');
}

public function addChildCrews($res) {
Expand Down