Merge branch 'development' into 'master'

Ajout du custom Mocica

See merge request !990

Co2Module.php

@@ -16,12 +16,16 @@ class Co2Module extends CWebModule {
 	private $_keywords = "societal, reseau,opensource,CO,communecter";
 	private $_description = "réseau social libre et citoyen";
 	private $_pageTitle = "Communecter:libre et connecté";
+	private $_image= "Communecter:libre et connecté";
+	private $_favicon= "ico.ico";
 
 	public function getVersion(){return $this->_version;}
 	public function getVersionDate(){return $this->_versionDate;}
 	public function getKeywords(){return $this->_keywords;}
 	public function getDescription(){return $this->_description;}
 	public function getPageTitle(){return $this->_pageTitle;}
+	public function getImage(){return $this->_image;}
+	public function getFavicon(){return $this->_favicon;}
 
 	public function init()
 	{

CustomModule.php

@@ -8,6 +8,19 @@
 */
 
 class CustomModule extends CWebModule {
+	private $_keywords = "societal, reseau,opensource,CO,communecter";
+	private $_description = "réseau social libre et citoyen";
+	private $_pageTitle = "Communecter:libre et connecté";
+	private $_image= "Communecter:libre et connecté";
+	private $_favicon= "ico.ico";
+
+	public function getVersion(){return $this->_version;}
+	public function getVersionDate(){return $this->_versionDate;}
+	public function getKeywords(){return $this->_keywords;}
+	public function getDescription(){return $this->_description;}
+	public function getPageTitle(){return $this->_pageTitle;}
+	public function getImage(){return $this->_image;}
+	public function getFavicon(){return $this->_favicon;}
 
 	public function init()
 	{
@@ -25,7 +38,7 @@ class CustomModule extends CWebModule {
 		//sudo ln -s co2 network
 		Yii::app()->theme = "CO2";
 		Yii::app()->session["theme"] == "CO2";
-		Yii::app()->params['customParams'] = ( @Yii::app()->session["customParams"] ) ? Yii::app()->session["customParams"] : @$_GET["custom"];
+		Yii::app()->params['costumParams'] = ( @Yii::app()->session["costumParams"] ) ? Yii::app()->session["costumParams"] : @$_GET["costum"];
 		
 		/*if(@$_GET["network"] ){
 		    Yii::app()->theme = "network";
@@ -112,7 +125,7 @@ class CustomModule extends CWebModule {
 
 		if(@$_GET["tpl"] == "iframesig"){ $theme = $_GET["tpl"]; }
 
-		if(@$_GET["custom"]) {
+		if(@$_GET["costum"]) {
             $theme = "CO2";
             //Yii::app()->params['customParams'] = $_GET["network"];
         }