  |
1 | 1 | | <?php |
| |
2 | 2 | | /* |
 |
3 | | - | $Id: language.php 151 2005-08-02 14:33:25Z mattice $ |
| |
| 3 | + | $Id: language.php 368 2005-12-22 16:27:23Z hpdl $ |
|
4 | 4 | | |
| |
5 | 5 | | osCommerce, Open Source E-Commerce Solutions |
| |
6 | 6 | | http://www.oscommerce.com |
| |
|
|
 |
… |
|
22 | 22 | | /* Class constructor */ |
| |
23 | 23 | | |
| |
24 | 24 | | function osC_Language() { |
|
25 | | - | global $osC_Database, $osC_Session; |
| |
| 25 | + | global $osC_Database; |
|
26 | 26 | | |
| |
27 | 27 | | $Qlanguages = $osC_Database->query('select * from :table_languages order by sort_order, name'); |
| |
28 | 28 | | $Qlanguages->bindTable(':table_languages', TABLE_LANGUAGES); |
| |
|
|
|
… |
|
39 | 39 | | |
| |
40 | 40 | | $Qlanguages->freeResult(); |
| |
41 | 41 | | |
|
42 | | - | if ($osC_Session->exists('language')) { |
| |
| 42 | + | if (isset($_SESSION['language'])) { |
|
43 | 43 | | $this->set(); |
| |
44 | 44 | | } else { |
| |
45 | 45 | | $this->setToBrowser(); |
| |
|
|
|
… |
|
49 | 49 | | /* Public methods */ |
| |
50 | 50 | | |
| |
51 | 51 | | function set($lang = '') { |
|
52 | | - | if (PHP_VERSION < 4.1) { |
| |
53 | | - | global $_COOKIE; |
| |
54 | | - | } |
| |
55 | | - | |
| |
56 | | - | global $osC_Session; |
| |
57 | | - | |
| |
58 | | - | if (empty($lang) && $osC_Session->exists('language')) { |
| |
| 52 | + | if (empty($lang) && isset($_SESSION['language'])) { |
|
59 | 53 | | foreach ($this->_languages as $l) { |
|
60 | | - | if ($l['directory'] == $osC_Session->value('language')) { |
| |
| 54 | + | if ($l['directory'] == $_SESSION['language']) { |
|
61 | 55 | | $lang = $l['code']; |
| |
62 | 56 | | break; |
| |
63 | 57 | | } |
| |
|
|
|
… |
|
74 | 68 | | tep_setcookie('language', $this->language['code'], time()+60*60*24*90); |
| |
75 | 69 | | } |
| |
76 | 70 | | |
|
77 | | - | if (($osC_Session->exists('language') === false) || ($osC_Session->exists('language') && ($osC_Session->value('language') != $this->language['directory']))) { |
| |
78 | | - | $osC_Session->set('language', $this->language['directory']); |
| |
79 | | - | $osC_Session->set('languages_id', $this->language['id']); |
| |
| 71 | + | if ((isset($_SESSION['language']) === false) || (isset($_SESSION['language']) && ($_SESSION['language'] != $this->language['directory']))) { |
| |
| 72 | + | $_SESSION['language'] = $this->language['directory']; |
| |
| 73 | + | $_SESSION['languages_id'] = $this->language['id']; |
|
80 | 74 | | } |
| |
81 | 75 | | } |
| |
82 | 76 | | |
| |
83 | 77 | | function setToBrowser() { |
|
84 | | - | if (PHP_VERSION < 4.1) { |
| |
85 | | - | global $_COOKIE, $_SERVER; |
| |
86 | | - | } |
| |
87 | | - | |
|
88 | 78 | | if (isset($_COOKIE['language'])) { |
| |
89 | 79 | | if ($this->exists($_COOKIE['language'])) { |
| |
90 | 80 | | $this->set($_COOKIE['language']); |