Translates peremption to expiration.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php
index bb2ebb5..ddfdef5 100644 (file)
--- a/include/validations/evts.inc.php
+++ b/include/validations/evts.inc.php
@@ -30,7 +30,7 @@ class EvtReq extends Validate
     public $texte;
     public $pmin;
     public $pmax;
-    public $peremption;
+    public $expiration;
     public $comment;
 
     public $imgtype;
@@ -41,14 +41,14 @@ class EvtReq extends Validate
     // }}}
     // {{{ constructor
 
-    public function __construct($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, User &$_user, PlUpload &$upload = null)
+    public function __construct($_titre, $_texte, $_pmin, $_pmax, $_expiration, $_comment, User &$_user, PlUpload &$upload = null)
     {
         parent::__construct($_user, false, 'evts');
         $this->titre      = $_titre;
         $this->texte      = $_texte;
         $this->pmin       = $_pmin;
         $this->pmax       = $_pmax;
-        $this->peremption = $_peremption;
+        $this->expiration = $_expiration;
         $this->comment    = $_comment;
         if ($upload) {
             $this->readImage($upload);
@@ -92,7 +92,7 @@ class EvtReq extends Validate
         $this->texte      = Env::v('texte');
         $this->pmin       = Env::i('promo_min');
         $this->pmax       = Env::i('promo_max');
-        $this->peremption = Env::v('peremption');
+        $this->expiration = Env::v('expiration');
         if (@$_FILES['image']['tmp_name']) {
             $upload = PlUpload::get($_FILES['image'], S::user()->login(), 'event');
             if (!$upload) {
@@ -136,9 +136,9 @@ class EvtReq extends Validate
     {
         if (XDB::execute("INSERT INTO  announces
                          SET  uid = {?}, creation_date=NOW(), titre={?}, texte={?},
-                              peremption={?}, promo_min={?}, promo_max={?}, flags=CONCAT(flags,',valide,wiki')",
+                              expiration={?}, promo_min={?}, promo_max={?}, flags=CONCAT(flags,',valide,wiki')",
                 $this->user->id(), $this->titre, $this->texte,
-                $this->peremption, $this->pmin, $this->pmax)) {
+                $this->expiration, $this->pmin, $this->pmax)) {
             $eid = XDB::insertId();
             if ($this->img) {
                 XDB::execute("INSERT INTO announce_photos

diff --git a/modules/events.php b/modules/events.php
index 98d4a37..d333d0c 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -65,7 +65,7 @@ class EventsModule extends PLModule
             $priority = (int)($priority/2);
             $res = XDB::query("SELECT  *
                                  FROM  tips
-                                WHERE  (peremption = '0000-00-00' OR peremption > CURDATE())
+                                WHERE  (expiration = '0000-00-00' OR expiration > CURDATE())
                                        AND (promo_min = 0 OR promo_min <= {?})
                                        AND (promo_max = 0 OR promo_max >= {?})
                                        AND (priorite >= {?})
@@ -134,7 +134,7 @@ class EventsModule extends PLModule
             XDB::execute('DELETE ev.*
                             FROM announce_read AS ev
                       INNER JOIN announces AS e ON e.id = ev.evt_id
-                           WHERE peremption < NOW()');
+                           WHERE expiration < NOW()');
             XDB::execute('REPLACE INTO announce_read VALUES({?},{?})',
                 $eid, S::v('uid'));
             pl_redirect('events#'.$pound);
@@ -154,13 +154,13 @@ class EventsModule extends PLModule
                                      p.x, p.y, p.attach IS NOT NULL AS img, FIND_IN_SET('wiki', e.flags) AS wiki,
                                      FIND_IN_SET('important', e.flags) AS important,
                                      e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY) AS news,
-                                     e.peremption < DATE_ADD(CURDATE(), INTERVAL 2 DAY) AS end,
+                                     e.expiration < DATE_ADD(CURDATE(), INTERVAL 2 DAY) AS end,
                                      ev.uid IS NULL AS nonlu, e.promo_min, e.promo_max
                                FROM  announces       AS e
                           LEFT JOIN  announce_photos AS p  ON (e.id = p.eid)
                           LEFT JOIN  announce_read   AS ev ON (e.id = ev.evt_id AND ev.uid = {?})
-                              WHERE  FIND_IN_SET('valide', e.flags) AND peremption >= NOW()
-                           ORDER BY  important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC",
+                              WHERE  FIND_IN_SET('valide', e.flags) AND expiration >= NOW()
+                           ORDER BY  important DESC, news DESC, end DESC, e.expiration, e.creation_date DESC",
                             S::i('uid'));
         $cats = array('important', 'news', 'end', 'body');
 
@@ -255,7 +255,7 @@ class EventsModule extends PLModule
         $texte      = Post::v('texte');
         $promo_min  = Post::i('promo_min');
         $promo_max  = Post::i('promo_max');
-        $peremption = Post::i('peremption');
+        $expiration = Post::i('expiration');
         $valid_mesg = Post::v('valid_mesg');
         $action     = Post::v('action');
         $upload     = new PlUpload(S::user()->login(), 'event');
@@ -273,7 +273,7 @@ class EventsModule extends PLModule
         $page->assign('texte', $texte);
         $page->assign('promo_min', $promo_min);
         $page->assign('promo_max', $promo_max);
-        $page->assign('peremption', $peremption);
+        $page->assign('expiration', $expiration);
         $page->assign('valid_mesg', $valid_mesg);
         $page->assign('action', strtolower($action));
         $page->assign_by_ref('upload', $upload);
@@ -288,7 +288,7 @@ class EventsModule extends PLModule
 
             require_once 'validations.inc.php';
             $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
-                                 $peremption, $valid_mesg, S::user(), $upload);
+                                 $expiration, $valid_mesg, S::user(), $upload);
             $evtreq->submit();
             $page->assign('ok', true);
         } elseif (!Env::v('preview')) {
@@ -308,7 +308,7 @@ class EventsModule extends PLModule
         $page->setTitle('Administration - Astuces');
         $page->assign('title', 'Gestion des Astuces');
         $table_editor = new PLTableEditor('admin/tips', 'tips', 'id');
-        $table_editor->describe('peremption', 'date de péremption', true);
+        $table_editor->describe('expiration', 'date de péremption', true);
         $table_editor->describe('promo_min', 'promo. min (0 aucune)', false);
         $table_editor->describe('promo_max', 'promo. max (0 aucune)', false);
         $table_editor->describe('titre', 'titre', true);
@@ -368,10 +368,10 @@ class EventsModule extends PLModule
 
                 XDB::execute('UPDATE announces
                                  SET creation_date = creation_date,
-                                     titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?},
+                                     titre={?}, texte={?}, expiration={?}, promo_min={?}, promo_max={?},
                                      flags = {?}
                                WHERE id = {?}',
-                              Post::v('titre'), Post::v('texte'), Post::v('peremption'),
+                              Post::v('titre'), Post::v('texte'), Post::v('expiration'),
                               Post::v('promo_min'), Post::v('promo_max'),
                               $flags, $eid);
                 if ($upload->exists() && list($x, $y, $type) = $upload->imageInfo()) {
@@ -384,17 +384,17 @@ class EventsModule extends PLModule
         }
 
         if ($action == 'edit') {
-            $res = XDB::query('SELECT titre, texte, peremption, promo_min, promo_max, FIND_IN_SET(\'important\', flags),
+            $res = XDB::query('SELECT titre, texte, expiration, promo_min, promo_max, FIND_IN_SET(\'important\', flags),
                                       attach IS NOT NULL
                                  FROM announces       AS e
                             LEFT JOIN announce_photos AS p ON(e.id = p.eid)
                                 WHERE id={?}', $eid);
-            list($titre, $texte, $peremption, $promo_min, $promo_max, $important, $img) = $res->fetchOneRow();
+            list($titre, $texte, $expiration, $promo_min, $promo_max, $important, $img) = $res->fetchOneRow();
             $page->assign('titre',$titre);
             $page->assign('texte',$texte);
             $page->assign('promo_min',$promo_min);
             $page->assign('promo_max',$promo_max);
-            $page->assign('peremption',$peremption);
+            $page->assign('expiration',$expiration);
             $page->assign('important', $important);
             $page->assign('eid', $eid);
             $page->assign('img', $img);
@@ -408,7 +408,7 @@ class EventsModule extends PLModule
                 $day=substr($p_stamp,6,2);
 
                 $select .= "<option value=\"$p_stamp\""
-                        . (($p_stamp == strtr($peremption, array("-" => ""))) ? " selected" : "")
+                        . (($p_stamp == strtr($expiration, array("-" => ""))) ? " selected" : "")
                         . "> $day / $month / $year</option>\n";
             }
             $page->assign('select',$select);
@@ -454,14 +454,14 @@ class EventsModule extends PLModule
             $pid = ($eid && $action == 'preview') ? $eid : -1;
             $sql = "SELECT  e.id, e.titre, e.texte,e.id = $pid AS preview, e.uid,
                             DATE_FORMAT(e.creation_date,'%d/%m/%Y %T') AS creation_date,
-                            DATE_FORMAT(e.peremption,'%d/%m/%Y') AS peremption,
+                            DATE_FORMAT(e.expiration,'%d/%m/%Y') AS expiration,
                             e.promo_min, e.promo_max,
                             FIND_IN_SET('valide', e.flags) AS fvalide,
                             FIND_IN_SET('archive', e.flags) AS farch,
                             FIND_IN_SET('wiki', e.flags) AS wiki
                       FROM  announces    AS e
                      WHERE  ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags)
-                  ORDER BY  FIND_IN_SET('valide',e.flags), e.peremption DESC";
+                  ORDER BY  FIND_IN_SET('valide',e.flags), e.expiration DESC";
             $page->assign('evs', XDB::iterator($sql));
         }
         $page->assign('arch', $arch);

diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php
index 524ff32..afa6396 100644 (file)
--- a/modules/events/feed.inc.php
+++ b/modules/events/feed.inc.php
@@ -50,7 +50,7 @@ class EventFeed extends PlFeed
                                          e.uid, e.promo_min, e.promo_max
                                    FROM  announces       AS e
                               LEFT JOIN  announce_photos AS p ON (p.eid = e.id)
-                                  WHERE  FIND_IN_SET("valide", e.flags) AND peremption >= NOW()');
+                                  WHERE  FIND_IN_SET("valide", e.flags) AND expiration >= NOW()');
         $data = array();
         while ($e = self::nextEvent($events, $user)) {
             $author = User::getWithUID($e['user_id']);

diff --git a/modules/gadgets.php b/modules/gadgets.php
index d769a9d..188dc57 100644 (file)
--- a/modules/gadgets.php
+++ b/modules/gadgets.php
@@ -48,7 +48,7 @@ class GadgetsModule extends PLModule
                                          ev.user_id IS NULL AS nonlu, e.uid
                                    FROM  announces AS e
                               LEFT JOIN  announce_read AS ev ON (e.id = ev.evt_id AND ev.uid = {?})
-                                  WHERE  FIND_IN_SET("valide", e.flags) AND peremption >= NOW()
+                                  WHERE  FIND_IN_SET("valide", e.flags) AND expiration >= NOW()
                                ORDER BY  e.creation_date DESC', S::i('uid'));
         $page->assign('event_count', XDB::query("SELECT FOUND_ROWS()")->fetchOneCell());
 

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 4852cb4..9b1fa04 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -69,7 +69,7 @@ class XnetGrpModule extends PLModule
                 XDB::query('DELETE  r.*
                               FROM  group_announces_read AS r
                         INNER JOIN  group_announces      AS a ON (a.id = r.announce_id)
-                             WHERE  peremption < CURRENT_DATE()');
+                             WHERE  expiration < CURRENT_DATE()');
                 XDB::query('INSERT INTO  group_announces_read
                                  VALUES  ({?}, {?})',
                             Env::i('read'), S::i('uid'));
@@ -85,25 +85,25 @@ class XnetGrpModule extends PLModule
             $arts = XDB::iterator("SELECT  a.*, FIND_IN_SET('photo', a.flags) AS photo
                                      FROM  group_announces      AS a
                                 LEFT JOIN  group_announces_read AS r ON (r.uid = {?} AND r.announce_id = a.id)
-                                    WHERE  asso_id = {?} AND peremption >= CURRENT_DATE()
+                                    WHERE  asso_id = {?} AND expiration >= CURRENT_DATE()
                                            AND (promo_min = 0 OR promo_min <= {?})
                                            AND (promo_max = 0 OR promo_max >= {?})
                                            AND r.announce_id IS NULL
-                                 ORDER BY  a.peremption",
+                                 ORDER BY  a.expiration",
                                    S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
             $index = XDB::iterator("SELECT  a.id, a.titre, r.user_id IS NULL AS nonlu
                                       FROM  group_announces      AS a
                                  LEFT JOIN  group_announces_read AS r ON (a.id = r.announce_id AND r.uid = {?})
-                                     WHERE  asso_id = {?} AND peremption >= CURRENT_DATE()
+                                     WHERE  asso_id = {?} AND expiration >= CURRENT_DATE()
                                             AND (promo_min = 0 OR promo_min <= {?})
                                             AND (promo_max = 0 OR promo_max >= {?})
-                                  ORDER BY  a.peremption",
+                                  ORDER BY  a.expiration",
                                    S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
             $page->assign('article_index', $index);
         } else {
             $arts = XDB::iterator("SELECT  *, FIND_IN_SET('photo', flags) AS photo
                                      FROM  group_announces
-                                    WHERE  asso_id = {?} AND peremption >= CURRENT_DATE()
+                                    WHERE  asso_id = {?} AND expiration >= CURRENT_DATE()
                                            AND FIND_IN_SET('public', flags)",
                                   $globals->asso('id'));
         }
@@ -1052,7 +1052,7 @@ class XnetGrpModule extends PLModule
             $art['prenom']     = S::v('prenom');
             $art['promo']      = S::v('promo');
             $art['hruid']      = S::user()->login();
-            $art['peremption'] = Post::v('peremption');
+            $art['expiration'] = Post::v('expiration');
             $art['public']     = Post::has('public');
             $art['xorg']       = Post::has('xorg');
             $art['nl']         = Post::has('nl');
@@ -1116,10 +1116,10 @@ class XnetGrpModule extends PLModule
                                           $art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80));
                 }*/
                 XDB::query('INSERT INTO  group_announces (uid, asso_id, create_date, titre, texte, contacts,
-                                                          peremption, promo_min, promo_max, flags, post_id)
+                                                          expiration, promo_min, promo_max, flags, post_id)
                                  VALUES  ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
                            S::i('uid'), $globals->asso('id'), $art['titre'], $art['texte'], $art['contact_html'],
-                           $art['peremption'], $promo_min, $promo_max, $flags, $post);
+                           $art['expiration'], $promo_min, $promo_max, $flags, $post);
                 $aid = XDB::insertId();
                 if ($art['photo']) {
                     list($imgx, $imgy, $imgtype) = $upload->imageInfo();
@@ -1130,7 +1130,7 @@ class XnetGrpModule extends PLModule
                 if ($art['xorg']) {
                     require_once('validations.inc.php');
                     $article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'], $fulltext,
-                                    $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::user(),
+                                    $art['promo_min'], $art['promo_max'], $art['expiration'], "", S::user(),
                                     $upload);
                     $article->submit();
                     $page->trigWarning("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation.");
@@ -1146,10 +1146,10 @@ class XnetGrpModule extends PLModule
                 }
             } else {
                 XDB::query('UPDATE  group_announces
-                               SET  titre = {?}, texte = {?}, contacts = {?}, peremption = {?},
+                               SET  titre = {?}, texte = {?}, contacts = {?}, expiration = {?},
                                     promo_min = {?}, promo_max = {?}, flags = {?}
                              WHERE  id = {?} AND asso_id = {?}',
-                           $art['titre'], $art['texte'], $art['contacts'], $art['peremption'],
+                           $art['titre'], $art['texte'], $art['contacts'], $art['expiration'],
                            $promo_min, $promo_max,  $flags,
                            $art['id'], $globals->asso('id'));
                 if ($art['photo'] && $upload->exists()) {
@@ -1205,10 +1205,10 @@ class XnetGrpModule extends PLModule
                                 WHERE  id = {?} AND asso_id = {?}',
                          Env::i('del'), $globals->asso('id'));
         }
-        $res = XDB::iterator('SELECT  id, titre, peremption, peremption < CURRENT_DATE() AS perime
+        $res = XDB::iterator('SELECT  id, titre, expiration, expiration < CURRENT_DATE() AS perime
                                 FROM  group_announces
                                WHERE  asso_id = {?}
-                            ORDER BY  peremption DESC',
+                            ORDER BY  expiration DESC',
                              $globals->asso('id'));
         $page->assign('articles', $res);
     }

diff --git a/modules/xnetgrp/feed.inc.php b/modules/xnetgrp/feed.inc.php
index b049f6a..95b421c 100644 (file)
--- a/modules/xnetgrp/feed.inc.php
+++ b/modules/xnetgrp/feed.inc.php
@@ -80,14 +80,14 @@ class XnetGrpEventFeed extends PlFeed
                                           FIND_IN_SET('photo', flags) AS photo,
                                           CONCAT({?}, '/#art', id) AS link
                                     FROM  group_announces
-                                   WHERE  peremption >= NOW() AND asso_id = {?}",
+                                   WHERE  expiration >= NOW() AND asso_id = {?}",
                                    $this->link, $globals->asso('id'), $user));
         } else {
             return  XDB::iterator("SELECT  id, titre AS title, texte, create_date AS publication,
                                            CONCAT({?}, '/#art', id) AS link,
                                            NULL AS photo, NULL AS contacts
                                      FROM  group_announces
-                                    WHERE  FIND_IN_SET('public', flags) AND peremption >= NOW() AND asso_id = {?}",
+                                    WHERE  FIND_IN_SET('public', flags) AND expiration >= NOW() AND asso_id = {?}",
                                   $this->link, $globals->asso('id'));
         }
     }

