[TEP-COMMIT] [CVS admin] remove the redundant split page results class
hpdl-OfajU3CKLf1/[email protected] 28 Oct 2004 12:40:32 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>admin/admin/includes</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>classes/<span id="removed">split_page_results.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/split_page_results.php?rev=1.13&content-type=text/vnd.viewcvs-markup">1.13</a> removed</td></tr>
<tr class="alt"><td><tt><a href="#file2">application_top.php</a></tt></td><td></td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.172&content-type=text/vnd.viewcvs-markup">1.172</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.172&r2=1.173">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.173&content-type=text/vnd.viewcvs-markup">1.173</a></td></tr>
<tr><td></td><td></td><td align="right" id="removed">-3</td><td></td></tr>
</table>
<small id="info">1 removed + 1 modified, total 2 files</small><br />
<pre class="comment">
remove the redundant split page results class
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname" id="removed"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes">classes</a><br /></span>
<div class="fileheader" id="removed"><big><b>split_page_results.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/classes/split_page_results.php?rev=1.13&content-type=text/vnd.viewcvs-markup">1.13</a></small></div>
<pre class="diff"><small id="info">diff -N split_page_results.php
--- /tmp/cvsAAASeaOsM Thu Oct 28 14:40:24 2004
+++ /dev/null Thu Oct 28 14:39:51 2004
@@ -1,103 +0,0 @@
</small></pre><pre class="diff" id="removed">-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2002 osCommerce
-
- Released under the GNU General Public License
-*/
-
- class splitPageResults {
- function splitPageResults(&$current_page_number, $max_rows_per_page, &$sql_query, &$query_num_rows) {
- if (empty($current_page_number)) $current_page_number = 1;
-
- $pos_to = strlen($sql_query);
- $pos_from = strpos($sql_query, ' from', 0);
-
- $pos_group_by = strpos($sql_query, ' group by', $pos_from);
- if (($pos_group_by < $pos_to) && ($pos_group_by != false)) $pos_to = $pos_group_by;
-
- $pos_having = strpos($sql_query, ' having', $pos_from);
- if (($pos_having < $pos_to) && ($pos_having != false)) $pos_to = $pos_having;
-
- $pos_order_by = strpos($sql_query, ' order by', $pos_from);
- if (($pos_order_by < $pos_to) && ($pos_order_by != false)) $pos_to = $pos_order_by;
-
- $reviews_count_query = tep_db_query("select count(*) as total " . substr($sql_query, $pos_from, ($pos_to - $pos_from)));
- $reviews_count = tep_db_fetch_array($reviews_count_query);
- $query_num_rows = $reviews_count['total'];
-
- $num_pages = ceil($query_num_rows / $max_rows_per_page);
- if ($current_page_number > $num_pages) {
- $current_page_number = $num_pages;
- }
- $offset = ($max_rows_per_page * ($current_page_number - 1));
- $sql_query .= " limit " . $offset . ", " . $max_rows_per_page;
- }
-
- function display_links($query_numrows, $max_rows_per_page, $max_page_links, $current_page_number, $parameters = '', $page_name = 'page') {
- global $PHP_SELF;
-
- if ( tep_not_null($parameters) && (substr($parameters, -1) != '&') ) $parameters .= '&';
-
-// calculate number of pages needing links
- $num_pages = ceil($query_numrows / $max_rows_per_page);
-
- $pages_array = array();
- for ($i=1; $i<=$num_pages; $i++) {
- $pages_array[] = array('id' => $i, 'text' => $i);
- }
-
- if ($num_pages > 1) {
- $display_links = tep_draw_form('pages', basename($PHP_SELF), '', 'get');
-
- if ($current_page_number > 1) {
- $display_links .= '<a href="' . tep_href_link(basename($PHP_SELF), $parameters . $page_name . '=' . ($current_page_number - 1), 'NONSSL') . '" class="splitPageLink">' . PREVNEXT_BUTTON_PREV . '</a>&nbsp;&nbsp;';
- } else {
- $display_links .= PREVNEXT_BUTTON_PREV . '&nbsp;&nbsp;';
- }
-
- $display_links .= sprintf(TEXT_RESULT_PAGE, tep_draw_pull_down_menu($page_name, $pages_array, $current_page_number, 'onChange="this.form.submit();"'), $num_pages);
-
- if (($current_page_number < $num_pages) && ($num_pages != 1)) {
- $display_links .= '&nbsp;&nbsp;<a href="' . tep_href_link(basename($PHP_SELF), $parameters . $page_name . '=' . ($current_page_number + 1), 'NONSSL') . '" class="splitPageLink">' . PREVNEXT_BUTTON_NEXT . '</a>';
- } else {
- $display_links .= '&nbsp;&nbsp;' . PREVNEXT_BUTTON_NEXT;
- }
-
- if ($parameters != '') {
- if (substr($parameters, -1) == '&') $parameters = substr($parameters, 0, -1);
- $pairs = explode('&', $parameters);
- while (list(, $pair) = each($pairs)) {
- list($key,$value) = explode('=', $pair);
- $display_links .= tep_draw_hidden_field(rawurldecode($key), rawurldecode($value));
- }
- }
-
- if (SID) $display_links .= tep_draw_hidden_field(tep_session_name(), tep_session_id());
-
- $display_links .= '</form>';
- } else {
- $display_links = sprintf(TEXT_RESULT_PAGE, $num_pages, $num_pages);
- }
-
- return $display_links;
- }
-
- function display_count($query_numrows, $max_rows_per_page, $current_page_number, $text_output) {
- $to_num = ($max_rows_per_page * $current_page_number);
- if ($to_num > $query_numrows) $to_num = $query_numrows;
- $from_num = ($max_rows_per_page * ($current_page_number - 1));
- if ($to_num == 0) {
- $from_num = 0;
- } else {
- $from_num++;
- }
-
- return sprintf($text_output, $from_num, $to_num, $query_numrows);
- }
- }
-?>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin">admin</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes">includes</a><br /></span>
<div class="fileheader"><big><b>application_top.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.172&content-type=text/vnd.viewcvs-markup">1.172</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php.diff?r1=1.172&r2=1.173">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/admin/admin/includes/application_top.php?rev=1.173&content-type=text/vnd.viewcvs-markup">1.173</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.172 -r1.173
--- application_top.php 2004/10/28 12:25:12 1.172
+++ application_top.php 2004/10/28 12:40:24 1.173
@@ -133,9 +133,6 @@
</small></pre><pre class="diff" id="context"> require('includes/classes/message_stack.php');
$messageStack = new messageStack;
</pre><pre class="diff" id="removed">-// split-page-results
- require('includes/classes/split_page_results.php');
-
</pre><pre class="diff" id="context"> // entry/item info classes
require('includes/classes/object_info.php');
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.9</small></center>
</body></html>
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click