From e22c88d65c51e7719402c7c21da81f4d63d981c1 Mon Sep 17 00:00:00 2001 From: e107steved Date: Sat, 22 Sep 2007 09:43:30 +0000 Subject: [PATCH] Bugtracker #4086, tidy up downloads admin a little, bring /download.php up to date --- download.php | 30 ++++++-- e107_admin/download.php | 158 +++++++++++++++++++++++----------------- 2 files changed, 113 insertions(+), 75 deletions(-) diff --git a/download.php b/download.php index c3655b27b..ed12c831b 100644 --- a/download.php +++ b/download.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/download.php,v $ -| $Revision: 1.14 $ -| $Date: 2007-07-09 19:49:59 $ +| $Revision: 1.15 $ +| $Date: 2007-09-22 09:43:30 $ | $Author: e107steved $ | +----------------------------------------------------------------------------+ @@ -318,17 +318,31 @@ if ($action == "list") $text .= $download_list_table_start.$download_list_table_string.$download_list_table_end; - if($DOWNLOAD_LIST_TABLE_RENDERPLAIN) { + if ($filetotal) + { // Only show list if some files in it + if($DOWNLOAD_LIST_TABLE_RENDERPLAIN) + { echo $text; - } else { + } + else + { $ns->tablerender($type, $text); + } } + if(!isset($DOWNLOAD_LIST_NEXTPREV)) + { + $sc_style['DOWNLOAD_LIST_NEXTPREV']['pre'] = "
"; + $sc_style['DOWNLOAD_LIST_NEXTPREV']['post'] = "
"; - echo "
".LAN_dl_9."


"; - $parms = $total_downloads.",".$view.",".$dl_from.",".e_SELF."?[FROM].list.{$id}.{$view}.{$order}.{$sort}."; - echo ($total_downloads > $view) ? "
 ".$tp->parseTemplate("{NEXTPREV={$parms}}")."
" : ""; - echo "
"; + $DOWNLOAD_LIST_NEXTPREV = " +
{DOWNLOAD_BACK_TO_CATEGORY_LIST}

