Fix scrutinizer

Dolibarr · Sep 1, 2019 · f6c2fb7 · f6c2fb7
1 parent 26fb5d3
commit f6c2fb7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
@@ -37,6 +37,7 @@ class AdherentStats extends Stats
      */
     public $table_element;
 
+    public $memberid;
     public $socid;
     public $userid;
 

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
@@ -219,7 +219,7 @@
         $scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
         // Fill file_list with files in signature, new files, modified files
-        $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat, $scanfiles);		// Fill array $file_list
+        $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat);		// Fill array $file_list
         // Complete with list of new files
         foreach ($scanfiles as $keyfile => $valfile)
         {

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
@@ -178,7 +178,7 @@ public function getListOfCountries($sortfield = "code", $sortorder = 'ASC', $lim
                 }
             }
         } else {
-            throw new RestException(503, 'Error when retrieving list of countries : '.$country->error);
+            throw new RestException(503, 'Error when retrieving list of countries');
         }
 
         return $list;
@@ -331,7 +331,7 @@ private function translateLabel($country, $lang)
      * @param string    $module     To filter on module events
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
+     * @return array				List of events types
      *
      * @url     GET dictionary/event_types
      *
@@ -394,7 +394,7 @@ public function getListOfEventTypes($sortfield = "code", $sortorder = 'ASC', $li
      * @param string    $module     To filter on module events
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
+     * @return array				List of civility types
      *
      * @url     GET dictionary/civilities
      *
@@ -456,7 +456,7 @@ public function getListOfCivilities($sortfield = "code", $sortorder = 'ASC', $li
      * @param int       $page       Page number (starting from zero)
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
+     * @return array				List of currencies
      *
      * @url     GET dictionary/currencies
      *
@@ -477,7 +477,7 @@ public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso",
         $sql.= " AND m.entity IN (".getEntity('multicurrency').")";
         if (!empty($multicurrency) && $multicurrency != 2) $sql.= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
         }
-        
+
         // Add sql filters
         if ($sqlfilters)
         {
@@ -523,7 +523,7 @@ public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso",
      * @param string	$sortorder	Sort order
      * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
-     * @return List of extra fields
+     * @return array				List of extra fields
      *
      * @url     GET extrafields
      *
@@ -602,7 +602,7 @@ public function getListOfExtrafields($sortfield = "t.pos", $sortorder = 'ASC', $
      * @param string    $town       To filter on city name
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of towns
+     * @return array				List of towns
      *
      * @url     GET dictionary/towns
      *
@@ -717,7 +717,7 @@ public function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $l
 
         return $list;
     }
-    
+
     /**
      * Get the list of shipping methods.
      *
@@ -788,7 +788,7 @@ public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilte
      * @param int       $page       Page number (starting from zero)
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
+     * @return array				List of measuring unit
      *
      * @url     GET dictionary/units
      *
@@ -848,7 +848,7 @@ public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC'
      * @param int       $page       Page number (starting from zero)
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
+     * @return array				List of ticket categories
      *
      * @url     GET dictionary/ticket_categories
      *
@@ -908,7 +908,7 @@ public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $l
      * @param int       $page       Page number (starting from zero)
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
+     * @return array				List of ticket severities
      *
      * @url     GET dictionary/ticket_severities
      *
@@ -968,7 +968,7 @@ public function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $l
      * @param int       $page       Page number (starting from zero)
      * @param int       $active     Payment term is active or not {@min 0} {@max 1}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return List of events types
+     * @return array				List of ticket types
      *
      * @url     GET dictionary/ticket_types
      *
@@ -1026,7 +1026,7 @@ public function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit
      * Do a test of integrity for files and setup.
      *
      * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
-     * @return 							Result of file and setup integrity check
+     * @return array					Result of file and setup integrity check
      *
      * @url     GET checkintegrity
      *
@@ -1158,7 +1158,7 @@ public function getCheckIntegrity($target)
     			$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
     			// Fill file_list with files in signature, new files, modified files
-    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat, $scanfiles);		// Fill array $file_list
+    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat);		// Fill array $file_list
     			// Complete with list of new files
     			foreach ($scanfiles as $keyfile => $valfile)
     			{