Skip to content
Snippets Groups Projects

5534 add docker

Merged Hahn Axel (hahn) requested to merge 5534-add-docker into master
1 file
+ 4
4
Compare changes
  • Side-by-side
  • Inline
@@ -167,21 +167,21 @@ class Actionlog {
@@ -167,21 +167,21 @@ class Actionlog {
if (isset($aFilter["project"]) && $aFilter["project"]) {
if (isset($aFilter["project"]) && $aFilter["project"]) {
$aWhere[]='`project`="' . $this->_filterAllowedChars($aFilter["project"], '[a-z0-9\-\_]') . '"';
$aWhere[]='`project`="' . $this->_filterAllowedChars($aFilter["project"], '[a-z0-9\-\_]') . '"';
}
}
if (isset($aFilter["from"])) {
if (isset($aFilter["from"]) && $aFilter["from"]) {
$aWhere[]='`time`>="' . $this->_filterAllowedChars($aFilter["from"], '[0-9\-\ \:]') . '"';
$aWhere[]='`time`>="' . $this->_filterAllowedChars($aFilter["from"], '[0-9\-\ \:]') . '"';
}
}
if (isset($aFilter["to"])) {
if (isset($aFilter["to"]) && $aFilter["to"]) {
$aWhere[]='`time`<="' . $this->_filterAllowedChars($aFilter["to"], '[0-9\-\ \:]') . '"';
$aWhere[]='`time`<="' . $this->_filterAllowedChars($aFilter["to"], '[0-9\-\ \:]') . '"';
}
}
$sSql.=(count($aWhere) ? 'WHERE '. implode(' AND ', $aWhere) : '');
$sSql.=(count($aWhere) ? 'WHERE '. implode(' AND ', $aWhere) : '');
if (isset($aFilter["order"])) {
if (isset($aFilter["order"]) && $aFilter["order"]) {
$sSql.=' ORDER BY ' . $this->_filterAllowedChars($aFilter["order"], '[a-z\`0-9\,\ ]');
$sSql.=' ORDER BY ' . $this->_filterAllowedChars($aFilter["order"], '[a-z\`0-9\,\ ]');
} else {
} else {
$sSql.=' ORDER BY id DESC ';
$sSql.=' ORDER BY id DESC ';
}
}
if (isset($aFilter["limit"])) {
if (isset($aFilter["limit"]) && $aFilter["limit"]) {
$sSql.=' LIMIT ' . $this->_filterAllowedChars($aFilter["limit"], '[0-9\,\ ]');
$sSql.=' LIMIT ' . $this->_filterAllowedChars($aFilter["limit"], '[0-9\,\ ]');
}
}
Loading