[Multishop-devel] osc_m2/catalog/admin/includes/functions general.php,1.4,1.5

[Piero T. <tr...@us...>]

Update of /cvsroot/multishop/osc_m2/catalog/admin/includes/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17833

Modified Files:
	general.php 
Log Message:
update to oscommerce-20051113

Index: general.php
===================================================================
RCS file: /cvsroot/multishop/osc_m2/catalog/admin/includes/functions/general.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** general.php	23 Nov 2005 00:29:06 -0000	1.4
--- general.php	4 Dec 2005 10:28:07 -0000	1.5
***************
*** 11,15 ****
  */
  
! /** Php-MultiShop
   ** function to check in table 'privacy' 
   ** if the customer is readable for this Shop
--- 11,16 ----
  */
  
! #==// Php-MultiShop
! /** 
   ** function to check in table 'privacy' 
   ** if the customer is readable for this Shop
***************
*** 32,35 ****
--- 33,37 ----
  	}
  }
+ #==//
  
  //Admin begin
***************
*** 103,119 ****
  ////
  // Redirect to another page or site
!   function tep_redirect($url) {
!     global $logger;
  
!     header('Location: ' . $url);
  
!     if (STORE_PAGE_PARSE_TIME == 'true') {
!       if (!is_object($logger)) $logger = new logger;
!       $logger->timer_stop();
!     }
  
!     exit;
    }
  
  ////
  // Parse the data used in the html tags to ensure the tags will not break
--- 105,125 ----
  ////
  // Redirect to another page or site
! function tep_redirect($url) {
!   global $logger;
  
!   if ( (strstr($url, "\n") != false) || (strstr($url, "\r") != false) ) {
!     tep_redirect(tep_href_link(FILENAME_DEFAULT, '', 'NONSSL', false));
!   }
  
!   header('Location: ' . $url);
  
!   if (STORE_PAGE_PARSE_TIME == 'true') {
!     if (!is_object($logger)) $logger = new logger;
!     $logger->timer_stop();
    }
  
+   exit;
+ }
+ 
  ////
  // Parse the data used in the html tags to ensure the tags will not break