fixed some Strict notices and a Swiftmailer bug (notice)

5 files changed, 9 insertions, 8 deletions

diff --git a/h-source/Application/Include/distributions.php b/h-source/Application/Include/distributions.php
index 14d59d5..048d1d9 100644
--- a/h-source/Application/Include/distributions.php
+++ b/h-source/Application/Include/distributions.php
@@ -31,7 +31,7 @@ class Distributions
 	}
 	
 	//fill the $allowed property with the list of allowed distros from the distros MySQL table
-	public function setAllowedList()
+	public static function setAllowedList()
 	{
 		$distros = new DistrosModel();
 
diff --git a/h-source/Application/Include/params.php b/h-source/Application/Include/params.php
index 3f905db..2560da8 100644
--- a/h-source/Application/Include/params.php
+++ b/h-source/Application/Include/params.php
@@ -22,7 +22,7 @@ if (!defined('EG')) die('Direct access not allowed!');
 
 class Website
 {
-	static public $generalMail = "";
+	static public $generalMail = "test@apineindustriose.org";
 	
 	static public $fromEmail = "noreply@h-node.org";
 	
@@ -30,9 +30,9 @@ class Website
 	
 	static public $projectName = "h-node";
 	
-	static public $mailServer = "";
+	static public $mailServer = "smtp.apineindustriose.org";
 	
-	static public $mailPassword = "";
+	static public $mailPassword = "lt241rskav1";
 
 	static public $allowAnonymousSubmission = "yes";
 	
diff --git a/h-source/Application/Models/HardwareModel.php b/h-source/Application/Models/HardwareModel.php
index f51333e..65bf868 100644
--- a/h-source/Application/Models/HardwareModel.php
+++ b/h-source/Application/Models/HardwareModel.php
@@ -170,7 +170,7 @@ class HardwareModel extends Model_Map {
 		 
 	}
 
-	public function update($id)
+	public function update($id = null, $where = null)
 	{
 		$clean['id'] = (int)$id;
 		
@@ -267,7 +267,7 @@ class HardwareModel extends Model_Map {
 		
 	}
 
-	public function associate($id_record)
+	public function associate($id_record = null, $idGroup = null)
 	{
 		return parent::associate((int)$id_record,(int)$this->id_user);
 	}
diff --git a/h-source/Application/Models/WikiModel.php b/h-source/Application/Models/WikiModel.php
index 7357705..6dc9fd1 100644
--- a/h-source/Application/Models/WikiModel.php
+++ b/h-source/Application/Models/WikiModel.php
@@ -110,7 +110,7 @@ class WikiModel extends Model_Map {
 		 
 	}
 
-	public function update($id)
+	public function update($id = null, $where = null)
 	{
 		$clean['id'] = (int)$id;
 
@@ -217,7 +217,7 @@ class WikiModel extends Model_Map {
 		
 	}
 
-	public function associate($id_record)
+	public function associate($id_record = null, $idGroup = null)
 	{
 		return parent::associate((int)$id_record,(int)$this->id_user);
 	}
diff --git a/h-source/External/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/h-source/External/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index 01ae8a5..1a20b0c 100644
--- a/h-source/External/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/h-source/External/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -23,6 +23,7 @@ class Swift_Transport_StreamBuffer
   extends Swift_ByteStream_AbstractFilterableInputStream
   implements Swift_Transport_IoBuffer
 {
+  private $_sequence;
   
   /** A primary socket */
   private $_stream;