diff --git a/actions/admin/settings/120.system.php b/actions/admin/settings/120.system.php index 346b2424..b2316307 100644 --- a/actions/admin/settings/120.system.php +++ b/actions/admin/settings/120.system.php @@ -67,15 +67,6 @@ return array( 'plausibility_check_method' => 'checkMysqlAccessHost', 'save_method' => 'storeSettingMysqlAccessHost', ), - 'system_realtime_port' => array( - 'label' => $lng['serversettings']['system_realtime_port'], - 'settinggroup' => 'system', - 'varname' => 'realtime_port', - 'type' => (function_exists('socket_create') ? 'int' : 'hidden'), - 'int_max' => 65535, - 'default' => 0, - 'save_method' => 'storeSettingField', - ), 'system_index_file_extension' => array( 'label' => $lng['serversettings']['index_file_extension'], 'settinggroup' => 'system', diff --git a/actions/admin/settings/137.perl.php b/actions/admin/settings/137.perl.php index 076d27cb..c7a8d462 100644 --- a/actions/admin/settings/137.perl.php +++ b/actions/admin/settings/137.perl.php @@ -46,7 +46,7 @@ return array( ), 'perl_server' => array( 'label' => $lng['serversettings']['perl_server'], - 'settinggroup' => 'system', + 'settinggroup' => 'serversettings', 'varname' => 'perl_server', 'type' => 'string', 'default' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock', diff --git a/install/froxlor.sql b/install/froxlor.sql index 6bddc672..dc7b9e61 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -462,7 +462,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.14'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.15-svn1'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 3dc751ec..f146134e 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1169,6 +1169,37 @@ if(isFroxlorVersion('0.9.14-svn5')) updateToVersion('0.9.14-svn6'); } +if(isFroxlorVersion('0.9.14-svn6')) +{ + showUpdateStep("Updating from 0.9.14-svn6 to 0.9.14-svn10", false); + + // remove deprecated realtime-feature + showUpdateStep("Removing realtime-feature (deprecated)"); + $db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'realtime_port';"); + lastStepStatus(0); + + // remove deprecated panel_navigation + showUpdateStep("Removing table `panel_navigation` (deprecated)"); + $db->query("DROP TABLE IF EXISTS `panel_navigation`;"); + lastStepStatus(0); + + // remove deprecated panel_cronscript + showUpdateStep("Removing table `panel_cronscript` (deprecated)"); + $db->query("DROP TABLE IF EXISTS `panel_cronscript`;"); + lastStepStatus(0); + + // make ticket-system ipv6 compatible + showUpdateStep("Altering IP field in panel_tickets (IPv6 compatibility)"); + $db->query("ALTER TABLE `" . TABLE_PANEL_TICKETS . "` MODIFY `ip` varchar(39) NOT NULL default '';"); + lastStepStatus(0); + + showUpdateStep("Removing deprecated legacy-cronjob from database"); + $db->query("DELETE FROM `".TABLE_PANEL_CRONRUNS."` WHERE `cronfile` ='cron_legacy.php';"); + lastStepStatus(0); + + updateToVersion('0.9.14-svn10'); +} + /* * revert database changes we did for multiserver-support * before branching - sorry guys :/ @@ -1211,37 +1242,6 @@ if(isFroxlorVersion('0.9.14-svn9')) updateToVersion('0.9.14-svn10'); } -if(isFroxlorVersion('0.9.14-svn6')) -{ - showUpdateStep("Updating from 0.9.14-svn6 to 0.9.14-svn10", false); - - // remove deprecated realtime-feature - showUpdateStep("Removing realtime-feature (deprecated)"); - $db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'realtime_port';"); - lastStepStatus(0); - - // remove deprecated panel_navigation - showUpdateStep("Removing table `panel_navigation` (deprecated)"); - $db->query("DROP TABLE IF EXISTS `panel_navigation`;"); - lastStepStatus(0); - - // remove deprecated panel_cronscript - showUpdateStep("Removing table `panel_cronscript` (deprecated)"); - $db->query("DROP TABLE IF EXISTS `panel_cronscript`;"); - lastStepStatus(0); - - // make ticket-system ipv6 compatible - showUpdateStep("Altering IP field in panel_tickets (IPv6 compatibility)"); - $db->query("ALTER TABLE `" . TABLE_PANEL_TICKETS . "` MODIFY `ip` varchar(39) NOT NULL default '';"); - lastStepStatus(0); - - showUpdateStep("Removing deprecated legacy-cronjob from database"); - $db->query("DELETE FROM `".TABLE_PANEL_CRONRUNS."` WHERE `cronfile` ='cron_legacy.php';"); - lastStepStatus(0); - - updateToVersion('0.9.14-svn10'); -} - if(isFroxlorVersion('0.9.14-svn10')) { showUpdateStep("Updating from 0.9.14-svn10 to 0.9.14 final"); @@ -1249,3 +1249,19 @@ if(isFroxlorVersion('0.9.14-svn10')) updateToVersion('0.9.14'); } + +if(isFroxlorVersion('0.9.14')) +{ + showUpdateStep("Updating from 0.9.14 to 0.9.15-svn1"); + lastStepStatus(0); + + showUpdateStep("."); + $db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (156, 'system', 'mod_fcgid_startport', '8888')"); + + showUpdateStep("."); + $db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (157, 'system', 'perl_server', 'unix:/var/run/nginx/cgiwrap-dispatch.sock')"); + + updateToVersion('0.9.15-svn1'); +} + + diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 1ad4b9c2..938f3db6 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -71,7 +71,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.14'; +$version = '0.9.15-svn1'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index ebc5be94..8e46e2cc 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1515,8 +1515,10 @@ $lng['serversettings']['login_domain_login'] = 'Allow login with domains'; $lng['panel']['unlock'] = 'unlock'; $lng['question']['customer_reallyunlock'] = 'Do you really want to unlock customer %s?'; -//ADDED IN FROXLOR NGINX BRANCH +// ADDED IN FROXLOR 0.9.15-svn1 $lng['serversettings']['perl_server']['title'] = 'Perl server location'; -$lng['serversettings']['perl_server']['description'] = 'This is only used for Nginx
defaultis set for using the guide found at: http://wiki.nginx.org/SimpleCGI'; +$lng['serversettings']['perl_server']['description'] = 'This is only used for Nginx
default is set for using the guide found at: http://wiki.nginx.org/SimpleCGI'; +$lng['serversettings']['mod_fcgid_startport']['title'] = 'PHP FCGId start port'; +$lng['serversettings']['mod_fcgid_startport']['description'] = 'this is the port that FCGI will listen on for requests for php scripts'; ?> \ No newline at end of file diff --git a/lng/german.lng.php b/lng/german.lng.php index a4dd8cc7..1eb77720 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1474,9 +1474,6 @@ $lng['admin']['templates']['forgotpwd'] = 'Benachrichtigungs-Mails bei Zurü $lng['admin']['templates']['password_reset'] = 'Kunden-Benachrichtigung nach Zurücksetzen des Passworts'; $lng['admin']['store_defaultindex'] = 'Erstelle standard Index-Datei in Kunden-Ordner'; -// ADDED FOR NGINX -$lng['serversettings']['mod_fcgid_startport']['title'] = 'Nur für Nginx: Port für FastCGI'; -$lng['serversettings']['mod_fcgid_startport']['description'] = 'Erster Port der Portrange.'; // ADDED IN FROXLOR 0.9.13-svn1 $lng['customer']['autoresponder'] = 'Abwesenheitsnachrichten'; @@ -1492,7 +1489,7 @@ $lng['admin']['ipsandports']['ssl_cert_chainfile'] = 'Pfad zu dem SSL Certificat // ADDED IN FROXLOR 0.9.14-svn5 $lng['admin']['ipsandports']['docroot']['title'] = 'Benutzerdefinierter Docroot (leer = zeige auf Froxlor)'; -$lng['admin']['ipsandports']['docroot']['description'] = 'Hier kann ein benutzerdefinierter Document-Root (der Zeilordner für einen Zugriff) für diese IP/Port Kombination gesetzt werden.
ACHTUNG: Bitte überlege vorher, welchen Pfad du hier angibst!'; +$lng['admin']['ipsandports']['docroot']['description'] = 'Hier kann ein benutzerdefinierter Document-Root (der Zielordner für einen Zugriff) für diese IP/Port Kombination gesetzt werden.
ACHTUNG: Bitte überlege vorher, welchen Pfad du hier angibst!'; // ADDED IN FROXLOR 0.9.14-svn6 $lng['serversettings']['login_domain_login'] = 'Erlaube Anmeldung mit Domains'; @@ -1501,4 +1498,9 @@ $lng['serversettings']['login_domain_login'] = 'Erlaube Anmeldung mit Domains'; $lng['panel']['unlock'] = 'entsperren'; $lng['question']['customer_reallyunlock'] = 'Wollen Sie den Kunden %s wirklich entsperren?'; +// ADDED IN FROXLOR 0.9.15-svn1 +$lng['serversettings']['perl_server']['title'] = 'Perl Server Ort'; +$lng['serversettings']['perl_server']['description'] = 'Nur für nginx
Der Standardwert ist diesem Guide entnommen: http://wiki.nginx.org/SimpleCGI'; +$lng['serversettings']['mod_fcgid_startport']['title'] = 'PHP FCGId start Port'; +$lng['serversettings']['mod_fcgid_startport']['description'] = 'Dies ist der Port den FCGI nutzen wird, um auf PHP Anfragen zu warten'; ?>