Laurent Destailleur 2 lat temu
rodzic
commit
b70c6faef2

+ 5 - 2
htdocs/core/modules/supplier_payment/modules_supplier_payment.php

@@ -17,6 +17,8 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+
+
 /**
  *	Parent class for supplier invoices models
  */
@@ -85,8 +87,9 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
 }
 
 /**
- *  \class      ModeleNumRefSupplierPayments
- *  \brief      Payment numbering references mother class
+ *  ModeleNumRefSupplierPayments
+ *
+ *  Payment numbering references mother class
  */
 
 abstract class ModeleNumRefSupplierPayments

+ 4 - 4
htdocs/ftp/index.php

@@ -282,7 +282,7 @@ if ($action == 'download') {
 
 		$newsection = $section;
 
-		$result = dol_ftp_get($connect_id, $localfile, $file, $newsection);
+		$result = dol_ftp_get($conn_id, $localfile, $file, $newsection);
 
 
 		if ($result) {
@@ -306,9 +306,9 @@ if ($action == 'download') {
 				header('Content-Type: '.$type);
 			}
 			if ($attachment) {
-				header('Content-Disposition: attachment; filename="'.$filename.'"');
+				header('Content-Disposition: attachment; filename="'.$file.'"');
 			} else {
-				header('Content-Disposition: inline; filename="'.$filename.'"');
+				header('Content-Disposition: inline; filename="'.$file.'"');
 			}
 
 			// Ajout directives pour resoudre bug IE
@@ -319,7 +319,7 @@ if ($action == 'download') {
 
 			exit;
 		} else {
-			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
+			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $file), null, 'errors');
 		}
 	} else {
 		dol_print_error('', $mesg);

+ 1 - 1
htdocs/index.php

@@ -119,7 +119,7 @@ if (empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) {
 	}
 
 	// Conf files must be in read only mode
-	if (is_writable($conffile)) {
+	if (is_writable($conffile)) {	// $conffile is defined into filefunc.inc.php
 		$langs->load("errors");
 		//$langs->load("other");
 		//if (!empty($message)) $message.='<br>';

+ 2 - 1
qodana.yaml

@@ -73,6 +73,7 @@ exclude:
   - name: RegExpSingleCharAlternation
   - name: PhpSuspiciousNameCombinationInspection
   - name: PhpObjectFieldsAreOnlyWrittenInspection
+  - name: PhpMissingParentConstructorInspection  
   - name: PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection
-  
+