- {DOWNLOAD_LIST_NEXTPREV} + if(!isset($DOWNLOAD_LIST_NEXTPREV)) + { + $sc_style['DOWNLOAD_LIST_NEXTPREV']['pre'] = " +
+ ";
+ $sc_style['DOWNLOAD_LIST_NEXTPREV']['post'] = "
";
- }
+
+ $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;
-} // end of action=="list"
+ $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 ;
+ } // end of action=="list"
//====================================================
// VIEW
//====================================================
if ($action == "view")
{
+ /*
$gen = new convert;
$highlight_search = FALSE;
@@ -419,7 +511,7 @@ if ($action == "view")
require_once(FOOTERF);
exit;
-
+ */
}
//====================================================
@@ -427,6 +519,7 @@ if ($action == "view")
//====================================================
if ($action == "report" && check_class($pref['download_reportbroken']))
{
+/*
$query = "
SELECT d.*, dc.* FROM #download AS d
LEFT JOIN #download_category AS dc ON d.download_category = dc.download_category_id
@@ -499,7 +592,8 @@ if ($action == "report" && check_class($pref['download_reportbroken']))
$dlbreadcrumb = $dl->getBreadcrumb(array(LAN_dl_18=>e_SELF, $dlrow['download_category_name']=>e_SELF."?list.".$dlrow['download_category_id'], $dlrow['download_name']=>e_SELF."?view.".$dlrow['download_id'], LAN_dl_50));
$dl_title .= $tp->parseTemplate("{BREADCRUMB=dlbreadcrumb}", TRUE, $download_shortcodes);
$ns->tablerender($dl_title, $text);
- }
+ }*/
+
require_once(FOOTERF);
exit;
}
diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php
index 073c35b01..1360a6722 100644
--- a/e107_plugins/download/download_shortcodes.php
+++ b/e107_plugins/download/download_shortcodes.php
@@ -16,25 +16,46 @@
if (!defined('e107_INIT')) { exit; }
require_once(e_HANDLER.'shortcode_handler.php');
-register_shortcode('download_shortcodes', true);
-initShortcodeClass('download_shortcodes');
+//register_shortcode('download_shortcodes', true);
+//initShortcodeClass('download_shortcodes');
/**
* download_shortcodes
*/
-class download_shortcodes
+class download_shortcodes extends e_shortcode
{
var $e107;
var $postInfo;
+ var $qry;
/**
* download_shortcodes constructor
*/
- function download_shortcodes()
+ function __construct()
{
$this->e107 = e107::getInstance();
$this->postInfo = array();
}
+
+ function sc_download_breadcrumb($parm='')
+ {
+ $tp = e107::getParser();
+ $frm = e107::getForm();
+
+ $frm->select();
+
+ global $dlrow;
+
+ $breadcrumb = array();
+ $breadcrumb[] = array('text' => LAN_dl_18, 'url' => e_SELF);
+ $breadcrumb[] = array('text' => $dlrow['download_category_name'], 'url' => e_SELF."?action=list&id=".$dlrow['download_category_id']);
+ $breadcrumb[] = array('text' => $dlrow['download_name'], 'url' => null);
+
+ return $frm->breadcrumb($breadcrumb);
+
+ }
+
+
// Category ************************************************************************************
function sc_download_cat_main_name() {
global $tp, $dlrow;
@@ -54,7 +75,7 @@ class download_shortcodes
global $tp, $dlsubrow;
if ($dlsubrow['d_count'])
{
- return "".$tp->toHTML($dlsubrow['download_category_name'], FALSE, 'TITLE')."";
+ return "".$tp->toHTML($dlsubrow['download_category_name'], FALSE, 'TITLE')."";
}
else
{
@@ -85,39 +106,105 @@ class download_shortcodes
global $dlsubrow;
return intval($dlsubrow['d_requests']);
}
+
+
// Sub-Sub-Category ****************************************************************************
+
+
function sc_download_cat_subsub_name() {
global $tp, $dlsubsubrow;
if ($dlsubsubrow['d_count'])
{
- return "".$tp->toHTML($dlsubsubrow['download_category_name'], FALSE, 'TITLE')."";
+ return "".$tp->toHTML($dlsubsubrow['download_category_name'], FALSE, 'TITLE')."";
}
else
{
return $tp->toHTML($dlsubsubrow['download_category_name'], FALSE, 'TITLE');
}
}
+
function sc_download_cat_subsub_description() {
global $tp, $dlsubsubrow;
return $tp->toHTML($dlsubsubrow['download_category_description'], TRUE, 'DESCRIPTION');
}
+
function sc_download_cat_subsub_icon() {
global $dlsubsubrow;
return $this->_sc_cat_icons($dlsubsubrow['download_category_icon'], $dlsubsubrow['d_count'], $dlsubsubrow['download_category_name']);
}
+
function sc_download_cat_subsub_count() {
global $dlsubsubrow;
return $dlsubsubrow['d_count'];
}
+
function sc_download_cat_subsub_size() {
global $e107, $dlsubsubrow;
return $this->e107->parseMemorySize($dlsubsubrow['d_size']);
}
+
function sc_download_cat_subsub_downloaded() {
global $dlsubsubrow;
return intval($dlsubsubrow['d_requests']);
}
+
+
// List ****************************************************************************************
+
+
+ function sc_download_list_caption($parm='')
+ {
+
+ $qry = $this->qry;
+
+ $qry['sort'] = ($qry['sort'] == 'asc') ? 'desc' : 'asc'; // reverse.
+
+ switch ($parm)
+ {
+ case 'name':
+ $qry['order'] = 'name';
+ $text = LAN_dl_28;
+ break;
+
+ case 'datestamp':
+ $qry['order'] = 'datestamp';
+ $text = LAN_dl_22;
+ break;
+
+ case 'author':
+ $qry['order'] = 'author';
+ $text = LAN_dl_24;
+ break;
+
+ case 'filesize':
+ $qry['order'] = 'filesize';
+ $text = LAN_dl_21;
+ break;
+
+ case 'requested':
+ $qry['order'] = 'requested';
+ $text = LAN_dl_29;
+ break;
+
+ case 'rating':
+ $text = LAN_dl_12;
+ break;
+
+ case 'link':
+ $text = LAN_dl_8;
+ break;
+
+ default:
+ $text = "Missing LAN Column"; // debug.
+ break;
+ }
+
+
+ return "".$text."" ;
+ }
+
+
+
function sc_download_list_name()
{
global $dlrow,$tp,$pref,$parm;
@@ -134,23 +221,27 @@ class download_shortcodes
$text .= $tp->toHTML($dlrow['download_name'], FALSE, 'TITLE')."";
return $text;
}
- return "".$tp->toHTML($dlrow['download_name'],TRUE,'LINKTEXT')."";
+ return "".$tp->toHTML($dlrow['download_name'],TRUE,'LINKTEXT')."";
}
+
function sc_download_list_author()
{
global $dlrow;
return $dlrow['download_author'];
}
+
function sc_download_list_requested()
{
global $dlrow;
return $dlrow['download_requested'];
}
+
function sc_download_list_newicon()
{
global $dlrow;
return (USER && $dlrow['download_datestamp'] > USERLV ? "+
+ {DOWNLOAD_LIST_NEXTPREV} +
".LAN_dl_2."
");
+ return;
+ // require_once(FOOTERF);
+ // exit;
+ }
+
+ global $dlrow, $dlsubrow;
+
+ $download_cat_table_string = "";
+ foreach($dlcat->cat_tree as $dlrow) // Display main category headings, then sub-categories, optionally with sub-sub categories expanded
+ {
+ $download_cat_table_string .= $tp->parseTemplate($DOWNLOAD_CAT_PARENT_TABLE, TRUE, vartrue($download_shortcodes));
+
+ foreach($dlrow['subcats'] as $dlsubrow)
+ {
+ $download_cat_table_string .= $tp->parseTemplate($DOWNLOAD_CAT_CHILD_TABLE, TRUE, $download_shortcodes);
+
+ foreach($dlsubrow['subsubcats'] as $dlsubsubrow)
+ {
+ $download_cat_table_string .= $tp->parseTemplate($DOWNLOAD_CAT_SUBSUB_TABLE, TRUE, $download_shortcodes);
+ }
+ }
+ }
+
+ $dl_text = $tp->parseTemplate($DOWNLOAD_CAT_TABLE_START, TRUE, $download_shortcodes);
+ $dl_text .= $download_cat_table_string;
+ $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $download_shortcodes);
+
+ $caption = varset($DOWNLOAD_CAT_CAPTION) ? $tp->parseTemplate($DOWNLOAD_CAT_CAPTION, TRUE, $download_shortcodes) : LAN_dl_18;
+
+ //ob_start();
+
+ $ns->tablerender($caption, $dl_text);
+
+ // $cache_data = ob_get_flush();
+ // $e107cache->set("download_cat".$maincatval, $cache_data);
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ public function renderView()
+ {
+ if(deftrue('BOOTSTRAP')) // v2.x
+ {
+ $template = e107::getTemplate('download','download','view');
+
+ $DOWNLOAD_VIEW_TABLE_START = varset($template['start']);
+ $DOWNLOAD_VIEW_TABLE = $template['item'];
+ $DOWNLOAD_VIEW_TABLE_END = varset($template['end']);
+ $DL_VIEW_NEXTPREV = varset($template['nextprev']);
+ $DL_VIEW_PAGETITLE = varset($template['pagetitle']);
+ $DL_VIEW_CAPTION = varset($template['caption'],"{DOWNLOAD_VIEW_CAPTION}");
+ }
+ else // Legacy v1.x
+ {
+ $template_name = 'download_template.php';
+
+ if (is_readable(THEME."templates/".$template_name))
+ {
+ require_once(THEME."templates/".$template_name);
+ }
+ elseif (is_readable(THEME.$template_name))
+ {
+ require_once(THEME.$template_name);
+ }
+ else
+ {
+ require_once(e_PLUGIN."download/templates/".$template_name);
+ }
+ }
+
+ $sql = e107::getDb();
+ $tp = e107::getParser();
+ $ns = e107::getRender();
+
+ $gen = new convert;
+
+ $download_shortcodes = new download_shortcodes;
+ $download_shortcodes->qry = $this->qry;
+
+ $highlight_search = FALSE;
+ if (isset($_POST['highlight_search']))
+ {
+ $highlight_search = TRUE;
+ }
+
+ $query = "
+ SELECT d.*, dc.* FROM #download AS d
+ LEFT JOIN #download_category AS dc ON d.download_category = dc.download_category_id
+ WHERE d.download_id = {$this->qry['id']} AND d.download_active > 0
+ AND d.download_visible IN (".USERCLASS_LIST.")
+ AND dc.download_category_class IN (".USERCLASS_LIST.")
+ LIMIT 1";
+
+ if(!$sql->gen($query))
+ {
+ //require_once(HEADERF);
+ $ns->tablerender(LAN_dl_18, "".LAN_dl_3."
");
+ return;
+ //require_once(FOOTERF);
+ //exit;
+ }
+
+ global $dlrow;
+
+ $dlrow = $sql->fetch();
+
+ $comment_edit_query = 'comment.download.'.$id;
+
+ if(!defined("DL_IMAGESTYLE")){ define("DL_IMAGESTYLE","border:0px");}
+ if(!isset($DL_VIEW_PAGETITLE))
+ {
+ $DL_VIEW_PAGETITLE = PAGE_NAME." / {DOWNLOAD_CATEGORY} / {DOWNLOAD_VIEW_NAME}";
+ }
+
+ $DL_TITLE = $tp->parseTemplate($DL_VIEW_PAGETITLE, TRUE, $download_shortcodes);
+
+ define("e_PAGETITLE", $DL_TITLE);
+
+ $DL_TEMPLATE = $DOWNLOAD_VIEW_TABLE_START.$DOWNLOAD_VIEW_TABLE.$DOWNLOAD_VIEW_TABLE_END;
+
+ $text = $tp->parseTemplate($DL_TEMPLATE, TRUE, $download_shortcodes);
+
+ if(!isset($DL_VIEW_NEXTPREV))
+ {
+ $DL_VIEW_NEXTPREV = "
+
+
+
+
+ ";
+ }
+
+
+
+ // ------- Next/Prev -----------
+ $text .= $tp->parseTemplate($DL_VIEW_NEXTPREV,TRUE, $download_shortcodes);
+
+ $caption = $tp->parseTemplate($DL_VIEW_CAPTION, TRUE, $download_shortcodes);
+
+ $ns->tablerender($caption, $text);
+
+ unset($text);
+
+ if ($dlrow['download_comment'])
+ {
+ e107::getComment()->compose_comment("download", "comment", $id, $width,$dlrow['download_name'], $showrate=FALSE);
+ }
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+ public function renderList()
+ {
+
+ if(deftrue('BOOTSTRAP')) // v2.x
+ {
+ $template = e107::getTemplate('download','download','list');
+
+ $DOWNLOAD_LIST_TABLE_START = $template['start'];
+ $DOWNLOAD_LIST_TABLE = $template['item'];
+ $DOWNLOAD_LIST_TABLE_END = $template['end'];
+ $DOWNLOAD_LIST_NEXTPREV = $template['nextprev'];
+ }
+ else // Legacy v1.x
+ {
+ $template_name = 'download_template.php';
+
+ if (is_readable(THEME."templates/".$template_name))
+ {
+ require_once(THEME."templates/".$template_name);
+ }
+ elseif (is_readable(THEME.$template_name))
+ {
+ require_once(THEME.$template_name);
+ }
+ else
+ {
+ require_once(e_PLUGIN."download/templates/".$template_name);
+ }
+ }
+
+
+ $sql = e107::getDb();
+ $tp = e107::getParser();
+ $ns = e107::getRender();
+
+ $download_shortcodes = new download_shortcodes;
+ $download_shortcodes->qry = $this->qry;
+
+ $total_downloads = $sql->count("download", "(*)", "WHERE download_category = '{$this->qry['id']}' AND download_active > 0 AND download_visible REGEXP '" . e_CLASS_REGEXP . "'");
+
+
+ /* SHOW SUBCATS ... */
+ $qry = "SELECT download_category_id,download_category_class FROM #download_category WHERE download_category_parent=".intval($this->qry['id']);
+ if($sql->gen($qry))
+ {
+ /* there are subcats - display them ... */
+ $qry = "
+ SELECT dc.*, dc2.download_category_name AS parent_name, dc2.download_category_icon as parent_icon, 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 AS d ON dc.download_category_id = d.download_category AND d.download_active > 0 AND d.download_visible IN (" . USERCLASS_LIST . ")
+ LEFT JOIN #download_category as dc2 ON dc2.download_category_id='{$this->qry['id']}'
+ WHERE dc.download_category_class IN (" . USERCLASS_LIST . ") AND dc.download_category_parent='{$this->qry['id']}'
+ GROUP by dc.download_category_id ORDER by dc.download_category_order
+ ";
+
+ $sql->gen($qry);
+
+ $scArray = $sql->db_getList();
+ $load_template = 'download_template';
+
+ if(!isset($DOWNLOAD_CAT_PARENT_TABLE))
+ {
+ eval($template_load_core);
+ }
+
+ if(!defined("DL_IMAGESTYLE"))
+ {
+ define("DL_IMAGESTYLE", "border:1px solid blue");
+ }
+
+ $download_cat_table_string = "";
+
+ $dl_text = $tp->parseTemplate($DOWNLOAD_CAT_TABLE_PRE, TRUE, $download_shortcodes);
+ $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_START, TRUE, $download_shortcodes);
+
+ foreach($scArray as $dlsubsubrow)
+ {
+ $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_SUBSUB_TABLE, TRUE, $download_shortcodes);
+ }
+
+ $dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $download_shortcodes);
+
+ $dlbreadcrumb = $this->getBreadcrumb(array(LAN_dl_18 => e_SELF,$type));
+ $dl_title = $tp->parseTemplate("{BREADCRUMB=dlbreadcrumb}", TRUE, $download_shortcodes);
+
+ $ns->tablerender($dl_title, $dl_text);
+ $text = "";
+ // If other files, show in a separate block
+ $dl_title = "";
+ // Cancel title once displayed
+ }// End of subcategory display
+
+ // Now display individual downloads
+ $download_category_class = 0;
+
+ if(!check_class($download_category_class))
+ {
+
+
+ $ns->tablerender(LAN_dl_18, "
+ | {DOWNLOAD_VIEW_PREV} | +{DOWNLOAD_BACK_TO_LIST} | +{DOWNLOAD_VIEW_NEXT} | +
+ " . LAN_dl_3 . "
+
");
+
+ return;
+ // require_once (FOOTERF);
+ // exit ;
+ }
+ if($total_downloads < $this->qry['view'])
+ {
+ $dl_from = 0;
+ }
+
+
+ if(!defined("DL_IMAGESTYLE"))
+ {
+ define("DL_IMAGESTYLE", "border:1px solid blue");
+ }
+
+ require_once (e_HANDLER . "rate_class.php");
+ $dltdownloads = 0;
+
+ // $dl_from - first entry to show (note - can get reset due to reuse of query,
+ // even if values overridden this time)
+ // $this->qry['view'] - number of entries per page
+ // $total_downloads - total number of entries matching search criteria
+ $filetotal = $sql->select("download", "*", "download_category='{$this->qry['id']}' AND download_active > 0 AND download_visible IN (" . USERCLASS_LIST . ") ORDER BY download_{$this->qry['order']} {$this->qry['sort']} LIMIT {$dl_from}, ".$this->qry['view']);
+
+ if($filetotal)
+ {
+ // Only show list if some files in it
+ $dl_text = $tp->parseTemplate($DOWNLOAD_LIST_TABLE_START, TRUE, $download_shortcodes);
+
+ global $dlrow, $dlft, $dltdownloads;
+
+ $dlft = ($filetotal < $this->qry['view'] ? $filetotal: $this->qry['view']);
+
+ while($dlrow = $sql->fetch())
+ {
+ $agreetext = $tp->toHTML($pref['agree_text'], TRUE, 'DESCRIPTION');
+ $current_row = ($current_row)? 0: 1;
+ // Alternating CSS for each row.(backwards compatible)
+ $template = ($current_row == 1)? $DOWNLOAD_LIST_TABLE: str_replace("forumheader3", "forumheader3 forumheader3_alt", $DOWNLOAD_LIST_TABLE);
+
+ $dltdownloads += $dlrow['download_requested'];
+
+ $dl_text .= $tp->parseTemplate($template, TRUE, $download_shortcodes);
+
+
+ }
+
+ $dl_text .= $tp->parseTemplate($DOWNLOAD_LIST_TABLE_END, TRUE, $download_shortcodes);
+
+ if($sql->select("download_category", "*", "download_category_id='{$download_category_parent}' "))
+ {
+ $parent = $sql->fetch();
+ }
+
+
+ $ns->tablerender(LAN_dl_18, $dl_text, 'download-list');
+ }
+
+ if(!isset($DOWNLOAD_LIST_NEXTPREV))
+ {
+ $sc_style['DOWNLOAD_LIST_NEXTPREV']['pre'] = "
+
+ ";
+ $sc_style['DOWNLOAD_LIST_NEXTPREV']['post'] = "
+
";
+
+ $DOWNLOAD_LIST_NEXTPREV = "
+
+ {DOWNLOAD_BACK_TO_CATEGORY_LIST}
+
+
+ {DOWNLOAD_LIST_NEXTPREV} +
";
+ }
+
+ global $nextprev_parms;
+
+ $nextprev_parms = $total_downloads . "," . $this->qry['view'] . "," . $dl_from . "," . e_SELF . "?[FROM].list.{$this->qry['id']}.{$this->qry['view']}.{$this->qry['order']}.{$this->qry['sort']}.";
+
+ echo $tp->parseTemplate($DOWNLOAD_LIST_NEXTPREV, TRUE, $download_shortcodes);
+
+
+
+ }
+
+
+ function renderReport()
+ {
+ $sql = e107::getDb();
+ $tp = e107::getParser();
+ $ns = e107::getRender();
+ $frm = e107::getForm();
+ $pref = e107::getPref();
+
+ $query = "
+ SELECT d.*, dc.* FROM #download AS d
+ LEFT JOIN #download_category AS dc ON d.download_category = dc.download_category_id
+ WHERE d.download_id = {$this->qry['id']}
+ AND download_active > 0
+ LIMIT 1";
+
+ if(!$sql->gen($query))
+ {
+ return;
+ }
+
+ $dlrow = $sql->fetch();
+
+ extract($dlrow);
+
+ if (isset($_POST['report_download']))
+ {
+ $report_add = $tp->toDB($_POST['report_add']);
+ $download_name = $tp->toDB($download_name);
+ $user = USER ? USERNAME : LAN_dl_52;
+
+ if ($pref['download_email'])
+ { // this needs to be moved into the NOTIFY, with an event.
+ require_once(e_HANDLER."mail.php");
+ $subject = LAN_dl_60." ".SITENAME;
+ $report = LAN_dl_58." ".SITENAME.":\n".(substr(SITEURL, -1) == "/" ? SITEURL : SITEURL."/")."download.php?view.".$download_id."\n
+ ".LAN_dl_59." ".$user."\n".$report_add;
+ sendemail(SITEADMINEMAIL, $subject, $report);
+ }
+
+ $sql->insert('generic', "0, 'Broken Download', ".time().",'".USERID."', '{$download_name}', {$id}, '{$report_add}'");
+
+ define("e_PAGETITLE", PAGE_NAME." / ".LAN_dl_47);
+
+ // require_once(HEADERF);
+
+ $text = LAN_dl_48."+
+ {DOWNLOAD_LIST_NEXTPREV} +
".LAN_dl_49.""; + // $dlbreadcrumb = $dl->getBreadcrumb(array(LAN_dl_18=>e_SELF, $dlrow['download_category_name']=>e_SELF."?list.".$dlrow['download_category_id'], $dlrow['download_name']=>e_SELF."?view.".$dlrow['download_id'], LAN_dl_50)); + // $dl_title .= $tp->parseTemplate("{BREADCRUMB=dlbreadcrumb}", TRUE, $download_shortcodes); + + $ns->tablerender(LAN_dl_18, $text); + } + else + { + define("e_PAGETITLE", PAGE_NAME." / ".LAN_dl_51." ".$download_name); + // require_once(HEADERF); + + $breadcrumb = array(); + $breadcrumb[] = array('text' => LAN_dl_18, 'url' => e_SELF); + $breadcrumb[] = array('text' => $dlrow['download_category_name'], 'url' => e_SELF."?action=list&id=".$dlrow['download_category_id']); + $breadcrumb[] = array('text' => $dlrow['download_name'], 'url' => e_SELF."?action=view&id=".$dlrow['download_id']); + $breadcrumb[] = array('text' => LAN_dl_50, 'url' => null); + + $text = $frm->breadcrumb($breadcrumb); + + $text .= ""; + + $ns->tablerender(LAN_dl_18, $text); + } + } + + + //TODO + function renderMirror() + { + + + + } + + + + + + + + + + + + + + + + + + + /** + * @DEPRECATED + */ function getBreadcrumb($arr) { $dlbreadcrumb = array(); @@ -67,7 +655,7 @@ class download 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)) + if (!$sql->gen($qry)) { return "Error reading categories
"; exit; @@ -76,7 +664,7 @@ class download \n"; // Its a structured display option - need a 2-step process to create a tree $catlist = array(); - while ($dlrow = $sql->db_Fetch(MYSQL_ASSOC)) + while ($dlrow = $sql->fetch(MYSQL_ASSOC)) { $tmp = $dlrow['download_category_parent']; if ($tmp == '0') diff --git a/e107_plugins/download/plugin.xml b/e107_plugins/download/plugin.xml index 61c09b6f2..da173ff9e 100755 --- a/e107_plugins/download/plugin.xml +++ b/e107_plugins/download/plugin.xml @@ -28,5 +28,6 @@
| ".LAN_dl_19." | +".LAN_dl_20." | +".LAN_dl_21." | +".LAN_dl_77." | +|||
|---|---|---|---|---|---|---|
| {DOWNLOAD_CAT_NEWDOWNLOAD_TEXT} | +||||||
| {DOWNLOAD_CAT_SEARCH} | +||||||
| + {DOWNLOAD_CAT_MAIN_ICON} + | +
+ {DOWNLOAD_CAT_MAIN_NAME} + {DOWNLOAD_CAT_MAIN_DESCRIPTION} + |
+ |||||
| {DOWNLOAD_CAT_SUB_ICON} | +
+ {DOWNLOAD_CAT_SUB_NEW_ICON} {DOWNLOAD_CAT_SUB_NAME} + {DOWNLOAD_CAT_SUB_DESCRIPTION} + |
+ {DOWNLOAD_CAT_SUB_COUNT} | +{DOWNLOAD_CAT_SUB_SIZE} | +{DOWNLOAD_CAT_SUB_DOWNLOADED} | +||
| + + | +
+
|
+ {DOWNLOAD_CAT_SUBSUB_COUNT} | +{DOWNLOAD_CAT_SUBSUB_SIZE} | +{DOWNLOAD_CAT_SUBSUB_DOWNLOADED} | +||
+
+
+
+
\n";
+
+$DOWNLOAD_TEMPLATE['view']['end'] = "";
+
+
+$DOWNLOAD_TEMPLATE['view']['nextprev'] = "
+| + {DOWNLOAD_VIEW_NAME} {DOWNLOAD_ADMIN_EDIT} + | +|
| {DOWNLOAD_VIEW_DESCRIPTION_LAN} | +{DOWNLOAD_VIEW_DESCRIPTION} | +
| {DOWNLOAD_VIEW_IMAGE_LAN} | +{DOWNLOAD_VIEW_IMAGE} | +
| {DOWNLOAD_VIEW_FILESIZE_LAN} | +{DOWNLOAD_VIEW_FILESIZE} | +
| {DOWNLOAD_VIEW_DATE_LAN} | +{DOWNLOAD_VIEW_DATE=long} | +
| {DOWNLOAD_VIEW_REQUESTED_LAN} | +{DOWNLOAD_VIEW_REQUESTED} | +
| {DOWNLOAD_VIEW_LINK_LAN} | +{DOWNLOAD_VIEW_LINK} | +
| {DOWNLOAD_VIEW_RATING_LAN} | +{DOWNLOAD_VIEW_RATING} | +
+
+
+
\n";
+
+$DOWNLOAD_TEMPLATE['view']['nextprev'] = '
+ | {DOWNLOAD_VIEW_PREV} | +{DOWNLOAD_BACK_TO_LIST} | +{DOWNLOAD_VIEW_NEXT} | +
-
+
- + {DOWNLOAD_VIEW_PREV} + +
- + {DOWNLOAD_VIEW_NEXT} + +
{DOWNLOAD_BACK_TO_LIST}
+';
+
+
+
+
+
+
+
+$DOWNLOAD_TEMPLATE['list']['start'] = "{DOWNLOAD_BREADCRUMB}
+
+
+
\n";
+
+
+$DOWNLOAD_TEMPLATE['list']['nextprev'] = "
+
+ {DOWNLOAD_BACK_TO_CATEGORY_LIST}
+
+
+ {DOWNLOAD_LIST_NEXTPREV} +
";
+
+
+$sc_style['DOWNLOAD_LIST_NEXTPREV']['pre'] = "+
+ {DOWNLOAD_LIST_NEXTPREV} +
";
+$sc_style['DOWNLOAD_LIST_NEXTPREV']['post'] = "
";
+$DOWNLOAD_LIST_NEXTPREV = "
+
+ {DOWNLOAD_BACK_TO_CATEGORY_LIST}
+
+
+ {DOWNLOAD_LIST_NEXTPREV} +
";
+
// ##### ------------------------------------------------------------------------------------------
?>
\ No newline at end of file
+
+ {DOWNLOAD_LIST_NEXTPREV} +