From dcbfa0604b7076337642cded0ef6e8e83b86be95 Mon Sep 17 00:00:00 2001
From: "tristan.champomier" <rooty@rooty.me>
Date: Wed, 5 May 2021 10:56:55 +0200
Subject: [PATCH] Implemented page headers mx blocks in template package

---
 data/template/qware/headers/author.mxt        |   1 +
 .../template/qware/headers/classification.mxt |   1 +
 data/template/qware/headers/description.mxt   |   1 +
 data/template/qware/headers/favicon.mxt       |   1 +
 data/template/qware/headers/keywords.mxt      |   1 +
 data/template/qware/headers/title.mxt         |   1 +
 lib/package/package.template.php              | 401 +++++++++++++-----
 7 files changed, 305 insertions(+), 102 deletions(-)
 create mode 100644 data/template/qware/headers/author.mxt
 create mode 100644 data/template/qware/headers/classification.mxt
 create mode 100644 data/template/qware/headers/description.mxt
 create mode 100644 data/template/qware/headers/favicon.mxt
 create mode 100644 data/template/qware/headers/keywords.mxt
 create mode 100644 data/template/qware/headers/title.mxt

diff --git a/data/template/qware/headers/author.mxt b/data/template/qware/headers/author.mxt
new file mode 100644
index 0000000..ece4a10
--- /dev/null
+++ b/data/template/qware/headers/author.mxt
@@ -0,0 +1 @@
+<meta name="author" content="<mx:text id="author"/>" />
diff --git a/data/template/qware/headers/classification.mxt b/data/template/qware/headers/classification.mxt
new file mode 100644
index 0000000..c67d839
--- /dev/null
+++ b/data/template/qware/headers/classification.mxt
@@ -0,0 +1 @@
+<meta name="classification" content="<mx:text id="classification"/>" />
diff --git a/data/template/qware/headers/description.mxt b/data/template/qware/headers/description.mxt
new file mode 100644
index 0000000..c6e5f15
--- /dev/null
+++ b/data/template/qware/headers/description.mxt
@@ -0,0 +1 @@
+<meta name="description" content="<mx:text id="description"/>" />
diff --git a/data/template/qware/headers/favicon.mxt b/data/template/qware/headers/favicon.mxt
new file mode 100644
index 0000000..5d29a55
--- /dev/null
+++ b/data/template/qware/headers/favicon.mxt
@@ -0,0 +1 @@
+<link rel="shortcut icon" type="image/png" href="<mx:text id="linkFavicon"/>" />
diff --git a/data/template/qware/headers/keywords.mxt b/data/template/qware/headers/keywords.mxt
new file mode 100644
index 0000000..d8464ac
--- /dev/null
+++ b/data/template/qware/headers/keywords.mxt
@@ -0,0 +1 @@
+<meta name="keywords" content="<mx:text id="keywords"/>" />
diff --git a/data/template/qware/headers/title.mxt b/data/template/qware/headers/title.mxt
new file mode 100644
index 0000000..d1ff657
--- /dev/null
+++ b/data/template/qware/headers/title.mxt
@@ -0,0 +1 @@
+<title><mx:text id="title"/></title>
diff --git a/lib/package/package.template.php b/lib/package/package.template.php
index 5cd8715..c8b7218 100755
--- a/lib/package/package.template.php
+++ b/lib/package/package.template.php
@@ -79,27 +79,224 @@ function exitBloc()
 */
 function mxPageTitle($label, $compl=False)
 {
-    if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("TITLELOAD") && isset($label) )
-    {
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("TITLELOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."title.mxt");
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("TITLELOAD", "appe");
+	if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("TITLELOAD") && isset($label) )
+	{
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("TITLELOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/title.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("TITLELOAD", "appe");
 
-        if( !$compl )
-        {
-            if( getMessage($label) )
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("title", getMessage($label));
-            else
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("title", $label);
-        } else
-            $GLOBALS['SYSTEM_TEMPLATE']->MxText("title", getMessage($label)." ".$compl);
-        
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
-        return true;
-    } else {
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("TITLELOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."title.mxt");
-        $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("TITLELOAD", "delete");
-        return false;
-    }
+		if( !$compl )
+		{
+			if( getMessage($label) )
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("title", getMessage($label));
+			else
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("title", $label);
+		} else
+			$GLOBALS['SYSTEM_TEMPLATE']->MxText("title", getMessage($label)." ".$compl);
+		
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("TITLELOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/title.mxt");
+		$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("TITLELOAD", "delete");
+		return false;
+	}
+}
+
+/**
+* fonction d'inclusion des favicons de pages dans le bloc MX principal
+* @return booleen
+*/
+function mxPageFavicon($favicon, $compl=False)
+{
+	if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("FAVICONLOAD") && isset($favicon) )
+	{
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("FAVICONLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/favicon.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("FAVICONLOAD", "appe");
+
+		if( !$compl )
+		{
+			if( getMessage($favicon) )
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("linkFavicon", getMessage($favicon));
+			else
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("linkFavicon", $favicon);
+		} else
+			$GLOBALS['SYSTEM_TEMPLATE']->MxText("linkFavicon", getMessage($favicon)." ".$compl);
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("FAVICONLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/favicon.mxt");
+		$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("FAVICONLOAD", "delete");
+		return false;
+	}
+}
+
+/**
+* fonction d'inclusion des mots clés de pages dans le bloc MX principal
+* @return booleen
+*/
+function mxPageKeywords($keywords, $compl=False)
+{
+	if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("KEYWORDSLOAD") && isset($keywords) )
+	{
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("KEYWORDSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/keywords.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("KEYWORDSLOAD", "appe");
+
+		if( !$compl )
+		{
+			if( getMessage($keywords) )
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("keywords", getMessage($keywords));
+			else
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("keywords", $keywords);
+		} else
+			$GLOBALS['SYSTEM_TEMPLATE']->MxText("keywords", getMessage($keywords)." ".$compl);
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("KEYWORDSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/keywords.mxt");
+		$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("KEYWORDSLOAD", "delete");
+		return false;
+	}
+}
+
+/**
+* fonction d'inclusion des descriptions de pages dans le bloc MX principal
+* @return booleen
+*/
+function mxPageDescription($description, $compl=False)
+{
+	if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("DESCRIPTIONLOAD") && isset($description) )
+	{
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("DESCRIPTIONLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/description.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("DESCRIPTIONLOAD", "appe");
+
+		if( !$compl )
+		{
+			if( getMessage($description) )
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", getMessage($description));
+			else
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", $description);
+		} else
+			$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", getMessage($description)." ".$compl);
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("DESCRIPTIONLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/description.mxt");
+		$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("DESCRIPTIONLOAD", "delete");
+		return false;
+	}
+}
+
+/**
+* fonction d'inclusion des descriptions de pages dans le bloc MX principal
+* @return booleen
+*/
+function mxPageClassification($classification, $compl=False)
+{
+	if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("CLASSIFICATIONLOAD") && isset($classification) )
+	{
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CLASSIFICATIONLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/classification.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("CLASSIFICATIONLOAD", "appe");
+
+		if( !$compl )
+		{
+			if( getMessage($classification) )
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", getMessage($classification));
+			else
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", $classification);
+		} else
+			$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", getMessage($classification)." ".$compl);
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CLASSIFICATIONLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/classification.mxt");
+		$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("CLASSIFICATIONLOAD", "delete");
+		return false;
+	}
+}
+
+/**
+* fonction d'inclusion des descriptions de pages dans le bloc MX principal
+* @return booleen
+*/
+function mxPageAuthor($author, $compl=False)
+{
+	if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("AUTHORLOAD") && isset($author) )
+	{
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("AUTHORLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/author.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("AUTHORLOAD", "appe");
+
+		if( !$compl )
+		{
+			if( getMessage($author) )
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", getMessage($author));
+			else
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", $author);
+		} else
+			$GLOBALS['SYSTEM_TEMPLATE']->MxText("description", getMessage($author)." ".$compl);
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("AUTHORLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/author.mxt");
+		$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("AUTHORLOAD", "delete");
+		return false;
+	}
+}
+
+/**
+* fonction d'inclusion des headerss de pages dans le bloc MX principal
+* @return booleen
+*/
+function mxPageHeaders($title, $keywords, $description, $classification, $author)
+{
+	if( isset($title) && $title !="" && $title )
+	{
+		mxPageTitle($title);
+		return true;
+	} else {
+		
+		return false;
+	}
+
+	if( isset($keywords) && is_array($keywords) )
+	{
+		mxPageKeywords($keywords);
+		return true;
+	} else {
+		
+		return false;
+	}
+
+	if( isset($description) && $description !="" && $description )
+	{
+		mxPageDescription($description);
+		return true;
+	} else {
+		
+		return false;
+	}
+
+	if( isset($classification) && is_array($classification) )
+	{
+		mxPageClassification($classification);
+		return true;
+	} else {
+		
+		return false;
+	}
+
+	if( isset($author) && $author !="" && $author )
+	{
+		mxPageAuthor($author);
+		return true;
+	} else {
+		
+		return false;
+	}
 }
 
 /**
@@ -108,36 +305,36 @@ function mxPageTitle($label, $compl=False)
 */
 function mxCallCss($arrayCallCss)
 {
-//     if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("CSSLOAD") && is_array($arrayCallCss) && count($arrayCallCss)>0 )
+//	 if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("CSSLOAD") && is_array($arrayCallCss) && count($arrayCallCss)>0 )
 	if ( is_array($arrayCallCss) && count($arrayCallCss)>0 )
-    {
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."css.mxt");
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("CSSLOAD", "appe");
+	{
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."css.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("CSSLOAD", "appe");
 
-        for ($j=0; $j<count($arrayCallCss); $j++)
-        {
-            if( is_string( $arrayCallCss[$j]) )
-            {
+		for ($j=0; $j<count($arrayCallCss); $j++)
+		{
+			if( is_string( $arrayCallCss[$j]) )
+			{
 // 				var_dump($arrayCallCss[$j]);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".hrefcss", $arrayCallCss[$j]);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocCSS".".blocIntegrity", "delete");
-                $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocCSS".".blocOrigin", "delete");
-            }elseif( is_array($arrayCallCss[$j]) )
-            {
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".hrefcss", $arrayCallCss[$j]["href"]);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".blocIntegrity".".integrity", $arrayCallCss[$j]["integrity"]);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".blocOrigin".".origin", $arrayCallCss[$j]["origin"]);
-            }
-            $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocCSS", "loop");
-        }
-        
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
-        return true;
-    } else {
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."css.mxt");
-        $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("CSSLOAD", "delete");
-        return false;
-    }
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".hrefcss", $arrayCallCss[$j]);
+				$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocCSS".".blocIntegrity", "delete");
+				$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocCSS".".blocOrigin", "delete");
+			}elseif( is_array($arrayCallCss[$j]) )
+			{
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".hrefcss", $arrayCallCss[$j]["href"]);
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".blocIntegrity".".integrity", $arrayCallCss[$j]["integrity"]);
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocCSS".".blocOrigin".".origin", $arrayCallCss[$j]["origin"]);
+			}
+			$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocCSS", "loop");
+		}
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."css.mxt");
+		$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("CSSLOAD", "delete");
+		return false;
+	}
 }
 
 /**
@@ -146,37 +343,37 @@ function mxCallCss($arrayCallCss)
 */
 function mxCallJs($arrayCallJs)
 {
-//     if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSLOAD") && is_array($arrayCallJs) && count($arrayCallJs)>0 )
+//	 if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSLOAD") && is_array($arrayCallJs) && count($arrayCallJs)>0 )
 	if ( is_array($arrayCallJs) && count($arrayCallJs)>0 )
-    {
-//         var_dump($arrayCallJs);
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."js.mxt");
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("JSLOAD", "appe");
+	{
+//		 var_dump($arrayCallJs);
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."js.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("JSLOAD", "appe");
 
-        for ($j=0; $j<count($arrayCallJs); $j++)
-        {
-            if( is_string( $arrayCallJs[$j]) )
-            {
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".hrefjs", $arrayCallJs[$j]);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocJS".".blocIntegrity", "delete");
-                $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocJS".".blocOrigin", "delete");
-            }
-            elseif( is_array($arrayCallJs[$j]) )
-            {
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".hrefjs", $arrayCallJs[$j]["src"]);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".blocIntegrity".".integrity", $arrayCallJs[$j]["integrity"]);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".blocOrigin".".origin", $arrayCallJs[$j]["origin"]);
-            }
-            $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocJS", "loop");
-        }
-        
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
-        return true;
-    } else {
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."js.mxt");
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSLOAD", 'delete');
-        return false;
-    }
+		for ($j=0; $j<count($arrayCallJs); $j++)
+		{
+			if( is_string( $arrayCallJs[$j]) )
+			{
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".hrefjs", $arrayCallJs[$j]);
+				$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocJS".".blocIntegrity", "delete");
+				$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocJS".".blocOrigin", "delete");
+			}
+			elseif( is_array($arrayCallJs[$j]) )
+			{
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".hrefjs", $arrayCallJs[$j]["src"]);
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".blocIntegrity".".integrity", $arrayCallJs[$j]["integrity"]);
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocJS".".blocOrigin".".origin", $arrayCallJs[$j]["origin"]);
+			}
+			$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocJS", "loop");
+		}
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."js.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSLOAD", 'delete');
+		return false;
+	}
 }
 
 /**
@@ -186,30 +383,30 @@ function mxCallJs($arrayCallJs)
 function mxRawJs($arrayRawJs)
 {
 // 	var_dump($arrayRawJs);
-//     if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSRAWLOAD") && is_array($arrayRawJs) && count($arrayRawJs)>0 )
+//	 if (  $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSRAWLOAD") && is_array($arrayRawJs) && count($arrayRawJs)>0 )
 	if (  is_array($arrayRawJs) && count($arrayRawJs)>0 )
-    {
-//         var_dump($arrayRawJs);
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSRAWLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."jsraw.mxt");
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("JSRAWLOAD", "appe");
+	{
+//		 var_dump($arrayRawJs);
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSRAWLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."jsraw.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("JSRAWLOAD", "appe");
 
-        for ($j=0; $j<count($arrayRawJs); $j++)
-        {
-//             if( is_string( $arrayRawJs[$j]) )
-//             {
+		for ($j=0; $j<count($arrayRawJs); $j++)
+		{
+//			 if( is_string( $arrayRawJs[$j]) )
+//			 {
 // 				var_dump($arrayRawJs);
-                $GLOBALS['SYSTEM_TEMPLATE']->MxText("blocRawJS".".contentjs", $arrayRawJs[$j]);
-//             }
-            $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocRawJS", "loop");
-        }
-        
-        $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
-        return true;
-    } else {
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSRAWLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."jsraw.mxt");
-        $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSRAWLOAD", 'delete');
-        return false;
-    }
+				$GLOBALS['SYSTEM_TEMPLATE']->MxText("blocRawJS".".contentjs", $arrayRawJs[$j]);
+//			 }
+			$GLOBALS['SYSTEM_TEMPLATE']->MxBloc("blocRawJS", "loop");
+		}
+
+		$GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("");
+		return true;
+	} else {
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSRAWLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."jsraw.mxt");
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSRAWLOAD", 'delete');
+		return false;
+	}
 }
 
 /**
@@ -296,7 +493,7 @@ function printTabTreeGroup($tabTreeGroup, $selected, $MxBlocName="GROUP", $name=
 
 		/*Fonction permettant de supprimer les numeros, le point et l'espace à l'affichage*/
 // 		$lib = eregi_replace("^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+", "", $lib);
