[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.705,1.706

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv10376/public_html

Modified Files:
	lib-common.php 
Log Message:
E_ALL fix


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.705
retrieving revision 1.706
diff -C2 -d -r1.705 -r1.706
*** lib-common.php	4 Jul 2008 13:16:07 -0000	1.705
--- lib-common.php	4 Jul 2008 15:14:28 -0000	1.706
***************
*** 6163,6184 ****
      $retval = '';
  
!     if( isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] ))
!     {
!         $accept = explode( ',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] );
!         foreach( $accept as $l )
!         {
!             $l = explode( ';', trim( $l ));
              $l = $l[0];
!             if( array_key_exists( $l, $_CONF['language_files'] ))
!             {
                  $retval = $_CONF['language_files'][$l];
                  break;
!             }
!             else
!             {
!                 $l = explode( '-', $l );
                  $l = $l[0];
!                 if( array_key_exists( $l, $_CONF['language_files'] ))
!                 {
                      $retval = $_CONF['language_files'][$l];
                      break;
--- 6163,6178 ----
      $retval = '';
  
!     if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
!         $accept = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
!         foreach ($accept as $l) {
!             $l = explode(';', trim($l));
              $l = $l[0];
!             if (array_key_exists($l, $_CONF['language_files'])) {
                  $retval = $_CONF['language_files'][$l];
                  break;
!             } else {
!                 $l = explode('-', $l);
                  $l = $l[0];
!                 if (array_key_exists($l, $_CONF['language_files'])) {
                      $retval = $_CONF['language_files'][$l];
                      break;
***************
*** 6186,6190 ****
              }
          }
- 
      }
  
--- 6180,6183 ----
***************
*** 6204,6225 ****
      $langfile = '';
  
!     if( !empty( $_USER['language'] ))
!     {
          $langfile = $_USER['language'];
!     }
!     else if( !empty( $_COOKIE[$_CONF['cookie_language']] ))
!     {
          $langfile = $_COOKIE[$_CONF['cookie_language']];
!     }
!     else
!     {
          $langfile = COM_getLanguageFromBrowser();
      }
  
      $langfile = COM_sanitizeFilename($langfile);
!     if( !empty( $langfile ))
!     {
!         if( is_file( $_CONF['path_language'] . $langfile . '.php' ))
!         {
              return $langfile;
          }
--- 6197,6211 ----
      $langfile = '';
  
!     if (!empty($_USER['language'])) {
          $langfile = $_USER['language'];
!     } elseif (!empty($_COOKIE[$_CONF['cookie_language']])) {
          $langfile = $_COOKIE[$_CONF['cookie_language']];
!     } elseif (isset($_CONF['languages'])) {
          $langfile = COM_getLanguageFromBrowser();
      }
  
      $langfile = COM_sanitizeFilename($langfile);
!     if (!empty($langfile)) {
!         if (is_file($_CONF['path_language'] . $langfile . '.php')) {
              return $langfile;
          }