? .htaccess
? document
? webcal
? admin/phpwiki.php
? admin/webcalendar.php
? conf/conf.php
? includes/magpierss
Index: pre.inc.php3
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/pre.inc.php3,v
retrieving revision 1.26
diff -u -r1.26 pre.inc.php3
--- pre.inc.php3	18 Jun 2003 14:12:24 -0000	1.26
+++ pre.inc.php3	22 Jul 2003 00:53:36 -0000
@@ -127,6 +127,19 @@
       $menu->add(DOL_URL_ROOT."/postnuke/articles/", "Editorial");
     }
 
+  if (defined("MAIN_MODULE_PHPWIKI") && MAIN_MODULE_PHPWIKI)
+    {
+      $menu->add(PHPWIKI_URL, "PhpWiki");
+      require_once("includes/magpierss/rss_fetch.inc");
+      $rss = fetch_rss( PHPWIKI_URLRSS );
+      
+      foreach ($rss->items as $item) {
+	$href = $item['link'];
+	$title = $item['title'];
+	$menu->add_submenu("$href","$title");
+      }
+    }
+
   $menu->add(DOL_URL_ROOT."/user/", "Utilisateurs");
 
   if ($user->admin)
Index: admin/modules.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/modules.php,v
retrieving revision 1.13
diff -u -r1.13 modules.php
--- admin/modules.php	24 Jun 2003 15:20:03 -0000	1.13
+++ admin/modules.php	22 Jul 2003 00:53:36 -0000
@@ -104,6 +104,16 @@
 $modules["MAIN_MODULE_POSTNUKE"][2] = MAIN_MODULE_POSTNUKE;
 $modules["MAIN_MODULE_POSTNUKE"][3] = "Module de gestion de postnuke";
 
+$modules["MAIN_MODULE_WEBCALENDAR"][0] = "Module Webcalendar";
+$modules["MAIN_MODULE_WEBCALENDAR"][1] = "MAIN_MODULE_WEBCALENDAR";
+$modules["MAIN_MODULE_WEBCALENDAR"][2] = MAIN_MODULE_WEBCALENDAR;
+$modules["MAIN_MODULE_WEBCALENDAR"][3] = "Module de gestion du calendrier";
+
+$modules["MAIN_MODULE_PHPWIKI"][0] = "Module PhpWiki";
+$modules["MAIN_MODULE_PHPWIKI"][1] = "MAIN_MODULE_PHPWIKI";
+$modules["MAIN_MODULE_PHPWIKI"][2] = MAIN_MODULE_PHPWIKI;
+$modules["MAIN_MODULE_PHPWIKI"][3] = "Module de gestion de phpwiki";
+
 if ($action == 'set')
 {
   $sql = "REPLACE INTO llx_const SET name = '".$value."', value='1', visible = 0";
Index: admin/pre.inc.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/pre.inc.php,v
retrieving revision 1.14
diff -u -r1.14 pre.inc.php
--- admin/pre.inc.php	24 Jun 2003 14:55:08 -0000	1.14
+++ admin/pre.inc.php	22 Jul 2003 00:53:37 -0000
@@ -49,6 +49,16 @@
       $menu->add_submenu("fichinter.php", "Fiches d'intervention");
     }
 
+  if(defined("MAIN_MODULE_WEBCALENDAR") && MAIN_MODULE_WEBCALENDAR)
+    {
+      $menu->add_submenu("webcalendar.php", "Calendrier");
+    }
+
+  if(defined("MAIN_MODULE_PHPWIKI") && MAIN_MODULE_PHPWIKI)
+    {
+      $menu->add_submenu("phpwiki.php", "PhpWiki");
+    }
+
 
   $menu->add("boxes.php", "Boites");
 
Index: includes/menus/barre_top/default.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/includes/menus/barre_top/default.php,v
retrieving revision 1.3
diff -u -r1.3 default.php
--- includes/menus/barre_top/default.php	23 Jun 2003 22:17:18 -0000	1.3
+++ includes/menus/barre_top/default.php	22 Jul 2003 00:53:38 -0000
@@ -82,11 +82,11 @@
   print '-';
 }
 print '</td><td width="15%" class="menu" align="center">';
-if ($conf->webcal->enabled)
+
+if(defined("MAIN_MODULE_WEBCALENDAR") && MAIN_MODULE_WEBCALENDAR)
 {
-  print '<a class="menu" href="'.$conf->webcal->url.'">Calendrier</a>';
+  print '<a class="menu" href="'. PHPWEBCALENDAR_URL .'">Calendrier</a>';
 };
 print '&nbsp;</TD>';
-
 
 ?>