From 3574fc102c1d87ae1a2c7761d14a50766ea49ad1 Mon Sep 17 00:00:00 2001
From: Chouchen <Chouchen@261488aa-f40c-4039-bc0e-bffa66c6468e>
Date: Wed, 6 Oct 2010 08:24:08 +0000
Subject: [PATCH] Correction du bug de l'ajout de module avec la nouvelle
 classe Module

---
 class/AccueilModules.php                | 20 ++++++--------------
 class/Module.php                        | 18 ++++++++++--------
 modules/blogs/Blogs.php                 |  2 +-
 modules/clock/Clock.php                 |  2 +-
 modules/clockAdvanced/ClockAdvanced.php |  2 +-
 modules/gmap/Gmap.php                   |  2 +-
 modules/links/Links.php                 |  2 +-
 modules/mappy/Mappy.php                 |  2 +-
 modules/news/News.php                   |  2 +-
 modules/notes/Notes.php                 |  2 +-
 modules/ouifm/Ouifm.php                 |  2 +-
 modules/rssblogs/Rssblogs.php           |  2 +-
 modules/search/Search.php               |  2 +-
 modules/todo/Todo.php                   |  2 +-
 modules/weather/Weather.php             |  2 +-
 15 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/class/AccueilModules.php b/class/AccueilModules.php
index 3091817..360dd35 100644
--- a/class/AccueilModules.php
+++ b/class/AccueilModules.php
@@ -121,19 +121,10 @@ class AccueilModules {
 			</script>';
 	}
 	
-	/**
-	 * 
-	 * @property Chaque module possède la fonction updateModule en static qui permet de changer un ou plusieurs de ses attributs
-	 * @param $module String Nom du module à modifier
-	 * @param $things2change Array du ou des attributs à modifier avec sa ou ses nouvelles valeurs
-	 * @return "ok" String si c'est bon, ou le message d'erreur
-	 */
-	/*public static function updateModule($module, $things2change){
-		//require 'Module.php';
-		//require '../modules/'.$module.'/'.ucfirst($module).'.php';
-		$module = new $module();
-		return call_user_func(array($module, "updateConfig"), $things2change);
-	}*/
+	public static function retrieveModuleParams($module){
+		$temp = new $module;
+		return $temp->getParamsList();
+	}
 	
 	/**
 	*
@@ -161,7 +152,8 @@ class AccueilModules {
 					if($config = simplexml_load_file('../'.self::CONFIG_FILE)){
 						$newItem = $config->addChild('item');
 						$newItem->addAttribute('id', $name);
-						$params = call_user_func(array($name, 'getParamList')); 
+						//$params = call_user_func(array($name, 'getParamList')); 
+						$params = self::retrieveModuleParams($name);
 						foreach($params as $param){
 							if($param == 'visibility')
 								$newItem->AddChild($param, 'true');
diff --git a/class/Module.php b/class/Module.php
index 1c8c3ae..8937c41 100644
--- a/class/Module.php
+++ b/class/Module.php
@@ -1,13 +1,7 @@
 <?php 
 class Module
 {
-	/**
-	* Liste des paramètres du module en concordance avec le "config.xml"
-	* Ses éléments ne peuvent être modifiés
-	* @var array
-	*/
-	protected static $paramsList = array();
-	
+
 	// Nom du module (aka le nom de la classe en minuscule)
 	protected $moduleName;
 	
@@ -24,8 +18,9 @@ class Module
 	*/
 	private $params = array();
 	
-	public function __construct($class, $params){
+	public function __construct($class, $params = null){
 		$this->setNames($class, $this->moduleTitle);
+		if($params != null && is_array($params))
 		$this->setParams($params);
 	}
 	
@@ -71,6 +66,13 @@ class Module
 		$this->moduleTitle	= $libelle;
 	}
 	