-        $lib = preg_replace("/^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+/i", "", $lib);
+		$lib = preg_replace("/^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+/i", "", $lib);
 		$tabSel[$tabTreeGroup[$i]->getId()]=$char.$lib;
 		$tabSel=printTreeGroupSon($tabSel, $tabTreeGroup[$i], $selected, $tabTreeGroup[$i]->getId(), "--", $MxBlocName);
 	}	
@@ -334,7 +531,7 @@ function printTreeGroupSon($tabSel, $TreeGroup, $selected, $id, $char="--", $MxB
 	{
 		/*Fonction permettant de supprimer les numeros, le point et l'espace à l'affichage*/
 // 		$tabName[$i] = eregi_replace("^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+", "", $tabName[$i]);
-        $tabName[$i] = preg_replace("/^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+/i", "", $tabName[$i]);
+		$tabName[$i] = preg_replace("/^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+/i", "", $tabName[$i]);
 	}
 
 	while (list($i, $lib) = each($tabName))
@@ -375,7 +572,7 @@ function printTabTreeNode($tabTreeGroup, $selected, $MxBlocName="NODE", $name="n
 
 			/*Fonction permettant de supprimer les numeros, le point et l'espace à l'affichage*/
 // 			$lib = eregi_replace("^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+", "", $lib);
-            $lib = preg_replace("/^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+/i", "", $lib);
+			$lib = preg_replace("/^[[:space:]]*[a-z]+[.)".chr(176)."][[:space:]]+/i", "", $lib);
 			$tabSel[($tabFather[$j])]=$lib;
 			$separ.="--";
 		}
@@ -493,10 +690,10 @@ function printTabCommProfiles($selected='', $MxBlocName="COMMPROFILES", $name="c
 {
 	global $SYSTEM_TEMPLATE;
 	$arrayCommProfiles = array("blog"=>"Blog", "asso"=>"Association", "vitrine"=>"Vitrine", "ecommerce"=>"E-commerce");
-	
+
 	asort($arrayCommProfiles);
 // 	reset($arrayCommProfiles);
-	
+
 	$GLOBALS['SYSTEM_TEMPLATE']->MxSelect($MxBlocName, $name, $selected, $arrayCommProfiles, $default, '', $opt, $attr);
 
 	return true;