GitLab

I was looking at the recent SVN commits and think there's something off in r879: $cgi_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/[system_user]/";

Shouldn't the system_user be expanded to $data["new"]["system_user"]? Otherwise all php-cgi starter scripts end up in the same directory and when disabling it for one would delete for all.

--- server/plugins-available/apache2_plugin.inc.php (revision 879) +++ server/plugins-available/apache2_plugin.inc.php (working copy) @@ -551,7 +551,7 @@ { //$cgi_config = $app->getconf->get_server_config($conf["server_id"], 'cgi');

•                   $cgi_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/[system_user]/";

•                   $cgi_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/".$data["new"]["system_user"]."/";
                    $cgi_config["cgi_starter_script"] = "php-cgi-starter";
                    $cgi_config["cgi_bin"] = "/usr/bin/php-cgi";

@@ -654,7 +654,7 @@ if ($data["old"]["php"] == "cgi") { // TODO: fetch the date from the server-settings

•                   $web_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/[system_user]/";

•                   $web_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/".$data["old"]["system_user"]."/";
  
                    $cgi_starter_path = str_replace("[system_user]",$data["old"]["system_user"],$web_config["cgi_starter_path"]);
                    if (is_dir($cgi_starter_path))