  |
1 | 1 | | <?php |
| |
2 | 2 | | /* |
 |
3 | | - | $Id: application_top.php 1859 2009-03-06 23:21:50Z hpdl $ |
| |
| 3 | + | $Id: application_top.php 1863 2009-03-06 23:53:49Z hpdl $ |
|
4 | 4 | | |
| |
5 | 5 | | osCommerce, Open Source E-Commerce Solutions |
| |
6 | 6 | | http://www.oscommerce.com |
| |
7 | 7 | | |
|
8 | | - | Copyright (c) 2007 osCommerce |
| |
| 8 | + | Copyright (c) 2009 osCommerce |
|
9 | 9 | | |
| |
10 | 10 | | This program is free software; you can redistribute it and/or modify |
| |
11 | 11 | | it under the terms of the GNU General Public License v2 (1991) |
| |
|
|
 |
… |
|
58 | 58 | | $osC_Cache = new osC_Cache(); |
| |
59 | 59 | | |
| |
60 | 60 | | // include the administrators log class |
|
61 | | - | require('includes/classes/administrators_log.php'); |
| |
| 61 | + | if ( file_exists('includes/applications/administrators_log/classes/administrators_log.php') ) { |
| |
| 62 | + | include('includes/applications/administrators_log/classes/administrators_log.php'); |
| |
| 63 | + | } |
|
62 | 64 | | |
| |
63 | 65 | | // include the database class |
| |
64 | 66 | | require('../includes/classes/database.php'); |
| |
|
|
|
… |
|
90 | 92 | | $osC_Session = osC_Session::load('osCAdminID'); |
| |
91 | 93 | | $osC_Session->start(); |
| |
92 | 94 | | |
|
93 | | - | if ( !isset($_SESSION['admin']) ) { |
| |
| 95 | + | if ( !isset($_SESSION['admin']) && (basename($_SERVER['PHP_SELF']) != FILENAME_RPC) ) { |
|
94 | 96 | | $redirect = false; |
| |
95 | 97 | | |
| |
96 | 98 | | if ( empty($_GET) ) { |
| |
|
|
|
… |
|
143 | 145 | | |
| |
144 | 146 | | // initialize the message stack for output messages |
| |
145 | 147 | | require('../includes/classes/message_stack.php'); |
|
146 | | - | $osC_MessageStack = new messageStack(); |
| |
147 | | - | $osC_MessageStack->loadFromSession(); |
| |
| 148 | + | $osC_MessageStack = new osC_MessageStack(); |
|
148 | 149 | | |
| |
149 | 150 | | // entry/item info classes |
| |
150 | 151 | | require('includes/classes/object_info.php'); |