franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify constraint on feed posts

Browse Source
This commit is contained in:
Franzz
2021-07-09 10:27:08 +02:00
parent 95531b4691
commit 0da78509a7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inc/Spot.php
View File

@@ -361,7 +361,7 @@ class Spot extends Main
* Get valid medias based on $sTimeRefField: * Get valid medias based on $sTimeRefField:
* - taken_on: Date/time on which the media was taken * - taken_on: Date/time on which the media was taken
* - posted_on: Date/time on which the media was uploaded * - posted_on: Date/time on which the media was uploaded
* @param String $sTimeRefField Field to calculate relative times * @param String $sTimeRefField Field to calculate relative times: 'taken_on' or 'posted_on'
* @return Array Medias info * @return Array Medias info
*/ */
private function getMedias($sTimeRefField) private function getMedias($sTimeRefField)
@@ -397,13 +397,15 @@ class Spot extends Main
'select' => array(Db::getFullColumnName(self::POST_TABLE, '*'), 'gravatar'), 'select' => array(Db::getFullColumnName(self::POST_TABLE, '*'), 'gravatar'),
'from' => self::POST_TABLE, 'from' => self::POST_TABLE,
'join' => array(User::USER_TABLE => Db::getId(User::USER_TABLE)), 'join' => array(User::USER_TABLE => Db::getId(User::USER_TABLE)),
'constraint'=> array(Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId()), 'constraint'=> array(
'constOpe' => array(Db::getId(Project::PROJ_TABLE) => "=") Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId(),
'site_time' => $this->oProject->getActivePeriod('to')
),
'constOpe' => array(
Db::getId(Project::PROJ_TABLE) => "=",
'site_time' => "<="
)
); );
if($this->oProject->getMode()==Project::MODE_HISTO) {
$asInfo['constraint']['site_time'] = $this->oProject->getActivePeriod('to');
$asInfo['constOpe']['site_time'] = "<=";
}
$asPosts = $this->oDb->selectRows($asInfo); $asPosts = $this->oDb->selectRows($asInfo);
foreach($asPosts as &$asPost) { foreach($asPosts as &$asPost) {