projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweaks to login page template (Closes FS#771) [alk]
[platal.git]
/
include
/
emails.inc.php
diff --git
a/include/emails.inc.php
b/include/emails.inc.php
index
325c5ab
..
a15bb3a
100644
(file)
--- a/
include/emails.inc.php
+++ b/
include/emails.inc.php
@@
-332,6
+332,7
@@
class Redirect
{
foreach ($this->emails as &$mail) {
if ($mail->email == $email) {
{
foreach ($this->emails as &$mail) {
if ($mail->email == $email) {
+ check_redirect($this);
return $mail->cleanErrors($this->uid);
}
}
return $mail->cleanErrors($this->uid);
}
}
@@
-351,6
+352,7
@@
class Redirect
$mail->active = false;
}
}
$mail->active = false;
}
}
+ check_redirect($this);
}
// function enable() {{{2
}
// function enable() {{{2
@@
-365,6
+367,7
@@
class Redirect
$mail->active = true;
$mail->disabled = false;
}
$mail->active = true;
$mail->disabled = false;
}
+ check_redirect($this);
}
}
}
}
@@
-372,9
+375,9
@@
class Redirect
public function get_broken_mx()
{
public function get_broken_mx()
{
- $res = XDB::query("SELECT host, text
- FROM mx_watch
- WHERE state != 'ok'");
+ $res = XDB::query("SELECT host, text
, state
+
FROM mx_watch
+
WHERE state != 'ok'");
if (!$res->numRows()) {
return array();
}
if (!$res->numRows()) {
return array();
}
@@
-388,15
+391,18
@@
class Redirect
$lcl_mxs = array($domain);
}
$broken = false;
$lcl_mxs = array($domain);
}
$broken = false;
+ $state = false;
foreach ($mxs as &$mx) {
foreach ($lcl_mxs as $lcl) {
if (fnmatch($mx['host'], $lcl)) {
$broken = $mx['text'];
foreach ($mxs as &$mx) {
foreach ($lcl_mxs as $lcl) {
if (fnmatch($mx['host'], $lcl)) {
$broken = $mx['text'];
+ $state = $mx['state'];
break;
}
}
if ($broken) {
break;
}
}
if ($broken) {
- $mails[] = array('mail' => $mail->email, 'text' => $broken);
+ $mails[] = array('mail' => $mail->email, 'text' => $broken, 'state' => $state);
+ break;
}
}
}
}
}
}