Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

style(legacy): format files

Browse source
This commit is contained in:
jo 2022-07-01 18:39:02 +02:00 • committed by Kyle Robbertze
parent 4d393fa14e
commit 5e8f7d430f
4 changed files with 517 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

4
legacy/application/forms/SmartBlockCriteria.php
View file

@ -855,9 +855,9 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
if (in_array($d['sp_criteria_modifier'], ['before', 'after', 'between'])) {
if (!preg_match('/^[1-9][0-9]*$|0/', $d['sp_criteria_value'])) {
$element->addError(_('Only non-negative integer numbers are allowed (e.g 1 or 5) for the text value'));
$isValid = false;
// TODO validate this on numeric input with whatever parsing also do for extra
// TODO validate this on numeric input with whatever parsing also do for extra
// if the modifier is before ago or between we skip validation until we confirm format
$isValid = false;
} elseif (isset($d['sp_criteria_datetime_select']) && $d['sp_criteria_datetime_select'] == '0') {
$element->addError(_('You must select a time unit for a relative datetime.'));
$isValid = false;

4
legacy/application/models/Block.php
View file

@ -1688,13 +1688,13 @@ SQL;
// need to pull in the current time and subtract the value or figure out how to make it relative
$relativedate = new DateTime($spCriteriaValue);
$dt = $relativedate->format(DateTime::ISO8601);
// Logging::info($spCriteriaValue);
$spCriteriaValue = "{$spCriteria} <= '{$dt}'";
// Logging::info($spCriteriaValue);
} elseif ($spCriteriaModifier == 'after') {
$relativedate = new DateTime($spCriteriaValue);
$dt = $relativedate->format(DateTime::ISO8601);
// Logging::info($spCriteriaValue);
$spCriteriaValue = "{$spCriteria} >= '{$dt}'";
// Logging::info($spCriteriaValue);
} elseif ($spCriteriaModifier == 'between') {
$fromrelativedate = new DateTime($spCriteriaValue);
$fdt = $fromrelativedate->format(DateTime::ISO8601);