projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Search UI is more coherent :
[platal.git]
/
modules
/
email.php
diff --git
a/modules/email.php
b/modules/email.php
index
0e7a1b4
..
96ab340
100644
(file)
--- a/
modules/email.php
+++ b/
modules/email.php
@@
-370,7
+370,15
@@
L'
if ($x = $sel->fetchOneAssoc()) {
// on écrit dans la base que l'adresse est cassée
if (!$x['panne']) {
if ($x = $sel->fetchOneAssoc()) {
// on écrit dans la base que l'adresse est cassée
if (!$x['panne']) {
- XDB::execute("UPDATE emails SET panne=NOW() WHERE email = {?}", $email);
+ XDB::execute("UPDATE emails
+ SET panne=NOW(),
+ last=NOW(),
+ panne_level = 1
+ WHERE email = {?}", $email);
+ } else {
+ XDB::execute("UPDATE emails
+ SET panne_level = 1
+ WHERE email = {?} AND panne_level = 0");
}
$page->assign_by_ref('x', $x);
}
}
$page->assign_by_ref('x', $x);
}
@@
-416,8
+424,8
@@
L'
if ($action == 'list') {
$sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife
FROM emails_watch AS w
if ($action == 'list') {
$sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife
FROM emails_watch AS w
-
INNER
JOIN emails AS e USING(email)
-
INNER
JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie')
+
LEFT
JOIN emails AS e USING(email)
+
LEFT
JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie')
ORDER BY w.state, w.email, a.alias";
$it = Xdb::iterRow($sql);
ORDER BY w.state, w.email, a.alias";
$it = Xdb::iterRow($sql);
@@
-444,9
+452,9
@@
L'
$sql = "SELECT w.detection, w.state, w.last, w.description,
a1.alias AS edit, a2.alias AS forlife
FROM emails_watch AS w
$sql = "SELECT w.detection, w.state, w.last, w.description,
a1.alias AS edit, a2.alias AS forlife
FROM emails_watch AS w
- INNER JOIN emails AS e USING(email)
- LEFT JOIN
aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie'
)
-
INNER
JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie')
+ LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie')
+ LEFT JOIN
emails AS e ON (w.email = e.email
)
+
LEFT
JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie')
WHERE w.email = {?}
ORDER BY a2.alias";
$it = Xdb::iterRow($sql, $email);
WHERE w.email = {?}
ORDER BY a2.alias";
$it = Xdb::iterRow($sql, $email);