Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12004] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-09-04 18:17:44
|
Revision: 12004
http://sourceforge.net/p/xoops/svn/12004
Author: luciorota
Date: 2013-09-04 18:17:39 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
code/template refactory but still rss bugs...
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-04 18:17:39 UTC (rev 12004)
@@ -161,7 +161,7 @@
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav_published = new XoopsPageNav($published_count, $wfdownloads->getConfig('admin_perpage') , $start_published, 'start_published');
- $GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published -> renderNav());
+ $GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published->renderNav());
}
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_mirrorslist.html");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-04 18:17:39 UTC (rev 12004)
@@ -98,9 +98,8 @@
$down['add_mirror'] = $add_mirror;
$down['use_mirrors'] = $use_mirrors;
- $rating = round(number_format($this->getVar('rating'), 0) / 2);
- $rateImage = "rate{$rating}.gif";
- $down['rateimg'] = $rateImage;
+ $down['rateimg'] = "rate" . round(number_format($this->getVar('rating'), 0) / 2) . ".gif"; // this definition is not removed for compatibility issues
+ $down['average_rating'] = $this->getVar('rating'); // new
$down['votes'] = ($this->getVar('votes') == 1) ? _MD_WFD_ONEVOTE : sprintf(_MD_WFD_NUMVOTES, $this->getVar('votes'));
$down['hits'] = $this->getVar('hits');
@@ -264,19 +263,14 @@
$down['reviews_num'] = ($numrows) ? $numrows : 0;
- $finalRating = 0;
- $totalRating = 0;
-
+ $totalReviewsRating = 0;
while ($review_text = $xoopsDB->fetchArray($results)) {
- $totalRating += $review_text['rated'];
+ $totalReviewsRating += $review_text['rated'];
}
+ $averageReviewsRating = ($down['reviews_num'] > 0) ? $totalReviewsRating / $down['reviews_num'] : 0;
+ $down['review_average_rating'] = $averageReviewsRating; // new
+ $down['review_rateimg'] = "rate" . round(number_format($averageReviewsRating, 0) / 2) . ".gif"; // this definition is not removed for compatibility issues
- if ($down['reviews_num'] > 0) {
- $finalRating = $totalRating / $down['reviews_num'];
- $finalRating = round(number_format($finalRating, 0) / 2);
- }
- $down['review_rateimg'] = "rate{$finalRating}.gif";;
-
$down['icons'] = wfd_displayicons($this->getVar('published'), $this->getVar('status'), $this->getVar('hits'));
global $xoopsDB;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-09-04 18:17:39 UTC (rev 12004)
@@ -215,10 +215,11 @@
$xoopsTpl->assign('lang_thereare', sprintf($lang_ThereAre, $count, array_sum($listings['count'])));
-if($wfdownloads->getConfig('enablerss') == 1) {
- //$rsslink=sprintf("<a href='%s' title='%s'><img src='%s' border=0 alt='%s' title='%s'></a>", WFDOWNLOADS_URL . "/rss.php", _MD_WFD_LEGENDTEXTRSS, XOOPS_URL . "/" . $wfdownloads->getConfig('mainimagedir') . "/icon/rss.gif", _MD_WFD_LEGENDTEXTRSS); $xoopsTpl->assign('full_rssfeed_link', $rsslink);
- $rsslink=sprintf("<a href='%s' title='%s'><img src='%s' border=0 alt='%s' title='%s'></a>", WFDOWNLOADS_URL . "/rss.php", _MD_WFD_LEGENDTEXTRSS, XOOPS_URL . "/" . $wfdownloads->getConfig('mainimagedir') . "/icon/rss.gif", _MD_WFD_LEGENDTEXTRSS, _MD_WFD_LEGENDTEXTRSS, '' ); //changed by Zyspec
-
+if($wfdownloads->getConfig('enablerss') == true) {
+ $rsslink_URL = WFDOWNLOADS_URL . "/rss.php";
+ $xoopsTpl->assign('full_rssfeed_URL', $rsslink_URL);
+ $rsslink = "<a href='" . $rsslink_URL . "' title='" . _MD_WFD_LEGENDTEXTRSS . "'><img src='" . XOOPS_URL . "/modules/" . $wfdownloads->getModule()->getVar('dirname') . "/images/icon/rss.gif' border='0' alt='" . _MD_WFD_LEGENDTEXTRSS . "' title='" . _MD_WFD_LEGENDTEXTRSS . "'></a>";
+ $xoopsTpl->assign('full_rssfeed_link', $rsslink); // this definition is not removed for compatibility issues
}
include 'footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/rss.php 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/rss.php 2013-09-04 18:17:39 UTC (rev 12004)
@@ -18,34 +18,35 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-include "../../mainfile.php";
+$currentFile = basename(__FILE__);
+include 'header.php';
if (function_exists('mb_http_output')) {
mb_http_output('pass');
}
+
+
$feed_type = 'rss';
$contents = ob_get_clean();
header ('Content-Type:text/xml; charset=utf-8');
$xoopsOption['template_main'] = 'system_' . $feed_type . '.html';
-//error_reporting(0);
+error_reporting(0);
-
-$member_handler =& xoops_gethandler('member');
-$gperm_handler = &xoops_gethandler('groupperm');
-
-include_once(XOOPS_ROOT_PATH."/class/template.php");
+include_once(XOOPS_ROOT_PATH . "/class/template.php");
$xoopsTpl = new XoopsTpl();
// Find case
$case = "all";
-$category = $wfdownloads->getHandler('category')->get(intval($_REQUEST['cid']));
+$category = $wfdownloads->getHandler('category')->get((int)$_REQUEST['cid']);
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
-$allowed_cats = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
+// Get download permissions
+$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
+
if (!$category->isNew()) {
- if (!in_array($category->getVar('cid'), $allowed_cats)) {
+ if (!in_array($category->getVar('cid'), $allowedDownCategoriesIds)) {
exit();
}
$case = "category";
@@ -54,11 +55,11 @@
switch ($case) {
// Set cache_prefix
default:
- case "all":
+ case "all" :
$cache_prefix = 'wfd|feed|' . $feed_type;
break;
- case "category":
+ case "category" :
$cache_prefix = 'wfd|catfeed|' . $feed_type. '|' . (int)$category->getVar('cid');
break;
}
@@ -77,25 +78,25 @@
switch ($case) {
default:
- case "all":
- $shorthand = "all";
+ case "all" :
+ $shorthand = 'all';
$title = $xoopsConfig['sitename'] . ' - ' . htmlspecialchars($wfdownloads->getModule()->getVar('name'), ENT_QUOTES);
$desc = $xoopsConfig['slogan'] ;
- $channel_url = XOOPS_URL . '/modules/wfdownloads/rss.php';
+ $channel_url = XOOPS_URL . '/modules/' . $wfdownloads->getModule()->getVat('dirname') . '/rss.php';
- $criteria->add(new Criteria("cid", '(' . implode(',', $allowed_cats) . ')', "IN"));
- $items = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $criteria->add(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'));
+ $downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
$id = 0;
break;
- case "category":
- $shorthand = "cat";
+ case "category" :
+ $shorthand = 'cat';
$title = $xoopsConfig['sitename'] . ' - ' . htmlspecialchars($category->getVar('title'), ENT_QUOTES);
$desc = $xoopsConfig['slogan'] . ' - ' . htmlspecialchars($category->getVar('title'), ENT_QUOTES);
- $channel_url = XOOPS_URL . '/modules/wfdownloads/rss.php?cid=' . (int)$category->getVar('cid');
+ $channel_url = XOOPS_URL . '/modules/' . $wfdownloads->getModule()->getVat('dirname') . '/rss.php?cid=' . (int)$category->getVar('cid');
- $criteria->add(new Criteria("cid", intval($category->getVar('cid'))));
- $items = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $criteria->add(new Criteria('cid', (int)$category->getVar('cid')));
+ $downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
$id = $category->getVar('categoryid');
break;
}
@@ -113,20 +114,20 @@
$xoopsTpl->assign('channel_language', _LANGCODE);
// Assign items to template style array
- $url = XOOPS_URL . '/modules/wfdownloads/';
- if(count($items) > 0){
- // Get users for items
+ $url = XOOPS_URL . '/modules/' . $wfdownloads->getModule()->getVat('dirname') . '/';
+ if(count($downloads) > 0){
+ // Get users for downloads
$uids = array();
- foreach(array_keys($items) AS $i){
- $uids[] = $items[$i]->getVar('submitter');
+ foreach($downloads as $download){
+ $uids[] = $download->getVar('submitter');
}
if (count($uids) > 0) {
- $users = $member_handler->getUserList(new Criteria('uid', '(' . implode(',', array_unique($uids)) . ')', "IN"));
+ $users = $member_handler->getUserList(new Criteria('uid', '(' . implode(',', array_unique($uids)) . ')', 'IN'));
}
- //Assign items to template
- foreach(array_keys($items) AS $i){
- $item = $items[$i];
+ // Assign items to template
+ foreach($downloads as $download){
+ $item = $download;
$link = $url . 'singlefile.php?lid=' . (int)$item->getVar('lid');
$title = htmlspecialchars($item->getVar('title', 'n'));
$teaser = htmlspecialchars($item->getVar('summary', 'n'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.html 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.html 2013-09-04 18:17:39 UTC (rev 12004)
@@ -55,10 +55,10 @@
</div>
<{/if}>
-<{if $full_rssfeed_link !== ""}>
- <div>
- <{$full_rssfeed_link}> <{$smarty.const._MD_WFD_LEGENDTEXTRSS}>
- </div>
+<{if $full_rssfeed_URL != ''}>
+ <a href='<{$full_rssfeed_URL}>' title='<{$smarty.const._MD_WFD_LEGENDTEXTRSS}>'>
+ <img src='images/icon/rss.gif' alt='<{$smarty.const._MD_WFD_LEGENDTEXTRSS}>' title='<{$smarty.const._MD_WFD_LEGENDTEXTRSS}>' />
+ </a>
<{/if}>
<br />
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-04 18:17:39 UTC (rev 12004)
@@ -39,11 +39,11 @@
<br />
<div style="margin-left: 10px; margin-right: 10px; padding: 4px; background-color:#e6e6e6; border-color:#999999;" class="outer">
- <div><b><{$smarty.const._MD_WFD_RATINGC}></b> <img src="images/icon/<{$download.rateimg}>" alt="" title="" align="middle" /> (<{$download.votes}>)</div>
+ <div><b><{$smarty.const._MD_WFD_RATINGC}></b> <img src="images/icon/<{$download.rateimg}>" alt="<{$download.average_rating|string_format:'%.2f'}>" title="<{$download.average_rating|string_format:'%.2f'}>" align="middle" /> (<{$download.votes}>)</div>
</div>
<br />
<div style="margin-left: 10px; margin-right: 10px; padding: 4px; background-color:#e6e6e6; border-color:#999999;" class="outer">
- <div><b><{$smarty.const._MD_WFD_REVIEWS}></b> <img src="images/icon/<{$download.review_rateimg}>" alt="" title="" align="middle" /> (<{$download.reviews_num}>)</div>
+ <div><b><{$smarty.const._MD_WFD_REVIEWS}></b> <img src="images/icon/<{$download.review_rateimg}>" alt="<{$download.review_average_rating|string_format:'%.2f'}>" title="<{$download.review_average_rating|string_format:'%.2f'}>" /> (<{$download.reviews_num}>)</div>
</div>
<br />
<{if $download.use_mirrors == 1}>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-09-04 18:17:39 UTC (rev 12004)
@@ -1,7 +1,10 @@
<{include file='db:wfdownloads_header.html'}>
+
<div>
-<{if $cat_rssfeed_link != ""}>
- <{$cat_rssfeed_link}>
+<{if $category_rssfeed_URL != ''}>
+ <a href='<{$category_rssfeed_URL}>' title='<{$smarty.const._MD_WFD_LEGENDTEXTCATRSS}>'>
+ <img src='images/icon/rss.gif' alt='<{$smarty.const._MD_WFD_LEGENDTEXTCATRSS}>' title='<{$smarty.const._MD_WFD_LEGENDTEXTCATRSS}>' />
+ </a>
<{/if}>
<{if $category_image_URL}>
<img src="<{$category_image_URL}>" alt="<{$category_title}>" title="<{$category_title}>" />
@@ -77,11 +80,7 @@
</div>
<{/if}>
<br />
-<{if $page_nav == true}>
- <div class="wfd_pagenav">
- <{$smarty.const._MD_WFD_PAGES}>: <{$pagenav}>
- </div>
-<{/if}>
+ <{$pagenav}>
<!-- Start link loop -->
<{foreach item=download from=$downloads}>
<div>
@@ -91,12 +90,14 @@
<{/foreach}>
<!-- End link loop -->
<div style="clear:both"></div>
-<{if $page_nav == true}>
- <div class="wfd_pagenav">
- <{$smarty.const._MD_WFD_PAGES}>: <{$pagenav}>
- </div>
-<{/if}>
+ <{$pagenav}>
</div>
<{/if}>
+<{if $category_rssfeed_URL != ""}>
+ <a href='<{$category_rssfeed_URL}>' title='<{$smarty.const._MD_WFD_LEGENDTEXTCATRSS}>'>
+ <img src='images/icon/rss.gif' alt='<{$smarty.const._MD_WFD_LEGENDTEXTCATRSS}>' title='<{$smarty.const._MD_WFD_LEGENDTEXTCATRSS}>' />
+ </a>
+<{/if}>
+
<{include file='db:wfdownloads_footer.html'}>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-09-04 18:17:39 UTC (rev 12004)
@@ -104,14 +104,14 @@
$criteria = new CriteriaCompo();
$criteria->setSort('weight ASC, title');
$categories = $wfdownloads->getHandler('category')->getObjects($criteria, true);
-include_once XOOPS_ROOT_PATH . "/class/tree.php";
+include_once XOOPS_ROOT_PATH . '/class/tree.php';
$categoriesTree = new XoopsObjectTree($categories, 'cid', 'pid');
// Breadcrumb
$breadcrumb = new WfdownloadsBreadcrumb();
$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
foreach(array_reverse($categoriesTree->getAllParent($cid)) as $parentCategory) {
- $breadcrumb->addLink($parentCategory->getVar('title'), "viewcat.php?cid=" . $parentCategory->getVar('cid'));
+ $breadcrumb->addLink($parentCategory->getVar('title'), 'viewcat.php?cid=' . $parentCategory->getVar('cid'));
}
$breadcrumb->addLink($category->getVar('title'), '');
$xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
@@ -133,23 +133,23 @@
$subsubCategories = $categoriesTree->getAllChild($subcategory->getVar('cid'));
// ----- added for subcat images -----
- if (($subcategory->getVar('imgurl') != '') && is_file(XOOPS_ROOT_PATH . "/" . $wfdownloads->getConfig('catimage') . "/" . $subcategory->getVar('imgurl'))) {
+ if (($subcategory->getVar('imgurl') != '') && is_file(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage') . '/' . $subcategory->getVar('imgurl'))) {
if ($wfdownloads->getConfig('usethumbs') && function_exists('gd_info')) {
$imageURL = down_createthumb($subcategory->getVar('imgurl'), $wfdownloads->getConfig('catimage'),
'thumbs', $wfdownloads->getConfig('cat_imgwidth'), $wfdownloads->getConfig('cat_imgheight'),
$wfdownloads->getConfig('imagequality'), $wfdownloads->getConfig('updatethumbs'), $wfdownloads->getConfig('keepaspect'));
} else {
- $imageURL = XOOPS_URL . "/" . $wfdownloads->getConfig('catimage') . "/" . $subcategory->getVar('imgurl');
+ $imageURL = XOOPS_URL . '/' . $wfdownloads->getConfig('catimage') . '/' . $subcategory->getVar('imgurl');
}
} else {
- $imageURL = ''; //XOOPS_URL . "/" . $wfdownloads->getConfig('catimage') . "/blank.gif";
+ $imageURL = ''; //XOOPS_URL . '/' . $wfdownloads->getConfig('catimage') . '/blank.gif';
}
// ----- end subcat images -----
if (count($subsubCategories) > 0) {
foreach (array_keys($subsubCategories) as $k) {
if (in_array($subsubCategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
- $download_count += isset($listings["count"][$subsubCategories[$k]->getVar('cid')]) ? $listings["count"][$subsubCategories[$k]->getVar('cid')] : 0;
+ $download_count += isset($listings['count'][$subsubCategories[$k]->getVar('cid')]) ? $listings['count'][$subsubCategories[$k]->getVar('cid')] : 0;
$infercategories[] = array(
'cid' => $subsubCategories[$k]->getVar('cid'),
'id' => $subsubCategories[$k]->getVar('cid'), // this definition is not removed for compatibility issues
@@ -195,13 +195,13 @@
$xoopsTpl->assign('category_allowed_upload', in_array($cid, $allowedUpCategoriesIds));
// Making the category image and title available in the template
- if (($categories[$cid]->getVar('imgurl') != "") && is_file(XOOPS_ROOT_PATH . "/" . $wfdownloads->getConfig('catimage') . "/" . $categories[$cid]->getVar('imgurl'))) {
+ if (($categories[$cid]->getVar('imgurl') != "") && is_file(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage') . '/' . $categories[$cid]->getVar('imgurl'))) {
if ($wfdownloads->getConfig('usethumbs') && function_exists('gd_info')) {
$imageURL = down_createthumb($categories[$cid]->getVar('imgurl'), $wfdownloads->getConfig('catimage'),
'thumbs', $wfdownloads->getConfig('cat_imgwidth'), $wfdownloads->getConfig('cat_imgheight'),
$wfdownloads->getConfig('imagequality'), $wfdownloads->getConfig('updatethumbs'), $wfdownloads->getConfig('keepaspect'));
} else {
- $imageURL = XOOPS_URL . "/" . $wfdownloads->getConfig('catimage') . "/" . $categories[$cid]->getVar('imgurl');
+ $imageURL = XOOPS_URL . '/' . $wfdownloads->getConfig('catimage') . '/' . $categories[$cid]->getVar('imgurl');
}
} else {
$imageURL = '';
@@ -213,26 +213,27 @@
}
// Extract Download information from database
-$xoopsTpl->assign('show_category_title', true);
+$xoopsTpl->assign('show_category_title', false);
if (isset($_GET['selectdate'])) {
- $criteria->add(new Criteria('', "TO_DAYS(FROM_UNIXTIME(" . (int)$_GET['selectdate'] . "))", "=", "", "TO_DAYS(FROM_UNIXTIME(published))"));
+ $criteria->add(new Criteria('', 'TO_DAYS(FROM_UNIXTIME(' . (int)$_GET['selectdate'] . '))', '=', '', 'TO_DAYS(FROM_UNIXTIME(published))'));
+ $xoopsTpl->assign('show_categort_title', true);
} elseif (isset($_GET['list'])) {
$criteria->setSort("{$orderby}, title");
- $criteria->add(new Criteria('title', $myts->addSlashes($_GET['list']) . "%", "LIKE"));
+ $criteria->add(new Criteria('title', $myts->addSlashes($_GET['list']) . '%', 'LIKE'));
$xoopsTpl->assign('categoryPath', sprintf(_MD_WFD_DOWNLOADS_LIST, htmlspecialchars($_GET['list'])));
+ $xoopsTpl->assign('show_categort_title', true);
} else {
$criteria->setSort("{$orderby}, title");
$criteria->add(new Criteria('cid', $cid));
- $xoopsTpl->assign('show_categort_title', false);
}
-$total_numrows = $wfdownloads->getHandler('download')->getActiveCount($criteria);
+$downloads_count = $wfdownloads->getHandler('download')->getActiveCount($criteria);
$criteria->setLimit($wfdownloads->getConfig('perpage'));
$criteria->setStart($start);
$downloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
// Show Downloads by file
-if ($total_numrows > 0) {
+if ($downloads_count > 0) {
foreach (array_keys($downloads) as $i) {
$downloadInfo = $downloads[$i]->getDownloadInfo();
$xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFD_DLTIMES, $downloadInfo['hits']));
@@ -243,7 +244,7 @@
// Show order box
$xoopsTpl->assign('show_links', false);
- if ($total_numrows > 1 && $cid != 0) {
+ if ($downloads_count > 1 && $cid != 0) {
$xoopsTpl->assign('show_links', true);
$orderbyTrans = convertorderbytrans($orderby);
$xoopsTpl->assign('lang_cursortedby', sprintf(_MD_WFD_CURSORTBY, convertorderbytrans($orderby)));
@@ -262,20 +263,22 @@
// Nav page render
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
if (isset($_GET['selectdate'])) {
- $pagenav = new XoopsPageNav($total_numrows, $wfdownloads->getConfig('perpage') , $start, 'start', 'list=' . urlencode($_GET['selectdate']));
+ $pagenav = new XoopsPageNav($downloads_count, $wfdownloads->getConfig('perpage'), $start, 'start', 'list=' . urlencode($_GET['selectdate']));
} elseif (isset($_GET['list'])) {
- $pagenav = new XoopsPageNav($total_numrows, $wfdownloads->getConfig('perpage') , $start, 'start', 'list=' . urlencode($_GET['list']));
+ $pagenav = new XoopsPageNav($downloads_count, $wfdownloads->getConfig('perpage'), $start, 'start', 'list=' . urlencode($_GET['list']));
} else {
- $pagenav = new XoopsPageNav($total_numrows, $wfdownloads->getConfig('perpage') , $start, 'start', 'cid=' . $cid);
+ $pagenav = new XoopsPageNav($downloads_count, $wfdownloads->getConfig('perpage'), $start, 'start', 'cid=' . $cid);
}
$page_nav = $pagenav->renderNav();
- $istrue = (isset($page_nav) && !empty($page_nav)) ? true : false;
- $xoopsTpl->assign('page_nav', $istrue);
- $xoopsTpl->assign('pagenav', $page_nav);
+ $xoopsTpl->assign('page_nav', (isset($page_nav) && !empty($page_nav))); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('pagenav', $pagenav->renderNav());
}
-if($wfdownloads->getConfig('enablerss') == 1 && $total_numrows > 0) {
- $rsslink = sprintf("<a href='%s' title='%s'><img src='%s' border='0' alt='%s' title='%s'></a>" ,WFDOWNLOADS_URL . "/rss.php?cid=" . (int)($cid), _MD_WFD_LEGENDTEXTCATRSS, XOOPS_URL . "/" . $wfdownloads->getConfig('mainimagedir') . "/icon/rss.gif", _MD_WFD_LEGENDTEXTCATRSS, ''); //changed by Zyspec
-}
+if($wfdownloads->getConfig('enablerss') == true && $downloads_count > 0) {
+ $rsslink_URL = WFDOWNLOADS_URL . "/rss.php?cid={$cid}";
+ $xoopsTpl->assign('category_rssfeed_URL', $rsslink_URL);
+ $rsslink = "<a href='" . $rsslink_URL . "' title='" . _MD_WFD_LEGENDTEXTCATRSS . "'><img src='" . XOOPS_URL . "/modules/" . $wfdownloads->getModule()->getVar('dirname') . "/images/icon/rss.gif' border='0' alt='" . _MD_WFD_LEGENDTEXTCATRSS . "' title='" . _MD_WFD_LEGENDTEXTCATRSS . "'></a>";
+ $xoopsTpl->assign('cat_rssfeed_link', $rsslink); // this definition is not removed for compatibility issues
+}
include 'footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-04 07:58:38 UTC (rev 12003)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-04 18:17:39 UTC (rev 12004)
@@ -47,9 +47,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-08-29';
-$modversion['release_date'] = '2013/08/29';
-$modversion['releasedate'] = "2013-08-29";
+$modversion['date'] = '2013-09-04';
+$modversion['release_date'] = '2013/09/04';
+$modversion['releasedate'] = "2013-09-04";
$modversion['status'] = "BETA";
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
