[Phpgroupware-cvs] CVS: backup/inc class.bobackup.inc.php,1.18.2.1,1.18.2.2 hook_admin.inc.php,1.1.1.1,1.1.1.1.2.1

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/backup/inc
In directory subversions:/tmp/cvs-serv17713/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bobackup.inc.php hook_admin.inc.php 
Log Message:
added aditional config

Index: class.bobackup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/backup/inc/class.bobackup.inc.php,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C2 -r1.18.2.1 -r1.18.2.2
*** class.bobackup.inc.php      18 Jan 2002 17:15:00 -0000      1.18.2.1
--- class.bobackup.inc.php      1 Feb 2002 23:52:06 -0000       1.18.2.2
***************
*** 131,134 ****
--- 131,186 ----
                                        }
                                }
+ 
+                               $site_co = $this->get_config();
+                               if (is_array($site_co))
+                               {
+                                       if (!isset($site_co['php_cgi']) || 
!isset($site_co['tar']) || !isset($site_co['zip']) || !isset($site_co['bzip2']))
+                                       {
+                                               $error[] = lang('Please enter 
the path of the needed applications in *Site configuration* !');
+                                       }
+ 
+                                       if ($values['b_sql'])
+                                       {
+                                               if 
($GLOBALS['phpgw_info']['server']['db_type'] == 'mysql')
+                                               {
+                                                       if 
(!isset($site_co['mysql']))
+                                                       {
+                                                               $error[] = 
lang('Please set the path to the MySQL database dir in *Site configuration* !');
+                                                       }
+                                               }
+                                               
elseif($GLOBALS['phpgw_info']['server']['db_type'] == 'pgsql')
+                                               {
+                                                       if 
(!isset($site_co['pgsql']))
+                                                       {
+                                                               $error[] = 
lang('Please set the path to the PostgreSQL database dir in *Site 
configuration* !');
+                                                       }
+                                               }
+                                               else
+                                               {
+                                                       $error[] = lang('Your 
SQL database isnt supported by this application !');
+                                               }
+                                       }
+ 
+                                       if ($values['b_ldap'])
+                                       {
+                                               if (!isset($site_co['ldap']) || 
!isset($site_co['ldap_in']))
+                                               {
+                                                       $error[] = lang('Please 
set the path to the LDAP database dir in *Site configuration* !');
+                                               }
+                                       }
+ 
+                                       if ($values['b_email'])
+                                       {
+                                               if (!isset($site_co['maildir']))
+                                               {
+                                                       $error[] = lang('Please 
specify the name of the Maildir in *Site configuration* !');
+                                               }
+                                       }
+ 
+                               }
+                               else
+                               {
+                                       $error[] = lang('Please set the values 
in *Site configuration* !');
+                               }
                        }
  
***************
*** 274,277 ****
--- 326,330 ----
                                $config = 
$GLOBALS['phpgw']->template->set_file(array('backup' => 'backup_form.tpl'));
                                $config .= 
$GLOBALS['phpgw']->template->set_var('script_path',$co['script_path']);
+                               $config .= 
$GLOBALS['phpgw']->template->set_var('php_path',$co['php_cgi']);
                                $config .= 
$GLOBALS['phpgw']->template->fp('out','backup',True);
                                $conf_file = $co['server_root'] . 
'/backup/phpgw_start_backup.' . $co['b_intval'];
***************
*** 291,298 ****
--- 344,358 ----
                                $config .= 
$GLOBALS['phpgw']->template->set_var('bcomp',$co['b_type']);
  
+                               $config .= 
$GLOBALS['phpgw']->template->set_var('php_path',$co['php_cgi']);
+                               $config .= 
$GLOBALS['phpgw']->template->set_var('tar_path',$co['tar']);
+                               $config .= 
$GLOBALS['phpgw']->template->set_var('zip_path',$co['zip']);
+                               $config .= 
$GLOBALS['phpgw']->template->set_var('bzip2_path',$co['bzip2']);
+ 
                                if ($co['b_sql'])
                                {
                                        $config .= 
$GLOBALS['phpgw']->template->set_var('bsql',$co['b_sql']);
                                        $config .= 
$GLOBALS['phpgw']->template->set_var('db_name',$co['db_name']);
+                                       $config .= 
$GLOBALS['phpgw']->template->set_var('mysql_dir',$co['mysql']);
+                                       $config .= 
$GLOBALS['phpgw']->template->set_var('pgsql_dir',$co['pgsql']);
                                }
  
***************
*** 300,303 ****
--- 360,365 ----
                                {
                                        $config .= 
$GLOBALS['phpgw']->template->set_var('bldap','yes');
+                                       $config .= 
$GLOBALS['phpgw']->template->set_var('ldap_dir',$co['ldap']);
+                                       $config .= 
$GLOBALS['phpgw']->template->set_var('ldap_in',$co['ldap_in']);
                                }
  
***************
*** 305,308 ****
--- 367,371 ----
                                {
                                        $config .= 
$GLOBALS['phpgw']->template->set_var('bemail','yes');
+                                       $config .= 
$GLOBALS['phpgw']->template->set_var('maildir',$co['maildir']);
  
                                        $allaccounts = 
$GLOBALS['phpgw']->accounts->get_list('accounts');

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/backup/inc/hook_admin.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** hook_admin.inc.php  4 Dec 2001 01:41:59 -0000       1.1.1.1
--- hook_admin.inc.php  1 Feb 2002 23:52:06 -0000       1.1.1.1.2.1
***************
*** 16,20 ****
                $file = Array
                (
! //                    'Site Configuration'    => 
$GLOBALS['phpgw']->link('/admin/config.php','appname=' . $appname)
                        'Backup Administration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=backup.uibackup.backup_admin')
                );
--- 16,20 ----
                $file = Array
                (
!                       'Site Configuration'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
                        'Backup Administration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=backup.uibackup.backup_admin')
                );