From 4d4ba6d7101b04cf5b2fb817a9d58d670c409a07 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Wed, 28 Oct 2009 23:07:16 +0100
Subject: [PATCH] All Xnet descriptions now use wiki syntax, thus there is no
 point to keep the distinction between wiki and plain descriptions.

---
 classes/platalglobals.php.in | 1 -
 modules/xnetgrp.php          | 7 +------
 templates/xnetgrp/asso.tpl   | 4 ----
 templates/xnetgrp/edit.tpl   | 3 +--
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/classes/platalglobals.php.in b/classes/platalglobals.php.in
index 94803e8..a35c3c1 100644
--- a/classes/platalglobals.php.in
+++ b/classes/platalglobals.php.in
@@ -61,7 +61,6 @@ class PlatalGlobals extends PlGlobals
 
             if ($gp) {
                 $res = XDB::query("SELECT  a.*, d.nom AS domnom,
-                                           FIND_IN_SET('wiki_desc', a.flags) AS wiki_desc,
                                            FIND_IN_SET('notif_unsub', a.flags) AS notif_unsub,
                                            FIND_IN_SET('has_ml', a.flags) AS has_ml
                                      FROM  groupex.asso AS a
diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 609c8c0..9f26711 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -225,7 +225,7 @@ class XnetGrpModule extends PLModule
         if (Post::has('submit')) {
             S::assert_xsrf_token();
 
-            $flags = new PlFlagSet('wiki_desc');
+            $flags = new PlFlagSet();
             if (Post::has('notif_unsub') && Post::i('notif_unsub') == 1) {
                 $flags->addFlag('notif_unsub');
             }
@@ -294,11 +294,6 @@ class XnetGrpModule extends PLModule
             $page->assign('dom', $dom);
             $page->assign('super', true);
         }
-        if (!$globals->asso('wiki_desc') && $globals->asso('descr')) {
-            $page->trigWarning("Attention, le format de la description a changé et utilise désormais la syntaxe wiki "
-                      . "intégrée au site. Il te faudra probablement adapter le formatage du texte actuel pour "
-                      . "qu'il s'affiche correctement avec cette nouvelle syntaxe.");
-        }
     }
 
     function handler_mail(&$page)
diff --git a/templates/xnetgrp/asso.tpl b/templates/xnetgrp/asso.tpl
index 35f3727..9aef3ff 100644
--- a/templates/xnetgrp/asso.tpl
+++ b/templates/xnetgrp/asso.tpl
@@ -99,11 +99,7 @@
 <br />
 
 <div style="text-align: justify">
-  {if $asso.wiki_desc}
   {$asso.descr|miniwiki:title|smarty:nodefaults}
-  {else}
-  {$asso.descr|smarty:nodefaults}
-  {/if}
 </div>
 
 <br />
diff --git a/templates/xnetgrp/edit.tpl b/templates/xnetgrp/edit.tpl
index 2c5765f..2fd3116 100644
--- a/templates/xnetgrp/edit.tpl
+++ b/templates/xnetgrp/edit.tpl
@@ -197,8 +197,7 @@
     <a href="wiki_help" class="popup3">
       {icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki autorisée pour la description.
     </a>
-    <textarea name="descr" cols="70" rows="15" id="descr"
-              {if !$asso.wiki_desc && $asso.descr}class="error"{/if}>{$asso.descr}</textarea>
+    <textarea name="descr" cols="70" rows="15" id="descr">{$asso.descr}</textarea>
     <input type="submit" name="preview" value="Aperçu de la description"
            onclick="previewWiki('descr', 'preview_descr', true, 'preview_descr'); return false;" /><br />
     <input type="submit" name="submit" value="Enregistrer" />
-- 
2.1.4