maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

added new setting: backup ftp passive mode, fixes #785

Browse Source 
Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>
This commit is contained in:
Christoph Burchert (Chb)
2011-05-18 02:08:45 +02:00
parent 75c5fae6b2
commit 7a4501e581
6 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
actions/admin/settings/215.backup.php
View File

@@ -98,6 +98,15 @@ return array(
'default' => '',
'save_method' => 'storeSettingField',
),
'backup_passive_mode' => array(
'label' => $lng{'serversettings']['backup_ftp_passive_mode'],
'settinggroup' => 'system',
'varname' => 'backup_ftp_passive',
'type' => 'bool',
'default' => true,
'save_method' => 'storeSettingField',
'overview_option' => false,
),
),
),
),

1
install/froxlor.sql
View File

@@ -631,6 +631,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_server', '');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_user', '');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_pass', '');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_passive', '1');
# --------------------------------------------------------
#

3
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -1594,6 +1594,9 @@ if(isFroxlorVersion('0.9.20.1-svn1') || isFroxlorVersion('0.9.20.2-svn1'))
// add table column for gender
$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `gender` INT( 1 ) NOT NULL DEFAULT '0' AFTER `firstname`");
/* add new setting: backup FTP mode */
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_passive', '1')");
lastStepStatus(0);
updateToVersion('0.9.21-svn1');

1
lng/english.lng.php
View File

@@ -1626,6 +1626,7 @@ $lng['gender']['title'] = 'Gender';
$lng['gender']['male'] = 'male';
$lng['gender']['female'] = 'female';
$lng['gender']['undef'] = 'not specified';
$lng['serversettings']['backup_ftp_passive_mode'] = 'Use passive mode';
// Country code (ISO-3166-2)
$lng['country']['AF'] = "Afghanistan";

1
lng/german.lng.php
View File

@@ -1606,3 +1606,4 @@ $lng['gender']['title'] = 'Geschlecht';
$lng['gender']['male'] = 'm&auml;nnlich';
$lng['gender']['female'] = 'weiblich';
$lng['gender']['undef'] = 'keine Angabe';
$lng['serversettings']['backup_ftp_passive_mode'] = 'Passiven Modus verwenden';

12
scripts/jobs/cron_backup.php
View File

@@ -122,7 +122,17 @@ if($settings['system']['backup_enabled'] == '1'){
if(preg_match('/.*\.tar\.gz$/', $ftp_file)){
$ftp_con = ftp_connect($settings['system']['backup_ftp_server']);
$ftp_login = ftp_login($ftp_con, $settings['system']['backup_ftp_user'], $settings['system']['backup_ftp_pass']);
ftp_pasv($ftp_con, true);
/* Check whether to use passive mode or not */
if($settings['system']['backup_ftp_passive'] == 1)
{
ftp_pasv($ftp_con, true);
}
else
{
ftp_pasv($ftp_con, false);
}
$ftp_upload = ftp_put($ftp_con, $ftp_file, $row['documentroot'] . $settings['system']['backup_dir'] . "/" . $ftp_file, FTP_BINARY);
}
}