phesis-commits Mailing List for Phesis

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/phesis/Loaded_3/catalog/catalog/includes/functions
In directory usw-pr-cvs1:/tmp/cvs-serv7492/catalog/catalog/includes/functions

Modified Files:
	html_output.php 
Log Message:
update to new checkout

Index: html_output.php
===================================================================
RCS file: /cvsroot/phesis/Loaded_3/catalog/catalog/includes/functions/html_output.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** html_output.php	19 Oct 2002 12:54:41 -0000	1.3
--- html_output.php	10 Nov 2002 19:44:41 -0000	1.4
***************
*** 12,19 ****
  
  ////
  // The HTML href link wrapper function
    function tep_href_link($page = '', $parameters = '', $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true) {
-     global $kill_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>');
--- 12,23 ----
  
  ////
+ // Parse the data used in the html tags to ensure the tags will not break
+   function tep_parse_input_field_data($data, $parse) {
+     return strtr(trim($data), $parse);
+   }
+  
+ ////
  // The HTML href link wrapper function
    function tep_href_link($page = '', $parameters = '', $connection = 'NONSSL', $add_session_id = true, $search_engine_safe = true) {
      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>');
***************
*** 39,42 ****
--- 43,47 ----
        $separator = '?';
      }
+ 
      while ( (substr($link, -1) == '&') || (substr($link, -1) == '?') ) $link = substr($link, 0, -1);
  
***************
*** 48,52 ****
      }
  
!     if ( (isset($sid) ) && ( !$kill_sid ) ) {
        $link .= $separator . $sid;
      }
--- 53,57 ----
      }
  
!     if (isset($sid) && ( !$kill_sid ) ) {
        $link .= $separator . $sid;
      }
***************
*** 72,79 ****
  // alt is added to the img tag even if it is null to prevent browsers from outputting
  // the image filename as default
!     $image = '<img src="' . $src . '" border="0" alt="' . htmlspecialchars($alt) . '"';
  
      if (tep_not_null($alt)) {
!       $image .= ' title=" ' . htmlspecialchars($alt) . ' "';
      }
  
--- 77,84 ----
  // alt is added to the img tag even if it is null to prevent browsers from outputting
  // the image filename as default
!     $image = '<img src="' . tep_parse_input_field_data($src, array('"' => '&quot;')) . '" border="0" alt="' . tep_parse_input_field_data($alt, array('"' => '&quot;')) . '"';
  
      if (tep_not_null($alt)) {
!       $image .= ' title=" ' . tep_parse_input_field_data($alt, array('"' => '&quot;')) . ' "';
      }
  
***************
*** 96,100 ****
  
      if ( ($width) && ($height) ) {
!       $image .= ' width="' . $width . '" height="' . $height . '"';
      }
  
--- 101,105 ----
  
      if ( ($width) && ($height) ) {
!       $image .= ' width="' . tep_parse_input_field_data($width, array('"' => '&quot;')) . '" height="' . tep_parse_input_field_data($height, array('"' => '&quot;')) . '"';
      }
  
***************
*** 112,118 ****
      global $language;
  
!     $image_submit = '<input type="image" src="' . DIR_WS_LANGUAGES . $language . '/images/buttons/' . $image . '" border="0" alt="' . htmlspecialchars($alt) . '"';
  
!     if (tep_not_null($alt)) $image_submit .= ' title=" ' . htmlspecialchars($alt) . ' "';
  
      if (tep_not_null($parameters)) $image_submit .= ' ' . $parameters;
--- 117,123 ----
      global $language;
  
!     $image_submit = '<input type="image" src="' . tep_parse_input_field_data(DIR_WS_LANGUAGES . $language . '/images/buttons/' . $image, array('"' => '&quot;')) . '" border="0" alt="' . tep_parse_input_field_data($alt, array('"' => '&quot;')) . '"';
  
!     if (tep_not_null($alt)) $image_submit .= ' title=" ' . tep_parse_input_field_data($alt, array('"' => '&quot;')) . ' "';
  
      if (tep_not_null($parameters)) $image_submit .= ' ' . $parameters;
