Commit bc93302e authored by Sophie Herold's avatar Sophie Herold
Browse files

Removes status 'old' tiggers warning (closes #25)

parent 3d49f836
......@@ -7,8 +7,8 @@
"license": "GPL-3.0+",
"authors": [
{
"name": "Michael Herold",
"email": "quabla@hemio.de"
"name": "Sophie Herold",
"email": "sophie@hemio.de"
}
],
"require": {
......
......@@ -117,6 +117,6 @@ class Progress extends form\Container implements ProgressInterface
public function isPending()
{
return $this->status !== null;
return $this->status !== null && $this->status !== 'old';
}
}
......@@ -47,12 +47,8 @@ class Db extends \hemio\edentata\ModuleDb
$this->pdo, 'email.sel_mailbox'
);
$where = '';
if ($activeOnly) {
$where = 'WHERE backend_status IS NULL OR backend_status <> \'del\' ';
}
$stmt->options($where.'ORDER BY backend_status, localpart, domain');
if ($activeOnly)
$stmt->options('WHERE backend_status IS NULL OR backend_status <> \'del\'');
return $stmt->execute();
}
......@@ -112,8 +108,7 @@ class Db extends \hemio\edentata\ModuleDb
, 'email.sel_alias'
);
$stmt->options(
'WHERE mailbox_localpart = :localpart AND mailbox_domain = :domain'.
' ORDER BY localpart, domain'
'WHERE mailbox_localpart = :localpart AND mailbox_domain = :domain'
);
return $stmt->execute(['localpart' => $mailboxLocalpart, 'domain' => $mailboxDomain]);
......@@ -170,8 +165,6 @@ class Db extends \hemio\edentata\ModuleDb
, 'email.sel_redirection'
);
$stmt->options('ORDER BY backend_status, localpart, domain');
return $stmt->execute();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment