Code cleaning

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1127 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/validations/aliases.inc.php b/include/validations/aliases.inc.php
index 34d0133..2f62e66 100644 (file)
--- a/include/validations/aliases.inc.php
+++ b/include/validations/aliases.inc.php
@@ -120,7 +120,7 @@ class AliasReq extends Validate
                                 $this->alias, $this->old);
         } else {
             XDB::execute('INSERT INTO virtual SET alias={?},type="user"', $this->alias);
-            $vid = mysql_insert_id();
+            $vid = XDB::insertId();
             $dom = $this->shorter_domain();
             return XDB::query('INSERT INTO virtual_redirect (vid,redirect) VALUES ({?}, {?})',
                               $vid, $this->forlife.'@'.$dom);

diff --git a/modules/banana/banana.inc.php b/modules/banana/banana.inc.php
index ed09290..1442220 100644 (file)
--- a/modules/banana/banana.inc.php
+++ b/modules/banana/banana.inc.php
@@ -207,7 +207,7 @@ class PlatalBanana extends Banana
         $diff = array_diff($_POST['subscribe'], array_keys($fids));
         foreach ($diff as $g) {
             XDB::execute("INSERT INTO {$globals->banana->table_prefix}list (nom) VALUES ({?})", $g);
-            $fids[$g] = mysql_insert_id();
+            $fids[$g] = XDB::insertId();
         }
 
         foreach ($_POST['subscribe'] as $g) {

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 3328be3..3295ca0 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -401,7 +401,7 @@ class XnetEventsModule extends PLModule
 
             // if new event, get its id
             if (!$eid) {
-                $eid = mysql_insert_id();
+                $eid = XDB::insertId();
             }
 
             $nb_moments   = 0;

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index 1cc15cc..8615f8b 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -273,7 +273,7 @@ function event_change_shortname(&$page, $old, $new)
         XDB::execute("INSERT INTO virtual SET type = 'evt', alias = {?}",
                 $new.'-participants@'.$globals->xnet->evts_domain);
 
-        $lastid = mysql_insert_id();
+        $lastid = XDB::insertId();
         XDB::execute(
           "INSERT INTO virtual_redirect (
                 SELECT {?} AS vid, IF(u.nom IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect
@@ -288,7 +288,7 @@ function event_change_shortname(&$page, $old, $new)
         XDB::execute("INSERT INTO virtual SET type = 'evt', alias = {?}",
                 $new.'-absents@'.$globals->xnet->evts_domain);
 
-        $lastid = mysql_insert_id();
+        $lastid = XDB::insertId();
         XDB::execute("INSERT INTO virtual_redirect (
             SELECT {?} AS vid, IF(u.nom IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect
                   FROM groupex.membres AS m

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index ee3aaa7..1e4b301 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -982,7 +982,7 @@ class XnetGrpModule extends PLModule
                             VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?})",
                            S::i('uid'), $globals->asso('id'), $art['titre'], $art['texte'], $art['contact_html'],
                            $art['peremption'], $promo_min, $promo_max, $art['public'] ? 'public' : '');
-                $aid = mysql_insert_id();
+                $aid = XDB::insertId();
                 if ($art['xorg']) {
                     require_once('validations.inc.php');
                     require_once('url_catcher.inc.php');

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 2a9ad7d..986cad9 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -163,22 +163,22 @@ class XnetListsModule extends ListsModule
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                "$red+post@listes.polytechnique.org");
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-owner@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                "$red+owner@listes.polytechnique.org");
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-admin@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                "$red+admin@listes.polytechnique.org");
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-bounces@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                 "$red+bounces@listes.polytechnique.org");
 
         pl_redirect('lists/admin/'.$liste);

diff --git a/templates/include/form.valid.evts.tpl b/templates/include/form.valid.evts.tpl
index e620e6b..7e205a1 100644 (file)
--- a/templates/include/form.valid.evts.tpl
+++ b/templates/include/form.valid.evts.tpl
@@ -27,7 +27,7 @@
 </tr>
 <tr class="pair">
   <td class="titre">Texte</td>
-  <td>{$valid->texte|nl2br}</td>
+  <td>{tidy}{$valid->texte|nl2br|smarty:nodefaults}{/tidy}</td>
 </tr>
 <tr class="pair">
   <td class="titre">Péremption</td>