Merge branch 'master' of /home/git/platal into profile_edit

[platal.git] / modules / axletter / axletter.inc.php

diff --git a/modules/axletter/axletter.inc.php b/modules/axletter/axletter.inc.php
index 9aa8cb6..386eb26 100644 (file)
--- a/modules/axletter/axletter.inc.php
+++ b/modules/axletter/axletter.inc.php
@@ -33,7 +33,7 @@ class AXLetter extends MassMailer
 
     function __construct($id)
     {
-        parent::__construct('axletter/letter.tpl', 'ax.css', 'ax/show');
+        parent::__construct('axletter/letter.tpl', 'ax.css', 'ax/show', 'axletter', 'axletter_ins');
         $this->_head = '<cher> <prenom>,';
 
         if (!is_array($id)) {
@@ -56,6 +56,9 @@ class AXLetter extends MassMailer
         list($this->_id, $this->_shortname, $this->_title_mail, $this->_title,
              $this->_body, $this->_signature, $this->_promo_min, $this->_promo_max,
              $this->_echeance, $this->_date, $this->_bits) = $id;
+        if ($this->_date == '0000-00-00') {
+            $this->_date = 0;
+        }
     }
 
     protected function assignData(&$smarty)
@@ -107,9 +110,10 @@ class AXLetter extends MassMailer
              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 (e.email IS NOT NULL OR ni.user_id = 0)
+                 WHERE  ni.last < {?} AND {$this->subscriptionWhere()}
+                        AND (e.email IS NOT NULL OR ni.user_id = 0)
               GROUP BY  u.user_id";
-    }              
+    }
 
     static public function subscriptionState($uid = null)
     {
@@ -118,8 +122,8 @@ class AXLetter extends MassMailer
                              FROM  axletter_ins
                             WHERE  user_id={?}", $user);
         return $res->fetchOneCell();
-    }   
-    
+    }
+
     static public function unsubscribe($uid = null, $hash = false)
     {
         $user = is_null($uid) ? S::v('uid') : $uid;
@@ -156,14 +160,43 @@ class AXLetter extends MassMailer
         return $res->fetchOneCell();
     }
 
-    protected function subscriptionTable()
+    static public function grantPerms($uid)
     {
-        return 'axletter_ins';
+        if (!is_numeric($uid)) {
+            $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $uid);
+            $uid = $res->fetchOneCell();
+        }
+        if (!$uid) {
+            return false;
+        }
+        return XDB::execute("INSERT IGNORE INTO axletter_rights SET user_id = {?}", $uid);
+    }
+
+    static public function revokePerms($uid)
+    {
+        if (!is_numeric($uid)) {
+            $res = XDB::query("SELECT id 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 subscriptionWhere()
     {
-        return 'ni.last';
+        if (!$this->_promo_min && !$this->_promo_max) {
+            return '1';
+        }
+        $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}))";
+        }
+        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}))";
+        }
+        return implode(' AND ', $where);
     }
 
     static public function awaiting()
@@ -189,16 +222,16 @@ class AXLetter extends MassMailer
     }
 
     static public function listSent()
-    {   
+    {
         $res = XDB::query("SELECT  IF(shortname IS NULL, id, shortname) as id, date, subject AS titre
                              FROM  axletter
                             WHERE  NOT (FIND_IN_SET('new', bits))
                          ORDER BY  date DESC");
         return $res->fetchAllAssoc();
     }
-    
+
     static public function listAll()
-    {   
+    {
         $res = XDB::query("SELECT  IF(shortname IS NULL, id, shortname) as id, date, subject AS titre
                              FROM  axletter
                          ORDER BY  date DESC");
@@ -206,5 +239,5 @@ class AXLetter extends MassMailer
     }
 }
 
-// vim:set et sw=4 sts=4 sws=4:
+// vim:set et sw=4 sts=4 sws=4 enc=utf-8:
 ?>