hotline #64605 : fix RT

library/Trait/Avis.php

@@ -57,23 +57,30 @@ trait Trait_Avis {
 
 
   public function isWaitingForModeration() {
-    if ($this->isWrittenByAbonne() && Class_AdminVar::get('MODO_AVIS') == 1)
-      return $this->isModerationOK() == false;
+    return $this->shouldBeModerated()
+      ? $this->isModerationNOK()
+      : false;
+  }
 
-    if ($this->isWrittenByBibliothecaire() && Class_AdminVar::get('MODO_AVIS_BIBLIO') == 1)
-      return $this->isModerationOK() == false;
 
-    return false;
+  public function shouldBeModerated() {
+    return ($this->isWrittenByAbonne() && Class_AdminVar::get('MODO_AVIS') == 1)
+      || ($this->isWrittenByBibliothecaire() && Class_AdminVar::get('MODO_AVIS_BIBLIO') == 1);
   }
 
 
   public function isVisibleForUser($user) {
     if (!$this->getUser())
-      return !$this->isWaitingForModeration();
+      return $this->hasBeenModerated();
 
     return ($user && ($this->getIdUser() == $user->ID_USER))
       ? true
-      : !$this->isWaitingForModeration();
+      : $this->hasBeenModerated();
+  }
+
+
+  public function hasBeenModerated() {
+    return !$this->isWaitingForModeration();
   }
 
 
@@ -81,14 +88,17 @@ trait Trait_Avis {
     return $this->getAbonOuBib() == self::$AVIS_ABONNE;
   }
 
+
   public function isOrphan() {
     return $this->getFlags() == self::ORPHAN_FLAG ;
   }
 
+
   public function isArchived() {
     return $this->getFlags() == self::ARCHIVED_FLAG ;
   }
 
+
   public function beWrittenByAbonne() {
     return $this->setAbonOuBib(self::$AVIS_ABONNE);
   }
@@ -114,6 +124,11 @@ trait Trait_Avis {
   }
 
 
+  public function isModerationNOK() {
+    return $this->getStatut() == self::$STATUT_NOK;
+  }
+
+
   public function setModerationNOK() {
     return $this->setStatut(self::$STATUT_NOK);
   }
@@ -123,4 +138,3 @@ trait Trait_Avis {
     return 'notices_avis' == $this->_table_name;
   }
 }
-?>
\ No newline at end of file