fix subscribe thingy

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-624

diff --git a/htdocs.net/groupe/asso.php b/htdocs.net/groupe/asso.php
index 729ca74..bc697d5 100644 (file)
--- a/htdocs.net/groupe/asso.php
+++ b/htdocs.net/groupe/asso.php
@@ -5,6 +5,7 @@ require 'xnet.inc.php';
 new_page('xnet/groupe/asso.tpl', AUTH_PUBLIC);
 $page->useMenu();
 $page->setType($globals->asso('cat'));
+$page->assign('is_member', is_member());
 
 $page->assign('asso', $globals->asso());
 if (!$globals->asso('id')) {

diff --git a/htdocs.net/groupe/edit.php b/htdocs.net/groupe/edit.php
index 389e3e5..fbf2e0d 100644 (file)
--- a/htdocs.net/groupe/edit.php
+++ b/htdocs.net/groupe/edit.php
@@ -7,21 +7,21 @@
         if (has_perms()) {
             $globals->xdb->execute(
                 "UPDATE  groupex.asso
-                    SET  nom={?}, diminutif={?}, cat={?}, dom={?}, descr={?}, site={?}, mail={?}, resp={?}, forum={?}, mail_domain={?}, ax={?}
+                    SET  nom={?}, diminutif={?}, cat={?}, dom={?}, descr={?}, site={?}, mail={?}, resp={?}, forum={?}, mail_domain={?}, ax={?}, sub_url={?}
                   WHERE  id={?}",
                   Post::get('nom'), Post::get('diminutif'), Post::get('cat'), Post::getInt('dom'),
                   Post::get('descr'), Post::get('site'), Post::get('mail'), Post::get('resp'),
-                  Post::get('forum'), Post::get('mail_domain'), Post::has('ax'), $globals->asso('id'));
+                  Post::get('forum'), Post::get('mail_domain'), Post::has('ax'), Post::get('sub_url'), $globals->asso('id'));
             if (Post::get('mail_domain')) {
                 $globals->xdb->execute('INSERT INTO virtual_domains (domain) VALUES({?})', Post::get('mail_domain'));
             }
         } else {
             $globals->xdb->execute(
                 "UPDATE  groupex.asso
-                    SET  descr={?}, site={?}, mail={?}, resp={?}, forum={?}, ax={?}
+                    SET  descr={?}, site={?}, mail={?}, resp={?}, forum={?}, ax={?}, sub_url={?}
                   WHERE  id={?}",
                   Post::get('descr'), Post::get('site'), Post::get('mail'), Post::get('resp'),
-                  Post::get('forum'), Post::has('ax'), $globals->asso('id'));
+                  Post::get('forum'), Post::has('ax'), Post::get('sub_url'), $globals->asso('id'));
         }
 
         if ($_FILES['logo']['name']) {

diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index 4c118e4..063b67f 100644 (file)
--- a/templates/xnet/groupe/asso.tpl
+++ b/templates/xnet/groupe/asso.tpl
@@ -63,11 +63,16 @@
   </tr>
   {/if}
 
+  {if !$is_member}
   <tr>
-    <td class="titre" colspan="2">
-      <strong>TODO: INSCRIPTION</strong>
+    <td class="titre">
+      M'inscrire :
+    </td>
+    <td>
+      <a href="{$asso.sub_url|default:"inscrire.php"}">m'inscrire</a>
     </td>
   </tr>
+  {/if}
 
   {if $asso.ax}
   <tr>

diff --git a/templates/xnet/groupe/edit.tpl b/templates/xnet/groupe/edit.tpl
index c760301..f279b95 100644 (file)
--- a/templates/xnet/groupe/edit.tpl
+++ b/templates/xnet/groupe/edit.tpl
@@ -125,8 +125,12 @@
     </tr>
 
     <tr>
-      <td class="titre" colspan="2">
-        <strong>TODO: INSCRIPTION</strong>
+      <td class="titre">
+        Lien pour l'inscription:<br />
+        <em>laisser vide par défaut</em>
+      </td>
+      <td>
+        <input type="text" size="40" name="sub_url" value="{$asso.sub_url}" />
       </td>
     </tr>
 

diff --git a/upgrade/0.9.6/00_xnet.sql b/upgrade/0.9.6/00_xnet.sql
index 0e1e997..43de972 100644 (file)
--- a/upgrade/0.9.6/00_xnet.sql
+++ b/upgrade/0.9.6/00_xnet.sql
@@ -10,6 +10,9 @@ alter table groupex.asso change column resp resp CHAR(255) not null;
 alter table groupex.asso change column forum forum CHAR(255) not null;
 alter table groupex.asso change column mail_domain mail_domain CHAR(255) not null;
 alter table groupex.asso add unique index (diminutif);
+alter table groupex.asso add column sub_url char(255) not null;
 
 alter table groupex.membres change column uid uid int not null;
 
+update groupex.asso set sub_url='http://www2.x-consult.org/xconsult/register.php' where diminutif = 'X-Mines-Consult';
+