Changeset 440

Timestamp:

09/18/08 15:29:11 (16 years ago)

Author:

niltonneto

Message:

Correção do commit efetuado por Rafael Raymundo (r. 432), que
sobrescreveu alterações anteriores (r.411).

File:

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

trunk/phpgwapi/inc/functions.inc.php

@@ -22 +22 @@
          * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
          \**************************************************************************/
-
-
+        
+        
         /***************************************************************************\
         * If running in PHP3, then force admin to upgrade                           *
@@ -38 +38 @@
 
         include(PHPGW_API_INC.'/common_functions.inc.php');
-
+        
         /*!
          @function lang
@@ -53 +53 @@
                         $vars = array($m1,$m2,$m3,$m4,$m5,$m6,$m7,$m8,$m9,$m10);
                 }
+                // Get the translation from Lang File, if the database is down.
+                if(!$GLOBALS['phpgw']->translation){
+                        $fn = PHPGW_SERVER_ROOT.'/phpgwapi/setup/phpgw_'.$GLOBALS['_SERVER']['HTTP_ACCEPT_LANGUAGE'].'.lang';
+                        if (file_exists($fn)){
+                                $fp = fopen($fn,'r');
+                                while ($data = fgets($fp,16000)){
+                                        list($message_id,$app_name,$null,$content) = explode("\t",substr($data,0,-1));
+                                        $GLOBALS['phpgw_info']['phpgwapi']['lang'][$message_id] =  $content;
+                                }
+                                fclose($fp);
+                        }
+                        $return = str_replace('%1',$vars[0],$GLOBALS['phpgw_info']['phpgwapi']['lang'][$key]);                  
+                        return $return;  
+                }
                 $value = $GLOBALS['phpgw']->translation->translate("$key",$vars);
                 return $value;
@@ -80 +94 @@
         * Multi-Domain support                                                       *
         \****************************************************************************/
-
+        
         /* make them fix their header */
         if (!isset($GLOBALS['phpgw_domain']))
@@ -148 +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'],
@@ -155 +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>';*/
-                echo '<center><b>ExpressoLivre indisponível no momento. Códgio 001<br>' .
-                         'Tente mais tarde.</b></center>';
+                echo '<center><b>'.lang("ExpressoLivre is unavailable at this moment. Code %1<br>Please, try later.","001").'</b></center>';
                 /* END - CELEPAR - jakjr - 05/06/2006 */
                 exit;
@@ -172 +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())
@@ -177 +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'";
@@ -184 +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)
         {
@@ -191 +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())
                 {
@@ -198 +219 @@
                 }
 
+                /*
                 if(@isset($GLOBALS['phpgw_info']['server']['cache_phpgw_info']))
                 {
@@ -208 +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);
@@ -454 +476 @@
                 }
                 $GLOBALS['phpgw']->applications->read_installed_apps(); // to get translated app-titles
-
+                
                 /*************************************************************************\
                 * Load the header unless the developer turns it off                       *