Changeset 370 for trunk/phpgwapi/inc/functions.inc.php

Timestamp:

07/28/08 16:42:45 (16 years ago)

Author:

niltonneto

Message:

Ver ocorrência #270 do Trac.

File:

• trunk/phpgwapi/inc/functions.inc.php (modified) (8 diffs)

trunk/phpgwapi/inc/functions.inc.php

@@ -162 +162 @@
         }
         $GLOBALS['phpgw']->db->Halt_On_Error = 'no';
+        /* jakjr: ExpressoLivre: We do not count the config table. */
+        if (!
         $GLOBALS['phpgw']->db->connect(
                 $GLOBALS['phpgw_info']['server']['db_name'],
@@ -169 +171 @@
                 $GLOBALS['phpgw_info']['server']['db_pass'],
                 $GLOBALS['phpgw_info']['server']['db_type']
-        );
-        @$GLOBALS['phpgw']->db->query("SELECT COUNT(config_name) FROM phpgw_config");
-        if(!@$GLOBALS['phpgw']->db->next_record())
-        {
-                $setup_dir = str_replace($_SERVER['PHP_SELF'],'index.php','setup/');
+        ) )
+        //@$GLOBALS['phpgw']->db->query("SELECT COUNT(config_name) FROM phpgw_config");
+        //if(!@$GLOBALS['phpgw']->db->next_record())
+        {
+                
                 /* BEGIN - CELEPAR - jakjr - 05/06/2006 */
+                /* $setup_dir = str_replace($_SERVER['PHP_SELF'],'index.php','setup/'); */
                 /*echo '<center><b>Fatal Error:</b> It appears that you have not created the database tables for '
                         .'eGroupWare.  Click <a href="' . $setup_dir . '">here</a> to run setup.</center>';*/
@@ -185 +188 @@
         /* Fill phpgw_info["server"] array */
         // An Attempt to speed things up using cache premise
+        /* jakjr: ExpressoLivre does not use cache. */
+        /*
         $GLOBALS['phpgw']->db->query("select config_value from phpgw_config WHERE config_app='phpgwapi' and config_name='cache_phpgw_info'",__LINE__,__FILE__);
         if ($GLOBALS['phpgw']->db->num_rows())
@@ -190 +195 @@
                 $GLOBALS['phpgw']->db->next_record();
                 $GLOBALS['phpgw_info']['server']['cache_phpgw_info'] = stripslashes($GLOBALS['phpgw']->db->f('config_value'));
-        }
-
+        }*/
+
+        /* jakjr: ExpressoLivre does not use cache. */
+        /*      
         $cache_query = "select content from phpgw_app_sessions where"
                 ." sessionid = '0' and loginid = '0' and app = 'phpgwapi' and location = 'config'";
@@ -197 +204 @@
         $GLOBALS['phpgw']->db->query($cache_query,__LINE__,__FILE__);
         $server_info_cache = $GLOBALS['phpgw']->db->num_rows();
-
+        */
+        /*
         if(@$GLOBALS['phpgw_info']['server']['cache_phpgw_info'] && $server_info_cache)
         {
@@ -204 +212 @@
         }
         else
-        {
-                $GLOBALS['phpgw']->db->query("select * from phpgw_config WHERE config_app='phpgwapi'",__LINE__,__FILE__);
+        {*/
+                $GLOBALS['phpgw']->db->query("SELECT * from phpgw_config WHERE config_app='phpgwapi'",__LINE__,__FILE__);
                 while ($GLOBALS['phpgw']->db->next_record())
                 {
@@ -211 +219 @@
                 }
 
+                /*
                 if(@isset($GLOBALS['phpgw_info']['server']['cache_phpgw_info']))
                 {
@@ -221 +230 @@
                                 . "'0','0','phpgwapi','config','".addslashes(serialize($GLOBALS['phpgw_info']['server']))."')";
                         $GLOBALS['phpgw']->db->query($cache_query,__LINE__,__FILE__);
-                }
-        }
+                }*/
+        //}
         unset($cache_query);
         unset($server_info_cache);