Remove completely deprecated dir /tmp

eldy · eldy · commit 0a53178f55c8 · 2025-11-05T19:35:26.000+01:00
diff --git a/doc/Documentation SellYourSaas - Master and Deployment Servers - EN.asciidoc b/doc/Documentation SellYourSaas - Master and Deployment Servers - EN.asciidoc
@@ -3277,14 +3277,6 @@ cp -p /home/admin/wwwroot/dolibarr_documents/sellyoursaas/spam/blacklistfrom /ho
 cp -p /home/admin/wwwroot/dolibarr_documents/sellyoursaas/spam/blacklistcontent /home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam/blacklistcontent;
 chmod a+rwx /home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam; chmod a+rw /home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam/*;
 
-
-mkdir /tmp/spam;
-cp -p /home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam/blacklistmail /tmp/spam/;
-cp -p /home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam/blacklistip /tmp/spam/;
-cp -p /home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam/blacklistfrom /tmp/spam/;
-cp -p /home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam/blacklistcontent /tmp/spam/;
-chmod a+rwx /tmp/spam; chmod a+rw /tmp/spam/*
-chown admin:www-data /tmp/spam/*
 ---------------
 
 
@@ -5947,7 +5939,7 @@ Check in file */etc/apparmor.d/usr.sbin.apache2* that */etc/passwd* is not denie
 
 If you got this error 
 	
-	ERROR /tmp/spam/... can't be read.
+	ERROR /tmp/... can't be read.
 	
 Check that the PrivateTmp mode is false into the launcher of apache2.
 
diff --git a/scripts/batch_detect_evil_instances.php b/scripts/batch_detect_evil_instances.php
@@ -170,7 +170,7 @@
 		if ($tmpline[0] == 'maxemailperdaypaid') {
 			$maxemailperdaypaid = $tmpline[1];
 		}
-		if ($tmpline[0] == 'pathtospamdir') {
+		if ($tmpline[0] == 'pathtospamdir' && !empty($tmpline[1])) {
 			$pathtospamdir = $tmpline[1];
 		}
 	}
diff --git a/scripts/phpsendmail.php b/scripts/phpsendmail.php
@@ -16,7 +16,6 @@
 
 // The directory $pathtospamdir must have permission rwxrwxrwx and not rwxrwxrwt
 $pathtospamdir = '/home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam';
-//$pathtospamdir = '/tmp/spam';
 
 //* Get the email content
 $mail='';
@@ -53,7 +52,7 @@
 		if ($tmpline[0] == 'maxemailperdaypaid') {
 			$maxemailperdaypaid = $tmpline[1];
 		}
-		if ($tmpline[0] == 'pathtospamdir') {
+		if ($tmpline[0] == 'pathtospamdir' && !empty($tmpline[1])) {
 			$pathtospamdir = $tmpline[1];
 		}
 	}
diff --git a/scripts/smtp_watchdog_daemon1.php b/scripts/smtp_watchdog_daemon1.php
@@ -70,7 +70,7 @@
 		if ($tmpline[0] == 'maxemailperdaypaid') {
 			$maxemailperdaypaid = $tmpline[1];
 		}
-		if ($tmpline[0] == 'pathtospamdir') {
+		if ($tmpline[0] == 'pathtospamdir' && !empty($tmpline[1])) {
 			$pathtospamdir = $tmpline[1];
 		}
 	}
@@ -183,9 +183,6 @@
 if (empty($EMAILTO)) {
 	$EMAILTO='supervision@'.$DOMAIN;
 }
-if (empty($pathtospamdir)) {
-	$pathtospamdir="/home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam";
-}
 
 $PID=getmypid();
 $scriptdir=dirname(__FILE__);

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@`
`170`	`170`	`if ($tmpline[0] == 'maxemailperdaypaid') {`
`171`	`171`	`$maxemailperdaypaid = $tmpline[1];`
`172`	`172`	`}`
`173`		`- if ($tmpline[0] == 'pathtospamdir') {`
	`173`	`+ if ($tmpline[0] == 'pathtospamdir' && !empty($tmpline[1])) {`
`174`	`174`	`$pathtospamdir = $tmpline[1];`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`// The directory $pathtospamdir must have permission rwxrwxrwx and not rwxrwxrwt`
`18`	`18`	`$pathtospamdir = '/home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam';`
`19`		`-//$pathtospamdir = '/tmp/spam';`
`20`	`19`
`21`	`20`	`//* Get the email content`
`22`	`21`	`$mail='';`
`@@ -53,7 +52,7 @@`
`53`	`52`	`if ($tmpline[0] == 'maxemailperdaypaid') {`
`54`	`53`	`$maxemailperdaypaid = $tmpline[1];`
`55`	`54`	`}`
`56`		`- if ($tmpline[0] == 'pathtospamdir') {`
	`55`	`+ if ($tmpline[0] == 'pathtospamdir' && !empty($tmpline[1])) {`
`57`	`56`	`$pathtospamdir = $tmpline[1];`
`58`	`57`	`}`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@`
`70`	`70`	`if ($tmpline[0] == 'maxemailperdaypaid') {`
`71`	`71`	`$maxemailperdaypaid = $tmpline[1];`
`72`	`72`	`}`
`73`		`- if ($tmpline[0] == 'pathtospamdir') {`
	`73`	`+ if ($tmpline[0] == 'pathtospamdir' && !empty($tmpline[1])) {`
`74`	`74`	`$pathtospamdir = $tmpline[1];`
`75`	`75`	`}`
`76`	`76`	`}`
`@@ -183,9 +183,6 @@`
`183`	`183`	`if (empty($EMAILTO)) {`
`184`	`184`	`$EMAILTO='supervision@'.$DOMAIN;`
`185`	`185`	`}`
`186`		`-if (empty($pathtospamdir)) {`
`187`		`- $pathtospamdir="/home/admin/wwwroot/dolibarr_documents/sellyoursaas_local/spam";`
`188`		`-}`
`189`	`186`
`190`	`187`	`$PID=getmypid();`
`191`	`188`	`$scriptdir=dirname(__FILE__);`