diff --git a/templates/events/admin.tpl b/templates/events/admin.tpl
index 9513349..90bc0c8 100644 (file)
--- a/templates/events/admin.tpl
+++ b/templates/events/admin.tpl
@@ -63,7 +63,7 @@
         Proposée par {profile user=$ev.uid promo=true sex=false}
       </small>
     </td>
-    <td class="right">{if !$ev.fvalide}<strong>{/if}{$ev.peremption}{if !$ev.fvalide}</strong>{/if}</td>
+    <td class="right">{if !$ev.fvalide}<strong>{/if}{$ev.expiration}{if !$ev.fvalide}</strong>{/if}</td>
     <td class="right" style="width: 42px">
       {if $arch}
         <a href="admin/events/unarchive/{$ev.id}?token={xsrf_token}">{icon name=package_delete title="Désarchiver"}</a><br />

diff --git a/templates/events/form.tpl b/templates/events/form.tpl
index cbd8501..a1e1dc5 100644 (file)
--- a/templates/events/form.tpl
+++ b/templates/events/form.tpl
@@ -32,8 +32,8 @@
 {if $smarty.request.promo_max}
 {assign var=promo_max value=$smarty.request.promo_max|smarty:nodefaults}
 {/if}
-{if $smarty.request.peremption}
-{assign var=peremption value=$smarty.request.peremption|smarty:nodefaults}
+{if $smarty.request.expiration}
+{assign var=expiration value=$smarty.request.expiration|smarty:nodefaults}
 {/if}
 {if $smarty.request.important}
 {assign var=important value=$smarty.request.important|smarty:nodefaults}
