From svn at agendadulibre.org  Mon Aug  2 22:25:39 2010
From: svn at agendadulibre.org (svn at agendadulibre.org)
Date: Mon,  2 Aug 2010 22:25:39 +0200 (CEST)
Subject: [Devel] r478 - branches/generic/includes
Message-ID: <20100802202540.043D752C157@toulibre.org>

Author: ploc
Date: Mon Aug  2 22:25:38 2010
New Revision: 478

Log:
Nous sommes bientot en 2011.

Modified:
   branches/generic/includes/funcs.inc.php

Modified: branches/generic/includes/funcs.inc.php
==============================================================================
--- branches/generic/includes/funcs.inc.php	Fri Jul 30 11:46:26 2010	(r477)
+++ branches/generic/includes/funcs.inc.php	Mon Aug  2 22:25:38 2010	(r478)
@@ -710,7 +710,7 @@
   echo "</select>\n";
 
   echo "<select name=\"__event_" . $ident . "_year\">\n";
-  for ($i = 2005; $i <= 2010; $i++)
+  for ($i = 2005; $i <= 2015; $i++)
     {
       if ($i == date("Y", $current_time))
 	echo "  <option value=\"$i\" selected=\"selected\">$i</option>\n";

From svn at agendadulibre.org  Mon Aug  2 23:40:31 2010
From: svn at agendadulibre.org (svn at agendadulibre.org)
Date: Mon,  2 Aug 2010 23:40:31 +0200 (CEST)
Subject: [Devel] r479 - in branches/generic: . adl-specific includes
Message-ID: <20100802214031.CC79552C156@toulibre.org>

Author: ploc
Date: Mon Aug  2 23:40:29 2010
New Revision: 479

Log:
using calendar_absolute_url function instead of  variable (and fixing a small bug on moderation logout redirect)

Modified:
   branches/generic/adl-specific/config.inc.php
   branches/generic/icallist.php
   branches/generic/includes/funcs.inc.php
   branches/generic/rss.php
   branches/generic/rsslist.php
   branches/generic/xmllistevents.php

Modified: branches/generic/adl-specific/config.inc.php
==============================================================================
--- branches/generic/adl-specific/config.inc.php	Mon Aug  2 22:25:38 2010	(r478)
+++ branches/generic/adl-specific/config.inc.php	Mon Aug  2 23:40:29 2010	(r479)
@@ -1,10 +1,10 @@
 <?php
 
 /* main config */
-$websiteName = "agenda du libre";                 /* title displayed on each page */
+$websiteName = "agenda du libre";                                       /* title displayed on each page */
 $websiteSlogan = "l'agenda des évènements du logiciel libre en France"; /* slogan displayed on some pages */
-$mailDomain = "agendadulibre.org";                /* domain used for sending mails */
-$rootUrl = "http://www.$mailDomain";              /* root url, without trailing slash */
+$mailDomain = "agendadulibre.org";                                      /* domain used for sending mails */
+$rootUrl = "www.$mailDomain";                                           /* root url, without leading protocol, without trailing slash */
 
 /* template config */
 $headerTemplate = "$specificContent/templates/header.html";

Modified: branches/generic/icallist.php
==============================================================================
--- branches/generic/icallist.php	Mon Aug  2 22:25:38 2010	(r478)
+++ branches/generic/icallist.php	Mon Aug  2 23:40:29 2010	(r479)
@@ -90,7 +90,7 @@
  par votre association, à partir du moment où vous pensez à marquer
  tous vos évènements avec un tag précis.<br/>
  Exemple :
- <code><?php echo $rootUrl; ?>/ical.php?tag=exemple</code>.
+ <code><?php echo calendar_absolute_url("/ical.php?tag=exemple"); ?></code>.
  </li>
 </ul>
 

Modified: branches/generic/includes/funcs.inc.php
==============================================================================
--- branches/generic/includes/funcs.inc.php	Mon Aug  2 22:25:38 2010	(r478)
+++ branches/generic/includes/funcs.inc.php	Mon Aug  2 23:40:29 2010	(r479)
@@ -710,7 +710,7 @@
   echo "</select>\n";
 
   echo "<select name=\"__event_" . $ident . "_year\">\n";
-  for ($i = 2005; $i <= 2015; $i++)
+  for ($i = 2005; $i <= 2010; $i++)
     {
       if ($i == date("Y", $current_time))
 	echo "  <option value=\"$i\" selected=\"selected\">$i</option>\n";

Modified: branches/generic/rss.php
==============================================================================
--- branches/generic/rss.php	Mon Aug  2 22:25:38 2010	(r478)
+++ branches/generic/rss.php	Mon Aug  2 23:40:29 2010	(r479)
@@ -106,10 +106,10 @@
 echo "   xmlns:content=\"http://purl.org/rss/1.0/modules/content/\"\n";
 echo "   xmlns:georss=\"http://www.georss.org/georss\">\n";
 
-echo "<channel rdf:about=\"" . $rootUrl . "\">\n";
+echo "<channel rdf:about=\"" . calendar_absolute_url() . "\">\n";
 echo " <title>" . $websiteName . " [ " . $region . " ]</title>\n";
 echo " <description>" . $websiteSlogan . "</description>\n";
-echo " <link>" . $rootUrl . "</link>\n";
+echo " <link>" . calendar_absolute_url() . "</link>\n";
 echo " <dc:language>fr</dc:language>\n";
 echo " <dc:creator>" . $mailDomain . "</dc:creator>\n";
 

Modified: branches/generic/rsslist.php
==============================================================================
--- branches/generic/rsslist.php	Mon Aug  2 22:25:38 2010	(r478)
+++ branches/generic/rsslist.php	Mon Aug  2 23:40:29 2010	(r479)
@@ -69,13 +69,13 @@
  par votre association, à partir du moment où vous pensez à marquer
  tous vos évènements avec un tag précis.<br/>
  Exemple:
- <code><?php echo $rootUrl; ?>/rss.php?tag=exemple</code>.
+ <code><?php echo calendar_absolute_url("/rss.php?tag=exemple"); ?></code>.
  </li>
 
  <li>Vous pouvez modifier la limite aux 30 prochains jours des flux
  RSS en utilisant le paramètre <code>daylimit</code>.<br/>
  Exemple:
- <code><?php echo $rootUrl; ?>/rss.php?region=6&amp;daylimit=42</code>
+ <code><?php echo calendar_absolute_url("/rss.php?region=6&amp;daylimit=42"); ?></code>
  </li>
 </ul>
 

Modified: branches/generic/xmllistevents.php
==============================================================================
--- branches/generic/xmllistevents.php	Mon Aug  2 22:25:38 2010	(r478)
+++ branches/generic/xmllistevents.php	Mon Aug  2 23:40:29 2010	(r479)
@@ -75,7 +75,7 @@
   $xml->writeElement("url", $event->url);
   $xml->writeElement("tags", $event->tags);
   $xml->writeElement("contact", $event->contact);
-  $xml->writeElement("adlurl", $rootUrl . "/showevent.php?id=" . $event->id);
+  $xml->writeElement("adlurl", calendar_absolute_url("/showevent.php?id=" . $event->id));
   $xml->startElement("description");
   $xml->writeCData($event->description);
   $xml->endElement();

From svn at agendadulibre.org  Tue Aug  3 20:37:15 2010
From: svn at agendadulibre.org (svn at agendadulibre.org)
Date: Tue,  3 Aug 2010 20:37:15 +0200 (CEST)
Subject: [Devel] r480 - in branches/generic: . adl-specific includes
Message-ID: <20100803183715.EE43852C14B@toulibre.org>

Author: ploc
Date: Tue Aug  3 20:37:14 2010
New Revision: 480

Log:
added possibility to set locale for day and month names, and to set the timezone (useful if different from the server timezone)

Modified:
   branches/generic/adl-specific/config.inc.php
   branches/generic/config.inc.php
   branches/generic/includes/funcs.inc.php

Modified: branches/generic/adl-specific/config.inc.php
==============================================================================
--- branches/generic/adl-specific/config.inc.php	Mon Aug  2 23:40:29 2010	(r479)
+++ branches/generic/adl-specific/config.inc.php	Tue Aug  3 20:37:14 2010	(r480)
@@ -11,18 +11,21 @@
 $footerTemplate = "$specificContent/templates/footer.html";
 
 /* main config */
-$developerMail = "devel at agendadulibre.org";       /* mail of developers */
-$moderatorMail = "moderateurs at agendadulibre.org"; /* mail of moderators */
+$locale = "fr_FR.utf8";                                                 /* locale used for month and day names */
+$timezone = "Europe/Paris";                                             /* default timezone used to get actual time (not the server local time)
+                                                                           see <http://php.net/manual/fr/timezones.php> for a list of valid timezones */
+$developerMail = "devel at agendadulibre.org";                             /* mail of developers */
+$moderatorMail = "moderateurs at agendadulibre.org";                       /* mail of moderators */
 $moderatorMail = "agenda at survie.org";
-$debugMail = "";                                  /* mail of debugger */
-/* When not empty, all the e-mails are sent to debug address, instead of the
-   event submitter addresses. Useful for debugging during development. */
+$debugMail = "";                                                        /* mail of debugger */
+             /* When not empty, all the e-mails are sent to debug address, instead of the
+                event submitter addresses. Useful for debugging during development. */
 
 /* database related config */
-$db_host = "host";                                /* where the database is hosted */
-$db_user = "user";                                /* username needed to connect to the database */
-$db_pass = "password";                            /* password needed to connect to the database */
-$db_name  = "db";                                 /* database name */
+$db_host = "host";                                                      /* mysql server */
+$db_user = "user";                                                      /* username needed to connect to the database */
+$db_pass = "password";                                                  /* password needed to connect to the database */
+$db_name  = "db";                                                       /* database name */
 
 /* misc config */
 $localGroupName = "groupe d'utilisateurs";

Modified: branches/generic/config.inc.php
==============================================================================
--- branches/generic/config.inc.php	Mon Aug  2 23:40:29 2010	(r479)
+++ branches/generic/config.inc.php	Tue Aug  3 20:37:14 2010	(r480)
@@ -4,4 +4,9 @@
 
 include("$specificContent/config.inc.php");
 
+if(date_default_timezone_set($timezone) == false)
+{
+    echo "timezone setting error";
+}
+
 ?>

Modified: branches/generic/includes/funcs.inc.php
==============================================================================
--- branches/generic/includes/funcs.inc.php	Mon Aug  2 23:40:29 2010	(r479)
+++ branches/generic/includes/funcs.inc.php	Tue Aug  3 20:37:14 2010	(r480)
@@ -28,15 +28,18 @@
 function calendar_absolute_url($url="", $protocol="http")
 {
   global $rootUrl;
+
   $rootUrl = rtrim ($rootUrl, "/");
   return $protocol . "://" . $rootUrl . "/" . $url;
 }
 
 function calendar_setlocale()
 {
-  if(setlocale(LC_TIME, "fr_FR.utf8") == false)
+  global $locale;
+
+  if(setlocale(LC_TIME, $locale) == false)
     {
-      echo "Erreur locales";
+      echo "locale setting error";
     }
 }
 

From plub2010 at acampado.net  Wed Aug  4 09:30:03 2010
From: plub2010 at acampado.net (Ploc)
Date: Wed, 04 Aug 2010 09:30:03 +0200
Subject: [Devel] r480 - in branches/generic: . adl-specific includes
In-Reply-To: <20100803183715.EE43852C14B@toulibre.org>
References: <20100803183715.EE43852C14B@toulibre.org>
Message-ID: <a92f44b2a6dc99faf97a50df938ddb23@mail.gandi.net>

Salut,

Je pense avoir bientôt terminé cette version générique. J'ai pas encore eu
vos impressions mais ça m'intéresse quand même.

Avec un minimum de validation de votre part, je compte maintenant proposer
un "thème" par défaut afin de pouvoir installer un agenda vierge par défaut
(et de continuer à pouvoir choisir le thème "agenda du libre" via le
fichier de configuration).

Merci de vos remarques et retours...

Ploc


On Tue,  3 Aug 2010 20:37:15 +0200 (CEST), svn at agendadulibre.org wrote:
> Author: ploc
> Date: Tue Aug  3 20:37:14 2010
> New Revision: 480
> 
> Log:
> added possibility to set locale for day and month names, and to set the
> timezone (useful if different from the server timezone)
> 
> Modified:
>    branches/generic/adl-specific/config.inc.php
>    branches/generic/config.inc.php
>    branches/generic/includes/funcs.inc.php
> 
> Modified: branches/generic/adl-specific/config.inc.php
>
==============================================================================
> --- branches/generic/adl-specific/config.inc.php	Mon Aug  2 23:40:29
> 2010	(r479)
> +++ branches/generic/adl-specific/config.inc.php	Tue Aug  3 20:37:14
> 2010	(r480)
> @@ -11,18 +11,21 @@
>  $footerTemplate = "$specificContent/templates/footer.html";
>  
>  /* main config */
> -$developerMail = "devel at agendadulibre.org";       /* mail of developers
*/
> -$moderatorMail = "moderateurs at agendadulibre.org"; /* mail of moderators
*/
> +$locale = "fr_FR.utf8";                                                
> /* locale used for month and day names */
> +$timezone = "Europe/Paris";                                            
> /* default timezone used to get actual time (not the server local time)
> +                                                                       

> see <http://php.net/manual/fr/timezones.php> for a list of valid
timezones
> */
> +$developerMail = "devel at agendadulibre.org";                            
> /* mail of developers */
> +$moderatorMail = "moderateurs at agendadulibre.org";                      
> /* mail of moderators */
>  $moderatorMail = "agenda at survie.org";
> -$debugMail = "";                                  /* mail of debugger
*/
> -/* When not empty, all the e-mails are sent to debug address, instead
of
> the
> -   event submitter addresses. Useful for debugging during development.
*/
> +$debugMail = "";                                                       
> /* mail of debugger */
> +             /* When not empty, all the e-mails are sent to debug
> address, instead of the
> +                event submitter addresses. Useful for debugging during
> development. */
>  
>  /* database related config */
> -$db_host = "host";                                /* where the database
> is hosted */
> -$db_user = "user";                                /* username needed to
> connect to the database */
> -$db_pass = "password";                            /* password needed to
> connect to the database */
> -$db_name  = "db";                                 /* database name */
> +$db_host = "host";                                                     
> /* mysql server */
> +$db_user = "user";                                                     
> /* username needed to connect to the database */
> +$db_pass = "password";                                                 
> /* password needed to connect to the database */
> +$db_name  = "db";                                                      
> /* database name */
>  
>  /* misc config */
>  $localGroupName = "groupe d'utilisateurs";
> 
> Modified: branches/generic/config.inc.php
>
==============================================================================
> --- branches/generic/config.inc.php	Mon Aug  2 23:40:29 2010	(r479)
> +++ branches/generic/config.inc.php	Tue Aug  3 20:37:14 2010	(r480)
> @@ -4,4 +4,9 @@
>  
>  include("$specificContent/config.inc.php");
>  
> +if(date_default_timezone_set($timezone) == false)
> +{
> +    echo "timezone setting error";
> +}
> +
>  ?>
> 
> Modified: branches/generic/includes/funcs.inc.php
>
==============================================================================
> --- branches/generic/includes/funcs.inc.php	Mon Aug  2 23:40:29
2010	(r479)
> +++ branches/generic/includes/funcs.inc.php	Tue Aug  3 20:37:14
2010	(r480)
> @@ -28,15 +28,18 @@
>  function calendar_absolute_url($url="", $protocol="http")
>  {
>    global $rootUrl;
> +
>    $rootUrl = rtrim ($rootUrl, "/");
>    return $protocol . "://" . $rootUrl . "/" . $url;
>  }
>  
>  function calendar_setlocale()
>  {
> -  if(setlocale(LC_TIME, "fr_FR.utf8") == false)
> +  global $locale;
> +
> +  if(setlocale(LC_TIME, $locale) == false)
>      {
> -      echo "Erreur locales";
> +      echo "locale setting error";
>      }
>  }
>  
> _______________________________________________
> Devel mailing list
> Devel at agendadulibre.org
> http://agendadulibre.org/cgi-bin/mailman/listinfo/devel

From svn at agendadulibre.org  Thu Aug  5 00:40:34 2010
From: svn at agendadulibre.org (svn at agendadulibre.org)
Date: Thu,  5 Aug 2010 00:40:34 +0200 (CEST)
Subject: [Devel] r481 - in branches/generic: . adl-specific adl-specific/css
	doc
Message-ID: <20100804224035.80F3A52C13D@toulibre.org>

Author: ploc
Date: Thu Aug  5 00:40:32 2010
New Revision: 481

Log:
replacing 'LUG' references by 'localgroup' references, which is more generic

Modified:
   branches/generic/adl-specific/config.inc.php
   branches/generic/adl-specific/css/calendar.css
   branches/generic/doc/INSTALL
   branches/generic/doc/UPGRADE
   branches/generic/doc/schema.sql
   branches/generic/localgroupstextlist.php
   branches/generic/map.php
   branches/generic/showevent.php
   branches/generic/testevent.php

Modified: branches/generic/adl-specific/config.inc.php
==============================================================================
--- branches/generic/adl-specific/config.inc.php	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/adl-specific/config.inc.php	Thu Aug  5 00:40:32 2010	(r481)
@@ -22,7 +22,7 @@
                 event submitter addresses. Useful for debugging during development. */
 
 /* database related config */
-$db_host = "host";                                                      /* mysql server */
+$db_host = "host";                                                      /* mysql server hostname */
 $db_user = "user";                                                      /* username needed to connect to the database */
 $db_pass = "password";                                                  /* password needed to connect to the database */
 $db_name  = "db";                                                       /* database name */

Modified: branches/generic/adl-specific/css/calendar.css
==============================================================================
--- branches/generic/adl-specific/css/calendar.css	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/adl-specific/css/calendar.css	Thu Aug  5 00:40:32 2010	(r481)
@@ -313,7 +313,7 @@
 	color: #000;
 }
 
-/* Carte evenements/lugs */
+/* Carte evenements/localgroups */
 
 #region-map {
 	border: 0px;
@@ -413,9 +413,9 @@
   color: #336699;
 }
 /*
- * Lug list (used only by showevent.php)
+ * local group list (used only by showevent.php and testevent.php)
  */
