mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-26 01:11:28 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4633 - handle changes of list length in downloads better

Browse Source
This commit is contained in:
e107steved
2008-12-22 22:53:31 +00:00
parent dc74e96e97
commit 4eacc8a194
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
download.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/download.php,v $ | $Source: /cvs_backup/e107_0.8/download.php,v $
| $Revision: 1.24 $ | $Revision: 1.25 $
| $Date: 2008-11-16 09:11:59 $ | $Date: 2008-12-22 22:53:18 $
| $Author: e107coders $ | $Author: e107steved $
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -146,9 +146,9 @@ else
if (isset($order) && !in_array($order,$order_options)) unset($order); if (isset($order) && !in_array($order,$order_options)) unset($order);
if (isset($sort) && !in_array($sort,$sort_options)) unset($sort); if (isset($sort) && !in_array($sort,$sort_options)) unset($sort);
if (!isset($order)) $order = varset($pref['download_order'],"download_datestamp"); if (!isset($order)) $order = varset($pref['download_order'],'download_datestamp');
if (!isset($sort)) $sort = varset($pref['download_sort'], "DESC"); if (!isset($sort)) $sort = varset($pref['download_sort'], 'DESC');
if (!isset($view)) $view = varset($pref['download_view'], "10"); if (!isset($view)) $view = varset($pref['download_view'], '10');
//-------------------------------------------------- //--------------------------------------------------
@@ -307,15 +307,17 @@ if ($action == "list")
} // End of subcategory display } // End of subcategory display
// Now display individual downloads // Now display individual downloads
$core_total = $sql->db_Count("download WHERE download_category='{$id}' AND download_active > 0 AND download_visible IN (".USERCLASS_LIST.")"); // Next line looks unnecessary
// $core_total = $sql->db_Count("download WHERE download_category='{$id}' AND download_active > 0 AND download_visible IN (".USERCLASS_LIST.")");
if (!check_class($download_category_class)) if (!check_class($download_category_class))
{ {
$ns->tablerender(LAN_dl_18, "<div style='text-align:center'>".LAN_dl_3."</div>"); $ns->tablerender(LAN_dl_18, "<div style='text-align:center'>".LAN_dl_3."</div>");
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
if ($total_downloads < $view) { $dl_from = 0; }
if(strstr($download_category_icon, chr(1))) if(strstr($download_category_icon, chr(1)))
{ {
list($download_category_icon, $download_category_icon_empty) = explode(chr(1), $download_category_icon); list($download_category_icon, $download_category_icon_empty) = explode(chr(1), $download_category_icon);
@@ -334,9 +336,13 @@ if ($action == "list")
$rater = new rater; $rater = new rater;
$tdownloads = 0; $tdownloads = 0;
// $dl_from - first entry to show (note - can get reset due to reuse of query, even if values overridden this time)
// $view - number of entries per page
// $total_downloads - total number of entries matching search criteria
$filetotal = $sql->db_Select("download", "*", "download_category='{$id}' AND download_active > 0 AND download_visible IN (".USERCLASS_LIST.") ORDER BY {$order} {$sort} LIMIT {$dl_from}, {$view}"); $filetotal = $sql->db_Select("download", "*", "download_category='{$id}' AND download_active > 0 AND download_visible IN (".USERCLASS_LIST.") ORDER BY {$order} {$sort} LIMIT {$dl_from}, {$view}");
$ft = ($filetotal < $view ? $filetotal : $view); $ft = ($filetotal < $view ? $filetotal : $view);
while ($row = $sql->db_Fetch()) { while ($row = $sql->db_Fetch())
{
extract($row); extract($row);
$download_list_table_string .= parse_download_list_table($row); $download_list_table_string .= parse_download_list_table($row);
$tdownloads += $download_requested; $tdownloads += $download_requested;