[Devel] r483 - in branches/generic: . adl-specific

[svn AT agendadulibre.org]

Author: ploc
Date: Fri Oct  8 01:38:49 2010
New Revision: 483

Log:
adding the capability of setting agenda to be completely private (as the 
moderations pages)

Modified:
   branches/generic/addnoteevent.php
   branches/generic/adl-specific/config.inc.php
   branches/generic/createyourown.php
   branches/generic/ical.php
   branches/generic/icalevent.php
   branches/generic/icallist.php
   branches/generic/index.php
   branches/generic/infos.php
   branches/generic/listevents.php
   branches/generic/localgroupstextlist.php
   branches/generic/map.php
   branches/generic/moderation-howto.php
   branches/generic/moderation.php
   branches/generic/passgen.php
   branches/generic/rejectevent.php
   branches/generic/requestinfosevent.php
   branches/generic/rss.php
   branches/generic/rsslist.php
   branches/generic/showevent.php
   branches/generic/stats.php
   branches/generic/submit-script-doc.php
   branches/generic/submit.php
   branches/generic/tags.php
   branches/generic/testevent.php
   branches/generic/textlist.php
   branches/generic/validateevent.php
   branches/generic/xmllistevents.php

Modified: branches/generic/addnoteevent.php
==============================================================================
--- branches/generic/addnoteevent.php   Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/addnoteevent.php   Fri Oct  8 01:38:49 2010        (r483)
@@ -22,11 +22,8 @@
 include("config.inc.php");
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
-include("includes/session.inc.php");
-include("includes/user.inc.php");
 
