Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

1372
  
1385
  
1385
  
database.php
_> 11 <?php
  22 /*
<> 3 -  $Id: database.php 1372 2007-03-05 22:58:51Z hpdl $
   3+  $Id: database.php 1385 2007-03-06 08:55:55Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
      
 !
 
…
548548         }
  549549 
  550550         if ($this->batch_query === true) {
<> 551 -          $this->getBatchSize();
   551+          $this->batch_size = $this->db_class->getBatchSize($this->sql_query, $this->batch_select_field);
552552 
  553553           $this->batch_to = ($this->batch_rows * $this->batch_number);
  554554           if ($this->batch_to > $this->batch_size) {
      
 !
 
…
650650     }
  651651 
  652652     function getBatchSize() {
<> 653 -      global $osC_Database;
   653+      return $this->batch_size;
   654+    }
654655 
<> 655 -      if (!isset($this->batch_size)) {
  656 -        $this->batch_size = $this->db_class->getBatchSize($this->sql_query, $this->batch_select_field);
   656+    function isBatchQuery() {
   657+      if ($this->batch_query === true) {
   658+        return true;
657659       }
  658660 
<> 659 -      return $this->batch_size;
   661+      return false;
660662     }
  661663 
<> 662 -    function displayBatchLinksTotal($text) {
   664+    function getBatchTotalPages($text) {
663665       return sprintf($text, $this->batch_from, $this->batch_to, $this->batch_size);
  664666     }
  665667 
<> 666 -    function displayBatchLinksPullDown($batch_keyword = 'page', $parameters = '') {
   668+    function getBatchPageLinks($batch_keyword = 'page', $parameters = '', $with_pull_down_menu = true) {
   669+      $string = $this->getBatchPreviousPageLink($batch_keyword, $parameters);
   670+
   671+      if ( $with_pull_down_menu === true ) {
   672+        $string .= $this->getBatchPagesPullDownMenu($batch_keyword, $parameters);
   673+      }
   674+
   675+      $string .= $this->getBatchNextPageLink($batch_keyword, $parameters);
   676+
   677+      return $string;
   678+    }
   679+
   680+    function getBatchPagesPullDownMenu($batch_keyword = 'page', $parameters = '') {
667681       global $osC_Language;
  668682 
  669683       $number_of_pages = ceil($this->batch_size / $this->batch_rows);
  670684 
<> 671 -      if ($number_of_pages > 1) {
   685+      if ( $number_of_pages > 1 ) {
672686         $pages_array = array();
<> 673 -        for ($i=1; $i<=$number_of_pages; $i++) {
  674 -          $pages_array[] = array('id' => $i, 'text' => $i);
   687+
   688+        for ( $i = 1; $i <= $number_of_pages; $i++ ) {
   689+          $pages_array[] = array('id' => $i,
   690+                                 'text' => $i);
675691         }
  676692 
<> 677 -        $get_parameter = '';
678693         $hidden_parameter = '';
  679694 
<> 680 -        if (!empty($parameters)) {
   695+        if ( !empty($parameters) ) {
681696           $parameters = explode('&', $parameters);
  682697 
<> 683 -          foreach ($parameters as $parameter) {
   698+          foreach ( $parameters as $parameter ) {
684699             $keys = explode('=', $parameter, 2);
  685700 
<> 686 -            if ($keys[0] != $batch_keyword) {
  687 -              $get_parameter .= $keys[0] . (isset($keys[1]) ? '=' . $keys[1] : '') . '&';
   701+            if ( $keys[0] != $batch_keyword ) {
688702               $hidden_parameter .= osc_draw_hidden_field($keys[0], (isset($keys[1]) ? $keys[1] : ''));
  689703             }
  690704           }
  691705         }
  692706 
<> 693 -        $display_links = '<form action="' . osc_href_link(basename($_SERVER['SCRIPT_FILENAME'])) . '" action="get">' . $hidden_parameter;
   707+        $string = '<form action="' . osc_href_link(basename($_SERVER['SCRIPT_FILENAME'])) . '" action="get">' . $hidden_parameter .
   708+                  sprintf($osC_Language->get('result_set_current_page'), osc_draw_pull_down_menu($batch_keyword, $pages_array, $this->batch_number, 'onchange="this.form.submit();"'), $number_of_pages) .
   709+                  osc_draw_hidden_session_id_field() . '</form>';
   710+      } else {
   711+        $string = sprintf($osC_Language->get('result_set_current_page'), 1, 1);
   712+      }
694713 
<> 695 -        if ($this->batch_number > 1) {
  696 -          $display_links .= osc_link_object(osc_href_link(basename($_SERVER['SCRIPT_FILENAME']), $get_parameter . $batch_keyword . '=' . ($this->batch_number - 1)), $osC_Language->get('result_set_previous_page'), 'class="splitPageLink"');
  697 -        } else {
  698 -          $display_links .= $osC_Language->get('result_set_previous_page');
  699 -        }
   714+      return $string;
   715+    }
700716 
<> 701 -        $display_links .= '&nbsp;&nbsp;' . sprintf($osC_Language->get('result_set_current_page'), osc_draw_pull_down_menu($batch_keyword, $pages_array, $this->batch_number, 'onchange="this.form.submit();"'), $number_of_pages) . '&nbsp;&nbsp;';
   717+    function getBatchPreviousPageLink($batch_keyword = 'page', $parameters = '') {
   718+      global $osC_Language;
702719 
<> 703 -        if (($this->batch_number < $number_of_pages) && ($number_of_pages != 1)) {
  704 -          $display_links .= osc_link_object(osc_href_link(basename($_SERVER['SCRIPT_FILENAME']), $get_parameter . $batch_keyword . '=' . ($this->batch_number + 1)), $osC_Language->get('result_set_next_page'), 'class="splitPageLink"');
  705 -        } else {
  706 -          $display_links .= $osC_Language->get('result_set_previous_page');
   720+      $get_parameter = '';
   721+
   722+      if ( !empty($parameters) ) {
   723+        $parameters = explode('&', $parameters);
   724+
   725+        foreach ( $parameters as $parameter ) {
   726+          $keys = explode('=', $parameter, 2);
   727+
   728+          if ( $keys[0] != $batch_keyword ) {
   729+            $get_parameter .= $keys[0] . (isset($keys[1]) ? '=' . $keys[1] : '') . '&';
   730+          }
707731         }
<>  732+      }
708733 
<> 709 -        $display_links .= osc_draw_hidden_session_id_field() . '</form>';
   734+      if ( defined('OSC_IN_ADMIN') && ( OSC_IN_ADMIN === true ) ) {
   735+        $back_string = osc_icon('nav_back.png');
   736+        $back_grey_string = osc_icon('nav_back_grey.png');
710737       } else {
<> 711 -        $display_links = sprintf($osC_Language->get('result_set_current_page'), 1, 1);
   738+        $back_string = $osC_Language->get('result_set_previous_page');
   739+        $back_grey_string = $osC_Language->get('result_set_previous_page');
712740       }
  713741 
<> 714 -      return $display_links;
   742+      if ( $this->batch_number > 1 ) {
   743+        $string = osc_link_object(osc_href_link(basename($_SERVER['SCRIPT_FILENAME']), $get_parameter . $batch_keyword . '=' . ($this->batch_number - 1)), $back_string);
   744+      } else {
   745+        $string = $back_grey_string;
   746+      }
   747+
   748+      $string .= '&nbsp;';
   749+
   750+      return $string;
715751     }
  716752 
<> 717 -    function isBatchQuery() {
  718 -      if ($this->batch_query === true) {
  719 -        return true;
   753+    function getBatchNextPageLink($batch_keyword = 'page', $parameters = '') {
   754+      global $osC_Language;
   755+
   756+      $number_of_pages = ceil($this->batch_size / $this->batch_rows);
   757+
   758+      $get_parameter = '';
   759+
   760+      if ( !empty($parameters) ) {
   761+        $parameters = explode('&', $parameters);
   762+
   763+        foreach ( $parameters as $parameter ) {
   764+          $keys = explode('=', $parameter, 2);
   765+
   766+          if ( $keys[0] != $batch_keyword ) {
   767+            $get_parameter .= $keys[0] . (isset($keys[1]) ? '=' . $keys[1] : '') . '&';
   768+          }
   769+        }
720770       }
  721771 
<> 722 -      return false;
   772+      if ( defined('OSC_IN_ADMIN') && ( OSC_IN_ADMIN === true ) ) {
   773+        $forward_string = osc_icon('nav_forward.png');
   774+        $forward_grey_string = osc_icon('nav_forward_grey.png');
   775+      } else {
   776+        $forward_string = $osC_Language->get('result_set_next_page');
   777+        $forward_grey_string = $osC_Language->get('result_set_next_page');
   778+      }
   779+
   780+      $string = '&nbsp;';
   781+
   782+      if ( ( $this->batch_number < $number_of_pages ) && ( $number_of_pages != 1 ) ) {
   783+        $string .= osc_link_object(osc_href_link(basename($_SERVER['SCRIPT_FILENAME']), $get_parameter . $batch_keyword . '=' . ($this->batch_number + 1)), $forward_string);
   784+      } else {
   785+        $string .= $forward_grey_string;
   786+      }
   787+
   788+      return $string;
<_ 723789     }
  724790   }
  725791 ?>