if ((preg_match('#^\d{4}$#', $p) && $p == $promo) ||
(preg_match('#^\d{4}-$#', $p) && intval(substr($p, 0, 4)) <= $promo) ||
(preg_match('#^-\d{4}$#', $p) && intval(substr($p, 1)) >= $promo) ||
- (preg_match('#^\d{4}-\d{4}$#', $p) && intval(substr($p, 0, 4)) <= $promo && intval(substr($p, 5)) >= $promo)) {
+ (preg_match('#^\d{4}-\d{4}$#', $p) &&
+ (intval(substr($p, 0, 4)) <= $promo && intval(substr($p, 5)) >= $promo ||
+ intval(substr($p, 0, 4)) >= $promo && intval(substr($p, 5)) <= $promo ))) {
return true;
}
}
}
$sql = 'SELECT v.id AS vid, a.question_id AS qid, a.answer AS answer
FROM survey_votes AS v
- LEFT JOIN survey_answers AS a
- ON a.vote_id=v.id
+ INNER JOIN survey_answers AS a ON a.vote_id=v.id
WHERE v.survey_id={?}
- ORDER BY vid ASC, qid ASC, answer ASC;';
+ ORDER BY vid ASC, qid ASC, answer ASC';
$res = XDB::iterator($sql, $this->id); // retrieves all answers from database
$vid = -1;
$vid_ = 0;