[Phpslash-commit] CVS: phpslash-ft/class functions.inc,1.135,1.136

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv32064/phpslash-ft/class

Modified Files:
	functions.inc 
Log Message:
tweaks for register_globals off and use new language and skin variables

Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** functions.inc	4 Mar 2003 21:54:30 -0000	1.135
--- functions.inc	6 Mar 2003 17:34:29 -0000	1.136
***************
*** 1018,1022 ****
        }
     }
!    debug('localinfo',$localinfo);
     if(!empty($localinfo[$locale][$category][$keyword])) {
        $ans = $localinfo[$locale][$category][$keyword];
--- 1018,1022 ----
        }
     }
!    // debug('localinfo',$localinfo);
     if(!empty($localinfo[$locale][$category][$keyword])) {
        $ans = $localinfo[$locale][$category][$keyword];
***************
*** 1100,1104 ****
  
     global $_PSL;
!    global $HTTP_ACCEPT_LANGUAGE;
     
     // start with default
--- 1100,1104 ----
  
     global $_PSL;
!    // global $HTTP_ACCEPT_LANGUAGE;
     
     // start with default
***************
*** 1116,1121 ****
           $_PSL['lang'] =  basename($new_lang);
        }
!    } elseif( $HTTP_ACCEPT_LANGUAGE) { // else try to get from browser
!       $lang_ary = split( "[,;]", $HTTP_ACCEPT_LANGUAGE);
        $i = 0;
        $done = false;
--- 1116,1121 ----
           $_PSL['lang'] =  basename($new_lang);
        }
!    } elseif( $_SERVER['HTTP_ACCEPT_LANGUAGE']) { // else try to get from browser
!       $lang_ary = split( "[,;]", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
        $i = 0;
        $done = false;
***************
*** 1137,1141 ****
        
     }
!    
     return $lang;
  } 
--- 1137,1146 ----
        
     }
!   
!    // set current language variable.
!    // TODO - identify use of _PSL['lang'] and move to _PSL['language.current']
!    // jvs 03/06/2003
!    $_PSL['language.current'] = $_PSL['lang'];
! 
     return $lang;
  }