Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

1400
 
1440
 
1440
 
application_top.php
_> 11 <?php
  22 /*
<> 3 -  $Id: application_top.php 1400 2007-03-07 00:05:32Z hpdl $
   3+  $Id: application_top.php 1440 2007-03-08 21:39:47Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
9494   $osC_Session = new osC_Session_Admin('osCAdminID');
  9595   $osC_Session->start();
  9696 
<> 97 -  if (!isset($_SESSION['admin'])) {
  98 -    if (!empty($_GET)) {
   97+  if ( !isset($_SESSION['admin']) ) {
   98+    $redirect = false;
   99+
   100+    if ( empty($_GET) ) {
   101+      $redirect = true;
   102+    } else {
99103       $first_array = array_slice($_GET, 0, 1);
  100104       $_module = osc_sanitize_string(basename(key($first_array)));
  101105 
<> 102 -      if ($_module != 'login') {
  103 -        osc_redirect_admin(osc_href_link_admin(FILENAME_DEFAULT, 'login'));
   106+      if ( $_module != 'login' ) {
   107+        if ( !isset($_SESSION['redirect_origin']) ) {
   108+          $_SESSION['redirect_origin'] = array('module' => $module,
   109+                                               'get' => $_GET);
   110+        }
   111+
   112+        $redirect = true;
104113       }
<> 105 -    } else {
   114+    }
   115+
   116+    if ( $redirect === true ) {
106117       osc_redirect_admin(osc_href_link_admin(FILENAME_DEFAULT, 'login'));
  107118     }
<>  119+
   120+    unset($redirect);
<_ 108121   }
  109122 
  110123   require('includes/classes/directory_listing.php');