- Timestamp:
- 06/24/08 17:10:06 (16 years ago)
- Location:
- trunk/setup
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/setup/config.php
r2 r328 155 155 } 156 156 157 @$GLOBALS['phpgw_setup']->db->query("SELECT * FROM $configtbl ");157 @$GLOBALS['phpgw_setup']->db->query("SELECT * FROM $configtbl where config_app='phpgwapi'"); 158 158 while(@$GLOBALS['phpgw_setup']->db->next_record()) 159 159 { -
trunk/setup/index.php
r2 r328 330 330 '' 331 331 ); 332 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type' ");332 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type' and config_app='phpgwapi'"); 333 333 $GLOBALS['phpgw_setup']->db->next_record(); 334 334 if ($GLOBALS['phpgw_setup']->db->f(0) == 'ldap') 335 335 { 336 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host' ");336 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host' and config_app='phpgwapi'"); 337 337 $GLOBALS['phpgw_setup']->db->next_record(); 338 338 if ($GLOBALS['phpgw_setup']->db->f(0) != '') … … 397 397 // Note: this does not check the availiblitly of accounts via other auth-methods then sql and ldap!! 398 398 399 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type' ");399 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type' and config_app='phpgwapi'"); 400 400 $GLOBALS['phpgw_setup']->db->next_record(); 401 401 if ($GLOBALS['phpgw_setup']->db->f(0) == 'ldap') 402 402 { 403 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host' ");403 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host' and config_app='phpgwapi'"); 404 404 $GLOBALS['phpgw_setup']->db->next_record(); 405 405 $ldap_host = $GLOBALS['phpgw_setup']->db->f(0); 406 406 407 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_context' ");407 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_context' and config_app='phpgwapi'"); 408 408 $GLOBALS['phpgw_setup']->db->next_record(); 409 409 $ldap_context = $GLOBALS['phpgw_setup']->db->f(0); 410 410 411 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_dn' ");411 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_dn' and config_app='phpgwapi'"); 412 412 $GLOBALS['phpgw_setup']->db->next_record(); 413 413 $ldap_root_dn = $GLOBALS['phpgw_setup']->db->f(0); 414 414 415 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_pw' ");415 $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_pw' and config_app='phpgwapi'"); 416 416 $GLOBALS['phpgw_setup']->db->next_record(); 417 417 $ldap_root_pw = $GLOBALS['phpgw_setup']->db->f(0); -
trunk/setup/ldapexport.php
r2 r328 51 51 )); 52 52 53 $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_ name LIKE 'ldap%'",__LINE__,__FILE__);53 $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_app = 'phpgwapi' and config_name LIKE 'ldap%'",__LINE__,__FILE__); 54 54 while ($GLOBALS['phpgw_setup']->db->next_record()) 55 55 { -
trunk/setup/ldapimport.php
r2 r328 56 56 $applications = $phpgw->applications; 57 57 58 $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_ name LIKE 'ldap%' OR config_name='account_repository'",__LINE__,__FILE__);58 $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_app='phpgwapi' and config_name LIKE 'ldap%' OR config_name='account_repository'",__LINE__,__FILE__); 59 59 while($GLOBALS['phpgw_setup']->db->next_record()) 60 60 { -
trunk/setup/ldapmodify.php
r2 r328 51 51 )); 52 52 53 $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_ name LIKE 'ldap%' OR config_name='account_repository'",__LINE__,__FILE__);53 $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_app = 'phpgwapi' and config_name LIKE 'ldap%' OR config_name='account_repository'",__LINE__,__FILE__); 54 54 while($GLOBALS['phpgw_setup']->db->next_record()) 55 55 { 56 56 $config[$GLOBALS['phpgw_setup']->db->f('config_name')] = $GLOBALS['phpgw_setup']->db->f('config_value'); 57 57 } 58 58 59 $phpgw_info['server']['ldap_host'] = $config['ldap_host']; 59 60 $phpgw_info['server']['ldap_context'] = $config['ldap_context'];
Note: See TracChangeset
for help on using the changeset viewer.