Commit 5b3f2519 authored by Till Brehm's avatar Till Brehm

- Removed unused file form.inc.php

- Added some cleanup code
parent 0281b9f7
...@@ -2152,7 +2152,7 @@ class installer_base { ...@@ -2152,7 +2152,7 @@ class installer_base {
// Add symlink for patch tool // Add symlink for patch tool
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch'); if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
} }
public function configure_dbserver() { public function configure_dbserver() {
...@@ -2240,6 +2240,21 @@ class installer_base { ...@@ -2240,6 +2240,21 @@ class installer_base {
touch($conf['ispconfig_log_dir'].'/cron.log'); touch($conf['ispconfig_log_dir'].'/cron.log');
chmod($conf['ispconfig_log_dir'].'/cron.log', 0660); chmod($conf['ispconfig_log_dir'].'/cron.log', 0660);
}
// This function is called at the end of the update process and contains code to clean up parts of old ISPCONfig releases
public function cleanup_ispconfig() {
global $app,$conf;
// Remove directories recursively
if(is_dir('/usr/local/ispconfig/interface/web/designer')) exec('rm -rf /usr/local/ispconfig/interface/web/designer');
// Remove files
if(is_file('/usr/local/ispconfig/interface/lib/classes/db_firebird.inc.php')) unlink('/usr/local/ispconfig/interface/lib/classes/db_firebird.inc.php');
if(is_file('/usr/local/ispconfig/interface/lib/classes/form.inc.php')) unlink('/usr/local/ispconfig/interface/lib/classes/form.inc.php');
} }
public function getinitcommand($servicename, $action, $init_script_directory = ''){ public function getinitcommand($servicename, $action, $init_script_directory = ''){
......
...@@ -443,6 +443,9 @@ if ($conf['services']['web'] && $inst->install_ispconfig_interface) { ...@@ -443,6 +443,9 @@ if ($conf['services']['web'] && $inst->install_ispconfig_interface) {
$inst->install_ispconfig(); $inst->install_ispconfig();
// Cleanup
$inst->cleanup_ispconfig();
//** Configure Crontab //** Configure Crontab
$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes', 'no'), 'yes','reconfigure_crontab'); $update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes', 'no'), 'yes','reconfigure_crontab');
if($update_crontab_answer == 'yes') { if($update_crontab_answer == 'yes') {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment