Changeset 1526 for trunk/expressoMail1_2/inc/class.functions.inc.php

Timestamp:

10/27/09 09:13:59 (15 years ago)

Author:

amuller

Message:

Ticket #622 - Removendo lang com xml/xsl descricao adicional no ticket

File:

• trunk/expressoMail1_2/inc/class.functions.inc.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.functions.inc.php

@@ -99 +99 @@
                         return $response;
                 }
-
-                function getLang( $key )
-                {
-                        static $language = NULL;
-
-                        if ( ! $language )
-                        {
-                                $_SESSION[ 'debug' ][ 'init_t' ] = time( );
-                                $_SESSION[ 'debug' ][ 'init_m' ] = microtime( );
-
-                                $xml = new DOMDocument;
-                                $xml -> preserveWhiteSpace = false;
-                                $xml -> load( dirname( __FILE__ )
-                                        . '/../setup/phpgw_'
-                                        . $_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang']
-                                        . '.xml'
-                                );
-
-                                $xpath = new DOMXPath( $xml );
-
-                                $_key = 'key';
-                                $_lang = 'translation';
-
-                                $language = array( );
-                                foreach( $xml -> documentElement -> childNodes as $entry )
-                                        $language[ $xpath->query( $_key, $entry ) -> item( 0 ) -> nodeValue ] = $xpath->query( $_lang, $entry ) -> item( 0 ) -> nodeValue;
-
-                                $_SESSION[ 'debug' ][ 'end_t' ] = time( );
-                                $_SESSION[ 'debug' ][ 'end_m' ] = microtime( );
-                        }
-
-                        if ( array_key_exists( $key, $language ) )
-                                return $language[ $key ];
-                        else
-                                return ( $key . '*' );
+                function getLang($key){
+                        if ($_SESSION['phpgw_info']['expressomail']['lang'][$key])
+                                return $_SESSION['phpgw_info']['expressomail']['lang'][$key];
                 }