Hotline

library/Class/WebService/SIGB/Nanook/Service.php

@@ -107,19 +107,34 @@ class Class_Webservice_SIGB_Nanook_Service extends Class_WebService_SIGB_Abstrac
    * @return Class_WebService_SIGB_Emprunteur
    */
   public function getEmprunteur($user) {
-    if (!$this->ilsdiAuthenticatePatron($user))
+    if (!$user
+        || (!$patron_id = $this->_patronIdFromUser($user)))
       return Class_WebService_SIGB_Emprunteur::nullInstance();
-    $emprunteur= $this->ilsdiGetPatronInfo(['patronId' => $user->getIdSigb()],
-                                     Class_WebService_SIGB_Nanook_PatronInfoReader::newInstance());
+
+    $emprunteur = $this->ilsdiGetPatronInfo(['patronId' => $user->getIdSigb()],
+                                            Class_WebService_SIGB_Nanook_PatronInfoReader::newInstance());
 
     if (!$emprunteur->getCodeBarres())
       $emprunteur->setCodeBarres($user->getLogin());
 
     $emprunteur->setPassword($user->getPassword());
+
     return $emprunteur;
   }
 
 
+  protected function _patronIdFromUser($user) {
+    $patron_id = Class_Users::isLogged($user)
+      ? $user->getIdSigb()
+      : '';
+
+    if (!$patron_id && $this->ilsdiAuthenticatePatron($user))
+      $patron_id = $user->getIdSigb();
+
+    return $patron_id;
+  }
+
+
   public function getUserAnnexe($user) {
     return $user->id_site;
   }