From a826242609878d1d3ab4a4150e8ee43bd735dd4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 22 Jul 2011 13:46:34 +0000
Subject: [PATCH] Fix: Migrate requests to delete orphelins

---
 htdocs/comm/action/index.php                  | 35 +++++++++----------
 .../install/mysql/migration/3.0.0-3.1.0.sql   |  4 ++-
 htdocs/lib/agenda.lib.php                     | 14 ++++----
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 08e7d071cab..05e52bded62 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -24,7 +24,7 @@
  *  \file       htdocs/comm/action/index.php
  *  \ingroup    agenda
  *  \brief      Home page of calendar events
- *  \version    $Id$
+ *  \version    $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $
  */
 
 require("../../main.inc.php");
@@ -487,24 +487,23 @@ if ($showbirthday)
 
 //Exernal Calendars
 $listofextcals=array();
-if ($conf->global->MAIN_FEATURES_LEVEL>=2)
+
+if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
 {
-    if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
-    {
-        $i=0;
-        while($i < $conf->global->AGENDA_EXT_NB)
-        {
-            $i++;
-            $paramkey='AGENDA_EXT_SRC'.$i;
-            $url=$conf->global->$paramkey;
-            $paramkey='AGENDA_EXT_NAME'.$i;
-            $namecal = $conf->global->$paramkey;
-            $paramkey='AGENDA_EXT_COLOR'.$i;
-            $colorcal = $conf->global->$paramkey;
-            if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal);
-        }
-    }
+	$i=0;
+	while($i < $conf->global->AGENDA_EXT_NB)
+	{
+		$i++;
+		$paramkey='AGENDA_EXT_SRC'.$i;
+		$url=$conf->global->$paramkey;
+		$paramkey='AGENDA_EXT_NAME'.$i;
+		$namecal = $conf->global->$paramkey;
+		$paramkey='AGENDA_EXT_COLOR'.$i;
+		$colorcal = $conf->global->$paramkey;
+		if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal);
+	}
 }
+
 if (sizeof($listofextcals))
 {
     require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php");
@@ -787,7 +786,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
 ';
 */
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $');
 
 
 /**
diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
index bad27534494..70ce4611860 100755
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
@@ -1,5 +1,5 @@
 --
--- $Id: 3.0.0-3.1.0.sql,v 1.79 2011/07/12 22:12:12 eldy Exp $
+-- $Id: 3.0.0-3.1.0.sql,v 1.80 2011/07/22 13:46:34 eldy Exp $
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
@@ -124,7 +124,9 @@ ALTER TABLE llx_usergroup_user DROP INDEX fk_user;
 ALTER TABLE llx_usergroup_user DROP INDEX uk_user_group_entity;
 ALTER TABLE llx_usergroup_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
 ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup);
+-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
 ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user      FOREIGN KEY (fk_user)         REFERENCES llx_user (rowid);
+-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup)    REFERENCES llx_usergroup (rowid);
 
 ALTER TABLE llx_commande ADD COLUMN ref_int	varchar(30) AFTER ref_ext;
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index 91a96d0e6e2..d47b327541d 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -22,7 +22,7 @@
 /**
  *  \file		htdocs/lib/agenda.lib.php
  *  \brief		Set of function for the agenda module
- *  \version	$Id$
+ *  \version	$Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $
  */
 
 
@@ -324,13 +324,11 @@ function agenda_prepare_head()
 	$head[$h][2] = 'xcal';
 	$h++;
 
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)   // In dev version only for the moment
-	{
-    	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
-    	$head[$h][1] = $langs->trans("ExtSites");
-    	$head[$h][2] = 'extsites';
-    	$h++;
-	}
+	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
+	$head[$h][1] = $langs->trans("ExtSites");
+	$head[$h][2] = 'extsites';
+	$h++;
+
 
 	return $head;
 }