diff --git a/e107_plugins/download/download.php b/e107_plugins/download/download.php index 1bfed6d4e..d78e875b1 100644 --- a/e107_plugins/download/download.php +++ b/e107_plugins/download/download.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/download/download.php,v $ -| $Revision: 1.7 $ -| $Date: 2009-05-04 20:09:45 $ +| $Revision: 1.8 $ +| $Date: 2009-07-14 23:19:22 $ | $Author: bugrain $ | +----------------------------------------------------------------------------+ @@ -268,11 +268,11 @@ if ($action == "list") $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_SUBSUB_TABLE, TRUE, $download_shortcodes); } $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $download_shortcodes); - $dlbreadcrumb = $dl->getBreadcrumb(array(LAN_dl_18=>e_SELF, $type)); - $dl_title .= $tp->parseTemplate("{BREADCRUMB=dlbreadcrumb}", TRUE, $download_shortcodes); + $dlbreadcrumb = $dl->getBreadcrumb(array(LAN_dl_18=>e_SELF, $type, DOWLAN_54)); + $dl_title = $tp->parseTemplate("{BREADCRUMB=dlbreadcrumb}", TRUE, $download_shortcodes); $ns->tablerender($dl_title, $dl_text); - $text = ""; // If other files, show in a separate block - $type = ""; // Cancel title once displayed + $text = ""; // If other files, show in a separate block + $dl_title = ""; // Cancel title once displayed } // End of subcategory display // Now display individual downloads diff --git a/e107_plugins/download/handlers/adminDownload_class.php b/e107_plugins/download/handlers/adminDownload_class.php index 223ada313..f37b33c2e 100644 --- a/e107_plugins/download/handlers/adminDownload_class.php +++ b/e107_plugins/download/handlers/adminDownload_class.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/adminDownload_class.php,v $ -| $Revision: 1.3 $ -| $Date: 2009-06-24 22:19:27 $ -| $Author: e107coders $ +| $Revision: 1.4 $ +| $Date: 2009-07-14 23:14:41 $ +| $Author: bugrain $ | +----------------------------------------------------------------------------+ */ @@ -111,7 +111,8 @@ class adminDownload extends download "; $text .= $this->_getConditionList('download_filter[date_condition]', $this->filterFields['date_condition']); - // $text .= $eform->datepicker('download_filter[date]', $this->filterFields['date']); +//TODO $text .= $eform->datepicker('download_filter[date]', $this->filterFields['date']); + $text .= "//TODO"; $text .= " Status @@ -288,7 +289,7 @@ class adminDownload extends download while ($row = $sql->db_Fetch()) { - $rowStyle = ($rowStyle == "odd") ? "even" : "odd"; + $rowStyle = ($rowStyle == "odd") ? "even" : "odd"; $text .= "".$row['download_id'].""; // Display Chosen options @@ -672,6 +673,14 @@ class adminDownload extends download $text .= $eform->bbarea('download_description',$download_description); $text .= " + + + Activation between + + + // TODO + + ".DOWLAN_19." @@ -1271,9 +1280,9 @@ class adminDownload extends download $preset = $pst->read_preset("admin_dl_cat"); // read preset values into array extract($preset); - $frm_action = (isset($_POST['add_category'])) ? e_SELF."?cat" : e_SELF."?".e_QUERY; + $eform_action = (isset($_POST['add_category'])) ? e_SELF."?cat" : e_SELF."?".e_QUERY; $text = "
-
+ @@ -1351,6 +1360,155 @@ class adminDownload extends download $ns->tablerender(DOWLAN_39, $text); } + function show_options() { + global $pref, $ns; + + require_once(e_HANDLER."form_handler.php"); + $eform = new e_form(true); //enable inner tabindex counter + + $agree_flag = $pref['agree_flag']; + $agree_text = $pref['agree_text']; + $c = $pref['download_php'] ? " checked = 'checked' " : ""; + $sacc = (varset($pref['download_incinfo'],0) == '1') ? " checked = 'checked' " : ""; + $order_options = array( + "download_id" => "Id No.", + "download_datestamp" => LAN_DATE, + "download_requested" => ADLAN_24, + "download_name" => DOWLAN_59, + "download_author" => DOWLAN_15 + ); + $sort_options = array( + "ASC" => DOWLAN_62, + "DESC" => DOWLAN_63 + ); + + $text = " +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
".LAN_DL_USE_PHP."" + .$eform->checkbox('download_subsub', '1', $pref['download_php']) + .$eform->label(LAN_DL_USE_PHP_INFO, 'download_php', '1') + ."
".LAN_DL_SUBSUB_CAT."" + .$eform->checkbox('download_subsub', '1', $pref['download_subsub']) + .$eform->label(LAN_DL_SUBSUB_CAT_INFO, 'download_subsub', '1') + ."
".LAN_DL_SUBSUB_COUNT."" + .$eform->checkbox('download_incinfo', '1', $pref['download_incinfo']) + .$eform->label(LAN_DL_SUBSUB_COUNT_INFO, 'download_incinfo', '1') + ."
".DOWLAN_55."".$eform->text('download_view', $pref['download_view'], '4', array('size'=>'4'))."
".DOWLAN_56."".$eform->selectbox('download_order', $order_options, $pref['download_order'])."
".LAN_ORDER."".$eform->selectbox('download_sort', $sort_options, $pref['download_sort'])."
".DOWLAN_160." + +
".DOWLAN_164." +
+
+ +
+
+ + + + + + + + + + + + + +
".DOWLAN_151."". r_userclass("download_reportbroken", $pref['download_reportbroken'])."
".DOWLAN_150."". ($pref['download_email'] ? "" : "")."
+
+
+
+
+ + + + + + + + + + + + + + + + + +
".DOWLAN_100."". ($agree_flag ? "" : "")."
".DOWLAN_101."".$eform->bbarea('agree_text',$agree_text)."
".DOWLAN_146."".$eform->bbarea('download_denied',$pref['download_denied'])."
+
+
+
+
+ + + + + +
+
+
+
+ +
+ + "; + $ns->tablerender(LAN_DL_OPTIONS, $text); + } + function create_category($subAction, $id) { global $sql, $tp, $admin_log; diff --git a/e107_plugins/download/plugin.xml b/e107_plugins/download/plugin.xml index 0f78ff73d..c7fbb4fa5 100755 --- a/e107_plugins/download/plugin.xml +++ b/e107_plugins/download/plugin.xml @@ -1,5 +1,5 @@ - + DOWLAN_DESCRIPTION @@ -7,7 +7,7 @@ content - download_admin.php + admin_download.php