@@ -170,7 +170,7 @@
         Dernier jour d'affichage
       </td>
       <td>
-        {valid_date name="peremption" value=$peremption to=60}
+        {valid_date name="expiration" value=$expiration to=60}
       </td>
     </tr>
     {if $admin_evts}

diff --git a/templates/include/form.valid.edit-evts.tpl b/templates/include/form.valid.edit-evts.tpl
index 54af916..e39cc50 100644 (file)
--- a/templates/include/form.valid.edit-evts.tpl
+++ b/templates/include/form.valid.edit-evts.tpl
@@ -24,7 +24,7 @@
 <br />
 <textarea rows="10" cols="60" name="texte">{$valid->texte}</textarea>
 <br />
-<strong>Péremption&nbsp;:</strong> <input type="text" name="peremption" size="10" value="{$valid->peremption}" />
+<strong>Péremption&nbsp;:</strong> <input type="text" name="expiration" size="10" value="{$valid->expiration}" />
 <strong>Promos&nbsp;:&nbsp;</strong>
 min <input type="text" name="promo_min" size="4" maxlength="4" value="{$valid->pmin}" />
 &nbsp;->&nbsp;max <input type="text" name="promo_max" size="4" maxlength="4" value="{$valid->pmax}" /><br />

diff --git a/templates/include/form.valid.evts.tpl b/templates/include/form.valid.evts.tpl
index 187a55e..a81b655 100644 (file)
--- a/templates/include/form.valid.evts.tpl
+++ b/templates/include/form.valid.evts.tpl
@@ -31,7 +31,7 @@
 </tr>
 <tr class="pair">
   <td class="titre">Péremption</td>