-#lug-list {
+#localgroup-list {
 	float: right;
    	background: #D6ECFF;/*#C6E5FF;*/
 	border : 1px solid #96CFFF;
@@ -426,7 +426,7 @@
 	font-size: 0.7em;
 }
 
-#lug-list h1 {
+#localgroup-list h1 {
 	border-bottom: 1px black solid;
 	padding-bottom: 4px;
 	font-size: 1.3em;
@@ -435,7 +435,7 @@
 	font-family: Georgia,sans-serif;
 }
 
-#lug-list ul {
+#localgroup-list ul {
 	text-align: left;
 	line-height: 1.2em;
 	margin-left:1em;

Modified: branches/generic/doc/INSTALL
==============================================================================
--- branches/generic/doc/INSTALL	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/doc/INSTALL	Thu Aug  5 00:40:32 2010	(r481)
@@ -91,9 +91,9 @@
 
  (enter previous login and password)
 
-9) Add the list of LUGs (optional)
+9) Add the list of local groups (optional)
 
-The list of LUGs in the Agenda du Libre is generated using a script
+The list of local groups in the Agenda du Libre is generated using a script
 available at
 http://www.agendadulibre.org/svn/scripts/extract-gulls.py. This script
 parses the LUG list of AFUL (at http://www.aful.org/gul/liste) and
@@ -101,5 +101,5 @@
 
 $ svn co http://www.agendadulibre.org/svn/scripts/extract-gulls.py
 $ chmod +x extract-gulls.py
-$ ./extract-gulls.py > lugs.sql
-$ mysql -h localhost -u agendadulibre -p agendadulibre < lugs.sql
+$ ./extract-gulls.py > localgroups.sql
+$ mysql -h localhost -u agendadulibre -p agendadulibre < localgroups.sql

Modified: branches/generic/doc/UPGRADE
==============================================================================
--- branches/generic/doc/UPGRADE	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/doc/UPGRADE	Thu Aug  5 00:40:32 2010	(r481)
@@ -117,4 +117,12 @@
 moderator list and the event submitter.
 
 alter table events add moderator_mail_id varchar(32);
-alter table events add submitter_mail_id varchar(32);
\ No newline at end of file
+alter table events add submitter_mail_id varchar(32);
+
+Revisions lower than 468
+========================
+
+At revision 468 (branch named "generic"), table named "lugs" has been renamed
+to "localgroups" (as this is more generic than "lugs").
+
+rename table lugs to localgroups;

Modified: branches/generic/doc/schema.sql
==============================================================================
--- branches/generic/doc/schema.sql	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/doc/schema.sql	Thu Aug  5 00:40:32 2010	(r481)
@@ -64,7 +64,7 @@
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-CREATE TABLE lugs (
+CREATE TABLE localgroups (
   id int(11) NOT NULL auto_increment,
   region int(11) NOT NULL default '0',
   department int(11) NOT NULL default '0',
@@ -93,4 +93,4 @@
   `event_id` int(11) default NULL,
   `author_id` int(11) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;

Modified: branches/generic/localgroupstextlist.php
==============================================================================
--- branches/generic/localgroupstextlist.php	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/localgroupstextlist.php	Thu Aug  5 00:40:32 2010	(r481)
@@ -30,7 +30,7 @@
 
 echo "lon\tlat\ttitle\tdescription\ticon\n";
 
-$sql = "select * from lugs";
+$sql = "select * from localgroups";
 
 $localgroups = $db->query($sql);
 while($localgroup = mysql_fetch_object($localgroups))

Modified: branches/generic/map.php
==============================================================================
--- branches/generic/map.php	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/map.php	Thu Aug  5 00:40:32 2010	(r481)
@@ -58,7 +58,7 @@
             var newl = new OpenLayers.Layer.GeoRSS('AdL', '" . calendar_absolute_url("rss.php?region=all&map=1&daylimit=0") . "');
             map.addLayer(newl);
 
-            var newl = new OpenLayers.Layer.Text('LUGs', {location: '" . calendar_absolute_url("localgroupstextlist.php") . "'});
+            var newl = new OpenLayers.Layer.Text('<?php echo ${localGroupAcronym}; ?>', {location: '" . calendar_absolute_url("localgroupstextlist.php") . "'});
             map.addLayer(newl);
         }
 

Modified: branches/generic/showevent.php
==============================================================================
--- branches/generic/showevent.php	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/showevent.php	Thu Aug  5 00:40:32 2010	(r481)
@@ -42,12 +42,12 @@
   exit;
 }
 
-echo "<div id=\"lug-list\"><h1>" . $localGroupName . " de la région</h1>";
+echo "<div id=\"localgroup-list\"><h1>" . $localGroupName . " de la région</h1>";
 
-$lugs = $db->query ("select distinct region, name, url from lugs where region = '" .
+$localgroups = $db->query ("select distinct region, name, url from localgroups where region = '" .
 		    $event->region . "'");
 
-if (mysql_num_rows ($lugs) == 0)
+if (mysql_num_rows ($localgroups) == 0)
 {
   echo "Pas de " . $localGroupName . ".<br/>";
 }
@@ -55,10 +55,10 @@
 {
   echo " <ul>";
 
-  while ($lug = mysql_fetch_object ($lugs))
+  while ($localgroup = mysql_fetch_object ($localgroups))
     {
-      echo "<li><a href=\"" . $lug->url . "\">" . $lug->name . "</a> (";
-      $dpts = $db->query ("select distinct department from lugs where name = " . $db->quote_smart($lug->name));
+      echo "<li><a href=\"" . $localgroup->url . "\">" . $localgroup->name . "</a> (";
+      $dpts = $db->query ("select distinct department from localgroups where name = " . $db->quote_smart($localgroup->name));
       $i = 1;
       while ($dpt = mysql_fetch_object ($dpts))
 	{

Modified: branches/generic/testevent.php
==============================================================================
--- branches/generic/testevent.php	Tue Aug  3 20:37:14 2010	(r480)
+++ branches/generic/testevent.php	Thu Aug  5 00:40:32 2010	(r481)
@@ -28,12 +28,12 @@
 
 put_header("informations sur un évènement");
 
-echo "<div id=\"lug-list\"><h1>" . $localGroupName . " de la région</h1>";
+echo "<div id=\"localgroup-list\"><h1>" . $localGroupName . " de la région</h1>";
 
-$lugs = $db->query ("select distinct region, name, url from lugs where region = '" .
+$localgroups = $db->query ("select distinct region, name, url from localgroups where region = '" .
 		    $_POST['__event_region'] . "'");
 
-if (mysql_num_rows ($lugs) == 0)
+if (mysql_num_rows ($localgroups) == 0)
 {
   echo "Pas de " . $localGroupName . ".<br/>";
 }
@@ -41,10 +41,10 @@
 {
   echo " <ul>";
 
-  while ($lug = mysql_fetch_object ($lugs))
+  while ($localgroup = mysql_fetch_object ($localgroups))
     {
-      echo "<li><a href=\"" . $lug->url . "\">" . $lug->name . "</a> (";
-      $dpts = $db->query ("select distinct department from lugs where name = '" . $lug->name . "'");
+      echo "<li><a href=\"" . $localgroup->url . "\">" . $localgroup->name . "</a> (";
+      $dpts = $db->query ("select distinct department from localgroups where name = " . $db->quote_smart($localgroup->name));
       $i = 1;
       while ($dpt = mysql_fetch_object ($dpts))
 	{

From svn at agendadulibre.org  Thu Aug  5 00:42:27 2010
From: svn at agendadulibre.org (svn at agendadulibre.org)
Date: Thu,  5 Aug 2010 00:42:27 +0200 (CEST)
Subject: [Devel] r482 - branches/generic/doc
Message-ID: <20100804224227.6A6BF52C13D@toulibre.org>

Author: ploc
Date: Thu Aug  5 00:42:26 2010
New Revision: 482

Log:
fixed wrong revision in file UPGRADE (468 instead of 482)

Modified:
   branches/generic/doc/UPGRADE

Modified: branches/generic/doc/UPGRADE
==============================================================================
--- branches/generic/doc/UPGRADE	Thu Aug  5 00:40:32 2010	(r481)
+++ branches/generic/doc/UPGRADE	Thu Aug  5 00:42:26 2010	(r482)
@@ -119,10 +119,10 @@
 alter table events add moderator_mail_id varchar(32);
 alter table events add submitter_mail_id varchar(32);
 
-Revisions lower than 468
+Revisions lower than 482
 ========================
 
-At revision 468 (branch named "generic"), table named "lugs" has been renamed
+At revision 482 (branch named "generic"), table named "lugs" has been renamed
 to "localgroups" (as this is more generic than "lugs").
 
 rename table lugs to localgroups;