Merge branch 'aps-remote-dont-load-nonexisting-config' into 'stable-3.1'

Marius Burkard · Marius Burkard · commit df57b55bf770 · 2019-09-02T16:26:29.000+02:00
Don't try to load non-existing config in aps remote, fixes #4974

See merge request ispconfig/ispconfig3!913
diff --git a/interface/lib/classes/remote.d/aps.inc.php b/interface/lib/classes/remote.d/aps.inc.php
@@ -43,8 +43,7 @@ public function sites_aps_update_package_list($session_id)
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		
-		require_once '../../../lib/config.inc.php';
+
 		$app->load('aps_crawler');
 		
 		$aps = new ApsCrawler($app, true); // true = Interface mode, false = Server mode

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ public function sites_aps_update_package_list($session_id)`
`43`	`43`	`throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`		`-`
`47`		`- require_once '../../../lib/config.inc.php';`
	`46`	`+`
`48`	`47`	`$app->load('aps_crawler');`
`49`	`48`
`50`	`49`	`$aps = new ApsCrawler($app, true); // true = Interface mode, false = Server mode`