X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter%2Faxletter.inc.php;h=53c7dd3039af3d2b0eeb146f8b3ee25311438374;hb=ae163e7a83670527fcc67e38b5bbc0902b7fe119;hp=68c64a91368d3079072b7828d44a49f9abbd2599;hpb=1605f171418842df3135d9331d607203e5899c99;p=platal.git diff --git a/modules/axletter/axletter.inc.php b/modules/axletter/axletter.inc.php index 68c64a9..53c7dd3 100644 --- a/modules/axletter/axletter.inc.php +++ b/modules/axletter/axletter.inc.php @@ -1,6 +1,6 @@ _id, $this->_shortname, $this->_title_mail, $this->_title, $this->_body, $this->_signature, $this->_promo_min, $this->_promo_max, - $this->_subset_to, $this->_echeance, $this->_date, $this->_bits) = $id; + $this->_subset_to, $this->_subset_rm, $this->_echeance, $this->_date, $this->_bits) = $id; if ($this->_date == '0000-00-00') { $this->_date = 0; } - $this->_subset_to = preg_split("/\n/", $this->_subset_to); + $this->_subset_to = ($this->_subset_to ? explode("\n", $this->_subset_to) : null); $this->_subset = (count($this->_subset_to) > 0); } @@ -100,46 +101,26 @@ class AXLetter extends MassMailer WHERE id={?}", $this->_id); } - protected function getAllRecipients() - { - global $globals; - return "SELECT ni.user_id, IF(ni.user_id = 0, NULL, u.hruid) AS hruid, - IF(ni.user_id = 0, ni.email, CONCAT(a.alias, '@{$globals->mail->domain}')) AS alias, - IF(ni.user_id = 0, ni.prenom, u.prenom) AS prenom, - IF(ni.user_id = 0, ni.nom, IF(u.nom_usage='', u.nom, u.nom_usage)) AS nom, - FIND_IN_SET('femme', IF(ni.user_id = 0, ni.flag, u.flags)) AS sexe, - IF(ni.user_id = 0, 'html', q.core_mail_fmt) AS pref, - IF(ni.user_id = 0, ni.hash, 0) AS hash - FROM axletter_ins AS ni - LEFT JOIN auth_user_md5 AS u USING(user_id) - LEFT JOIN auth_user_quick AS q ON(q.user_id = u.user_id) - LEFT JOIN aliases AS a ON(u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags)) - LEFT JOIN emails AS e ON(e.uid=u.user_id AND e.flags='active') - WHERE ni.last < {?} AND {$this->subscriptionWhere()} - AND (e.email IS NOT NULL OR FIND_IN_SET('googleapps', u.mail_storage) OR ni.user_id = 0) - GROUP BY u.user_id"; - } - static public function subscriptionState($uid = null) { $user = is_null($uid) ? S::v('uid') : $uid; $res = XDB::query("SELECT 1 FROM axletter_ins - WHERE user_id={?}", $user); + WHERE uid={?}", $user); return $res->fetchOneCell(); } static public function unsubscribe($uid = null, $hash = false) { $user = is_null($uid) ? S::v('uid') : $uid; - $field = !$hash ? 'user_id' : 'hash'; + $field = !$hash ? 'uid' : 'hash'; if (is_null($uid) && $hash) { return false; } - $res = XDB::query("SELECT * + $res = XDB::query("SELECT uid FROM axletter_ins WHERE $field={?}", $user); - if (!$res->numRows()) { + if ($res->numRows() != 1) { return false; } XDB::execute("DELETE FROM axletter_ins @@ -150,7 +131,7 @@ class AXLetter extends MassMailer static public function subscribe($uid = null) { $user = is_null($uid) ? S::v('uid') : $uid; - XDB::execute("REPLACE INTO axletter_ins (user_id,last) + XDB::execute("REPLACE INTO axletter_ins (uid,last) VALUES ({?}, 0)", $user); } @@ -161,40 +142,32 @@ class AXLetter extends MassMailer } $res = XDB::query("SELECT COUNT(*) FROM axletter_rights - WHERE user_id = {?}", S::i('uid')); + WHERE uid = {?}", S::i('uid')); return ($res->fetchOneCell() > 0); } static public function grantPerms($uid) { if (!is_numeric($uid)) { - $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $uid); + $res = XDB::query("SELECT uid FROM aliases WHERE alias = {?}", $uid); $uid = $res->fetchOneCell(); } if (!$uid) { return false; } - return XDB::execute("INSERT IGNORE INTO axletter_rights SET user_id = {?}", $uid); + return XDB::execute("INSERT IGNORE INTO axletter_rights SET uid = {?}", $uid); } static public function revokePerms($uid) { if (!is_numeric($uid)) { - $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $uid); + $res = XDB::query("SELECT uid FROM aliases WHERE alias = {?}", $uid); $uid = $res->fetchOneCell(); } if (!$uid) { return false; } - return XDB::execute("DELETE FROM axletter_rights WHERE user_id = {?}", $uid); - } - - protected function subsetJoin() - { - if ($this->_subset) { - return "INNER JOIN axletter_subsets AS c ON (c.letter_id = ".XDB::escape($this->_id)." AND ni.user_id = c.uid)"; - } - return ''; + return XDB::execute("DELETE FROM axletter_rights WHERE uid = {?}", $uid); } protected function subscriptionWhere() @@ -202,21 +175,28 @@ class AXLetter extends MassMailer if (!$this->_promo_min && !$this->_promo_max && !$this->_subset) { return '1'; } + /* TODO: refines this filter on promotions by using userfilter. */ $where = array(); if ($this->_promo_min) { - $where[] = "((ni.user_id = 0 AND ni.promo >= {$this->_promo_min}) OR (ni.user_id != 0 AND u.promo >= {$this->_promo_min}))"; + $where[] = "((ni.uid = 0 AND ni.promo >= {$this->_promo_min}) OR (ni.uid != 0 AND pd.promo >= 'X{$this->_promo_min}'))"; } if ($this->_promo_max) { - $where[] = "((ni.user_id = 0 AND ni.promo <= {$this->_promo_max}) OR (ni.user_id != 0 AND u.promo <= {$this->_promo_max}))"; + $where[] = "((ni.uid = 0 AND ni.promo <= {$this->_promo_max}) OR (ni.uid != 0 AND pd.promo <= 'X{$this->_promo_max}'))"; } if ($this->_subset) { require_once("emails.inc.php"); - print_r($this->_subset_to); - $ids = idsFromMails($this->_subset_to); - print_r($ids); + $ids = ids_from_mails($this->_subset_to); $ids_list = implode(',', $ids); - $where[] = "ni.user_id IN ($ids_list)"; - // TODO : force use of the adresses given by AX, not "canonical" ones ? + if(count($ids) > 0) { + if ($this->_subset_rm) { + $where[] = "ni.uid NOT IN ($ids_list)"; + } else { + $where[] = "ni.uid IN ($ids_list)"; + } + } else { + // No valid email + $where[] = "0"; + } } return implode(' AND ', $where); }