-  <td>{$valid->peremption|date_format}</td>
+  <td>{$valid->expiration|date_format}</td>
 </tr>
 <tr class="pair">
   <td class="titre">Promos</td>

diff --git a/templates/xnetgrp/announce-admin.tpl b/templates/xnetgrp/announce-admin.tpl
index 65ee9c7..eab92b5 100644 (file)
--- a/templates/xnetgrp/announce-admin.tpl
+++ b/templates/xnetgrp/announce-admin.tpl
@@ -31,7 +31,7 @@
   {iterate item=art from=$articles}
   <tr class="{if $art.perime}im{/if}pair">
     <td><a href="{$platal->ns}announce/edit/{$art.id}">{$art.titre}</a></td>
-    <td>{$art.peremption|date_format}</td>
+    <td>{$art.expiration|date_format}</td>
     <td class="right"><a href="{$platal->ns}admin/announces?del={$art.id}&amp;token={xsrf_token}">
         Supprimer l'annonce {icon name=cross}
       </a>

diff --git a/templates/xnetgrp/announce-edit.tpl b/templates/xnetgrp/announce-edit.tpl
index 2a77949..92ecf00 100644 (file)
--- a/templates/xnetgrp/announce-edit.tpl
+++ b/templates/xnetgrp/announce-edit.tpl
@@ -136,7 +136,7 @@ function visibilityChange(box)
     <tr>
       <td class="titre">Date de péremption&nbsp;:</td>
       <td>
-        {valid_date name="peremption" value=$art.peremption}
+        {valid_date name="expiration" value=$art.expiration}
       </td>
     </tr>
     {if $events}

diff --git a/upgrade/account/20_naming_convention.sql b/upgrade/account/20_naming_convention.sql
index d3bcd7b..2648a94 100644 (file)
--- a/upgrade/account/20_naming_convention.sql
+++ b/upgrade/account/20_naming_convention.sql
@@ -31,6 +31,7 @@ CHANGE COLUMN  user_id uid INT(11) not null;
 # announces
   ALTER TABLE  announces
 CHANGE COLUMN  user_id uid INT(11) not null;
+CHANGE COLUMN  peremption expiration DATE NOT NULL;
   ALTER TABLE  announce_read
 CHANGE COLUMN  user_id uid INT(11) not null;
 
@@ -67,6 +68,7 @@ CHANGE COLUMN  uid pid INT(11) NOT NULL;
 # group
   ALTER TABLE  group_announces
 CHANGE COLUMN  user_id uid INT(11) NOT NULL;
+CHANGE COLUMN  peremption expiration DATE NOT NULL;
   ALTER TABLE  group_announces_read
 CHANGE COLUMN  user_id uid INT(11) NOT NULL;