Changeset 328

Timestamp:

06/24/08 17:10:06 (16 years ago)

Author:

niltonneto

Message:

Alteração para carregar no setup apenas as variáveis da API,
evitando conflitos de variáveis com demais módulos.

Location:

trunk/setup

Files:

• config.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• ldapexport.php (modified) (1 diff)
• ldapimport.php (modified) (1 diff)
• ldapmodify.php (modified) (1 diff)

trunk/setup/config.php

@@ -155 +155 @@
         }
 
-        @$GLOBALS['phpgw_setup']->db->query("SELECT * FROM $configtbl");
+        @$GLOBALS['phpgw_setup']->db->query("SELECT * FROM $configtbl where config_app='phpgwapi'");
         while(@$GLOBALS['phpgw_setup']->db->next_record())
         {

trunk/setup/index.php

@@ -330 +330 @@
                                 ''
                         );
-                        $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type'");
+                        $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type' and config_app='phpgwapi'");
                         $GLOBALS['phpgw_setup']->db->next_record();
                         if ($GLOBALS['phpgw_setup']->db->f(0) == 'ldap')
                         {
-                                $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host'");
+                                $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host' and config_app='phpgwapi'");
                                 $GLOBALS['phpgw_setup']->db->next_record();
                                 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!!
 
-                        $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type'");
+                        $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type' and config_app='phpgwapi'");
                         $GLOBALS['phpgw_setup']->db->next_record();
                         if ($GLOBALS['phpgw_setup']->db->f(0) == 'ldap')
                         {
-                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host'");
+                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host' and config_app='phpgwapi'");
                           $GLOBALS['phpgw_setup']->db->next_record();
                           $ldap_host = $GLOBALS['phpgw_setup']->db->f(0);
                           
-                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_context'");
+                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_context' and config_app='phpgwapi'");
                           $GLOBALS['phpgw_setup']->db->next_record();
                           $ldap_context = $GLOBALS['phpgw_setup']->db->f(0);
 
-                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_dn'");
+                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_dn' and config_app='phpgwapi'");
                           $GLOBALS['phpgw_setup']->db->next_record();
                           $ldap_root_dn = $GLOBALS['phpgw_setup']->db->f(0);
 
-                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_pw'");
+                          $GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_root_pw' and config_app='phpgwapi'");
                           $GLOBALS['phpgw_setup']->db->next_record();
                           $ldap_root_pw = $GLOBALS['phpgw_setup']->db->f(0);

trunk/setup/ldapexport.php

@@ -51 +51 @@
         ));
 
-        $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_name LIKE 'ldap%'",__LINE__,__FILE__);
+        $GLOBALS['phpgw_setup']->db->query("SELECT config_name,config_value FROM phpgw_config WHERE config_app = 'phpgwapi' and config_name LIKE 'ldap%'",__LINE__,__FILE__);
         while ($GLOBALS['phpgw_setup']->db->next_record())
         {

trunk/setup/ldapimport.php

@@ -56 +56 @@
         $applications        = $phpgw->applications;
 
-        $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__);
+        $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__);
         while($GLOBALS['phpgw_setup']->db->next_record())
         {

trunk/setup/ldapmodify.php

@@ -51 +51 @@
         ));
 
-        $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__);
+        $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__);
         while($GLOBALS['phpgw_setup']->db->next_record())
         {
                 $config[$GLOBALS['phpgw_setup']->db->f('config_name')] = $GLOBALS['phpgw_setup']->db->f('config_value');
         }
+
         $phpgw_info['server']['ldap_host']          = $config['ldap_host'];
         $phpgw_info['server']['ldap_context']       = $config['ldap_context'];