From 3090ee508dcad4f088cf1aa981abfd0c215e98ed Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 4 Nov 2011 21:27:21 +0000
Subject: [PATCH] =?UTF-8?q?Modularit=C3=A9=20:=20ajout=20du=20javascript?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/ac_common.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/include/ac_common.php b/include/ac_common.php
index a97053ae9..f0aae9e26 100644
--- a/include/ac_common.php
+++ b/include/ac_common.php
@@ -747,7 +747,7 @@ function show_module($selected)
     if ($selected != -1)
     {
 	require_once('template/module.php');
-	$file = $cn->get_array("select me_file,me_parameter from v_all_menu
+	$file = $cn->get_array("select me_file,me_parameter,me_javascript from v_all_menu
 	    where me_code=$1 and user_name=$2", array($selected,$g_user->login));
 	if ( count($file ) == 0 )
 	{
@@ -769,6 +769,10 @@ function show_module($selected)
 	    require_once $file[0]['me_file'];
 	    exit();
 	}
+	if ( $file[0]['me_javascript'] != '')
+	{
+		create_script($file[0]['me_javascript']);
+	}
     }
     else
     {
@@ -845,11 +849,12 @@ function show_menu($module, $idx)
 	 * @todo add security
 	 * check if user can access this module
 	 */
-		$file = $cn->get_array("select me_file,me_parameter
+		$file = $cn->get_array("select me_file,me_parameter,me_javascript
 		from menu_ref
 		where
-		me_code=$1 and
-		(me_file is not null or trim(me_file) <>'')", array($module[$idx]));
+		me_code=$1 and 
+		(me_file is not null or trim(me_file) <>'' or
+		me_javascript is not null or trim (me_javascript) <> '')", array($module[$idx]));
 
 		if (count($file)==0)
 		{
@@ -870,6 +875,10 @@ function show_menu($module, $idx)
 			echo '</div>';
 			exit();
 		}
+		if ( $file[0]['me_javascript'] != '')
+		{
+		echo create_script($file[0]['me_javascript']);
+		}
     }
 }
 /**