From 663998bab11a371b4162c89c2f5893a8075b352d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jun 2019 20:15:04 +0200
Subject: [PATCH] Fix scrutinizer errors

---
 htdocs/includes/odtphp/odf.php        |  2 +-
 htdocs/opensurvey/results.php         |  4 ++--
 htdocs/product/price.php              |  2 +-
 htdocs/user/class/user.class.php      | 12 ++++++------
 htdocs/user/class/usergroup.class.php |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 6b3a6400bc3..21e9b56b4bb 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -745,7 +745,7 @@ IMG;
 	private function _rrmdir($dir)
 	{
 		if ($handle = opendir($dir)) {
-			while (false !== ($file = readdir($handle))) {
+			while (($file = readdir($handle)) !== false) {
 				if ($file != '.' && $file != '..') {
 					if (is_dir($dir . '/' . $file)) {
 						$this->_rrmdir($dir . '/' . $file);
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index c648b15664e..1b3034bb82c 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -249,8 +249,8 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 
 		$dateinsertion = substr("$dateinsertion", 1);
 
-		//mise a jour avec les nouveaux sujets dans la base
-		if (isset($erreur_ajout_date) && !$erreur_ajout_date)
+		// update with new topics into database
+		if (isset($erreur_ajout_date) && empty($erreur_ajout_date))
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
 			$sql.= " SET sujet = '".$db->escape($dateinsertion)."'";
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 5b5b9ad48fa..26970f1dd13 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -153,7 +153,7 @@ if (empty($reshook))
 	    $db->begin();
 
 	    $resql = $object->update($object->id, $user);
-	    if (! $resql || $resql < 0)
+	    if ($resql <= 0)
 	    {
 	        $error++;
 	        setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c5ac20e8cc7..a151fdb5574 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -774,7 +774,7 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::clearrights reset user->rights");
 		$this->rights='';
 		$this->nb_rights=0;
-		$this->all_permissions_are_loaded=false;
+		$this->all_permissions_are_loaded=0;
 		$this->_tab_loaded=array();
 	}
 
@@ -799,16 +799,16 @@ class User extends CommonObject
 				return;
 			}
 
-			if ($this->all_permissions_are_loaded)
+			if (! empty($this->all_permissions_are_loaded))
 			{
 				// We already loaded all rights for this user, so we leave
 				return;
 			}
 		}
 
-		// Recuperation des droits utilisateurs + recuperation des droits groupes
+		// Get permission of users + Get permissions of groups
 
-		// D'abord les droits utilisateurs
+		// First user permissions
 		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
 		$sql.= ", ".MAIN_DB_PREFIX."rights_def as r";
@@ -862,7 +862,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 		}
 
-		// Maintenant les droits groupes
+		// Now permissions of groups
 		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";
 		$sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
@@ -933,7 +933,7 @@ class User extends CommonObject
 		}
 		else
 		{
-			// Si module defini, on le marque comme charge en cache
+			// If module defined, we flag it as loaded into cache
 			$this->_tab_loaded[$moduletag]=1;
 		}
 	}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 9fb6e600a3b..d51d82c8d13 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -552,13 +552,13 @@ class UserGroup extends CommonObject
 
 		if ($moduletag && isset($this->_tab_loaded[$moduletag]) && $this->_tab_loaded[$moduletag])
 		{
-			// Le fichier de ce module est deja charge
+			// Rights for this module are already loaded, so we leave
 			return;
 		}
 
 		if (! empty($this->all_permissions_are_loaded))
 		{
-			// Si les permissions ont deja ete chargees, on quitte
+			// We already loaded all rights for this group, so we leave
 			return;
 		}
 
@@ -618,7 +618,7 @@ class UserGroup extends CommonObject
 		}
 		else
 		{
-		    // Si module defini, on le marque comme charge en cache
+			// If module defined, we flag it as loaded into cache
 		    $this->_tab_loaded[$moduletag]=1;
 		}