"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/Froxlor/Cron/Http/Php/Fpm.php" between
froxlor-0.10.26.tar.gz and froxlor-0.10.27.tar.gz

About: Froxlor is a web-based server management panel. It’s a fork of SysCP and has its main focus on simplicity and usability.

Fpm.php  (froxlor-0.10.26):Fpm.php  (froxlor-0.10.27)
skipping to change at line 221 skipping to change at line 221
if ($this->domain['openbasedir_path'] == '0' && strstr($this->domain['documentroot'], ":") === false) { if ($this->domain['openbasedir_path'] == '0' && strstr($this->domain['documentroot'], ":") === false) {
$openbasedir = \Froxlor\Domain\Do main::appendOpenBasedirPath($this->domain['documentroot'], true); $openbasedir = \Froxlor\Domain\Do main::appendOpenBasedirPath($this->domain['documentroot'], true);
} else { } else {
$openbasedir = \Froxlor\Domain\Do main::appendOpenBasedirPath($this->domain['customerroot'], true); $openbasedir = \Froxlor\Domain\Do main::appendOpenBasedirPath($this->domain['customerroot'], true);
} }
$openbasedir .= \Froxlor\Domain\Domain::a ppendOpenBasedirPath($this->getTempDir()); $openbasedir .= \Froxlor\Domain\Domain::a ppendOpenBasedirPath($this->getTempDir());
$openbasedir .= $_phpappendopenbasedir; $openbasedir .= $_phpappendopenbasedir;
} }
} }
$fpm_config .= 'php_admin_value[session.save_path] = ' . \Froxlor\FileDir::makeCorrectDir(Settings::Get('phpfpm.tmpdir') . '/' . $this->d omain['loginname'] . '/') . "\n";
$fpm_config .= 'php_admin_value[upload_tmp_dir] = ' . \Fr oxlor\FileDir::makeCorrectDir(Settings::Get('phpfpm.tmpdir') . '/' . $this->doma in['loginname'] . '/') . "\n"; $fpm_config .= 'php_admin_value[upload_tmp_dir] = ' . \Fr oxlor\FileDir::makeCorrectDir(Settings::Get('phpfpm.tmpdir') . '/' . $this->doma in['loginname'] . '/') . "\n";
$admin = $this->getAdminData($this->domain['adminid']); $admin = $this->getAdminData($this->domain['adminid']);
$php_ini_variables = array( $php_ini_variables = array(
'SAFE_MODE' => 'Off', // keep this for compatibil ity, just in case 'SAFE_MODE' => 'Off', // keep this for compatibil ity, just in case
'PEAR_DIR' => Settings::Get('phpfpm.peardir'), 'PEAR_DIR' => Settings::Get('phpfpm.peardir'),
'TMP_DIR' => $this->getTempDir(), 'TMP_DIR' => $this->getTempDir(),
'CUSTOMER_EMAIL' => $this->domain['email'], 'CUSTOMER_EMAIL' => $this->domain['email'],
'ADMIN_EMAIL' => $admin['email'], 'ADMIN_EMAIL' => $admin['email'],
'DOMAIN' => $this->domain['domain'], 'DOMAIN' => $this->domain['domain'],
skipping to change at line 264 skipping to change at line 264
} }
} }
} }
// now check if 'sendmail_path' has not beed set in the c ustom-php.ini // now check if 'sendmail_path' has not beed set in the c ustom-php.ini
// if not we use our fallback-default as usual // if not we use our fallback-default as usual
if (strpos($fpm_config, 'php_admin_value[sendmail_path]') === false) { if (strpos($fpm_config, 'php_admin_value[sendmail_path]') === false) {
$fpm_config .= 'php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f ' . $this->domain['email'] . "\n"; $fpm_config .= 'php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f ' . $this->domain['email'] . "\n";
} }
// check for session.save_path, whether it has been speci
fied by the user, if not, set a default
if (strpos($fpm_config, 'php_value[session.save_path]') =
== false && strpos($fpm_config, 'php_admin_value[session.save_path]') === false)
{
$fpm_config .= 'php_admin_value[session.save_path
] = ' . $this->getTempDir() . "\n";
}
// append custom phpfpm configuration // append custom phpfpm configuration
if (! empty($fpm_custom_config)) { if (! empty($fpm_custom_config)) {
$fpm_config .= "\n; Custom Configuration\n"; $fpm_config .= "\n; Custom Configuration\n";
$fpm_config .= \Froxlor\PhpHelper::replaceVariabl es($fpm_custom_config, $php_ini_variables); $fpm_config .= \Froxlor\PhpHelper::replaceVariabl es($fpm_custom_config, $php_ini_variables);
} }
fwrite($fh, $fpm_config, strlen($fpm_config)); fwrite($fh, $fpm_config, strlen($fpm_config));
fclose($fh); fclose($fh);
} }
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)