[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: backup/inc class.bobackup.inc.php,1.18,1.19 clas
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: backup/inc class.bobackup.inc.php,1.18,1.19 class.uibackup.inc.php,1.12,1.13 |
Date: |
Fri, 18 Jan 2002 12:15:22 -0500 |
Update of /cvsroot/phpgroupware/backup/inc
In directory subversions:/tmp/cvs-serv15945/inc
Modified Files:
class.bobackup.inc.php class.uibackup.inc.php
Log Message:
update
Index: class.bobackup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/backup/inc/class.bobackup.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.bobackup.inc.php 22 Dec 2001 03:38:11 -0000 1.18
--- class.bobackup.inc.php 18 Jan 2002 17:15:20 -0000 1.19
***************
*** 97,101 ****
if (! $values['l_path'] && !
$values['l_websave'])
{
! $error[] = lang('Plase enter
the path of the backup dir and/or enable showing archives in phpGroupWare !');
}
}
--- 97,101 ----
if (! $values['l_path'] && !
$values['l_websave'])
{
! $error[] = lang('Plase enter
the path to the backup dir and/or enable showing archives in phpGroupWare !');
}
}
***************
*** 107,113 ****
$error[] = lang('Please select
an application for transport to the remote host !');
}
! elseif (! $values['r_user'] || !
$values['r_pwd'])
{
! $error[] = lang('Please enter
username and password for remote connection !');
}
elseif ($values['r_app'] == 'ftp')
--- 107,124 ----
$error[] = lang('Please select
an application for transport to the remote host !');
}
! elseif ($values['r_app'] != 'nfs')
{
! if (! $values['r_user'] || !
$values['r_pwd'])
! {
! $error[] = lang('Please
enter username and password for remote connection !');
! }
! }
! elseif (!$values['r_ip'])
! {
! $error[] = lang('Please specify
the ip of the remote host !');
! }
! elseif (!$values['r_path'])
! {
! $error[] = lang('Please specify
the path to the backup directory !');
}
elseif ($values['r_app'] == 'ftp')
***************
*** 119,126 ****
}
}
- elseif (!$values['r_ip'])
- {
- $error[] = lang('Please specify
the ip of the remote host !');
- }
}
}
--- 130,133 ----
***************
*** 254,267 ****
// ------------------------------------ check
-----------------------------------------------
! $check_exists = $co['server_root'] .
'/backup/phpgw_check_for_backup';
! if (file_exists($check_exists) == False)
! {
! $check =
$GLOBALS['phpgw']->template->set_file(array('check' => 'check_form.tpl'));
! $check .=
$GLOBALS['phpgw']->template->set_var('server_root',$co['server_root']);
! $check .=
$GLOBALS['phpgw']->template->set_var('script_path',$co['script_path']);
! $check .=
$GLOBALS['phpgw']->template->fp('out','check',True);
! $conf_file = $co['server_root'] .
'/backup/phpgw_check_for_backup';
! $this->save_config($conf_file,$check);
! }
// -------------------------------- end check
-----------------------------------------------
--- 261,271 ----
// ------------------------------------ check
-----------------------------------------------
! $check =
$GLOBALS['phpgw']->template->set_file(array('check' => 'check_form.tpl'));
! $check .=
$GLOBALS['phpgw']->template->set_var('server_root',$co['server_root']);
! $check .=
$GLOBALS['phpgw']->template->set_var('script_path',$co['script_path']);
! $check .=
$GLOBALS['phpgw']->template->fp('out','check',True);
! $conf_file = $co['server_root'] .
'/backup/phpgw_check_for_backup';
! $this->save_config($conf_file,$check);
!
// -------------------------------- end check
-----------------------------------------------
Index: class.uibackup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/backup/inc/class.uibackup.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uibackup.inc.php 17 Dec 2001 02:20:35 -0000 1.12
--- class.uibackup.inc.php 18 Jan 2002 17:15:20 -0000 1.13
***************
*** 137,146 ****
{
case 'ftp':
$r_type_sel[0]=' selected';break;
! case 'scp':
$r_type_sel[1]=' selected';break;
case 'smbmount': $r_type_sel[2]='
selected';break;
}
$r_app_list = '<option value="ftp"' . $r_type_sel[0] .
'>' . lang('ftp') . '</option>' . "\n"
! . '<option value="scp"' .
$r_type_sel[1] . '>' . lang('scp') . '</option>' . "\n"
. '<option value="smbmount"' .
$r_type_sel[2] . '>' . lang('smbmount') . '</option>' . "\n";
--- 137,146 ----
{
case 'ftp':
$r_type_sel[0]=' selected';break;
! case 'nfs':
$r_type_sel[1]=' selected';break;
case 'smbmount': $r_type_sel[2]='
selected';break;
}
$r_app_list = '<option value="ftp"' . $r_type_sel[0] .
'>' . lang('ftp') . '</option>' . "\n"
! . '<option value="nfs"' .
$r_type_sel[1] . '>' . lang('nfs') . '</option>' . "\n"
. '<option value="smbmount"' .
$r_type_sel[2] . '>' . lang('smbmount') . '</option>' . "\n";
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: backup/inc class.bobackup.inc.php,1.18,1.19 class.uibackup.inc.php,1.12,1.13,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: backup/templates/default script_form.tpl,1.23,1.23.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: backup/setup phpgw_de.lang,1.9,1.10 phpgw_en.lang,1.8,1.9 phpgw_es.lang,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: backup/templates/default script_form.tpl,1.23,1.23.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: backup/setup phpgw_de.lang,1.9,1.10 phpgw_en.lang,1.8,1.9 phpgw_es.lang,1.1,1.2
- Index(es):