[TEP-COMMIT] CVS: catalog/catalog/includes/functions html_output.php,1.57,1.58

Update of /cvsroot/tep/catalog/catalog/includes/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv5792/functions

Modified Files:
	html_output.php 
Log Message:
use the new session class


Index: html_output.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/functions/html_output.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- html_output.php	19 Sep 2003 07:13:41 -0000	1.57
+++ html_output.php	17 Nov 2003 18:50:25 -0000	1.58
@@ -13,7 +13,7 @@
 ////
 // The HTML href link wrapper function
   function tep_href_link($page = '', $parameters = '', $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true) {
-    global $request_type, $session_started, $SID;
+    global $request_type, $osC_Session, $SID;
 
     if (!tep_not_null($page)) {
       die('</td></tr></table></td></tr></table><br><br><font color="#ff0000"><b>Error!</b></font><br><br><b>Unable to determine the page link!<br><br>');
@@ -42,12 +42,12 @@
     while ( (substr($link, -1) == '&') || (substr($link, -1) == '?') ) $link = substr($link, 0, -1);
 
 // Add the session ID when moving from different HTTP and HTTPS servers, or when SID is defined
-    if ( ($add_session_id == true) && ($session_started == true) && (SESSION_FORCE_COOKIE_USE == 'False') ) {
+    if ( ($add_session_id == true) && ($osC_Session->is_started == true) && (SESSION_FORCE_COOKIE_USE == 'False') ) {
       if (tep_not_null($SID)) {
         $_sid = $SID;
       } elseif ( ( ($request_type == 'NONSSL') && ($connection == 'SSL') && (ENABLE_SSL == true) ) || ( ($request_type == 'SSL') && ($connection == 'NONSSL') ) ) {
         if (HTTP_COOKIE_DOMAIN != HTTPS_COOKIE_DOMAIN) {
-          $_sid = tep_session_name() . '=' . tep_session_id();
+          $_sid = $osC_Session->name . '=' . $osC_Session->id;
         }
       }
     }
@@ -116,9 +116,9 @@
 // The HTML form submit button wrapper function
 // Outputs a button in the selected language
   function tep_image_submit($image, $alt = '', $parameters = '') {
-    global $language;
+    global $osC_Session;
 
-    $image_submit = '<input type="image" src="' . tep_output_string(DIR_WS_LANGUAGES . $language . '/images/buttons/' . $image) . '" border="0" alt="' . tep_output_string($alt) . '"';
+    $image_submit = '<input type="image" src="' . tep_output_string(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/images/buttons/' . $image) . '" border="0" alt="' . tep_output_string($alt) . '"';
 
     if (tep_not_null($alt)) $image_submit .= ' title=" ' . tep_output_string($alt) . ' "';
 
@@ -132,9 +132,9 @@
 ////
 // Output a function button in the selected language
   function tep_image_button($image, $alt = '', $parameters = '') {
-    global $language;
+    global $osC_Session;
 
-    return tep_image(DIR_WS_LANGUAGES . $language . '/images/buttons/' . $image, $alt, '', '', $parameters);
+    return tep_image(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/images/buttons/' . $image, $alt, '', '', $parameters);
   }
 
 ////
@@ -250,10 +250,10 @@
 ////
 // Hide form elements
   function tep_hide_session_id() {
-    global $session_started, $SID;
+    global $osC_Session, $SID;
 
-    if (($session_started == true) && tep_not_null($SID)) {
-      return tep_draw_hidden_field(tep_session_name(), tep_session_id());
+    if (($osC_Session->is_started == true) && tep_not_null($SID)) {
+      return tep_draw_hidden_field($osC_Session->name, $osC_Session->id);
     }
   }
 



-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl