Validate DNS of domains when using Lets Encrypt';
- $return['system_le_domain_dnscheck_note'] = ['type' => 'infotext', 'value' => $description];
- $return['system_le_domain_dnscheck'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-}
diff --git a/install/updates/preconfig/0.9/index.html b/install/updates/preconfig/0.9/index.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
deleted file mode 100644
index 310d8217..00000000
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ /dev/null
@@ -1,768 +0,0 @@
- (2010-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Language
- *
- */
-
-use Froxlor\Database\Database;
-use Froxlor\Settings;
-use Froxlor\UI\Panel\UI;
-use PHPMailer\PHPMailer\PHPMailer;
-
-/**
- * checks if the new-version has some updating to do
- *
- * @param boolean $has_preconfig
- * pointer to check if any preconfig has to be output
- * @param string $return
- * pointer to output string
- * @param string $current_version
- * current froxlor version
- *
- * @return void
- */
-function parseAndOutputPreconfig09(&$has_preconfig, &$return, $current_version, $current_db_version)
-{
- global $lng;
-
- if (versionInUpdate($current_version, '0.9.4-svn2')) {
- $has_preconfig = true;
- $description = 'Froxlor now enables the usage of a domain-wildcard entry and subdomains for this domain at the same time (subdomains are parsed before the main-domain vhost container).';
- $description .= 'This makes it possible to catch all non-existing subdomains with the main vhost but also have the ability to use subdomains for that domain.
';
- $description .= 'If you would like Froxlor to do so with your domains, the update script can set the correct values for existing domains for you. Note: future domains will have wildcard-entries enabled by default no matter how you decide here.';
- $question = 'Do you want to use wildcard-entries for existing domains?:';
-
- $return['update_domainwildcardentry_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_domainwildcardentry'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.6-svn2')) {
- if (!PHPMailer::ValidateAddress(Settings::Get('panel.adminmail'))) {
- $has_preconfig = true;
- $description = 'Froxlor uses a newer version of the PHPMailer-Class and determined that your current admin-mail address is invalid.';
- $question = 'Please specify a new admin-email address:';
-
- $return['update_adminmail_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_adminmail'] = ['type' => 'text', 'value' => Settings::Get('panel.adminmail'), 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.6-svn3')) {
- $has_preconfig = true;
- $description = 'You now have the possibility to define default error-documents for your webserver which replace the default webserver error-messages.';
- $question = 'Do you want to enable default error-documents?:';
-
- $return['update_deferr_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_deferr_enable'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- if (Settings::Get('system.webserver') == 'apache2') {
- $return['update_deferr_500'] = ['type' => 'text', 'value' => "", 'label' => 'Path/URL for error 500:'];
- $return['update_deferr_401'] = ['type' => 'text', 'value' => "", 'label' => 'Path/URL for error 401:'];
- $return['update_deferr_403'] = ['type' => 'text', 'value' => "", 'label' => 'Path/URL for error 403:'];
- }
- $return['update_deferr_404'] = ['type' => 'text', 'value' => "", 'label' => 'Path/URL for error 404:'];
- }
-
- if (versionInUpdate($current_version, '0.9.6-svn4')) {
- $has_preconfig = true;
- $description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.';
- $question = 'Which should be the default ticket-priority?:';
-
- $return['update_deftic_priority_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_deftic_priority'] = ['type' => 'select', 'select_var' => [1 => $lng['ticket']['high'], 2 => $lng['ticket']['normal'], 3 => $lng['ticket']['low']], 'selected' => 2, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.6-svn5')) {
- $has_preconfig = true;
- $description = 'If you have more than one PHP configurations defined in Froxlor you can now set a default one which will be used for every domain.';
- $question = 'Select default PHP configuration:';
-
- $return['update_defsys_phpconfig_note'] = ['type' => 'infotext', 'value' => $description];
- $configs_array = \Froxlor\Http\PhpConfig::getPhpConfigs();
- $configs = '';
- foreach ($configs_array as $idx => $desc) {
- $configs[$idx] = $desc;
- }
- $return['update_defsys_phpconfig'] = ['type' => 'select', 'select_var' => $configs, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.6-svn6')) {
- $has_preconfig = true;
- $description = 'For the new FTP-quota feature, you can now chose the currently used ftpd-software.';
- $question = 'Used FTPd-software:';
-
- $return['update_defsys_ftpserver_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_defsys_ftpserver'] = ['type' => 'select', 'select_var' => ['proftpd' => 'ProFTPd', 'pureftpd' => 'PureFTPd'], 'selected' => 'proftpd', 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.7-svn1')) {
- $has_preconfig = true;
- $description = 'You can now choose whether customers can select the http-redirect code and which of them acts as default.';
- $question = 'Allow customer chosen redirects?:';
- $return['update_customredirect_enable_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_customredirect_enable'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
-
- $question = 'Select default redirect code (default: empty):';
- $return['update_customredirect_default'] = [
- 'type' => 'select',
- 'select_var' => [
- 1 => '--- (' . $lng['redirect_desc']['rc_default'] . ')',
- 2 => '301 (' . $lng['redirect_desc']['rc_movedperm'] . ')',
- 3 => '302 (' . $lng['redirect_desc']['rc_found'] . ')',
- 4 => '303 (' . $lng['redirect_desc']['rc_seeother'] . ')',
- 5 => '307 (' . $lng['redirect_desc']['rc_tempred'] . ')'
- ],
- 'selected' => 1,
- 'label' => $question
- ];
- }
-
- if (versionInUpdate($current_version, '0.9.7-svn2')) {
- $result = Database::query("SELECT `domain` FROM " . TABLE_PANEL_DOMAINS . " WHERE `documentroot` LIKE '%:%' AND `documentroot` NOT LIKE 'http://%' AND `openbasedir_path` = '0' AND `openbasedir` = '1'");
- $wrongOpenBasedirDomain = array();
- while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
- $wrongOpenBasedirDomain[] = $row['domain'];
- }
-
- if (count($wrongOpenBasedirDomain) > 0) {
- $has_preconfig = true;
- $description = 'Due to a security - issue regarding open_basedir, Froxlor will set the open_basedir for the following domains to the customers root instead of the chosen documentroot:
';
- $description .= '';
- $idna_convert = new \Froxlor\Idna\IdnaWrapper();
- foreach ($wrongOpenBasedirDomain as $domain) {
- $description .= '- ' . $idna_convert->decode($domain) . '
';
- }
- $description .= '
';
- $return['update_reset_openbasedirpath_note'] = ['type' => 'infotext', 'value' => $description];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.9-svn1')) {
- $has_preconfig = true;
- $description = 'When entering MX servers to Froxlor there was no mail-, imap-, pop3- and smtp-"A record" created. You can now chose whether this should be done or not.';
- $question = 'Do you want these A-records to be created even with MX servers given?:';
-
- $return['update_defdns_mailentry_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_defdns_mailentry'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.10-svn1')) {
- $has_nouser = false;
- $has_nogroup = false;
-
- $result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
- $result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
- if (!isset($result) || !isset($result['value'])) {
- $has_preconfig = true;
- $has_nouser = true;
- $guessed_user = 'www-data';
- if (function_exists('posix_getuid') && function_exists('posix_getpwuid')) {
- $_httpuser = posix_getpwuid(posix_getuid());
- $guessed_user = $_httpuser['name'];
- }
- }
-
- $result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
- $result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
- if (!isset($result) || !isset($result['value'])) {
- $has_preconfig = true;
- $has_nogroup = true;
- $guessed_group = 'www-data';
- if (function_exists('posix_getgid') && function_exists('posix_getgrgid')) {
- $_httpgroup = posix_getgrgid(posix_getgid());
- $guessed_group = $_httpgroup['name'];
- }
- }
-
- if ($has_nouser || $has_nogroup) {
- $description = 'Please enter the correct username/groupname of the webserver on your system We\'re guessing the user but it might not be correct, so please check.';
- $return['update_httpusergroup_note'] = ['type' => 'infotext', 'value' => $description];
- if ($has_nouser) {
- $question = 'Please enter the webservers username:';
- $return['update_httpuser'] = ['type' => 'text', 'value' => $guessed_user, 'label' => $question];
- }
- if ($has_nogroup) {
- $question = 'Please enter the webservers groupname:';
- $return['update_httpgroup'] = ['type' => 'text', 'value' => $guessed_group, 'label' => $question];
- }
- }
- }
-
- if (versionInUpdate($current_version, '0.9.10')) {
- $has_preconfig = true;
- $description = 'you can now decide whether Froxlor should be reached via hostname/froxlor or directly via the hostname.';
- $question = 'Do you want Froxlor to be reached directly via the hostname?:';
- $return['update_directlyviahostname_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_directlyviahostname'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.11-svn1')) {
- $has_preconfig = true;
- $description = 'It is possible to enhance security with setting a regular expression to force your customers to enter more complex passwords.';
- $question = 'Enter a regular expression to force a higher password complexity (leave empty for none):';
- $return['update_pwdregex_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_pwdregex'] = ['type' => 'text', 'value' => '', 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.11-svn3')) {
- if (Settings::Get('system.webserver') == 'lighttpd') {
- $has_preconfig = true;
- $description = 'As Froxlor can now handle perl, you have to specify where the perl executable is.';
- $question = 'Path to perl (default \'/usr/bin/perl\'):';
- $return['update_perlpath_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_perlpath'] = ['type' => 'text', 'value' => '/usr/bin/perl', 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.12-svn1')) {
- if (Settings::Get('system.mod_fcgid') == 1) {
- $has_preconfig = true;
- $description = 'You can chose whether you want Froxlor to use FCGID itself too now.';
- $question = 'Use FCGID for the Froxlor Panel?:';
- $return['update_fcgid_ownvhost_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_fcgid_ownvhost'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
-
- $question = 'If \'yes\', please specify local user (has to exist, Froxlor does not add it automatically):';
- $return['update_fcgid_httpuser'] = ['type' => 'text', 'value' => 'froxlorlocal', 'label' => $question];
- $question = 'If \'yes\', please specify local group (has to exist, Froxlor does not add it automatically):';
- $return['update_fcgid_httpgroup'] = ['type' => 'text', 'value' => 'froxlorlocal', 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.12-svn2')) {
- $has_preconfig = true;
- $description = 'Many apache user will have problems using perl/CGI as the customer docroots are not within the suexec path. Froxlor provides a simple workaround for that.';
- $question = 'Enable Apache/SuExec/Perl workaround?:';
- $return['update_perl_suexecworkaround_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_perl_suexecworkaround'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
-
- $description = 'If \'yes\', please specify a path within the suexec path where Froxlor will create symlinks to customer perl-enabled paths:';
- $question = 'Path for symlinks (must be within suexec path):';
- $return['update_perl_suexecpath_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_perl_suexecpath'] = ['type' => 'text', 'value' => '/var/www/cgi-bin/', 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.12-svn4')) {
- if ((int) Settings::Get('system.awstats_enabled') == 1) {
- $has_preconfig = true;
- $description = 'Due to different paths of awstats_buildstaticpages.pl and awstats.pl you can set a different path for awstats.pl now.';
- $question = 'Path to \'awstats.pl\'?:';
- $return['update_awstats_awstatspath_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_awstats_awstatspath'] = ['type' => 'text', 'value' => Settings::Get('system.awstats_path'), 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.13-svn1')) {
- if ((int) Settings::Get('autoresponder.autoresponder_active') == 1) {
- $has_preconfig = true;
- $description = 'Froxlor can now limit the number of autoresponder-entries for each user. Here you can set the value which will be available for each customer (Of course you can change the value for each customer separately after the update).';
- $question = 'How many autoresponders should your customers be able to add?:
-1 equals no limit';
- $return['update_autoresponder_default_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_autoresponder_default'] = ['type' => 'number', 'value' => -1, 'min' => -1, 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.13.1')) {
- if ((int) Settings::Get('system.mod_fcgid_ownvhost') == 1) {
- $has_preconfig = true;
- $description = 'You have FCGID for Froxlor itself activated. You can now specify a PHP-configuration for this.';
- $question = 'Select Froxlor-vhost PHP configuration:';
- $return['update_defaultini_ownvhost_note'] = ['type' => 'infotext', 'value' => $description];
- $configs_array = \Froxlor\Http\PhpConfig::getPhpConfigs();
- $configs = '';
- foreach ($configs_array as $idx => $desc) {
- $configs[$idx] = $desc;
- }
- $return['update_defaultini_ownvhost'] = [
- 'type' => 'select',
- 'select_var' => $configs,
- 'selected' => 1,
- 'label' => $question
- ];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.14-svn3')) {
- if ((int) Settings::Get('system.awstats_enabled') == 1) {
- $has_preconfig = true;
- $description = 'To have icons in AWStats statistic-pages please enter the path to AWStats icons folder.';
- $question = 'Path to AWSTats icons folder:';
- $return['update_awstats_icons_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_awstats_icons'] = ['type' => 'text', 'value' => Settings::Get('system.awstats_icons'), 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.14-svn4')) {
- if ((int) Settings::Get('system.use_ssl') == 1) {
- $has_preconfig = true;
- $description = 'Froxlor now has the possibility to set \'SSLCertificateChainFile\' for the apache webserver.';
- $question = 'Enter filename (leave empty for none):';
- $return['update_ssl_cert_chainfile_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_ssl_cert_chainfile'] = ['type' => 'text', 'value' => Settings::Get('system.ssl_cert_chainfile'), 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.14-svn6')) {
- $has_preconfig = true;
- $description = 'You can now allow customers to use any of their domains as username for the login.';
- $question = 'Do you want to enable domain-login for all customers?:';
- $return['update_allow_domain_login_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_allow_domain_login'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.14-svn10')) {
- $has_preconfig = true;
- $description = 'This update removes the unsupported real-time option. Additionally the deprecated tables for navigation and cronscripts are removed, any modules using these tables need to be updated to the new structure!';
- $return['update_unsported_realtime_option_note'] = ['type' => 'infotext', 'value' => $description];
- }
-
- if (versionInUpdate($current_version, '0.9.16-svn1')) {
- $has_preconfig = true;
- $description = 'Froxlor now features support for php-fpm.';
- $question = 'Do you want to enable php-fpm?:';
- $return['update_phpfpm_enabled_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_phpfpm_enabled'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
-
- $question = 'If \'yes\', please specify the configuration directory:';
- $return['update_phpfpm_configdir'] = ['type' => 'text', 'value' => "/etc/php-fpm.d/", 'label' => $question];
- $question = 'Please specify the temporary files directory:';
- $return['update_phpfpm_tmpdir'] = ['type' => 'text', 'value' => "/var/customers/tmp/", 'label' => $question];
- $question = 'Please specify the PEAR directory:';
- $return['update_phpfpm_peardir'] = ['type' => 'text', 'value' => "/usr/share/php/:/usr/share/php5/", 'label' => $question];
- $question = 'Please specify the php-fpm restart-command:';
- $return['update_phpfpm_reload'] = ['type' => 'text', 'value' => "/etc/init.d/php-fpm restart", 'label' => $question];
- $question = 'Please specify the php-fpm rocess manager control:';
- $return['update_phpfpm_pm'] = [
- 'type' => 'select',
- 'select_var' => [
- 'static' => 'static',
- 'dynamic' => 'dynamic'
- ],
- 'selected' => 'dynamic',
- 'label' => $question
- ];
- $question = 'Please specify the number of child processes:';
- $return['update_phpfpm_max_children'] = ['type' => 'number', 'value' => "2", 'label' => $question];
- $question = 'Please specify the number of requests per child before respawning:';
- $return['update_phpfpm_max_requests'] = ['type' => 'number', 'value' => "0", 'label' => $question];
- $description = 'The following settings are only required if you chose process manager = dynamic';
- $return['update_phpfpm_dynamic_pm_note'] = ['type' => 'infotext', 'value' => $description];
- $question = 'Please specify the number of child processes created on startup:';
- $return['update_phpfpm_start_servers'] = ['type' => 'number', 'value' => "20", 'label' => $question];
- $question = 'Please specify the desired minimum number of idle server processes:';
- $return['update_phpfpm_min_spare_servers'] = ['type' => 'number', 'value' => "5", 'label' => $question];
- $question = 'Please specify the desired maximum number of idle server processes:';
- $return['update_phpfpm_max_spare_servers'] = ['type' => 'number', 'value' => "35", 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.16-svn2')) {
- if ((int) Settings::Get('phpfpm.enabled') == 1) {
- $has_preconfig = true;
- $description = 'You can chose whether you want Froxlor to use PHP-FPM itself too now.';
- $question = 'Use PHP-FPM for the Froxlor Panel?:';
- $return['update_phpfpm_enabled_ownvhost_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_phpfpm_enabled_ownvhost'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
-
- $question = 'If \'yes\', please specify local user (has to exist, Froxlor does not add it automatically):';
- $return['update_phpfpm_httpuser'] = ['type' => 'text', 'value' => Settings::Get('system.mod_fcgid_httpuser'), 'label' => $question];
- $question = 'If \'yes\', please specify local group (has to exist, Froxlor does not add it automatically):';
- $return['update_phpfpm_httpgroup'] = ['type' => 'text', 'value' => Settings::Get('system.mod_fcgid_httpgroup'), 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.17-svn1')) {
- $has_preconfig = true;
- $description = 'Select if you want to enable the web- and traffic-reports';
- $question = 'Enable?:';
- $return['update_system_report_enable_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_system_report_enable'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
-
- $question = 'If \'yes\', please specify a percentage value for web-usage when reports are to be sent:';
- $return['update_system_report_webmax'] = ['type' => 'number', 'value' => '90', 'label' => $question];
- $question = 'If \'yes\', please specify a percentage value for traffic-usage when reports are to be sent:';
- $return['update_system_report_trafficmax'] = ['type' => 'number', 'value' => '90', 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.18-svn2')) {
- $has_preconfig = true;
- $description = 'As you can (obviously) see, Froxlor now comes with a new theme. You also have the possibility to switch back to "Classic" if you want to.';
- $return['update_default_theme_note'] = ['type' => 'infotext', 'value' => $description];
- $question = 'Select default panel theme:';
- $themes = UI::getThemes();
- $sel_themes = [];
- foreach ($themes as $cur_theme) {
- $sel_themes[$cur_theme] = $cur_theme;
- }
- $return['update_default_theme'] = [
- 'type' => 'select',
- 'select_var' => $sel_themes,
- 'selected' => 'Froxlor',
- 'label' => $question
- ];
- }
-
- if (versionInUpdate($current_version, '0.9.28-svn4')) {
- $has_preconfig = true;
- $description = 'This version introduces a lot of profound changes:';
- $description .= '
- Improving the whole template system
- Full UTF-8 support
- Removing support for the former default theme \'Classic\'
';
- $description .= '
Notice: This update will alter your Froxlor database to use UTF-8 as default charset. ';
- $description .= 'Even though this is already tested, we strongly recommend to ';
- $description .= 'test this update in a testing environment using your existing data.
';
- $return['classic_theme_replacement_note'] = ['type' => 'infotext', 'value' => $description];
- $question = 'Select your preferred Classic Theme replacement:';
- $themes = UI::getThemes();
- $sel_themes = [];
- foreach ($themes as $cur_theme) {
- $sel_themes[$cur_theme] = $cur_theme;
- }
- $return['classic_theme_replacement'] = [
- 'type' => 'select',
- 'select_var' => $sel_themes,
- 'selected' => 'Froxlor',
- 'label' => $question
- ];
- }
-
- if (versionInUpdate($current_version, '0.9.28-svn6')) {
-
- if (Settings::Get('system.webserver') == 'apache2') {
- $has_preconfig = true;
- $description = 'Froxlor now supports the new Apache 2.4. Please be aware that you need to load additional apache-modules in order to use it.
';
- $description .= 'LoadModule authz_core_module modules/mod_authz_core.so
- LoadModule authz_host_module modules/mod_authz_host.so
';
- $question = 'Do you want to enable the Apache-2.4 modification?:';
- $return['update_system_apache24_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_system_apache24'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- } elseif (Settings::Get('system.webserver') == 'nginx') {
- $has_preconfig = true;
- $description = 'The path to nginx\'s fastcgi_params file is now customizable.';
- $question = 'Please enter full path to you nginx/fastcgi_params file (including filename):';
- $return['nginx_fastcgi_params_note'] = ['type' => 'infotext', 'value' => $description];
- $return['nginx_fastcgi_params'] = ['type' => 'text', 'value' => "/etc/nginx/fastcgi_params", 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.28-rc2')) {
-
- $has_preconfig = true;
-
- $description = 'This version adds an option to append the domain-name to the document-root for domains and subdomains.
';
- $description .= 'You can enable or disable this feature anytime from settings -> system settings.';
- $question = 'Do you want to automatically append the domain-name to the documentroot of newly created domains?:';
- $return['update_system_documentroot_use_default_value_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_system_documentroot_use_default_value'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.28')) {
-
- $has_preconfig = true;
- // just an information about the new sendmail parameter (#1134)
- $description = 'Froxlor changed the default parameter-set of sendmail (php.ini)
';
- $description .= 'sendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"
';
- $description .= 'If you don\'t have any problems with sending mails, you don\'t need to change this';
- if (Settings::Get('system.mod_fcgid') == '1' || Settings::Get('phpfpm.enabled') == '1') {
- // information about removal of php's safe_mode
- $description .= '
The php safe_mode flag has been removed as current versions of PHP do not support it anymore.
';
- $description .= 'Please check your php-configurations and remove safe_mode-directives to avoid php notices/warnings.';
- }
- $return['update_default_sendmail_params_note'] = ['type' => 'infotext', 'value' => $description];
- }
-
- if (versionInUpdate($current_version, '0.9.29-dev1')) {
- // we only need to ask if fcgid|php-fpm is enabled
- if (Settings::Get('system.mod_fcgid') == '1' || Settings::Get('phpfpm.enabled') == '1') {
- $has_preconfig = true;
- $description = 'Standard-subdomains can now be hidden from the php-configuration overview.';
- $question = 'Do you want to hide the standard-subdomains (this can be changed in the settings any time)?:';
- $return['hide_stdsubdomains_note'] = ['type' => 'infotext', 'value' => $description];
- $return['hide_stdsubdomains'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.29-dev2')) {
- $has_preconfig = true;
- $description = 'You can now decide whether admins/customers are able to change the theme
';
- $return['allow_themechange_ac_note'] = ['type' => 'infotext', 'value' => $description];
- $question = 'Allow theme-changing for admins:';
- $return['allow_themechange_a'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
- $question = 'Allow theme-changing for customers:';
- $return['allow_themechange_c'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.29-dev3')) {
- $has_preconfig = true;
- $description = 'There is now a possibility to specify AXFR servers for your bind zone-configuration';
- $question = 'Enter a comma-separated list of AXFR servers or leave empty (default):';
- $return['system_afxrservers_note'] = ['type' => 'infotext', 'value' => $description];
- $return['system_afxrservers'] = ['type' => 'text', 'value' => '', 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.29-dev4')) {
- $has_preconfig = true;
- $description = 'As customers can now specify ssl-certificate data for their domains, you need to specify where the generated files are stored';
- $question = 'Specify the directory for customer ssl-certificates:';
- $return['system_customersslpath_note'] = ['type' => 'infotext', 'value' => $description];
- $return['system_customersslpath'] = ['type' => 'text', 'value' => '/etc/ssl/froxlor-custom/', 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.29.1-dev3')) {
- $has_preconfig = true;
- $description = 'The build in logrotation-feature has been removed. Please follow the configuration-instructions for your system to enable logrotating again.';
- $return['update_removed_builtin_logrotate_note'] = ['type' => 'infotext', 'value' => $description];
- }
-
- // let the apache+fpm users know that they MUST change their config
- // for the domains / webserver to work after the update
- if (versionInUpdate($current_version, '0.9.30-dev1')) {
- if (Settings::Get('system.webserver') == 'apache2' && Settings::Get('phpfpm.enabled') == '1') {
- $has_preconfig = true;
- $description = 'The PHP-FPM implementation for apache2 has changed. Please look for the "fastcgi.conf" (Debian/Ubuntu) or "70_fastcgi.conf" (Gentoo) within /etc/apache2/ and change it as shown below:
';
- $description .= '<IfModule mod_fastcgi.c>
- FastCgiIpcDir /var/lib/apache2/fastcgi/
- <Location "/fastcgiphp">
- Order Deny,Allow
- Deny from All
- # Prevent accessing this path directly
- Allow from env=REDIRECT_STATUS
- </Location>
-</IfModule>
';
- $return['update_fpm_implementation_changed_note'] = ['type' => 'infotext', 'value' => $description];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.31-dev2')) {
- if (Settings::Get('system.webserver') == 'apache2' && Settings::Get('phpfpm.enabled') == '1') {
- $has_preconfig = true;
- $description = 'The FPM socket directory is now a setting in froxlor. Its default is /var/lib/apache2/fastcgi/.
If you are using /var/run/apache2 in the "fastcgi.conf" (Debian/Ubuntu) or "70_fastcgi.conf" (Gentoo) please correct this path accordingly';
- $return['update_fpm_socket_directory_changed_note'] = ['type' => 'infotext', 'value' => $description];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.31-dev4')) {
- $has_preconfig = true;
- $description = 'The template-variable {PASSWORD} has been replaced with {LINK}. Please update your password reset templates!';
- $return['update_template_var_password_changed_note'] = ['type' => 'infotext', 'value' => $description];
- }
-
- if (versionInUpdate($current_version, '0.9.31-dev5')) {
- $has_preconfig = true;
- $description = 'You can enable/disable error-reporting for admins and customers!';
- $return['update_error_report_admin_customer_note'] = ['type' => 'infotext', 'value' => $description];
-
- $question = 'Do you want to enable error-reporting for admins? (default: yes):';
- $return['update_error_report_admin'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
- $question = 'Do you want to enable error-reporting for customers? (default: no):';
- $return['update_error_report_customer'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.31-rc2')) {
- $has_preconfig = true;
- $description = 'You can enable/disable the display/usage of the news-feed for admins';
- $question = 'Do you want to enable the news-feed for admins? (default: yes):';
- $return['update_admin_news_feed_note'] = ['type' => 'infotext', 'value' => $description];
- $return['update_admin_news_feed'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.32-dev2')) {
- $has_preconfig = true;
- $description = 'To enable logging of the mail-traffic, you need to set the following settings accordingly';
- $question = 'Do you want to enable the traffic collection for mail? (default: yes):';
- $return['mailtraffic_enabled_note'] = ['type' => 'infotext', 'value' => $description];
- $return['mailtraffic_enabled'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
-
- $question = 'Mail Transfer Agent';
- $return['mtaserver'] = [
- 'type' => 'select',
- 'select_var' => [
- 'postfix' => 'Postfix',
- 'exim4' => 'Exim4'
- ],
- 'selected' => 'postfix',
- 'label' => $question
- ];
-
- $question = 'Logfile for your MTA:';
- $return['mtalog'] = ['type' => 'text', 'value' => "/var/log/mail.log", 'label' => $question];
-
- $question = 'Mail Delivery Agent';
- $return['mdaserver'] = [
- 'type' => 'select',
- 'select_var' => [
- 'dovecot' => 'Dovecot',
- 'courier' => 'Courier'
- ],
- 'selected' => 'dovecot',
- 'label' => $question
- ];
-
- $question = 'Logfile for your MDA:';
- $return['mdalog'] = ['type' => 'text', 'value' => "/var/log/mail.log", 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.32-dev5')) {
- $has_preconfig = true;
- $description = 'Froxlor now generates a cron-configuration file for the cron-daemon. Please set a filename which will be included automatically by your crond (e.g. files in /etc/cron.d/)';
- $question = 'Path to the cron-service configuration-file. This file will be updated regularly and automatically by froxlor.
Note: please be sure to use the same filename as for the main froxlor cronjob (default: /etc/cron.d/froxlor)!';
- $return['crondfile_note'] = ['type' => 'infotext', 'value' => $description];
- $return['crondfile'] = ['type' => 'text', 'value' => "/etc/cron.d/froxlor", 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.32-dev6')) {
- $has_preconfig = true;
- $description = 'In order for the new cron.d file to work properly, we need to know about the cron-service reload command.';
- $question = 'Please specify the reload-command of your cron-daemon (default: /etc/init.d/cron reload)';
- $return['crondreload_note'] = ['type' => 'infotext', 'value' => $description];
- $return['crondreload'] = ['type' => 'text', 'value' => "/etc/init.d/cron reload", 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.32-rc2')) {
- $has_preconfig = true;
- $description = 'To customize the command which executes the cronjob (php - basically) change the path below according to your system.';
- $question = 'Please specify the command to execute cronscripts (default: "/usr/bin/nice -n 5 /usr/bin/php -q")';
- $return['croncmdline_note'] = ['type' => 'infotext', 'value' => $description];
- $return['croncmdline'] = ['type' => 'text', 'value' => "/usr/bin/nice -n 5 /usr/bin/php -q", 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.33-dev1')) {
- $has_preconfig = true;
- $description = 'You can enable/disable the display/usage of the custom newsfeed for customers.';
- $question = 'Do you want to enable the custom newsfeed for customer? (default: no):';
- $return['customer_show_news_feed_note'] = ['type' => 'infotext', 'value' => $description];
- $return['customer_show_news_feed'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
-
- $question = 'You have to set the URL for your RSS-feed here, if you have chosen to enable the custom newsfeed on the customer-dashboard:';
- $return['customer_news_feed_url'] = ['type' => 'text', 'value' => "", 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.33-dev2')) {
- // only if bind is used - if not the default will be set, which is '0' (off)
- if (Settings::get('system.bind_enable') == 1) {
- $has_preconfig = true;
- $description = 'You can enable/disable the generation of the bind-zone / config for the system hostname.';
- $question = 'Do you want to generate a bind-zone for the system-hostname? (default: no):';
- $return['dns_createhostnameentry_note'] = ['type' => 'infotext', 'value' => $description];
- $return['dns_createhostnameentry'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_version, '0.9.33-rc2')) {
- $has_preconfig = true;
- $description = 'You can chose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes.';
- $question = 'Do you want to receive cron-errors via mail? (default: no):';
- $return['system_send_cron_errors_note'] = ['type' => 'infotext', 'value' => $description];
- $return['system_send_cron_errors'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_version, '0.9.34-dev3')) {
- $has_preconfig = true;
- $description = 'Froxlor now requires the PHP mbstring-extension as we need to be multibyte-character safe in some cases
';
- $description .= 'PHP mbstring is currently: ';
- if (!extension_loaded('mbstring')) {
- $description .= 'not installed/loaded';
- $description .= '
Please install the PHP mbstring extension in order to finish the update';
- } else {
- $description .= 'installed/loaded';
- }
- $return['update_php_mbstring_extension_installed_note'] = ['type' => 'infotext', 'value' => $description];
- }
-
- if (versionInUpdate($current_db_version, '201603070')) {
- $has_preconfig = true;
- $description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation.
Please remember that you need to go through the webserver-configuration when enabled because this feature needs a special configuration.';
- $question = 'Do you want to enable Let\'s Encrypt? (default: yes):';
- $return['enable_letsencrypt_note'] = ['type' => 'infotext', 'value' => $description];
- $return['enable_letsencrypt'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_db_version, '201604270')) {
- $has_preconfig = true;
- $description = 'You can chose whether you want to enable or disable our backup function.';
- $question = 'Do you want to enable Backup? (default: no):';
- $return['enable_backup_note'] = ['type' => 'infotext', 'value' => $description];
- $return['enable_backup'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_db_version, '201605090')) {
- $has_preconfig = true;
- $description = 'You can chose whether you want to enable or disable our DNS editor';
- $question = 'Do you want to enable the DNS editor? (default: no):';
- $return['enable_dns_note'] = ['type' => 'infotext', 'value' => $description];
- $return['enable_dns'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_db_version, '201605170')) {
- $has_preconfig = true;
- $description = 'Froxlor now supports the dns-daemon Power-DNS, you can chose between bind and powerdns now.';
- $return['new_dns_daemon_note'] = ['type' => 'infotext', 'value' => $description];
- $question = 'Select dns-daemon you want to use:';
- $return['new_dns_daemon'] = [
- 'type' => 'select',
- 'select_var' => [
- 'bind' => 'Bind9',
- 'pdns' => 'PowerDNS'
- ],
- 'selected' => 'bind',
- 'label' => $question
- ];
- }
-
- if (versionInUpdate($current_db_version, '201609120')) {
- if (Settings::Get('system.leenabled') == 1) {
- $has_preconfig = true;
- $description = 'You can now customize the path to your acme.conf file (global alias for Let\'s Encrypt). If you already set up Let\'s Encrypt and the acme.conf file, please set this to the complete path to the file!';
- $question = 'Path to the acme.conf alias-file.';
- $return['acmeconffile_note'] = ['type' => 'infotext', 'value' => $description];
- $return['acmeconffile'] = ['type' => 'text', 'value' => "/etc/apache2/conf-enabled/acme.conf", 'label' => $question];
- }
- }
-
- if (versionInUpdate($current_db_version, '201609200')) {
- $has_preconfig = true;
- $description = 'Specify SMTP settings which froxlor should use to send mail (optional)';
- $return['update_mail_via_smtp_note'] = ['type' => 'infotext', 'value' => $description];
- $question = 'Enable sending mails via SMTP?';
- $return['smtp_enable'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- $question .= 'Enable sending mails via SMTP?';
- $return['smtp_host'] = ['type' => 'text', 'value' => 'localhost', 'label' => $question];
- $question .= 'TCP port to connect to?';
- $return['smtp_port'] = ['type' => 'number', 'value' => '25', 'label' => $question];
- $question .= 'Enable TLS encryption?';
- $return['smtp_usetls'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
- $question .= 'Enable SMTP authentication?';
- $return['smtp_auth'] = ['type' => 'checkbox', 'value' => 1, 'checked' => 1, 'label' => $question];
- $question .= 'SMTP user?';
- $return['smtp_user'] = ['type' => 'text', 'value' => '', 'label' => $question];
- $question .= 'SMTP password?';
- $return['smtp_user'] = ['type' => 'password', 'value' => '', 'label' => $question];
- }
-
- if (versionInUpdate($current_db_version, '201705050')) {
- $has_preconfig = true;
- $description = 'DEBIAN/UBUNTU ONLY: Enable usage of libnss-extrausers as alternative to libnss-mysql (NOTE: if enabled, go through the configuration steps right after the update!!!)';
- $question = 'Enable usage of libnss-extrausers?';
- $return['system_nssextrausers_note'] = ['type' => 'infotext', 'value' => $description];
- $return['system_nssextrausers'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
-
- if (versionInUpdate($current_db_version, '201712310')) {
- if (Settings::Get('system.leenabled') == 1) {
- $has_preconfig = true;
- $description = 'Chose whether you want to disable the Let\'s Encrypt selfcheck as it causes false positives for some configurations.';
- $question = 'Disable Let\'s Encrypt self-check?';
- $return['system_disable_le_selfcheck_note'] = ['type' => 'infotext', 'value' => $description];
- $return['system_disable_le_selfcheck'] = ['type' => 'checkbox', 'value' => 1, 'label' => $question];
- }
- }
-}
diff --git a/install/updatesql.php b/install/updatesql.php
index b50e7bc0..9f3c696c 100644
--- a/install/updatesql.php
+++ b/install/updatesql.php
@@ -2,19 +2,25 @@
/**
* This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
*
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
- * @copyright (c) the authors
- * @author Florian Lippert (2003-2009)
- * @author Froxlor team (2010-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Install
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you can also view it online at
+ * http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright the authors
+ * @author Froxlor team
+ * @license http://files.froxlor.org/misc/COPYING.txt GPLv2
*/
use Froxlor\FroxlorLogger;
@@ -46,8 +52,6 @@ if (\Froxlor\Froxlor::isFroxlor()) {
$update_tasks = [];
$task_counter = 0;
- include_once(\Froxlor\FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/0.9/update_0.9.inc.php'));
- include_once(\Froxlor\FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/0.10/update_0.10.inc.php'));
include_once(\Froxlor\FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/0.11/update_0.11.inc.php'));
// Check Froxlor - database integrity (only happens after all updates are done, so we know the db-layout is okay)
diff --git a/lib/Froxlor/Cli/CliCommand.php b/lib/Froxlor/Cli/CliCommand.php
new file mode 100644
index 00000000..344d3ce7
--- /dev/null
+++ b/lib/Froxlor/Cli/CliCommand.php
@@ -0,0 +1,48 @@
+
+ * @license http://files.froxlor.org/misc/COPYING.txt GPLv2
+ */
+
+namespace Froxlor\Cli;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Froxlor\Froxlor;
+
+class CliCommand extends Command
+{
+
+ protected function validateRequirements(InputInterface $input, OutputInterface $output): int
+ {
+ if (!file_exists(Froxlor::getInstallDir() . '/lib/userdata.inc.php')) {
+ $output->writeln("Could not find froxlor's userdata.inc.php file. You should use this script only with an installed froxlor system.");
+ return self::INVALID;
+ }
+ if (Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) {
+ $output->writeln("It seems that the froxlor files have been updated. Please login and finish the update procedure.");
+ return self::INVALID;
+ }
+ return self::SUCCESS;
+ }
+}
diff --git a/lib/Froxlor/Cli/ConfigServices.php b/lib/Froxlor/Cli/ConfigServices.php
index dc445d80..0feeefb7 100644
--- a/lib/Froxlor/Cli/ConfigServices.php
+++ b/lib/Froxlor/Cli/ConfigServices.php
@@ -1,8 +1,30 @@
+ * @license http://files.froxlor.org/misc/COPYING.txt GPLv2
+ */
+
namespace Froxlor\Cli;
-use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -15,21 +37,7 @@ use Froxlor\SImExporter;
use Froxlor\Database\Database;
use Froxlor\Config\ConfigParser;
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2022 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright (c) the authors
- * @author Froxlor team (2018-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *
- */
-final class ConfigServices extends Command
+final class ConfigServices extends CliCommand
{
protected function configure()
@@ -37,33 +45,37 @@ final class ConfigServices extends Command
$this->setName('froxlor:config-services');
$this->setDescription('Configure system services');
$this->addOption('create', 'c', InputOption::VALUE_NONE, 'Create a services list configuration for the --apply option.')
- ->addOption('apply', 'a', InputOption::VALUE_REQUIRED, 'Configure your services by given configuration file. To create one run the command with the --create option.')
+ ->addOption('apply', 'a', InputOption::VALUE_REQUIRED, 'Configure your services by given configuration file/string. To create one run the command with the --create option.')
->addOption('list', 'l', InputOption::VALUE_NONE, 'Output the services that are going to be configured using a given config file (--apply option). No services will be configured.')
->addOption('daemon', 'd', InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'When used with --apply you can specify one or multiple daemons. These will be the only services that get configured.')
- ->addOption('import-settings', 'i', InputOption::VALUE_REQUIRED, 'Import settings from another froxlor installation. This can be done standalone or in addition to --apply.');
+ ->addOption('import-settings', 'i', InputOption::VALUE_REQUIRED, 'Import settings from another froxlor installation. This can be done standalone or in addition to --apply.')
+ ->addOption('yes-to-all', 'A', InputOption::VALUE_NONE, 'Install packages without asking questions');
}
protected function execute(InputInterface $input, OutputInterface $output)
{
global $lng;
- if (!file_exists(Froxlor::getInstallDir() . '/lib/userdata.inc.php')) {
- $output->writeln("Could not find froxlor's userdata.inc.php file. You should use this script only with an installed froxlor system.");
+ $result = self::SUCCESS;
+
+ $result = $this->validateRequirements($input, $output);
+
+ if ($result == self::SUCCESS && $input->getOption('import-settings') == false && $input->getOption('create') == false && $input->getOption('apply') == false) {
+ $output->writeln('No option given to do something, exiting.');
return self::INVALID;
}
- if ($input->getOption('import-settings') == false && $input->getOption('create') == false && $input->getOption('apply') == false) {
- $output->writeln('No option given to do something, exiting.');
- return self::INVALID;
+ if ($result == self::SUCCESS && $input->getOption('yes-to-all')) {
+ putenv("DEBIAN_FRONTEND=noninteractive");
+ exec("echo 'APT::Get::Assume-Yes \"true\";' > /tmp/_tmp_apt.conf");
+ putenv("APT_CONFIG=/tmp/_tmp_apt.conf");
}
include_once Froxlor::getInstallDir() . 'lng/english.lng.php';
include_once Froxlor::getInstallDir() . 'lng/lng_references.php';
- $result = self::SUCCESS;
-
// import settings if given
- if ($input->getOption('import-settings')) {
+ if ($result == self::SUCCESS && $input->getOption('import-settings')) {
$result = $this->importSettings($input, $output);
}
@@ -79,6 +91,12 @@ final class ConfigServices extends Command
}
}
+ if ($input->getOption('yes-to-all')) {
+ putenv("DEBIAN_FRONTEND");
+ unlink("/tmp/_tmp_apt.conf");
+ putenv("APT_CONFIG");
+ }
+
return $result;
}
@@ -112,7 +130,7 @@ final class ConfigServices extends Command
// get configparser object
$dist = new ConfigParser($_distribution);
// get distro-info
- $dist_display = $this->getCompleteDistroName($dist);
+ $dist_display = $dist->getCompleteDistroName();
// store in tmp array
$distributions_select_data[$dist_display] = str_replace(".xml", "", strtolower(basename($_distribution)));
@@ -152,6 +170,10 @@ final class ConfigServices extends Command
$default_daemon = "";
$table_rows = [];
$valid_options = [];
+ if ($si != 'system') {
+ $table_rows[] = ['x', 'No'];
+ $valid_options[] = 'x';
+ }
foreach ($daemons as $di => $dd) {
$title = $dd->title;
if ($dd->default) {
@@ -161,10 +183,6 @@ final class ConfigServices extends Command
$table_rows[] = [$di, $title];
$valid_options[] = $di;
}
- if ($si != 'system') {
- $table_rows[] = ['x', 'No'];
- $valid_options[] = 'x';
- }
$io->table(
['Value', 'Name'],
$table_rows
@@ -213,28 +231,37 @@ final class ConfigServices extends Command
{
$applyFile = $input->getOption('apply');
- if (strtoupper(substr($applyFile, 0, 4)) == 'HTTP') {
- $output->writeln("Config file seems to be an URL, trying to download");
- $target = "/tmp/froxlor-config-" . time() . ".json";
- if (@file_exists($target)) {
- @unlink($target);
- }
- $this->downloadFile($applyFile, $target);
- $applyFile = $target;
- }
- if (!is_file($applyFile)) {
- $output->writeln('Given config file is not a file');
- return self::INVALID;
- } elseif (!file_exists($applyFile)) {
- $output->writeln('Given config file cannot be found (' . $applyFile . ')');
- return self::INVALID;
- } elseif (!is_readable($applyFile)) {
- $output->writeln('Given config file cannot be read (' . $applyFile . ')');
- return self::INVALID;
+ // check if plain JSON
+ $decoded_config = json_decode($applyFile);
+ $skipFileCheck = false;
+ if (json_last_error() == JSON_ERROR_NONE) {
+ $skipFileCheck = true;
}
- $config = file_get_contents($applyFile);
- $decoded_config = json_decode($config, true);
+ if (!$skipFileCheck) {
+ if (strtoupper(substr($applyFile, 0, 4)) == 'HTTP') {
+ $output->writeln("Config file seems to be an URL, trying to download");
+ $target = "/tmp/froxlor-config-" . time() . ".json";
+ if (@file_exists($target)) {
+ @unlink($target);
+ }
+ $this->downloadFile($applyFile, $target);
+ $applyFile = $target;
+ }
+ if (!is_file($applyFile)) {
+ $output->writeln('Given config file is not a file');
+ return self::INVALID;
+ } elseif (!file_exists($applyFile)) {
+ $output->writeln('Given config file cannot be found (' . $applyFile . ')');
+ return self::INVALID;
+ } elseif (!is_readable($applyFile)) {
+ $output->writeln('Given config file cannot be read (' . $applyFile . ')');
+ return self::INVALID;
+ }
+
+ $config = file_get_contents($applyFile);
+ $decoded_config = json_decode($config, true);
+ }
if ($input->getOption('list') != false) {
$table_rows = [];
@@ -416,22 +443,6 @@ final class ConfigServices extends Command
return $replace_arr;
}
- private function getCompleteDistroName($cparser)
- {
- // get distro-info
- $dist_display = $cparser->distributionName;
- if ($cparser->distributionCodename != '') {
- $dist_display .= " " . $cparser->distributionCodename;
- }
- if ($cparser->distributionVersion != '') {
- $dist_display .= " (" . $cparser->distributionVersion . ")";
- }
- if ($cparser->deprecated) {
- $dist_display .= " [deprecated]";
- }
- return $dist_display;
- }
-
private function importSettings(InputInterface $input, OutputInterface $output)
{
$importFile = $input->getOption('import-settings');
diff --git a/lib/Froxlor/Cli/PhpSessionclean.php b/lib/Froxlor/Cli/PhpSessionclean.php
index 4af9a1dd..5ba94ad5 100644
--- a/lib/Froxlor/Cli/PhpSessionclean.php
+++ b/lib/Froxlor/Cli/PhpSessionclean.php
@@ -1,8 +1,30 @@
+ * @license http://files.froxlor.org/misc/COPYING.txt GPLv2
+ */
+
namespace Froxlor\Cli;
-use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -11,21 +33,7 @@ use Froxlor\FileDir;
use Froxlor\Settings;
use Froxlor\Database\Database;
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2022 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright (c) the authors
- * @author Froxlor team (2018-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *
- */
-final class PhpSessionclean extends Command
+final class PhpSessionclean extends CliCommand
{
protected function configure()
@@ -37,23 +45,24 @@ final class PhpSessionclean extends Command
protected function execute(InputInterface $input, OutputInterface $output)
{
- if (!file_exists(Froxlor::getInstallDir() . '/lib/userdata.inc.php')) {
- $output->writeln("Could not find froxlor's userdata.inc.php file. You should use this script only with an installed froxlor system.");
- return self::INVALID;
- }
+ $result = $this->validateRequirements($input, $output);
- if ((int) Settings::Get('phpfpm.enabled') == 1) {
- if ($input->hasArgument('max-lifetime') && is_numeric($input->getArgument('max-lifetime')) && $input->getArgument('max-lifetime') > 0) {
- $this->cleanSessionfiles((int)$input->getArgument('max-lifetime'));
+ if ($result == self::SUCCESS) {
+ if ((int) Settings::Get('phpfpm.enabled') == 1) {
+ if ($input->hasArgument('max-lifetime') && is_numeric($input->getArgument('max-lifetime')) && $input->getArgument('max-lifetime') > 0) {
+ $this->cleanSessionfiles((int)$input->getArgument('max-lifetime'));
+ } else {
+ // use default max-lifetime value
+ $this->cleanSessionfiles();
+ }
+ $result = self::SUCCESS;
} else {
- // use default max-lifetime value
- $this->cleanSessionfiles();
+ // php-fpm not enabled
+ $output->writeln('PHP-FPM not enabled for this installation.');
+ $result = self::INVALID;
}
- return self::SUCCESS;
}
- // php-fpm not enabled
- $output->writeln('PHP-FPM not enabled for this installation.');
- return self::INVALID;
+ return $result;
}
private function cleanSessionfiles(int $maxlifetime = 1440)
diff --git a/lib/Froxlor/Cli/SwitchServerIp.php b/lib/Froxlor/Cli/SwitchServerIp.php
index 9956f39b..0dd9db71 100644
--- a/lib/Froxlor/Cli/SwitchServerIp.php
+++ b/lib/Froxlor/Cli/SwitchServerIp.php
@@ -1,30 +1,37 @@
+ * @license http://files.froxlor.org/misc/COPYING.txt GPLv2
+ */
+
namespace Froxlor\Cli;
-use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
-use Froxlor\Froxlor;
use Froxlor\Database\Database;
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2022 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright (c) the authors
- * @author Froxlor team (2018-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *
- */
-final class SwitchServerIp extends Command
+final class SwitchServerIp extends CliCommand
{
protected function configure()
@@ -37,21 +44,18 @@ final class SwitchServerIp extends Command
protected function execute(InputInterface $input, OutputInterface $output)
{
- if (!file_exists(Froxlor::getInstallDir() . '/lib/userdata.inc.php')) {
- $output->writeln("Could not find froxlor's userdata.inc.php file. You should use this script only with an installed froxlor system.");
- return self::INVALID;
- }
+ $result = self::SUCCESS;
- if ($input->getOption('list') == false && $input->getOption('switch') == false) {
+ $result = $this->validateRequirements($input, $output);
+
+ if ($result == self::SUCCESS && $input->getOption('list') == false && $input->getOption('switch') == false) {
$output->writeln('Either --list or --switch option must be provided. Nothing to do, exiting.');
- return self::INVALID;
+ $result = self::INVALID;
}
$io = new SymfonyStyle($input, $output);
- $result = self::SUCCESS;
-
- if ($input->getOption('list')) {
+ if ($result == self::SUCCESS && $input->getOption('list')) {
$sel_stmt = Database::prepare("SELECT * FROM panel_ipsandports ORDER BY ip ASC, port ASC");
Database::pexecute($sel_stmt);
@@ -67,7 +71,7 @@ final class SwitchServerIp extends Command
);
}
- if ($input->getOption('switch')) {
+ if ($result == self::SUCCESS && $input->getOption('switch')) {
$result = $this->switchIPs($input, $output);
}
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index d653b9e7..98c1fccd 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -2,19 +2,25 @@
/**
* This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
*
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
*
- * @copyright (c) the authors
- * @author Florian Lippert (2003-2009)
- * @author Froxlor team (2010-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package System
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you can also view it online at
+ * http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright the authors
+ * @author Froxlor team
+ * @license http://files.froxlor.org/misc/COPYING.txt GPLv2
*/
const TABLE_FTP_GROUPS = 'ftp_groups';
@@ -37,7 +43,6 @@ const TABLE_PANEL_TEMPLATES = 'panel_templates';
const TABLE_PANEL_TRAFFIC = 'panel_traffic';
const TABLE_PANEL_TRAFFIC_ADMINS = 'panel_traffic_admins';
const TABLE_PANEL_DISKSPACE = 'panel_diskspace';
-const TABLE_PANEL_LANGUAGE = 'panel_languages';
const TABLE_PANEL_IPSANDPORTS = 'panel_ipsandports';
const TABLE_PANEL_LOG = 'panel_syslog';
const TABLE_PANEL_PHPCONFIGS = 'panel_phpconfigs';