This commit is contained in:
Laurent Destailleur 2023-05-11 02:04:25 +02:00
parent a22a83827a
commit f59987af77
12 changed files with 14 additions and 14 deletions

View File

@ -214,10 +214,10 @@ class CMailFile
$this->mixed_boundary = "multipart_x.".time().".x_boundary";
// On defini related_boundary
$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3); // Force md5 hash (does not contains special chars)
$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3); // Force md5 hash (does not contain special chars)
// On defini alternative_boundary
$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)
$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contain special chars)
if (empty($subject)) {
dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
@ -1799,7 +1799,7 @@ class CMailFile
$this->html_images[$i]["content_type"] = $this->image_types[$ext];
}
// cid
$this->html_images[$i]["cid"] = dol_hash($this->html_images[$i]["fullpath"], 'md5'); // Force md5 hash (does not contains special chars)
$this->html_images[$i]["cid"] = dol_hash($this->html_images[$i]["fullpath"], 'md5'); // Force md5 hash (does not contain special chars)
// type
$this->html_images[$i]["type"] = 'cidfromurl';

View File

@ -6133,7 +6133,7 @@ abstract class CommonObject
foreach ($this->array_options as $key => $value) {
if (in_array(substr($key, 8), array_keys($target_extrafields))) { // We remove the 'options_' from $key for test
$new_array_options[$key] = $value;
} elseif (in_array($key, array_keys($target_extrafields))) { // We test on $key that does not contains the 'options_' prefix
} elseif (in_array($key, array_keys($target_extrafields))) { // We test on $key that does not contain the 'options_' prefix
$new_array_options['options_'.$key] = $value;
}
}

View File

@ -211,7 +211,7 @@ class RssParser
}
$this->_urlRSS = $urlRSS;
$newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
$newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contain special chars)
$newmask = '0644';
//dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);

View File

@ -2321,7 +2321,7 @@ function dol_uncompress($inputfile, $outputdir)
$res = $zip->open($inputfile);
if ($res === true) {
//$zip->extractTo($outputdir.'/');
// We must extract one file at time so we can check that file name does not contains '..' to avoid transversal path of zip built for example using
// We must extract one file at time so we can check that file name does not contain '..' to avoid transversal path of zip built for example using
// python3 path_traversal_archiver.py <Created_file_name> test.zip -l 10 -p tmp/
// with -l is the range of dot to go back in path.
// and path_traversal_archiver.py found at https://github.com/Alamot/code-snippets/blob/master/path_traversal/path_traversal_archiver.py

View File

@ -122,7 +122,7 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $c
dol_syslog('dolWebsiteReplacementOfLinks start (contenttype='.$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR') ? '1' : '')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER') ? '1' : '').')', LOG_DEBUG);
//if ($contenttype == 'html') { print $content;exit; }
// Replace php code. Note $content may come from database and does not contains body tags.
// Replace php code. Note $content may come from database and does not contain body tags.
$replacewith = '...php...';
if ($removephppart) {
$replacewith = '';

View File

@ -363,7 +363,7 @@ class ImportCsv extends ModeleImports
if ($obj) {
$tablewithentity_cache[$tablename] = 1; // table contains entity field
} else {
$tablewithentity_cache[$tablename] = 0; // table does not contains entity field
$tablewithentity_cache[$tablename] = 0; // table does not contain entity field
}
} else {
dol_print_error($this->db);

View File

@ -408,7 +408,7 @@ class ImportXlsx extends ModeleImports
if ($obj) {
$tablewithentity_cache[$tablename] = 1; // table contains entity field
} else {
$tablewithentity_cache[$tablename] = 0; // table does not contains entity field
$tablewithentity_cache[$tablename] = 0; // table does not contain entity field
}
} else {
dol_print_error($this->db);

View File

@ -486,7 +486,7 @@ FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
FECFormatMulticurrencyCode=Multicurrency code (Idevise)
DateExport=Date export
WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
ExpenseReportJournal=Expense Report Journal
DocsAlreadyExportedAreIncluded=Docs already exported are included
ClickToShowAlreadyExportedLines=Click to show already exported lines

View File

@ -13,7 +13,7 @@ KeyForCronAccess=Security key for URL to launch cron jobs
FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
CronMethodDoesNotExists=Class %s does not contains any method %s
CronMethodDoesNotExists=Class %s does not contain any method %s
CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
CronJobProfiles=List of predefined cron job profiles

View File

@ -1229,4 +1229,4 @@ PublicVirtualCard=Virtual business card
TreeView=Tree view
DropFileToAddItToObject=Drop a file to add it to this object
UploadFileDragDropSuccess=The file(s) have been uploaded successfully
SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contains' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <= or >= before the value to filter using a mathematical comparison
SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <= or >= before the value to filter using a mathematical comparison

View File

@ -88,7 +88,7 @@ if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg)) {
$paymentmethod = $reg[1];
}
if (empty($paymentmethod)) {
dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
dol_print_error(null, 'The back url does not contain a parameter fulltag that should help us to find the payment method used');
exit;
} else {
dol_syslog("paymentmethod=".$paymentmethod);

View File

@ -122,7 +122,7 @@ if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg)) {
}
if (empty($paymentmethod)) {
dol_syslog("***** paymentok.php was called with a non valid parameter FULLTAG=".$FULLTAG, LOG_DEBUG, 0, '_payment');
dol_print_error(null, 'The callback url does not contains a parameter fulltag that should help us to find the payment method used');
dol_print_error(null, 'The callback url does not contain a parameter fulltag that should help us to find the payment method used');
exit;
}