Merge branch 'dupe-code-warning' into 'develop'

Marius Burkard · Marius Burkard · commit 2ee27283d9b2 · 2022-08-15T22:11:08.000Z
Warn about duplicate code in a comment

See merge request ispconfig/ispconfig3!1597
diff --git a/interface/lib/classes/remote.d/client.inc.php b/interface/lib/classes/remote.d/client.inc.php
@@ -397,6 +397,8 @@ public function client_delete_everything($session_id, $client_id)
 			return false;
 		}
 
+		// DUPLICATE CODE IN interface/web/client/client_del.php
+
 		$client_id = $app->functions->intval($client_id);
 
 		if($client_id > 0) {
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
@@ -151,6 +151,8 @@ function onDelete() {
 	function onBeforeDelete() {
 		global $app, $conf;
 
+		// DUPLICATE CODE IN interface/lib/classes/remote.d/client.inc.php
+
 		$client_id = $app->functions->intval($this->dataRecord['client_id']);
 
 		if($client_id > 0) {

Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,8 @@ public function client_delete_everything($session_id, $client_id)`
`397`	`397`	`return false;`
`398`	`398`	`}`
`399`	`399`
	`400`	`+ // DUPLICATE CODE IN interface/web/client/client_del.php`
	`401`	`+`
`400`	`402`	`$client_id = $app->functions->intval($client_id);`
`401`	`403`
`402`	`404`	`if($client_id > 0) {`