+	/**
+	 * @return la liste des paramètres du module
+	 */
+	public function getParamsList(){
+		return $this->paramsList;
+	}
+	
 	/**
 	 * @param $class string nom du module
 	 * @param $key string le nom du paramètre à changer
diff --git a/modules/blogs/Blogs.php b/modules/blogs/Blogs.php
index e4dcf33..23e853f 100644
--- a/modules/blogs/Blogs.php
+++ b/modules/blogs/Blogs.php
@@ -1,7 +1,7 @@
 <?php
 class blogs extends Module {
 	protected $moduleTitle = 'Blogs BD';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'x',
 		'y'
diff --git a/modules/clock/Clock.php b/modules/clock/Clock.php
index 42d260c..20b41e2 100644
--- a/modules/clock/Clock.php
+++ b/modules/clock/Clock.php
@@ -1,7 +1,7 @@
 <?php
 class clock extends Module {
 	protected $moduleTitle = 'Horloge Simple';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'x',
 		'y'
diff --git a/modules/clockAdvanced/ClockAdvanced.php b/modules/clockAdvanced/ClockAdvanced.php
index 225cbcc..3ab1582 100644
--- a/modules/clockAdvanced/ClockAdvanced.php
+++ b/modules/clockAdvanced/ClockAdvanced.php
@@ -1,7 +1,7 @@
 <?php
 class clockAdvanced extends Module {
 	protected $moduleTitle = 'Horloge Avancée';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'x',
 		'y',
diff --git a/modules/gmap/Gmap.php b/modules/gmap/Gmap.php
index ab3c41f..c41de0c 100644
--- a/modules/gmap/Gmap.php
+++ b/modules/gmap/Gmap.php
@@ -1,7 +1,7 @@
 <?php
 class gmap extends Module {
 	protected $moduleTitle = 'Google Maps';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility'
 	);
 	
diff --git a/modules/links/Links.php b/modules/links/Links.php
index b671f18..3e43de5 100644
--- a/modules/links/Links.php
+++ b/modules/links/Links.php
@@ -1,7 +1,7 @@
 <?php
 class links extends Module{
 	protected $moduleTitle = 'Liens';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility'
 	);
 	
diff --git a/modules/mappy/Mappy.php b/modules/mappy/Mappy.php
index 6234eca..c1e968c 100644
--- a/modules/mappy/Mappy.php
+++ b/modules/mappy/Mappy.php
@@ -1,7 +1,7 @@
 <?php
 class mappy extends Module {
 	protected $moduleTitle = 'Mappy';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility'
 	);
 	
diff --git a/modules/news/News.php b/modules/news/News.php
index 3821877..2e3d426 100644
--- a/modules/news/News.php
+++ b/modules/news/News.php
@@ -1,7 +1,7 @@
 <?php
 class news extends Module{
 	protected $moduleTitle = 'Google News';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'x',
 		'y'
diff --git a/modules/notes/Notes.php b/modules/notes/Notes.php
index 8aa120a..67a26ec 100644
--- a/modules/notes/Notes.php
+++ b/modules/notes/Notes.php
@@ -2,7 +2,7 @@
 class notes extends Module {
 	protected $moduleTitle = 'Post-It';
 	
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility'
 	);
 	
diff --git a/modules/ouifm/Ouifm.php b/modules/ouifm/Ouifm.php
index 6c2648b..362784b 100644
--- a/modules/ouifm/Ouifm.php
+++ b/modules/ouifm/Ouifm.php
@@ -1,7 +1,7 @@
 <?php
 class ouifm extends Module {
 	protected $moduleTitle = 'Oui FM Radio';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'x',
 		'y'
diff --git a/modules/rssblogs/Rssblogs.php b/modules/rssblogs/Rssblogs.php
index 2046db3..6072bb4 100644
--- a/modules/rssblogs/Rssblogs.php
+++ b/modules/rssblogs/Rssblogs.php
@@ -1,7 +1,7 @@
 <?php
 class rssblogs extends Module {
 	protected $moduleTitle = 'Lecteur de flux RSS';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'x',
 		'y'
diff --git a/modules/search/Search.php b/modules/search/Search.php
index 9fd4b53..a404190 100644
--- a/modules/search/Search.php
+++ b/modules/search/Search.php
@@ -1,7 +1,7 @@
 <?php
 class search extends Module {
 	protected $moduleTitle = 'Recherche';
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility'
 	);
 	
diff --git a/modules/todo/Todo.php b/modules/todo/Todo.php
index a9671f4..e9dacbe 100644
--- a/modules/todo/Todo.php
+++ b/modules/todo/Todo.php
@@ -3,7 +3,7 @@ class todo extends Module {
 
 	protected $moduleTitle = 'Todo List';
 	
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'x',
 		'y'
diff --git a/modules/weather/Weather.php b/modules/weather/Weather.php
index 2fbea70..686547b 100644
--- a/modules/weather/Weather.php
+++ b/modules/weather/Weather.php
@@ -3,7 +3,7 @@ class weather extends Module {
 
 	protected $moduleTitle = 'Météo';
 	
-	protected static $paramsList = array(
+	protected $paramsList = array(
 		'visibility',
 		'city',
 		'x',