Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2261

Přidáno uživatelem Ondřej Fibich před více než 10 roky(ů)

Opravy:
- closes #841: Upozornovani na e-mail/SMS nefunguje pokud nema uzivatel nastavenou alespon jednu IP

Zobrazit rozdíly:

freenetis/branches/1.1/application/models/member.php
switch ($type)
{
case Message_Model::INTERRUPTED_MEMBERSHIP_MESSAGE:
$where = "WHERE mi.id IS NOT NULL";
$where = "AND mi.id IS NOT NULL";
$order_by = 'whitelisted ASC, interrupt DESC';
break;
case Message_Model::DEBTOR_MESSAGE:
// without interrupted members, former members, applicants
$where = "WHERE mi.id IS NULL "
$where = "AND mi.id IS NULL "
. " AND m.type <> " . intval(Member_Model::TYPE_APPLICANT)
. " AND m.type <> " . Member_Model::TYPE_FORMER
. " AND a.balance < ".intval(Settings::get('debtor_boundary'))
......
case Message_Model::PAYMENT_NOTICE_MESSAGE:
// without interrupted members, former members, applicants, debtors
$where = "WHERE mi.id IS NULL "
$where = "AND mi.id IS NULL "
. " AND m.type <> " . intval(Member_Model::TYPE_APPLICANT)
. " AND m.type <> " . Member_Model::TYPE_FORMER
. " AND a.balance < ".intval(Settings::get('payment_notice_boundary'))."
......
a_comment, w.whitelisted,
IFNULL(mi.id, 0) AS interrupt,
1 AS redirection, 1 AS email, 1 AS sms
FROM
(
SELECT IFNULL(ip.member_id,u.member_id) AS member_id
FROM ip_addresses ip
LEFT JOIN ifaces i ON ip.iface_id = i.id
LEFT JOIN devices d ON i.device_id = d.id
LEFT JOIN users u ON d.user_id = u.id
) ip
JOIN members m ON ip.member_id = m.id
FROM members m
JOIN accounts a ON a.member_id = m.id AND account_attribute_id = ?
LEFT JOIN
(
......
LEFT JOIN members_whitelists mw ON mw.member_id = m2.id
AND mw.since <= CURDATE() AND mw.until >= CURDATE()
) w ON w.member_id = m.id
LEFT JOIN
(
SELECT ip.member_id, COUNT(*) AS unallowed_count
FROM
(
SELECT *
FROM
(
SELECT ip.subnet_id,
IFNULL(ip.member_id, u.member_id) AS member_id
FROM ip_addresses ip
LEFT JOIN ifaces i ON ip.iface_id = i.id
LEFT JOIN devices d ON i.device_id = d.id
LEFT JOIN users u ON d.user_id = u.id
) ip
GROUP BY ip.member_id, ip.subnet_id
) ip
LEFT JOIN allowed_subnets als ON ip.subnet_id = als.subnet_id
AND ip.member_id = als.member_id
WHERE ip.member_id <> ? AND IFNULL(als.enabled, 0) = 0
GROUP BY ip.member_id
) un ON un.member_id = m.id
$where
WHERE m.id <> ? $where
GROUP BY m.id
ORDER BY $order_by
", array(Account_attribute_Model::CREDIT, self::ASSOCIATION));
", Account_attribute_Model::CREDIT, Member_Model::ASSOCIATION);
}
/**

Také k dispozici: Unified diff