-$db = new db();
-$user = new user($db);
+include("includes/authenticate.inc.php");
 
 if ($_POST['__event_note_cancel'])
 {

Modified: branches/generic/adl-specific/config.inc.php
==============================================================================
--- branches/generic/adl-specific/config.inc.php        Thu Aug  5 00:42:26 
2010        (r482)
+++ branches/generic/adl-specific/config.inc.php        Fri Oct  8 01:38:49 
2010        (r483)
@@ -5,15 +5,12 @@
 $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 = "www.$mailDomain";                                           /* 
root url, without leading protocol, without trailing slash */
-
-/* template config */
-$headerTemplate = "$specificContent/templates/header.html";
-$footerTemplate = "$specificContent/templates/footer.html";
-
-/* main config */
+$privateAgenda = false;                                                 /* 
define if agenda is public or private */
 $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 */
+
+/* mail config */
 $developerMail = "devel AT agendadulibre.org";                             /* 
mail of developers */
 $moderatorMail = "moderateurs AT agendadulibre.org";                       /* 
mail of moderators */
 $moderatorMail = "agenda AT survie.org";
@@ -21,6 +18,10 @@
              /* When not empty, all the e-mails are sent to debug address, 
instead of the
                 event submitter addresses. Useful for debugging during 
development. */
 
+/* template config */
+$headerTemplate = "$specificContent/templates/header.html";
+$footerTemplate = "$specificContent/templates/footer.html";
+
 /* database related config */
 $db_host = "host";                                                      /* 
mysql server hostname */
 $db_user = "user";                                                      /* 
username needed to connect to the database */

Modified: branches/generic/createyourown.php
==============================================================================
--- branches/generic/createyourown.php  Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/createyourown.php  Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 put_header ("créer votre agenda");
 ?>
 

Modified: branches/generic/ical.php
==============================================================================
--- branches/generic/ical.php   Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/ical.php   Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/funcs.inc.php");
 include("includes/ical.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 header("Content-Type: application/octet-stream; charset=utf-8");

Modified: branches/generic/icalevent.php
==============================================================================
--- branches/generic/icalevent.php      Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/icalevent.php      Fri Oct  8 01:38:49 2010        (r483)
@@ -25,6 +25,10 @@
 include("includes/session.inc.php");
 include("includes/ical.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 $session = new session();
 

Modified: branches/generic/icallist.php
==============================================================================
--- branches/generic/icallist.php       Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/icallist.php       Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 put_header("calendriers iCal");

Modified: branches/generic/index.php
==============================================================================
--- branches/generic/index.php  Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/index.php  Fri Oct  8 01:38:49 2010        (r483)
@@ -29,6 +29,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 put_header("accueil");
 
 $db = new db();

Modified: branches/generic/infos.php
==============================================================================
--- branches/generic/infos.php  Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/infos.php  Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 put_header ("informations");
 
 ?>

Modified: branches/generic/listevents.php
==============================================================================
--- branches/generic/listevents.php     Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/listevents.php     Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 function list_events($events)
 {
   echo " <ul>\n";

Modified: branches/generic/localgroupstextlist.php
==============================================================================
--- branches/generic/localgroupstextlist.php    Thu Aug  5 00:42:26 2010      
  (r482)
+++ branches/generic/localgroupstextlist.php    Fri Oct  8 01:38:49 2010      
  (r483)
@@ -22,6 +22,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 calendar_setlocale();

Modified: branches/generic/map.php
==============================================================================
--- branches/generic/map.php    Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/map.php    Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 calendar_setlocale();
 
 $jcode = "

Modified: branches/generic/moderation-howto.php
==============================================================================
--- branches/generic/moderation-howto.php       Thu Aug  5 00:42:26 2010      
  (r482)
+++ branches/generic/moderation-howto.php       Fri Oct  8 01:38:49 2010      
  (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 put_header("recommandations sur la modération");
 
 echo $moderationExplanations;

Modified: branches/generic/moderation.php
==============================================================================
--- branches/generic/moderation.php     Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/moderation.php     Fri Oct  8 01:38:49 2010        (r483)
@@ -22,11 +22,8 @@
 include("config.inc.php");
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
-include("includes/session.inc.php");
-include("includes/user.inc.php");
 
-$db = new db();
-$user = new user($db);
+include("includes/authenticate.inc.php");
 
 if ($_GET['disconnect'])
 {
@@ -109,7 +106,7 @@
       echo $note->contents;
       echo "<br/>";
       echo "<p style=\"text-align: right; font-size: 80%; padding: 0px; 
margin: 0px;\">";
-      echo "<i>Posté par " . user_get_name_from_id($db, $note->author_id) . 
" le " . date_mysql2humanreadable($note->date) . "</i>";
+      echo "<i>Posté par " . user_get_name_from_id($db, $note->author_id) . 
", le " . date_mysql2humanreadable($note->date) . "</i>";
       echo "</p>";
       echo "</td>";
       echo "</tr>";

Modified: branches/generic/passgen.php
==============================================================================
--- branches/generic/passgen.php        Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/passgen.php        Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 put_header("génération du mot de passe");
 
 $db = new db();

Modified: branches/generic/rejectevent.php
==============================================================================
--- branches/generic/rejectevent.php    Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/rejectevent.php    Fri Oct  8 01:38:49 2010        (r483)
@@ -22,11 +22,8 @@
 include("config.inc.php");
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
-include("includes/session.inc.php");
-include("includes/user.inc.php");
 
-$db = new db();
-$user = new user($db);
+include("includes/authenticate.inc.php");
 
 if ($_POST['__event_rejection_cancel'])
 {

Modified: branches/generic/requestinfosevent.php
==============================================================================
--- branches/generic/requestinfosevent.php      Thu Aug  5 00:42:26 2010      
  (r482)
+++ branches/generic/requestinfosevent.php      Fri Oct  8 01:38:49 2010      
  (r483)
@@ -22,11 +22,8 @@
 include("config.inc.php");
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
-include("includes/session.inc.php");
-include("includes/user.inc.php");
 
-$db = new db();
-$user = new user($db);
+include("includes/authenticate.inc.php");
 
 if ($_POST['__event_requestinfo_cancel'])
 {

Modified: branches/generic/rss.php
==============================================================================
--- branches/generic/rss.php    Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/rss.php    Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 calendar_setlocale();

Modified: branches/generic/rsslist.php
==============================================================================
--- branches/generic/rsslist.php        Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/rsslist.php        Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 put_header("flux rss");

Modified: branches/generic/showevent.php
==============================================================================
--- branches/generic/showevent.php      Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/showevent.php      Fri Oct  8 01:38:49 2010        (r483)
@@ -23,7 +23,12 @@
 include("config.inc.php");
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
-include("includes/session.inc.php");
+
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+} else {
+  include("includes/session.inc.php");
+}
 
 global $localGroupName;
 

Modified: branches/generic/stats.php
==============================================================================
--- branches/generic/stats.php  Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/stats.php  Fri Oct  8 01:38:49 2010        (r483)
@@ -25,6 +25,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 put_header("statistiques");

Modified: branches/generic/submit-script-doc.php
==============================================================================
--- branches/generic/submit-script-doc.php      Thu Aug  5 00:42:26 2010      
  (r482)
+++ branches/generic/submit-script-doc.php      Fri Oct  8 01:38:49 2010      
  (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 put_header ("soumission d'évènement");
 
 ?>

Modified: branches/generic/submit.php
==============================================================================
--- branches/generic/submit.php Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/submit.php Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 function alert_moderators ($db, $id, $title, $start, $end, $description, 
$city,

Modified: branches/generic/tags.php
==============================================================================
--- branches/generic/tags.php   Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/tags.php   Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 put_header("tags");
 
 echo "<h2>Tags</h2>";

Modified: branches/generic/testevent.php
==============================================================================
--- branches/generic/testevent.php      Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/testevent.php      Fri Oct  8 01:38:49 2010        (r483)
@@ -24,6 +24,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 $db = new db();
 
 put_header("informations sur un évènement");

Modified: branches/generic/textlist.php
==============================================================================
--- branches/generic/textlist.php       Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/textlist.php       Fri Oct  8 01:38:49 2010        (r483)
@@ -4,6 +4,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 calendar_setlocale();
 
 $db = new db();

Modified: branches/generic/validateevent.php
==============================================================================
--- branches/generic/validateevent.php  Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/validateevent.php  Fri Oct  8 01:38:49 2010        (r483)
@@ -22,11 +22,8 @@
 include("config.inc.php");
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
-include("includes/session.inc.php");
-include("includes/user.inc.php");
 
-$db = new db();
-$user = new user($db);
+include("includes/authenticate.inc.php");
 
 if ($_POST['__event_validation_cancel'])
 {

Modified: branches/generic/xmllistevents.php
==============================================================================
--- branches/generic/xmllistevents.php  Thu Aug  5 00:42:26 2010        (r482)
+++ branches/generic/xmllistevents.php  Fri Oct  8 01:38:49 2010        (r483)
@@ -23,6 +23,10 @@
 include("includes/bd.inc.php");
 include("includes/funcs.inc.php");
 
+if(${privateAgenda}) {
+  include("includes/authenticate.inc.php");
+}
+
 if ($_GET['tag'] && ereg("^[a-z0-9\-]*$", $_GET['tag']))
   $tag = $_GET['tag'];
 else