+ {DOWNLOAD_LIST_NEXTPREV} +
"; + } + + $nextprev_parms = $total_downloads.",".$view.",".$dl_from.",".e_SELF."?[FROM].list.{$id}.{$view}.{$order}.{$sort}."; + echo $tp->parseTemplate($DOWNLOAD_LIST_NEXTPREV, TRUE, $download_shortcodes); require_once(FOOTERF); exit; diff --git a/e107_admin/download.php b/e107_admin/download.php index 21a1f81a8..7c7d80d87 100644 --- a/e107_admin/download.php +++ b/e107_admin/download.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/download.php,v $ -| $Revision: 1.4 $ -| $Date: 2007-06-04 19:26:54 $ +| $Revision: 1.5 $ +| $Date: 2007-09-22 09:43:30 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -455,7 +455,8 @@ class download { $search_display = explode("|",$pref['admin_download_disp']); } - $query = "SELECT d.*, dc.* FROM #download AS d LEFT JOIN #download_category AS dc ON dc. download_category_id = d.download_category"; +// $query = "SELECT d.*, dc.* FROM #download AS d LEFT JOIN #download_category AS dc ON dc. download_category_id = d.download_category"; + $query = "SELECT d.*, dc.* FROM `#download` AS d LEFT JOIN `#download_category` AS dc ON dc. download_category_id = d.download_category"; if (isset($_POST['searchquery']) && $_POST['searchquery'] != "") { $query .= " WHERE download_url REGEXP('".$_POST['searchquery']."') OR download_author REGEXP('".$_POST['searchquery']."') OR download_description REGEXP('".$_POST['searchquery']."') "; @@ -467,92 +468,115 @@ class download { $query .= " ORDER BY ".($sub_action ? $sub_action : $sortorder)." ".($id ? $id : "DESC")." LIMIT $from, $amount"; } - if ($sql->db_Select_gen($query)) { - $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform")." + if ($dl_count = $sql->db_Select_gen($query)) + { + $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform")." "; // Search Display Column header.---------- - foreach($search_display as $disp){ - if($disp == "download_name"){ - $text .= ""; - }else{ - $repl = array("download_","_"); - $text .= ""; - } + foreach($search_display as $disp) + { + if($disp == "download_name") + { + $text .= ""; + } + else + { + $repl = array("download_","_"); + $text .= ""; + } + } + + + $text .=""; + + while ($row = $sql->db_Fetch()) + { + $text .= ""; + + // Display Chosen options + foreach($search_display as $disp) + { + $text .= ""; } -// ------------------------------ - $text .=" - - "; - while ($row = $sql->db_Fetch()) { - extract($row); - $text .= " - "; - -// Display Chosen options ------------------------------------- - $bolean_list = array("download_active","download_comment"); - - foreach($search_display as $disp){ - $text .= ""; - } -// ------------------------------------------------------------- $text .= " "; - } - $text .= "
ID".DOWLAN_27."".ucwords(str_replace($repl," ",$disp))."".DOWLAN_27."".ucwords(str_replace($repl," ",$disp))."".LAN_OPTIONS."
".$row['download_id'].""; + switch ($disp) + { + case "download_name" : + $text .= "".$row['download_name'].""; + break; + case "download_category" : + $text .= $row['download_category_name']." "; + break; + case "download_datestamp" : + $text .= ($row[$disp]) ? strftime($pref['shortdate'],$row[$disp])." " : " "; + break; + case "download_class" : + case "download_visible" : + $text .= r_userclass_name($row[$disp])." "; + break; + case "download_filesize" : + $text .= ($row[$disp]) ? round(($row[$disp] / 1000))." Kb " : " "; + break; + case "download_thumb" : + $text .= ($row[$disp]) ? "" : ""; + break; + case "download_image" : + $text .= "".$row[$disp]." "; + break; + case "download_description" : + $text .= $tp->toHTML($row[$disp],TRUE)." "; + break; + case "download_active" : + if($row[$disp]== 1) + { + $text .= "\n"; + } + elseif($row[$disp]== 2) + { + $text .= "\n"; + } + else + { + $text .= "\n"; + } + break; + case "download_comment" : + $text .= ($row[$disp]) ? ADMIN_TRUE_ICON : " "; + break; + default : + $text .= $row[$disp]." "; + } + $text .= "".LAN_OPTIONS."
$download_id"; - - if($disp == "download_name"){ - $text .= "$download_name"; - }elseif($disp == "download_category"){ - $text .= $row['download_category_name']." "; - }elseif($disp == "download_datestamp"){ - $text .= ($row[$disp]) ? strftime($pref['shortdate'],$row[$disp])." " : " "; - }elseif($disp == "download_class" || $disp == "download_visible"){ - $text .= r_userclass_name($row[$disp])." "; - }elseif($disp == "download_filesize"){ - $text .= ($row[$disp]) ? round(($row[$disp] / 1000))." Kb " : " "; - }elseif($disp == "download_thumb"){ - $text .= ($row[$disp]) ? "" : ""; - }elseif($disp == "download_image"){ - $text .= "".$row[$disp]." "; - }elseif($disp == "download_description"){ - $text .= $tp->toHTML($row[$disp],TRUE)." "; - }elseif($disp == "download_active"){ - if($row[$disp]== 1){ $text .= "\n"; } - elseif($row[$disp]== 2){ $text .= "\n"; } - else{ $text .= "\n"; } - }elseif($disp == "download_comment"){ - $text .= ($row[$disp]) ? ADMIN_TRUE_ICON : " "; - }else{ - $text .= $row[$disp]." "; - } - - $text .= " - ".ADMIN_EDIT_ICON." - toJS(DOWLAN_33." [ID: $download_id ]")."') \" /> + ".ADMIN_EDIT_ICON." + toJS(DOWLAN_33." [ID: ".$row['download_id']." ]")."') \" />
"; - } else { - $text .= "
".DOWLAN_6."
"; + } + $text .= ""; + } + else + { // 'No downloads yet' + $text .= "
".DOWLAN_6."
"; } $text .= ""; -// Next-Previous. ========================== - + // Next-Previous. $downloads = $sql->db_Count("download"); - if ($downloads > $amount && !$_POST['searchquery']) { + if ($downloads > $amount && !$_POST['searchquery']) + { $parms = "{$downloads},{$amount},{$from},".e_SELF."?".(e_QUERY ? "$action.$sub_action.$id." : "main.download_id.desc.")."[FROM]"; $text .= "
".$tp->parseTemplate("{NEXTPREV={$parms}}"); } -// Search & display options etc. =========================. - + // Search & display options etc. $text .= "
\n

\n\n\n

"; $text .= "
".LAN_DISPLAYOPT."
";