Merge branch 'dev#18020-afim-update' into 'stable'

Dev#18020 afim update

See merge request !745

application/modules/push/controllers/MultimediaController.php

@@ -81,7 +81,6 @@ class Push_MultimediaController extends Zend_Controller_Action {
 	}
 
 
-
 	public function getAllBorrowersAction() {
 		$this->getHelper('ViewRenderer')->setNoRender();
 
@@ -94,6 +93,7 @@ class Push_MultimediaController extends Zend_Controller_Action {
 			->getResponse($this->_request));
 	}
 
+
 	public function createBorrowerAction() {
 		$multimedia = Class_Multimedia::getInstance();
 		$log = $multimedia->getLog();
@@ -122,8 +122,6 @@ class Push_MultimediaController extends Zend_Controller_Action {
 		}
 
 		$this->_response->setBody(Class_Multimedia_Users::getInstance()->createUser($infoUser));
-
-
 	}
 }
 ?>
\ No newline at end of file

library/Class/Multimedia/Users.php

@@ -20,53 +20,53 @@
  */
 class Class_Multimedia_Users {
 
-	private $_instance = null;
+	private static $_instance = null;
 
 	public static function getInstance(){
-		if(null == $this->_instance)
-			$this->_instance =Class_Multimedia_Users::newInstance();
-		return $this->_instance;
+		if(null == self::$_instance)
+			self::$_instance = new Class_Multimedia_Users();
+		return self::$_instance;
 	}
 
-	public function createUser($infoUser){
-		if(!$this->isValidInfo($infoUser)){
-			return 'INVALID_INFO_USER';
-		}
 
-		if(!$group = Class_UserGroup::findGroupUserMultimedia()){
-			return 'UNDEFINED_GROUP_USER_AFIM';
-		}
+	public function createUser($infoUsers){
+		foreach($infoUsers as $infoUser) {
+			if(!$this->isValidInfo($infoUser))
+				return 'INVALID_INFO_USER';
 
-		$user = new Class_Users();
-		$user
-			->setLogin($infoUser->login)
-			->setPassword($infoUser->pwd)
-			->setNom($infoUser->nom)
-			->setPrenom($infoUser->prenom)
-			->setNaissance($infoUser->naissance);
-			->setPseudo('')
-			->setMail('')
-			->setRoleLevel(0)
-			->setRole('')
-			->setIdabon(null)
-			->setOrdreabon(1)
-			->setDateDebut('')
-			->setDateFin($infoUser->dateFin)
-			->setIdSite($infoUser->site->id)
-			->setUserGroups($group);
+			if(!$group = Class_UserGroup::findGroupUserMultimedia())
+				return 'UNDEFINED_GROUP_USER_AFIM';
 
-		$user->save();
+			$user = new Class_Users();
+			$user->setLogin($infoUser->login)
+					 ->setPassword($infoUser->pwd)
+					 ->setNom($infoUser->nom)
+					 ->setPrenom($infoUser->prenom)
+					 ->setNaissance($infoUser->naissance)
+					 ->setPseudo('')
+					 ->setMail('')
+					 ->setRoleLevel(0)
+					 ->setRole('')
+					 ->setIdabon($infoUser->login)
+					 ->setOrdreabon(1)
+					 ->setDateDebut('')
+					 ->setDateFin($infoUser->datefin)
+					 ->setIdSite($infoUser->site->id)
+					 ->save();
+
+			$usergroupShip = new Class_UserGroupMembership();
+			$usergroupShip->setUser($user)
+										->setUserGroup($group)
+										->save();
+		}
 
 	}
 
 
 	public function isValidInfo($infoUser){
-		if($infoUser->login != null && $infoUser->login != '' &&
-			 $infoUser->pwd != null && $infoUser->pwd != '' &&
-			 $infoUser->nom != null && $infoUser->nom != '')
-			return true;
-
-		return false;
+		return $infoUser->login != null && $infoUser->login != ''
+			&& $infoUser->pwd != null && $infoUser->pwd != ''
+			&& $infoUser->nom != null && $infoUser->nom != '';
 	}
 
 }

library/Class/UserGroup.php

@@ -138,7 +138,7 @@ class Class_UserGroup extends Storm_Model_Abstract {
 	}
 
 	public static function findGroupUserMultimedia(){
-		return self::findFirstBy(['groupe_type'=>self::TYPE_MULTIMEDIA]);
+		return self::findFirstBy(['group_type' => self::TYPE_MULTIMEDIA]);
 	}