Skip to content

Commit 9d05ac1

Browse files
author
Till Brehm
committed
Merge branch 'revert-f8317f75' into 'stable-3.1'
Revert "Fixed csrf issue when deleting an invoice draft" See merge request ispconfig/ispconfig3!942
2 parents bda038c + 2bdc1c8 commit 9d05ac1

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

server/lib/classes/aps_installer.inc.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -550,21 +550,10 @@ private function doInstallation($task, $sxe)
550550
foreach($this->putenv as $var) {
551551
putenv($var);
552552
}
553-
554-
$tmpi = "<?php\n\n";
555-
foreach($this->putenv as $var) {
556-
$tmpi .= "putenv('".$var."');\n";
557-
}
558-
$tmpi .= "chdir('".$this->local_installpath.'install_scripts/'."');\n";
559-
$tmpi .= 'exec("php '.$this->local_installpath.'install_scripts/'.$cfgscript.' install");';
560-
561-
$app->system->file_put_contents($this->local_installpath.'install_scripts/ispinstall.php', $tmpi);
562-
exec('php '.$this->local_installpath.'install_scripts/ispinstall.php');
563-
die();
564553

565554
$shell_retcode = true;
566555
$shell_ret = array();
567-
//$app->system->exec_safe('sudo -u ? php ? install 2>&1', $this->file_owner_user, $this->local_installpath.'install_scripts/'.$cfgscript);
556+
$app->system->exec_safe('php ? install 2>&1', $this->local_installpath.'install_scripts/'.$cfgscript);
568557
$shell_ret = $app->system->last_exec_out();
569558
$shell_retcode = $app->system->last_exec_retcode();
570559
$shell_ret = array_filter($shell_ret);

0 commit comments

Comments
 (0)