[Phpgroupware-cvs] CVS: setup ldapimport.php,1.7,1.8 ldapmodify.php,1.7,1.8

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv17673

Modified Files:
        ldapimport.php ldapmodify.php 
Log Message:
Add more exclusions to applist



Index: ldapimport.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldapimport.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ldapimport.php      4 Mar 2002 02:55:53 -0000       1.7
--- ldapimport.php      14 May 2002 13:43:34 -0000      1.8
***************
*** 129,134 ****
        }
  
!       $GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM 
phpgw_applications WHERE app_enabled != '0' AND app_enabled != '3' AND "
!               . "app_name != 'administration' ORDER BY 
app_title",__LINE__,__FILE__);
        while ($GLOBALS['phpgw_setup']->db->next_record())
        {
--- 129,133 ----
        }
  
!       $GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM 
phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY 
app_title",__LINE__,__FILE__);
        while ($GLOBALS['phpgw_setup']->db->next_record())
        {
***************
*** 442,454 ****
        }
  
!       while (list($apptitle,$appname) = each($apps))
        {
!               if ($apptitle != 'admin')
                {
!                       $app_list .= '<option value="' . $apptitle . '" 
selected>' . $appname . '</option>';
                }
                else
                {
!                       $app_list .= '<option value="' . $apptitle . '">' . 
$appname . '</option>';
                }
        }
--- 441,460 ----
        }
  
!       while(list($appname,$apptitle) = each($apps))
        {
!               if($appname == 'admin' ||
!                       $appname == 'skel' ||
!                       $appname == 'backup' ||
!                       $appname == 'netsaint' ||
!                       $appname == 'developer_tools' ||
!                       $appname == 'phpsysinfo' ||
!                       $appname == 'eldaptir' ||
!                       $appname == 'qmailldap')
                {
!                       $app_list .= '<option value="' . $appname . '">' . 
$apptitle . '</option>';
                }
                else
                {
!                       $app_list .= '<option value="' . $appname . '" 
selected>' . $apptitle . '</option>';
                }
        }

Index: ldapmodify.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldapmodify.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ldapmodify.php      4 Mar 2002 02:55:53 -0000       1.7
--- ldapmodify.php      14 May 2002 13:43:34 -0000      1.8
***************
*** 111,116 ****
        }
  
!       $GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM 
phpgw_applications WHERE app_enabled != '0' AND app_enabled != '3' AND "
!               . "app_name != 'administration' ORDER BY 
app_title",__LINE__,__FILE__);
        while ($GLOBALS['phpgw_setup']->db->next_record())
        {
--- 111,115 ----
        }
  
!       $GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM 
phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY 
app_title",__LINE__,__FILE__);
        while ($GLOBALS['phpgw_setup']->db->next_record())
        {
***************
*** 378,390 ****
        }
  
!       while (list($apptitle,$appname) = each($apps))
        {
!               if ($apptitle != 'admin')
                {
!                       $app_list .= '<option value="' . $apptitle . '" 
selected>' . $appname . '</option>';
                }
                else
                {
!                       $app_list .= '<option value="' . $apptitle . '">' . 
$appname . '</option>';
                }
        }
--- 377,396 ----
        }
  
!       while(list($appname,$apptitle) = each($apps))
        {
!               if($appname == 'admin' ||
!                       $appname == 'skel' ||
!                       $appname == 'backup' ||
!                       $appname == 'netsaint' ||
!                       $appname == 'developer_tools' ||
!                       $appname == 'phpsysinfo' ||
!                       $appname == 'eldaptir' ||
!                       $appname == 'qmailldap')
                {
!                       $app_list .= '<option value="' . $appname . '">' . 
$apptitle . '</option>';
                }
                else
                {
!                       $app_list .= '<option value="' . $appname . '" 
selected>' . $apptitle . '</option>';
                }
        }