***************
*** 140,144 ****
  // Output a form
    function tep_draw_form($name, $action, $method = 'post', $parameters = '') {
!     $form = '<form name="' . $name . '" action="' . $action . '" method="' . $method . '"';
  
      if (tep_not_null($parameters)) $form .= ' ' . $parameters;
--- 145,149 ----
  // Output a form
    function tep_draw_form($name, $action, $method = 'post', $parameters = '') {
!     $form = '<form name="' . tep_parse_input_field_data($name, array('"' => '&quot;')) . '" action="' . tep_parse_input_field_data($action, array('"' => '&quot;')) . '" method="' . tep_parse_input_field_data($method, array('"' => '&quot;')) . '"';
  
      if (tep_not_null($parameters)) $form .= ' ' . $parameters;
***************
*** 152,161 ****
  // Output a form input field
    function tep_draw_input_field($name, $value = '', $parameters = '', $type = 'text', $reinsert_value = true) {
!     $field = '<input type="' . $type . '" name="' . $name . '"';
  
      if ( (isset($GLOBALS[$name])) && ($reinsert_value == true) ) {
!       $field .= ' value="' . htmlspecialchars(trim($GLOBALS[$name])) . '"';
      } elseif (tep_not_null($value)) {
!       $field .= ' value="' . htmlspecialchars(trim($value)) . '"';
      }
  
--- 157,166 ----
  // Output a form input field
    function tep_draw_input_field($name, $value = '', $parameters = '', $type = 'text', $reinsert_value = true) {
!     $field = '<input type="' . tep_parse_input_field_data($type, array('"' => '&quot;')) . '" name="' . tep_parse_input_field_data($name, array('"' => '&quot;')) . '"';
  
      if ( (isset($GLOBALS[$name])) && ($reinsert_value == true) ) {
!       $field .= ' value="' . tep_parse_input_field_data($GLOBALS[$name], array('"' => '&quot;')) . '"';
      } elseif (tep_not_null($value)) {
!       $field .= ' value="' . tep_parse_input_field_data($value, array('"' => '&quot;')) . '"';
      }
  
***************
*** 176,182 ****
  // Output a selection field - alias function for tep_draw_checkbox_field() and tep_draw_radio_field()
    function tep_draw_selection_field($name, $type, $value = '', $checked = false, $parameters = '') {
!     $selection = '<input type="' . $type . '" name="' . $name . '"';
  
!     if (tep_not_null($value)) $selection .= ' value="' . $value . '"';
  
      if ( ($checked == true) || ($GLOBALS[$name] == 'on') || ( (isset($value)) && ($GLOBALS[$name] == $value) ) ) {
--- 181,187 ----
  // Output a selection field - alias function for tep_draw_checkbox_field() and tep_draw_radio_field()
    function tep_draw_selection_field($name, $type, $value = '', $checked = false, $parameters = '') {
!     $selection = '<input type="' . tep_parse_input_field_data($type, array('"' => '&quot;')) . '" name="' . tep_parse_input_field_data($name, array('"' => '&quot;')) . '"';
  
!     if (tep_not_null($value)) $selection .= ' value="' . tep_parse_input_field_data($value, array('"' => '&quot;')) . '"';
  
      if ( ($checked == true) || ($GLOBALS[$name] == 'on') || ( (isset($value)) && ($GLOBALS[$name] == $value) ) ) {
***************
*** 206,210 ****
  // Output a form textarea field
    function tep_draw_textarea_field($name, $wrap, $width, $height, $text = '', $parameters = '', $reinsert_value = true) {
!     $field = '<textarea name="' . $name . '" wrap="' . $wrap . '" cols="' . $width . '" rows="' . $height . '"';
  
      if (tep_not_null($parameters)) $field .= ' ' . $parameters;
--- 211,215 ----
  // Output a form textarea field
    function tep_draw_textarea_field($name, $wrap, $width, $height, $text = '', $parameters = '', $reinsert_value = true) {
!     $field = '<textarea name="' . tep_parse_input_field_data($name, array('"' => '&quot;')) . '" wrap="' . tep_parse_input_field_data($wrap, array('"' => '&quot;')) . '" cols="' . tep_parse_input_field_data($width, array('"' => '&quot;')) . '" rows="' . tep_parse_input_field_data($height, array('"' => '&quot;')) . '"';
  
      if (tep_not_null($parameters)) $field .= ' ' . $parameters;
***************
*** 226,235 ****
  // Output a form hidden field
    function tep_draw_hidden_field($name, $value = '', $parameters = '') {
!     $field = '<input type="hidden" name="' . $name . '" value="';
  
      if (tep_not_null($value)) {
!       $field .= htmlspecialchars(trim($value));
      } else {
!       $field .= htmlspecialchars(trim($GLOBALS[$name]));
      }
  
--- 231,240 ----
  // Output a form hidden field
    function tep_draw_hidden_field($name, $value = '', $parameters = '') {
!     $field = '<input type="hidden" name="' . tep_parse_input_field_data($name, array('"' => '&quot;')) . '" value="';
  
      if (tep_not_null($value)) {
!       $field .= tep_parse_input_field_data($value, array('"' => '&quot;'));
      } else {
!       $field .= tep_parse_input_field_data($GLOBALS[$name], array('"' => '&quot;'));
      }
  
***************
*** 244,248 ****
  // Hide form elements
    function tep_hide_session_id() {
-     global $cart, $customer_id;
      if (tep_not_null(SID)) return tep_draw_hidden_field(tep_session_name(), tep_session_id());
    }
--- 249,252 ----
***************
*** 251,255 ****
  // Output a form pull down menu
    function tep_draw_pull_down_menu($name, $values, $default = '', $parameters = '', $required = false) {
!     $field = '<select name="' . $name . '"';
  
      if (tep_not_null($parameters)) $field .= ' ' . $parameters;
--- 255,259 ----
  // Output a form pull down menu
    function tep_draw_pull_down_menu($name, $values, $default = '', $parameters = '', $required = false) {
!     $field = '<select name="' . tep_parse_input_field_data($name, array('"' => '&quot;')) . '"';
  
      if (tep_not_null($parameters)) $field .= ' ' . $parameters;
***************
*** 258,266 ****
  
      for ($i=0; $i<sizeof($values); $i++) {
!       $field .= '<option value="' . $values[$i]['id'] . '"';
        if ( ($GLOBALS[$name] == $values[$i]['id']) || ($default == $values[$i]['id']) ) {
          $field .= ' SELECTED';
        }
!       $field .= '>' . htmlspecialchars($values[$i]['text']) . '</option>';
      }
      $field .= '</select>';
--- 262,270 ----
  
      for ($i=0; $i<sizeof($values); $i++) {
!       $field .= '<option value="' . tep_parse_input_field_data($values[$i]['id'], array('"' => '&quot;')) . '"';
        if ( ($GLOBALS[$name] == $values[$i]['id']) || ($default == $values[$i]['id']) ) {
          $field .= ' SELECTED';
        }
!       $field .= '>' . tep_parse_input_field_data($values[$i]['text'], array('"' => '&quot;', '\'' => '&#039;', '<' => '&lt;', '>' => '&gt;')) . '</option>';
      }
      $field .= '</select>';

phesis-commits Mailing List for Phesis

phesis-commits — Tracks commits to all Phesis Modules