-
- ".DOWLAN_12."
+
-
- ".DOWLAN_139."
+
-
- ".DOWLAN_136."
+
";
- $text .= DOWLAN_140."
";
-
+ $text .= DOWLAN_140."
";
foreach($imagelist as $file)
{
$text .= "
";
@@ -1859,15 +2156,15 @@ class download
-
- ".DOWLAN_141."
+
-
- ".DOWLAN_18."
+ ";
$text .= $eform->bbarea('mirror_description',$mirror_description);
$text .= "
@@ -1887,8 +2184,6 @@ class download
$ns -> tablerender($caption, $text);
}
-
-
function submit_mirror()
{
global $tp, $sql, $admin_log;
@@ -1959,13 +2254,11 @@ class download
function download_admin_adminmenu($parms)
{
- global $download;
- global $action;
- $download->show_options($action);
+ global $adminDownload,$action,$subAction;
+ $adminDownload->show_options($action);
+ if ('maint' == $action)
+ {
+ $adminDownload->show_maint_options($action,$subAction);
+ }
}
-
-
-
-
-
-?>
+?>
\ No newline at end of file
diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php
index df8697e3d..060bd29c9 100644
--- a/e107_plugins/download/download_shortcodes.php
+++ b/e107_plugins/download/download_shortcodes.php
@@ -11,520 +11,580 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/download/download_shortcodes.php,v $
-| $Revision: 1.2 $
-| $Date: 2009-01-14 23:45:33 $
+| $Revision: 1.3 $
+| $Date: 2009-02-11 21:41:54 $
| $Author: bugrain $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
-include_once(e_HANDLER.'shortcode_handler.php');
-$download_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
-/*
-SC_BEGIN DOWNLOAD_LIST_NAME
-global $row,$tp,$pref;
-if($parm == "nolink"){
- return $tp->toHTML($row['download_name'],TRUE,'LINKTEXT');
-}
-if($parm == "request"){
+register_shortcode('download_shortcodes', true);
+initShortcodeClass('download_shortcodes');
- $agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'));
- if($row['download_mirror_type']){
- $text = ($pref['agree_flag'] ? "" : " ");
- }else{
- $text = ($pref['agree_flag'] ? " " : " ");
- }
- $text .= $tp->toHTML($row['download_name'], FALSE, 'USER_TITLE')." ";
- return $text;
-}
-
-return "".$tp->toHTML($row['download_name'],TRUE,'LINKTEXT')." ";
-SC_END
-
-
-SC_BEGIN DOWNLOAD_LIST_AUTHOR
-global $row;
-return $row['download_author'];
-SC_END
-
-
-SC_BEGIN DOWNLOAD_LIST_REQUESTED
-global $row;
-return $row['download_requested'];
-SC_END
-
-
-SC_BEGIN DOWNLOAD_LIST_ICON
-global $row;
-$img = "".$img." ";
-}else{
- return $img;
-}
-return;
-SC_END
-
-
-SC_BEGIN DOWNLOAD_LIST_NEWICON
-global $row;
-return (USER && $row['download_datestamp'] > USERLV ? "".$img." ";
-}else{
- return $img;
-}
-SC_END
-
-
-SC_BEGIN DOWNLOAD_LIST_ID
-global $row;
-return $row['download_id'];
-SC_END
-
-
-SC_BEGIN DOWNLOAD_LIST_RATING
-global $row;
-$rater = new rater;
-$ratearray = $rater->getrating("download", $row['download_id']);
- if (!$ratearray[0]) {
- return LAN_dl_13;
- } else {
- return ($ratearray[2] ? "{$ratearray[1]}.{$ratearray[2]}/{$ratearray[0]}" : "{$ratearray[1]}/{$ratearray[0]}");
- }
-SC_END
-
-
-SC_BEGIN DOWNLOAD_LIST_LINK
-global $tp,$row,$pref;
-$agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'));
- if($row['download_mirror_type']){
- return ($pref['agree_flag'] ? "" : " ");
- }else{
- return ($pref['agree_flag'] ? " " : " ");
- }
-SC_END
-
-SC_BEGIN DOWNLOAD_LIST_NEXTPREV
- global $nextprev_parms,$tp;
- return $tp->parseTemplate("{NEXTPREV={$nextprev_parms}}");
-SC_END
-
-
-// ---------------------- Download View ----------------------------------------
-
-SC_BEGIN DOWNLOAD_VIEW_ID
-global $dl;
-return $dl['download_id'];
-SC_END
-
-
-SC_BEGIN DOWNLOAD_ADMIN_EDIT
-global $dl;
-return (ADMIN && getperms('6')) ? " ".$dl['download_name']." ";
-$link['request'] = "".$dl['download_name']." ";
-
-if($parm){
- return $link[$parm];
-}
-return $dl['download_name'];
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_NAME_LINKED
-global $pref,$dl,$tp;
-if ($pref['agree_flag'] == 1) {
- return "toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'))."');\" title='".LAN_dl_46."'>".$dl['download_name']." ";
-} else {
- return "".$dl['download_name']." ";
-}
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_AUTHOR
-global $dl;
-return ($dl['download_author'] ? $dl['download_author'] : "");
-SC_END
-
-
-SC_BEGIN DOWNLOAD_VIEW_AUTHOREMAIL
-global $tp,$dl;
-return ($dl['download_author_email']) ? $tp -> toHTML($dl['download_author_email'], TRUE, 'LINKTEXT') : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_AUTHORWEBSITE
-global $tp,$dl;
-return ($dl['download_author_website']) ? $tp -> toHTML($dl['download_author_website'], TRUE,'LINKTEXT') : "";
-SC_END
-
-
-
-SC_BEGIN DOWNLOAD_VIEW_DESCRIPTION
-global $tp, $dl;
-$maxlen = ($parm ? intval($parm) : 0);
-$text = ($dl['download_description'] ? $tp->toHTML($dl['download_description'], TRUE, 'DESCRIPTION') : "");
-if($maxlen){
- return substr($text, 0, $maxlen);
-}else{
- return $text;
-}
-return $text;
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_DATE
-global $gen,$dl;
-return ($dl['download_datestamp']) ? $gen->convert_date($dl['download_datestamp'], $parm) : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_DATE_SHORT
-// deprecated: DOWNLOAD_VIEW_DATE should be used instead.
-global $gen,$dl;
-return ($dl['download_datestamp']) ? $gen->convert_date($dl['download_datestamp'], "short") : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_DATE_LONG
-// deprecated: DOWNLOAD_VIEW_DATE should be used instead.
-global $gen,$dl;
-return ($dl['download_datestamp']) ? $gen->convert_date($dl['download_datestamp'], "long") : "";
-SC_END
-
-
-
-SC_BEGIN DOWNLOAD_VIEW_IMAGE
-global $dl;
-if ($dl['download_thumb']) {
- return ($dl['download_image'] ? "".LAN_dl_40." ";
-}
-else
-{
- return LAN_dl_75;
-}
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_IMAGEFULL
-global $dl;
-return ($dl['download_image']) ? "toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'))."');\">";
-} else {
- $dnld_link = " ";
-}
-
-if($dl['download_mirror'])
-{
- if($dl['download_mirror_type'])
+ /**
+ * download_shortcodes constructor
+ */
+ function download_shortcodes()
{
- return " ".LAN_dl_66." ";
+ $this->e107 = e107::getInstance();
+ $this->postInfo = array();
}
- else
+ // Category ************************************************************************************
+ function get_download_cat_main_name() {
+ global $tp, $dlrow;
+ return $tp->toHTML($dlrow['download_category_name'], FALSE, 'USER_TITLE');
+ }
+ function get_download_cat_main_description() {
+ global $tp, $dlrow;
+ return $tp->toHTML($dlrow['download_category_description'], TRUE, 'DESCRIPTION');
+ }
+ function get_download_cat_main_icon() {
+ global $dlrow;
+ // Pass count as 1 to force non-empty icon
+ return $this->_get_cat_icons($dlrow['download_category_icon'], 1, $dlrow['download_category_name']);
+ }
+ // Sub-Category ********************************************************************************
+ function get_download_cat_sub_name() {
+ global $tp, $dlsubrow;
+ if ($dlsubrow['d_count'])
+ {
+ return "".$tp->toHTML($dlsubrow['download_category_name'], FALSE, 'USER_TITLE')." ";
+ }
+ else
+ {
+ return $tp->toHTML($dlsubrow['download_category_name'], FALSE, 'USER_TITLE');
+ }
+ }
+ function get_download_cat_sub_description() {
+ global $tp, $dlsubrow;
+ return $tp->toHTML($dlsubrow['download_category_description'], TRUE, 'DESCRIPTION');
+ }
+ function get_download_cat_sub_icon() {
+ global $dlsubrow;
+ return $this->_get_cat_icons($dlsubrow['download_category_icon'], $dlsubrow['d_count'], $dlsubrow['download_category_name']);
+ }
+ function get_download_cat_sub_new_icon() {
+ global $dlsubrow;
+ return $this->_check_new_download($dlsubrow['d_last_subs']);
+ }
+ function get_download_cat_sub_count() {
+ global $dlsubrow;
+ return $dlsubrow['d_count'];
+ }
+ function get_download_cat_sub_size() {
+ global $e107, $dlsubrow;
+ return $this->e107->parseMemorySize($dlsubrow['d_size']);
+ }
+ function get_download_cat_sub_downloaded() {
+ global $dlsubrow;
+ return intval($dlsubrow['d_requests']);
+ }
+ // Sub-Sub-Category ****************************************************************************
+ function get_download_cat_subsub_name() {
+ global $tp, $dlsubsubrow;
+ if ($dlsubsubrow['d_count'])
+ {
+ return "".$tp->toHTML($dlsubsubrow['download_category_name'], FALSE, 'USER_TITLE')." ";
+ }
+ else
+ {
+ return $tp->toHTML($dlsubsubrow['download_category_name'], FALSE, 'USER_TITLE');
+ }
+ }
+ function get_download_cat_subsub_description() {
+ global $tp, $dlsubsubrow;
+ return $tp->toHTML($dlsubsubrow['download_category_description'], TRUE, 'DESCRIPTION');
+ }
+ function get_download_cat_subsub_icon() {
+ global $dlsubsubrow;
+ return $this->_get_cat_icons($dlsubsubrow['download_category_icon'], $dlsubsubrow['d_count'], $dlsubsubrow['download_category_name']);
+ }
+ function get_download_cat_subsub_count() {
+ global $dlsubsubrow;
+ return $dlsubsubrow['d_count'];
+ }
+ function get_download_cat_subsub_size() {
+ global $e107, $dlsubsubrow;
+ return $this->e107->parseMemorySize($dlsubsubrow['d_size']);
+ }
+ function get_download_cat_subsub_downloaded() {
+ global $dlsubsubrow;
+ return intval($dlsubsubrow['d_requests']);
+ }
+ // List ****************************************************************************************
+ function get_download_list_name()
+ {
+ global $dlrow,$tp,$pref,$parm;
+ if ($parm == "nolink"){
+ return $tp->toHTML($dlrow['download_name'],TRUE,'LINKTEXT');
+ }
+ if ($parm == "request"){
+ $agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'));
+ if ($dlrow['download_mirror_type']){
+ $text = ($pref['agree_flag'] ? "" : " ");
+ }else{
+ $text = ($pref['agree_flag'] ? " " : " ");
+ }
+ $text .= $tp->toHTML($dlrow['download_name'], FALSE, 'USER_TITLE')." ";
+ return $text;
+ }
+ return "".$tp->toHTML($dlrow['download_name'],TRUE,'LINKTEXT')." ";
+ }
+ function get_download_list_author()
+ {
+ global $dlrow;
+ return $dlrow['download_author'];
+ }
+ function get_download_list_requested()
+ {
+ global $dlrow;
+ return $dlrow['download_requested'];
+ }
+ function get_download_list_newicon()
+ {
+ global $dlrow;
+ return (USER && $dlrow['download_datestamp'] > USERLV ? "".$img." ";
+ }
+ else
+ {
+ return $img;
+ }
+ }
+ function get_download_list_id()
+ {
+ global $dlrow;
+ return $dlrow['download_id'];
+ }
+ function get_download_list_rating()
+ {
+ global $dlrow;
+ $rater = new rater();
+ $ratearray = $rater->getrating("download", $dlrow['download_id']);
+ if (!$ratearray[0]) {
+ return LAN_dl_13;
+ }
+ else
+ {
+ return ($ratearray[2] ? "{$ratearray[1]}.{$ratearray[2]}/{$ratearray[0]}" : "{$ratearray[1]}/{$ratearray[0]}");
+ }
+ }
+ function get_download_list_link()
+ {
+ global $tp, $dlrow, $pref, $parm;
+ $agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'));
+
+ $img = "{$img} ";
+ }
+ else
+ {
+ return ($pref['agree_flag'] ? "{$img} " : "{$img} ");
+ }
+ }
+ function get_download_list_icon()
+ {
+ global $dlrow,$parm;
+ if ($parm == "link"){
+ return "".$img." ";
+ }
+ else
+ {
+ return $img;
+ }
+ return;
+ }
+ function get_download_list_nextprev()
+ {
+ global $nextprev_parms,$tp;
+ return $tp->parseTemplate("{NEXTPREV={$nextprev_parms}}");
+ }
+ function get_download_list_total_amount() {
+ global $dltdownloads;
+ return $dltdownloads." ".LAN_dl_16;
+ }
+ function get_download_list_total_files() {
+ global $dlft;
+ return $dlft." ".LAN_dl_17;
+ }
+ // View ****************************************************************************************
+ function get_download_view_id()
+ {
+ global $dlrow;
+ return $dlrow['download_id'];
+ }
+ function get_download_admin_edit()
+ {
+ global $dlrow;
+ return (ADMIN && getperms('6')) ? "".$dlrow['download_name']." ";
+ $link['request'] = "".$dlrow['download_name']." ";
+ if ($parm){
+ return $link[$parm];
+ }
+ return $dlrow['download_name'];
+ }
+ function get_download_view_name_linked()
+ {
+ global $pref,$dl,$tp;
+ if ($pref['agree_flag'] == 1) {
+ return "toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'))."');\" title='".LAN_dl_46."'>".$dl['download_name']." ";
+ } else {
+ return "".$dl['download_name']." ";
+ }
+ }
+ function get_download_view_author()
+ {
+ global $dlrow;
+ return ($dlrow['download_author'] ? $dlrow['download_author'] : "");
+ }
+ function get_download_view_authoremail()
+ {
+ global $tp,$dlrow;
+ return ($dlrow['download_author_email']) ? $tp -> toHTML($dlrow['download_author_email'], TRUE, 'LINKTEXT') : "";
+ }
+ function get_download_view_authorwebsite()
+ {
+ global $tp,$dlrow;
+ return ($dlrow['download_author_website']) ? $tp -> toHTML($dlrow['download_author_website'], TRUE,'LINKTEXT') : "";
+ }
+ function get_download_view_description()
+ {
+ global $tp,$dlrow,$parm;
+ $maxlen = ($parm ? intval($parm) : 0);
+ $text = ($dlrow['download_description'] ? $tp->toHTML($dlrow['download_description'], TRUE, 'DESCRIPTION') : "");
+ if ($maxlen){
+ return substr($text, 0, $maxlen);
+ }else{
+ return $text;
+ }
+ return $text;
+ }
+ function get_download_view_date()
+ {
+ global $gen,$dlrow,$parm;
+ return ($dlrow['download_datestamp']) ? $gen->convert_date($dlrow['download_datestamp'], $parm) : "";
+ }
+ function get_download_view_date_short()
+ {
+ // deprecated: DOWNLOAD_VIEW_DATE should be used instead.
+ global $gen,$dlrow;
+ return ($dlrow['download_datestamp']) ? $gen->convert_date($dlrow['download_datestamp'], "short") : "";
+ }
+ function get_download_view_date_long()
+ {
+ // deprecated: DOWNLOAD_VIEW_DATE should be used instead.
+ global $gen,$dlrow;
+ return ($dlrow['download_datestamp']) ? $gen->convert_date($dlrow['download_datestamp'], "long") : "";
+ }
+ function get_download_view_image()
+ {
+ global $dlrow;
+ if ($dlrow['download_thumb']) {
+ return ($dlrow['download_image'] ? "".LAN_dl_40." ";
+ }
+ else
+ {
+ return LAN_dl_75;
+ }
+ }
+ function get_download_view_imagefull()
+ {
+ global $dlrow;
+ return ($dlrow['download_image']) ? "";
+ if ($dlrow['download_mirror'])
+ {
+ if ($dlrow['download_mirror_type'])
+ {
+ return " ".LAN_dl_66." ";
+ }
+ else
+ {
+ return $dnld_link."
+
+ ";
+ if ($ratearray = $rater->getrating("download", $dlrow['download_id'])) {
+ for($c = 1; $c <= $ratearray[1]; $c++) {
+ $text .= " ";
+ if (!$rater->checkrated("download", $dlrow['download_id']) && USER) {
+ $text .= $rater->rateselect(" ".LAN_dl_14, "download", $dlrow['download_id'])." ";
+ }
+ else if (!USER) {
+ $text .= " ";
+ } else {
+ $text .= LAN_dl_15;
+ }
+ $text .= "
";
+ return $text;
+ }
+ function get_download_report_link()
+ {
+ global $dlrow,$pref;
+ return (check_class($pref['download_reportbroken'])) ? "".LAN_dl_45." " : "";
+ }
+ function get_download_view_caption()
+ {
+ global $dlrow;
+ $text = $dlrow['download_category_name'];
+ $text .= ($dlrow['download_category_description']) ? " [ ".$dlrow['download_category_description']." ]" : "";
+ return $text;
+ }
+ // Mirror **************************************************************************************
+ function get_download_mirror_request() {
+ global $dlrow;
+ return $dlrow['download_name'];
+ }
+ function get_download_mirror_request_icon() {
+ global $dlrow;
+ return ($dlrow['download_thumb'] ? "".$dlmirror['mirror_name']." ";
+ }
+ function get_download_mirror_image() {
+ global $dlrow, $dlmirror;
+ return ($dlmirror['mirror_image'] ? "
+ ";
+ }
+ function get_download_mirror_requests() {
+ global $dlmirrorfile;
+ return (ADMIN ? LAN_dl_73.$dlmirrorfile[2] : "");
+ }
+ function get_download_total_mirror_requests() {
+ global $dlmirror;
+ return (ADMIN ? LAN_dl_74.$dlmirror['mirror_count'] : "");
+ }
+ // --------- Download View Lans -----------------------------
+ function get_download_view_author_lan()
+ {
+ global $dlrow;
+ return ($dlrow['download_author']) ? LAN_dl_24 : "";
+ }
+ function get_download_view_authoremail_lan()
+ {
+ global $dlrow;
+ return ($dlrow['download_author_email']) ? LAN_dl_30 : "";
+ }
+ function get_download_view_authorwebsite_lan()
+ {
+ global $dlrow;
+ return ($dlrow['download_author_website']) ? LAN_dl_31 : "";
+ }
+ function get_download_view_date_lan()
+ {
+ global $dlrow;
+ return ($dlrow['download_datestamp']) ? LAN_dl_22 : "";
+ }
+ function get_download_view_image_lan()
+ {
+ return LAN_dl_11;
+ }
+ function get_download_view_requested()
+ {
+ global $dlrow;
+ return $dlrow['download_requested'];
+ }
+ function get_download_view_rating_lan()
+ {
+ return LAN_dl_12;
+ }
+ function get_download_view_filesize_lan()
+ {
+ return LAN_dl_10;
+ }
+ function get_download_view_description_lan()
+ {
+ return LAN_dl_7;
+ }
+ function get_download_view_requested_lan()
+ {
+ return LAN_dl_77;
+ }
+ function get_download_view_link_lan()
+ {
+ return LAN_dl_32;
+ }
+ // ----------- Download View : Previous and Next ---------------
+ function get_download_view_prev()
+ {
+ global $dlrow,$sql;
+ $dlrow_id = intval($dlrow['download_id']);
+ if ($sql->db_Select("download", "*", "download_category='".intval($dlrow['download_category_id'])."' AND download_id < {$dlrow_id} AND download_active > 0 && download_visible IN (".USERCLASS_LIST.") ORDER BY download_datestamp DESC LIMIT 1")) {
+ $dlrowrow = $sql->db_Fetch();
+ return "<< ".LAN_dl_33." [".$dlrowrow['download_name']."] \n";
+ } else {
+ return " ";
+ }
+ }
+ function get_download_view_next()
+ {
+ global $dlrow,$sql;
+ $dlrow_id = intval($dlrow['download_id']);
+ if ($sql->db_Select("download", "*", "download_category='".intval($dlrow['download_category_id'])."' AND download_id > {$dlrow_id} AND download_active > 0 && download_visible IN (".USERCLASS_LIST.") ORDER BY download_datestamp ASC LIMIT 1")) {
+ $dlrowrow = $sql->db_Fetch();
+ extract($dlrowrow);
+ return "[".$dlrowrow['download_name']."] ".LAN_dl_34." >> \n";
+ } else {
+ return " ";
+ }
+ }
+ function get_download_back_to_list()
+ {
+ global $dlrow;
+ return "".LAN_dl_35." ";
+ }
+ function get_download_back_to_category_list()
+ {
+ return "".LAN_dl_9." ";
+ }
+ // Misc stuff ---------------------------------------------------------------------------------
+ function get_download_cat_newdownload_text()
+ {
+ return "
-
- ";
-
- if ($ratearray = $rater->getrating("download", $dl['download_id'])) {
- for($c = 1; $c <= $ratearray[1]; $c++) {
- $text .= " ";
-
- if (!$rater->checkrated("download", $dl['download_id']) && USER) {
- $text .= $rater->rateselect(" ".LAN_dl_14, "download", $dl['download_id'])." ";
- }
- else if(!USER) {
- $text .= " ";
- } else {
- $text .= LAN_dl_15;
- }
- $text .= "
";
-return $text;
-SC_END
-
-SC_BEGIN DOWNLOAD_REPORT_LINK
-global $dl,$pref;
-return (check_class($pref['download_reportbroken'])) ? "".LAN_dl_45." " : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_CAPTION
-global $dl;
- $text = $dl['download_category_name'];
- $text .= ($dl['download_category_description']) ? " [ ".$dl['download_category_description']." ]" : "";
-return $text;
-SC_END
-
-
-// --------- Download View Lans -----------------------------
-
-SC_BEGIN DOWNLOAD_VIEW_AUTHOR_LAN
-global $dl;
-return ($dl['download_author']) ? LAN_dl_24 : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_AUTHOREMAIL_LAN
-global $dl;
-return ($dl['download_author_email']) ? LAN_dl_30 : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_AUTHORWEBSITE_LAN
-global $dl;
-return ($dl['download_author_website']) ? LAN_dl_31 : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_DATE_LAN
-global $dl;
-return ($dl['download_datestamp']) ? LAN_dl_22 : "";
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_IMAGE_LAN
-return LAN_dl_11;
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_REQUESTED
-global $dl;
-return $dl['download_requested'];
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_RATING_LAN
-return LAN_dl_12;
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_FILESIZE_LAN
-return LAN_dl_10;
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_DESCRIPTION_LAN
-return LAN_dl_7;
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_REQUESTED_LAN
-return LAN_dl_77;
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_LINK_LAN
-return LAN_dl_32;
-SC_END
-
-
-
-// ----------- Download View : Previous and Next ---------------
-
-SC_BEGIN DOWNLOAD_VIEW_PREV
-global $dl,$sql;
-
- $dl_id = intval($dl['download_id']);
-
- if ($sql->db_Select("download", "*", "download_category='".intval($dl['download_category_id'])."' AND download_id < {$dl_id} AND download_active > 0 && download_visible IN (".USERCLASS_LIST.") ORDER BY download_datestamp DESC LIMIT 1")) {
- $row = $sql->db_Fetch();
- return "<< ".LAN_dl_33." [".$row['download_name']."] \n";
- } else {
- return " ";
- }
-SC_END
-
-SC_BEGIN DOWNLOAD_VIEW_NEXT
-global $dl,$sql;
-$dl_id = intval($dl['download_id']);
- if ($sql->db_Select("download", "*", "download_category='".intval($dl['download_category_id'])."' AND download_id > {$dl_id} AND download_active > 0 && download_visible IN (".USERCLASS_LIST.") ORDER BY download_datestamp ASC LIMIT 1")) {
- $row = $sql->db_Fetch();
- extract($row);
- return "[".$row['download_name']."] ".LAN_dl_34." >> \n";
- } else {
- return " ";
- }
-SC_END
-
-
-SC_BEGIN DOWNLOAD_BACK_TO_LIST
-global $dl;
-return "".LAN_dl_35." ";
-SC_END
-
-SC_BEGIN DOWNLOAD_BACK_TO_CATEGORY_LIST
- return "".LAN_dl_9." ";
-SC_END
-
-
-// --------------- Download - Admin -----------------------------------
-
-SC_BEGIN DOWNLOAD_CATEGORY_SELECT
- global $sql;
- $cdc = $parm;
-
- $boxinfo = "\n";
- $qry = "
- SELECT dc.download_category_name, dc.download_category_order, dc.download_category_id, dc.download_category_parent,
- dc1.download_category_parent AS d_parent1
- FROM #download_category AS dc
- LEFT JOIN #download_category as dc1 ON dc1.download_category_id=dc.download_category_parent AND dc1.download_category_class IN (".USERCLASS_LIST.")
- LEFT JOIN #download_category as dc2 ON dc2.download_category_id=dc1.download_category_parent ";
- if (ADMIN === FALSE) $qry .= " WHERE dc.download_category_class IN (".USERCLASS_LIST.") ";
- $qry .= " ORDER by dc2.download_category_order, dc1.download_category_order, dc.download_category_order"; // This puts main categories first, then sub-cats, then sub-sub cats
-
- if (!$sql->db_Select_gen($qry))
- {
- return "Error reading categories
- \n";
-
- // Its a structured display option - need a 2-step process to create a tree
- $catlist = array();
- while ($row = $sql->db_Fetch(MYSQL_ASSOC))
- {
- $tmp = $row['download_category_parent'];
- if ($tmp == '0')
- {
- $row['subcats'] = array();
- $catlist[$row['download_category_id']] = $row;
- }
- else
- {
- if (isset($catlist[$tmp]))
- { // Sub-Category
- $catlist[$tmp]['subcats'][$row['download_category_id']] = $row;
- $catlist[$tmp]['subcats'][$row['download_category_id']]['subsubcats'] = array();
- }
- else
- { // Its a sub-sub category
- if (isset($catlist[$row['d_parent1']]['subcats'][$tmp]))
- {
- $catlist[$row['d_parent1']]['subcats'][$tmp]['subsubcats'][$row['download_category_id']] = $row;
- }
- }
- }
- }
-
- // Now generate the options
- foreach ($catlist as $thiscat)
- { // Main categories
- // Could add a display class to the group, but the default looked OK
-
- if(count($thiscat['subcats'])>0)
- {
- $boxinfo .= "\n";
- $scprefix = '';
- }
- else
- {
- $sel = ($cdc == $thiscat['download_category_id']) ? " selected='selected'" : "";
- $boxinfo .= "".htmlspecialchars($thiscat['download_category_name'])." \n";
- }
-
- foreach ($thiscat['subcats'] as $sc)
- { // Sub-categories
- $sscprefix = '--> ';
- $boxinfo .= "\n";
- foreach ($sc['subsubcats'] as $ssc)
- { // Sub-sub categories
- $boxinfo .= " \n";
- }
- }
- $boxinfo .= " \n";
- }
-
- $boxinfo .= " \n";
- return $boxinfo;
-
-SC_END
-
-
-
-
-
-
-*/
-?>
+?>
\ No newline at end of file
diff --git a/e107_plugins/download/handlers/category_class.php b/e107_plugins/download/handlers/category_class.php
new file mode 100644
index 000000000..af6305575
--- /dev/null
+++ b/e107_plugins/download/handlers/category_class.php
@@ -0,0 +1,165 @@
+0 creates full tree.
+ // If load-class non-null, assumed to be a 'class set' such as USERCLASS_LIST
+ // If $accum is TRUE, include file counts and sizes in superior categories
+ define("SUB_PREFIX","-->"); // Added in front of sub categories
+ define("SUBSUB_PREFIX","---->"); // Added in front of sub-sub categories
+ $this->cat_tree = $this->down_cat_tree($nest_level,$load_class, $main_cat_load, $accum);
+ }
+
+
+// Function returns a 'tree' of download categories, subcategories, and sub-sub-categories.
+// Returns empty array if nothing defined
+// Within the 'main category' level of the nesting, array 'subcats' has the next level's info
+// Within the 'sub-category' level of the nesting, array 'subsubcats' has the next level's info
+// If $main_cat_load is numeric, and the value of a 'main' category, only that main category is displayed.
+// (Unpredictable if $main_cat_load is some other category)
+ function down_cat_tree($nest_level = 1, $load_cat_class = USERCLASS_LIST, $main_cat_load = '', $accum = FALSE)
+ {
+ global $sql2;
+
+ $catlist = array();
+ $this->cat_count = 0;
+ $this->down_count = 0;
+ $temp2 = "";
+ $temp1 = "";
+ if ($load_cat_class != "")
+ {
+ $temp1 = " WHERE dc.download_category_class IN ({$load_cat_class}) ";
+ $temp2 = "AND d.download_visible IN ({$load_cat_class}) ";
+ }
+
+ $qry = "
+ SELECT dc.*,
+ dc1.download_category_parent AS d_parent1, dc1.download_category_order,
+ SUM(d.download_filesize) AS d_size,
+ COUNT(d.download_id) AS d_count,
+ MAX(d.download_datestamp) as d_last,
+ SUM(d.download_requested) as d_requests
+ FROM #download_category as dc
+ LEFT JOIN #download_category as dc1 ON dc1.download_category_id=dc.download_category_parent
+ LEFT JOIN #download_category as dc2 ON dc2.download_category_id=dc1.download_category_parent
+ LEFT JOIN #download AS d on d.download_category = dc.download_category_id AND d.download_active > 0 {$temp2}
+ {$temp1}
+ GROUP by dc.download_category_id
+ ORDER by dc2.download_category_order, dc1.download_category_order, dc.download_category_order"; // This puts main categories first, then sub-cats, then sub-sub cats
+
+ if (!$sql2->db_Select_gen($qry)) return $catlist;
+
+ while ($row = $sql2->db_Fetch())
+ {
+ $tmp = $row['download_category_parent'];
+ if ($tmp == '0')
+ { // Its a main category
+ if (!is_numeric($main_cat_load) || ($main_cat_load == $row['download_category_id']))
+ {
+ $row['subcats'] = array();
+ $catlist[$row['download_category_id']] = $row;
+ }
+ }
+ else
+ {
+ if (isset($catlist[$tmp]))
+ { // Sub-Category
+ $this->cat_count++;
+ $this->down_count += $row['d_count'];
+ $catlist[$tmp]['subcats'][$row['download_category_id']] = $row;
+ $catlist[$tmp]['subcats'][$row['download_category_id']]['subsubcats'] = array();
+ $catlist[$tmp]['subcats'][$row['download_category_id']]['d_last_subs'] =
+ $catlist[$tmp]['subcats'][$row['download_category_id']]['d_last'];
+ }
+ else
+ { // Its a sub-sub category
+ if (isset($catlist[$row['d_parent1']]['subcats'][$tmp]))
+ {
+ $this->cat_count++;
+ $this->down_count += $row['d_count'];
+ if ($accum || ($nest_level == 0))
+ { // Add the counts into the subcategory values
+ $catlist[$row['d_parent1']]['subcats'][$tmp]['d_size'] += $row['d_size'];
+ $catlist[$row['d_parent1']]['subcats'][$tmp]['d_count'] += $row['d_count'];
+ $catlist[$row['d_parent1']]['subcats'][$tmp]['d_requests'] += $row['d_requests'];
+ }
+ if ($nest_level == 0)
+ { // Reflect subcat dates in category
+ if ($catlist[$row['d_parent1']]['subcats'][$tmp]['d_last'] < $row['d_last'])
+ $catlist[$row['d_parent1']]['subcats'][$tmp]['d_last'] = $row['d_last'];
+ }
+ else
+ {
+ $catlist[$row['d_parent1']]['subcats'][$tmp]['subsubcats'][$row['download_category_id']] = $row;
+ }
+ // Separately accumulate 'last update' for subcat plus associated subsubcats
+ if ($catlist[$row['d_parent1']]['subcats'][$tmp]['d_last_subs'] < $row['d_last'])
+ $catlist[$row['d_parent1']]['subcats'][$tmp]['d_last_subs'] = $row['d_last'];
+ }
+ }
+ }
+ }
+ return $catlist;
+ }
+
+
+// Rest of the class isn't actually used normally, but print_tree() might help with debug
+
+ function print_cat($cat, $prefix,$postfix)
+ {
+ $text = "".$cat['download_category_id']." ".$cat['download_category_parent']." ";
+ $text .= $prefix.htmlspecialchars($cat['download_category_name']).$postfix." ".$cat['d_size']." ";
+ $text .= "".$cat['d_count']." ".$cat['d_requests']." ".strftime('%H:%M %d-%m-%Y',$cat['d_last'])." ";
+ $text .= "ID Parent Name Bytes Files Requests Last Download ";
+ foreach ($this->cat_tree as $thiscat)
+ { // Main categories
+ $scprefix = SUB_PREFIX;
+ echo $this->print_cat($thiscat,'',' ');
+ foreach ($thiscat['subcats'] as $sc)
+ { // Sub-categories
+ $sscprefix = SUBSUB_PREFIX;
+ echo $this->print_cat($sc,$scprefix,'');
+ foreach ($sc['subsubcats'] as $ssc)
+ { // Sub-sub categories
+ echo $this->print_cat($ssc,$sscprefix,'');
+ }
+ }
+ }
+ echo "
";
+ return;
+ }
+
+}
+?>
\ No newline at end of file
diff --git a/e107_plugins/download/handlers/download_class.php b/e107_plugins/download/handlers/download_class.php
new file mode 100644
index 000000000..7fc4cb984
--- /dev/null
+++ b/e107_plugins/download/handlers/download_class.php
@@ -0,0 +1,146 @@
+$crumb) {
+ $dlbreadcrumb[$ix]['sep'] = " :: ";
+ $ix++;
+ if (is_int($key))
+ {
+ $dlbreadcrumb[$ix]['value'] = $crumb;
+ }
+ else
+ {
+ $dlbreadcrumb[$ix]['value'] = "".$key." ";
+ }
+ }
+ $dlbreadcrumb['fieldlist'] = implode(",", array_keys($dlbreadcrumb));
+ return $dlbreadcrumb;
+ }
+ function getCategorySelectList($currentID=0, $blankText="", $incSubSub=true, $groupOnMain=true)
+ {
+ global $sql,$parm;
+ $boxinfo = "\n";
+ $qry = "
+ SELECT dc.download_category_name, dc.download_category_order, dc.download_category_id, dc.download_category_parent,
+ dc1.download_category_parent AS d_parent1
+ FROM #download_category AS dc
+ LEFT JOIN #download_category as dc1 ON dc1.download_category_id=dc.download_category_parent AND dc1.download_category_class IN (".USERCLASS_LIST.")
+ LEFT JOIN #download_category as dc2 ON dc2.download_category_id=dc1.download_category_parent ";
+ if (ADMIN === FALSE) $qry .= " WHERE dc.download_category_class IN (".USERCLASS_LIST.") ";
+ $qry .= " ORDER by dc2.download_category_order, dc1.download_category_order, dc.download_category_order"; // This puts main categories first, then sub-cats, then sub-sub cats
+ if (!$sql->db_Select_gen($qry))
+ {
+ return "Error reading categories
+ {$blankText} \n";
+ // Its a structured display option - need a 2-step process to create a tree
+ $catlist = array();
+ while ($dlrow = $sql->db_Fetch(MYSQL_ASSOC))
+ {
+ $tmp = $dlrow['download_category_parent'];
+ if ($tmp == '0')
+ {
+ $dlrow['subcats'] = array();
+ $catlist[$dlrow['download_category_id']] = $dlrow;
+ }
+ else
+ {
+ if (isset($catlist[$tmp]))
+ { // Sub-Category
+ $catlist[$tmp]['subcats'][$dlrow['download_category_id']] = $dlrow;
+ $catlist[$tmp]['subcats'][$dlrow['download_category_id']]['subsubcats'] = array();
+ }
+ else
+ { // Its a sub-sub category
+ if (isset($catlist[$dlrow['d_parent1']]['subcats'][$tmp]))
+ {
+ $catlist[$dlrow['d_parent1']]['subcats'][$tmp]['subsubcats'][$dlrow['download_category_id']] = $dlrow;
+ }
+ }
+ }
+ }
+ // Now generate the options
+ foreach ($catlist as $thiscat)
+ { // Main categories
+ if (count($thiscat['subcats']) > 0)
+ {
+ if ($groupOnMain)
+ {
+ $boxinfo .= "";
+ $scprefix = '';
+ }
+ else
+ {
+ $boxinfo .= "\n";
+ $scprefix = ' ';
+ }
+ foreach ($thiscat['subcats'] as $sc)
+ { // Sub-categories
+ $sscprefix = '--> ';
+ $boxinfo .= " \n";
+ if ($incSubSub)
+ { // Sub-sub categories
+ foreach ($sc['subsubcats'] as $ssc)
+ {
+ $boxinfo .= " \n";
+ }
+ }
+ }
+ if ($groupOnMain)
+ {
+ $boxinfo .= " \n";
+ }
+ }
+ else
+ {
+ $sel = ($currentID == $thiscat['download_category_id']) ? " selected='selected'" : "";
+ $boxinfo .= "".htmlspecialchars($thiscat['download_category_name'])." \n";
+ }
+ }
+ $boxinfo .= " \n";
+ return $boxinfo;
+ }
+}
+?>
\ No newline at end of file
diff --git a/e107_plugins/download/help.php b/e107_plugins/download/help.php
index 3ccd18ee7..74e4b5d31 100644
--- a/e107_plugins/download/help.php
+++ b/e107_plugins/download/help.php
@@ -11,16 +11,84 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/download/help.php,v $
-| $Revision: 1.1 $
-| $Date: 2009-01-11 02:59:10 $
+| $Revision: 1.2 $
+| $Date: 2009-02-11 21:41:54 $
| $Author: bugrain $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
-$text = "Please upload your files into the ".e_FILE."downloads folder, your images into the ".e_FILE."downloadimages folder and thumbnail images into the ".e_FILE."downloadthumbs folder.
-Create/edit a download.
Enter only one of: File, URL or Mirror.
Ensure you select a category, otherwise your download will not be visible on the downloads page.
");
+define("DOWLAN_HELP_3", "Help for cat");
+define("DOWLAN_HELP_4", "Help for opt");
+define("DOWLAN_HELP_5", "Use the maintenance pages to find duplicate downloads, find orphaned files, find missing (broken) entries, manage inactive downloads, refresh file sizes and view the downlaod log.");
+define("DOWLAN_HELP_5_1", "This page shows duplicate entries in the database - records where the same file is referenced more than once.");
+define("DOWLAN_HELP_5_2", "This page shows orphan files - files in the downloads directory that do not have a record in the database referenceing them.");
+define("DOWLAN_HELP_5_3", "This page shows missing entries in the database - records that reference a non-existing file.");
+define("DOWLAN_HELP_5_4", "This page shows all records that are marked as inactive.");
+define("DOWLAN_HELP_5_5", "This page shows records in the database that are not associated with a download category.");
+define("DOWLAN_HELP_5_6", "This page shows records in the database that have an incorrect file size when comapred to the file in the downloads folder.");
+define("DOWLAN_HELP_5_7", "This page shows the downloads log entries.");
+define("DOWLAN_HELP_6", "Help for limits");
+define("DOWLAN_HELP_7", "Help for mirror");
+define("DOWLAN_HELP_8", "Help for ");
+define("DOWLAN_HELP_9", "Help for ");
+
?>
\ No newline at end of file
diff --git a/e107_plugins/download/plugin.xml b/e107_plugins/download/plugin.xml
index 023821ad1..141fea818 100755
--- a/e107_plugins/download/plugin.xml
+++ b/e107_plugins/download/plugin.xml
@@ -1,5 +1,5 @@
-
+
This plugin is a fully featured Download system
@@ -17,7 +17,7 @@
Configure Download
Your download plugin is now installed
-
{DOWNLOAD_CAT_MAIN_DESCRIPTION}
";
+}
if(!isset($DOWNLOAD_CAT_TABLE_START))
{
- $DOWNLOAD_CAT_TABLE_START = "
-
-
\n
-
-
- ".LAN_dl_19."
- ".LAN_dl_20."
- ".LAN_dl_21."
- ".LAN_dl_77."
- ";
+ $DOWNLOAD_CAT_TABLE_START = "
+
+
\n
+
+
+
+
+ ".LAN_dl_19."
+ ".LAN_dl_20."
+ ".LAN_dl_21."
+ ".LAN_dl_77."
+
+
+
+
+
+
+
+
+
+
+ ";
}
if(!isset($DOWNLOAD_CAT_PARENT_TABLE))
{
- $DOWNLOAD_CAT_PARENT_TABLE = "
-
-
- ";
+ $DOWNLOAD_CAT_PARENT_TABLE = "
+
+
+
+ ";
}
if(!isset($DOWNLOAD_CAT_CHILD_TABLE))
{
- $DOWNLOAD_CAT_CHILD_TABLE = "
-
-
-
-
-
-
-
- {DOWNLOAD_CAT_SUBSUB}
- ";
-
+ $DOWNLOAD_CAT_CHILD_TABLE = "
+
+
+
+
+
+
+
+ {DOWNLOAD_CAT_SUBSUB}";
}
-
if(!isset($DOWNLOAD_CAT_SUBSUB_TABLE))
{
$DOWNLOAD_CAT_SUBSUB_TABLE = "
-
-
-
-
-
-
-
- ";
+
+
+
+
+
+
+ ";
}
-
if(!isset($DOWNLOAD_CAT_TABLE_END))
{
- $DOWNLOAD_CAT_TABLE_END = "
-
-
+
-
-
- {DOWNLOAD_VIEW_PREV}
- {DOWNLOAD_BACK_TO_LIST}
- {DOWNLOAD_VIEW_NEXT}
-
-
-
+
+
+ {DOWNLOAD_VIEW_PREV}
+ {DOWNLOAD_BACK_TO_LIST}
+ {DOWNLOAD_VIEW_NEXT}
+
+
+
-
\n
-
-
- {DOWNLOAD_VIEW_NAME}
-
-
-
- {DOWNLOAD_VIEW_AUTHOR_LAN}
- {DOWNLOAD_VIEW_AUTHOR}
-
- {DOWNLOAD_VIEW_AUTHOREMAIL_LAN}
- {DOWNLOAD_VIEW_AUTHOREMAIL}
-
- {DOWNLOAD_VIEW_AUTHORWEBSITE_LAN}
- {DOWNLOAD_VIEW_AUTHORWEBSITE}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{DOWNLOAD_ADMIN_EDIT}
+ $DOWNLOAD_VIEW_TABLE = "
+
+
+
+
+
+
+ {DOWNLOAD_VIEW_NAME}
+
+
+ {DOWNLOAD_VIEW_AUTHOR_LAN}
+ {DOWNLOAD_VIEW_AUTHOR}
+ {DOWNLOAD_VIEW_AUTHOREMAIL_LAN}
+ {DOWNLOAD_VIEW_AUTHOREMAIL}
+ {DOWNLOAD_VIEW_AUTHORWEBSITE_LAN}
+ {DOWNLOAD_VIEW_AUTHORWEBSITE}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{DOWNLOAD_ADMIN_EDIT}
\n";
}
-// ##### ------------------------------------------------------------------------------------------
-
// ##### MIRROR LIST -------------------------------------------------------------------------------
-
if(!isset($DOWNLOAD_MIRROR_START))
{
$DOWNLOAD_MIRROR_START = "
-
-
- {DOWNLOAD_MIRROR_REQUEST}
-
-
-
-
-
-
-
+
+
+
+
+ {DOWNLOAD_MIRROR_REQUEST_ICON}
+ ".LAN_dl_72."{DOWNLOAD_MIRROR_REQUEST}
+
+
+
+
+
+
+
+
";
}
if(!isset($DOWNLOAD_MIRROR))
{
$DOWNLOAD_MIRROR = "
-
-
-
-
-
-
+
+
+
+
+
+
+
+
";
}
if(!isset($DOWNLOAD_MIRROR_END))
{
$DOWNLOAD_MIRROR_END = "
-
+
";
}