Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12160] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-10-07 20:17:57
|
Revision: 12160
http://sourceforge.net/p/xoops/svn/12160
Author: luciorota
Date: 2013-10-07 20:17:51 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
added: sort downloads by file size
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -170,7 +170,7 @@
$xoopsTpl->assign('brokenreportexists', true);
$xoopsTpl->assign('broken', $broken);
- $xoopsTpl->assign('brokenreport', true); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('brokenreport', true); // this definition is not removed for backward compatibility issues
} else {
// file info
$down['title'] = trim($download->getVar('title'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -163,7 +163,7 @@
$use_ratings = $this->wfdownloads->getConfig('enable_ratings');
$download['rateimg']
=
- "rate" . round(number_format($this->getVar('rating'), 0) / 2) . ".gif"; // this definition is not removed for compatibility issues
+ "rate" . round(number_format($this->getVar('rating'), 0) / 2) . ".gif"; // this definition is not removed for backward compatibility issues
$download['average_rating'] = $this->getVar('rating'); // new
$download['votes'] = ($this->getVar('votes') == 1)
? _MD_WFDOWNLOADS_ONEVOTE
@@ -422,7 +422,7 @@
$download['review_average_rating'] = $averageReviewsRating; // new
$download['review_rateimg']
=
- 'rate' . round(number_format($averageReviewsRating, 0) / 2) . '.gif'; // this definition is not removed for compatibility issues
+ 'rate' . round(number_format($averageReviewsRating, 0) / 2) . '.gif'; // this definition is not removed for backward compatibility issues
$download['icons'] = wfdownloads_displayIcons($this->getVar('published'), $this->getVar('status'), $this->getVar('hits'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -777,31 +777,22 @@
function convertorderbyin($orderby)
{
switch (trim($orderby)) {
- case "titleA":
- $orderby = "title ASC";
- break;
- case "dateA":
- $orderby = "published ASC";
- break;
- case "hitsA":
- $orderby = "hits ASC";
- break;
- case "ratingA":
- $orderby = "rating ASC";
- break;
- case "titleD":
- $orderby = "title DESC";
- break;
- case "hitsD":
- $orderby = "hits DESC";
- break;
- case "ratingD":
- $orderby = "rating DESC";
- break;
- case"dateD":
- default:
- $orderby = "published DESC";
- break;
+ case "titleA" : $orderby = "title ASC"; break;
+ case "titleD" : $orderby = "title DESC"; break;
+
+ case "dateA" : $orderby = "published ASC"; break;
+ case "dateD" : $orderby = "published DESC"; break;
+
+ case "hitsA" : $orderby = "hits ASC"; break;
+ case "hitsD" : $orderby = "hits DESC"; break;
+
+ case "ratingA" : $orderby = "rating ASC"; break;
+ case "ratingD" : $orderby = "rating DESC"; break;
+
+ case "sizeD" : $orderby = "size DESC"; break;
+ case "sizeA" : $orderby = "size ASC"; break;
+
+ default: $orderby = "published DESC"; break;
}
return $orderby;
@@ -811,30 +802,21 @@
if (!function_exists('convertorderbytrans')) {
function convertorderbytrans($orderby)
{
- if ($orderby == "hits ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYLTOM;
- }
- if ($orderby == "hits DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYMTOL;
- }
- if ($orderby == "title ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_TITLEATOZ;
- }
- if ($orderby == "title DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_TITLEZTOA;
- }
- if ($orderby == "published ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_DATEOLD;
- }
- if ($orderby == "published DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_DATENEW;
- }
- if ($orderby == "rating ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_RATINGLTOH;
- }
- if ($orderby == "rating DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_RATINGHTOL;
- }
+ if ($orderby == "title ASC") $orderbyTrans = _MD_WFDOWNLOADS_TITLEATOZ;
+ if ($orderby == "title DESC") $orderbyTrans = _MD_WFDOWNLOADS_TITLEZTOA;
+
+ if ($orderby == "published ASC") $orderbyTrans = _MD_WFDOWNLOADS_DATEOLD;
+ if ($orderby == "published DESC") $orderbyTrans = _MD_WFDOWNLOADS_DATENEW;
+
+ if ($orderby == "hits ASC") $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYLTOM;
+ if ($orderby == "hits DESC") $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYMTOL;
+
+ if ($orderby == "rating ASC") $orderbyTrans = _MD_WFDOWNLOADS_RATINGLTOH;
+ if ($orderby == "rating DESC") $orderbyTrans = _MD_WFDOWNLOADS_RATINGHTOL;
+
+ if ($orderby == "size ASC") $orderbyTrans = _MD_WFDOWNLOADS_SIZELTOH;
+ if ($orderby == "size DESC") $orderbyTrans = _MD_WFDOWNLOADS_SIZEHTOL;
+
return $orderbyTrans;
}
}
@@ -842,30 +824,20 @@
if (!function_exists('convertorderbyout')) {
function convertorderbyout($orderby)
{
- if ($orderby == "title ASC") {
- $orderby = "titleA";
- }
- if ($orderby == "published ASC") {
- $orderby = "dateA";
- }
- if ($orderby == "hits ASC") {
- $orderby = "hitsA";
- }
- if ($orderby == "rating ASC") {
- $orderby = "ratingA";
- }
- if ($orderby == "title DESC") {
- $orderby = "titleD";
- }
- if ($orderby == "published DESC") {
- $orderby = "dateD";
- }
- if ($orderby == "hits DESC") {
- $orderby = "hitsD";
- }
- if ($orderby == "rating DESC") {
- $orderby = "ratingD";
- }
+ if ($orderby == "title ASC") $orderby = "titleA";
+ if ($orderby == "title DESC") $orderby = "titleD";
+
+ if ($orderby == "published ASC") $orderby = "dateA";
+ if ($orderby == "published DESC") $orderby = "dateD";
+
+ if ($orderby == "hits ASC") $orderby = "hitsA";
+ if ($orderby == "hits DESC") $orderby = "hitsD";
+
+ if ($orderby == "rating ASC") $orderby = "ratingA";
+ if ($orderby == "rating DESC") $orderby = "ratingD";
+
+ if ($orderby == "size ASC") $orderby = "sizeA";
+ if ($orderby == "size DESC") $orderby = "sizeD";
return $orderby;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -56,7 +56,7 @@
$breadcrumb = new WfdownloadsBreadcrumb();
$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-$xoopsTpl->assign('module_home', wfdownloads_module_home(false)); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('module_home', wfdownloads_module_home(false)); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
$cat_criteria = new CriteriaCompo();
@@ -193,7 +193,7 @@
if ($wfdownloads->getConfig('subcats') == 1 AND $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
// if we are collecting subcat info for displaying, and this subcat is a first level child...
$subcategories[] = array(
- 'id' => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => $allSubcategories[$k]->getVar('cid'),
'allowed_download' => in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($allSubcategories[$k]->getVar('cid'), $allowedUpCategoriesIds)),
@@ -209,15 +209,15 @@
$xoopsTpl->append(
'categories',
array(
- 'image' => $imageURL, // this definition is not removed for compatibility issues
+ 'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
- 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => (int)$mainCategories[$i]->getVar('cid'),
'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($mainCategories[$i]->getVar('cid'), $allowedUpCategoriesIds)),
'title' => $mainCategories[$i]->getVar('title'),
'summary' => $mainCategories[$i]->getVar('summary'),
- 'totaldownloads' => (int)$download_count, // this definition is not removed for compatibility issues
+ 'totaldownloads' => (int)$download_count, // this definition is not removed for backward compatibility issues
'downloads_count' => (int)$download_count,
'count' => (int)$count,
'alttext' => $isNewImage['alttext']
@@ -227,16 +227,16 @@
$xoopsTpl->append(
'categories',
array(
- 'image' => $imageURL, // this definition is not removed for compatibility issues
+ 'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
- 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => (int)$mainCategories[$i]->getVar('cid'),
'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($mainCategories[$i]->getVar('cid'), $allowedUpCategoriesIds)),
'title' => $mainCategories[$i]->getVar('title'),
'summary' => $mainCategories[$i]->getVar('summary'),
'subcategories' => $subcategories,
- 'totaldownloads' => (int)$download_count, // this definition is not removed for compatibility issues
+ 'totaldownloads' => (int)$download_count, // this definition is not removed for backward compatibility issues
'downloads_count' => (int)$download_count,
'count' => (int)$count,
'alttext' => $isNewImage['alttext']
@@ -257,7 +257,7 @@
"<a href='" . $rsslink_URL . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "'><img src='" . XOOPS_URL . "/modules/" . $wfdownloads->getModule(
)->getVar('dirname') . "/images/icon/rss.gif' border='0' alt='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS
. "'></a>";
- $xoopsTpl->assign('full_rssfeed_link', $rsslink); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('full_rssfeed_link', $rsslink); // this definition is not removed for backward compatibility issues
}
include 'footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -46,6 +46,8 @@
define('_MD_WFDOWNLOADS_DATENEW', "Date (new files listed first)");
define('_MD_WFDOWNLOADS_RATINGLTOH', "Rating (lowest to highest score)");
define('_MD_WFDOWNLOADS_RATINGHTOL', "Rating (highest to lowest score)");
+define('_MD_WFDOWNLOADS_SIZELTOH', "Size (smallest to largest)");
+define('_MD_WFDOWNLOADS_SIZEHTOL', "Size (largest to smallest)");
define('_MD_WFDOWNLOADS_DESCRIPTIONC', "Description");
define('_MD_WFDOWNLOADS_CATEGORYC', "Category");
define('_MD_WFDOWNLOADS_VERSION', "Version");
@@ -112,6 +114,7 @@
define('_MD_WFDOWNLOADS_TITLE', "Title");
define('_MD_WFDOWNLOADS_DATE', "Date");
define('_MD_WFDOWNLOADS_POPULARITY', "Popularity");
+define('_MD_WFDOWNLOADS_SIZE', "Size");
define('_MD_WFDOWNLOADS_TOPRATED', "Rating");
define('_MD_WFDOWNLOADS_CURSORTBY', "Downloads currently sorted by: %s");
define('_MD_WFDOWNLOADS_CANCEL', "Cancel");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -333,3 +333,6 @@
define('_MI_WFDOWNLOADS_AUTOSUMMARY1', _NO);
define('_MI_WFDOWNLOADS_AUTOSUMMARY2', "If blank");
define('_MI_WFDOWNLOADS_AUTOSUMMARY3', _YES);
+
+define('_MI_WFDOWNLOADS_DISCLAIMER_DEFAULT', 'We have the right, but not the obligation to monitor and review submissions submitted by users, in the forums. We shall not be responsible for any of the content of these messages. We further reserve the right, to delete, move or edit submissions that the we, in its exclusive discretion, deems abusive, defamatory, obscene or in violation of any Copyright or Trademark laws or otherwise objectionable.');
+define('_MI_WFDOWNLOADS_DOWNDISCLAIMER_DEFAULT', 'The file downloads on this site are provided as is without warranty either expressed or implied. Downloaded files should be checked for possible virus infection using the most up-to-date detection and security packages. If you have a question concerning a particular piece of software, feel free to contact the developer. We refuse liability for any damage or loss resulting from the use or misuse of any software offered from this site for downloading. If you have any doubt at all about the safety and operation of software made available to you on this site, do not download it.<br /><br />Contact us if you have questions concerning this disclaimer.');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -66,7 +66,7 @@
$op = WfdownloadsRequest::getString('op', 'mirror.add');
switch ($op) {
case "mirrors.list" :
- case "list" : // this case is not removed for compatibility issues
+ case "list" : // this case is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
$xoopsOption['template_main'] = 'wfdownloads_mirrors.html';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -73,7 +73,7 @@
$xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFDOWNLOADS_DLTIMES, $downloadInfo['hits']));
$xoopsTpl->assign('lang_subdate', $downloadInfo['is_updated']);
$xoopsTpl->append('file', $downloadInfo);
- $xoopsTpl->append('downloads', $downloadInfo); // this definition is not removed for compatibility issues
+ $xoopsTpl->append('downloads', $downloadInfo); // this definition is not removed for backward compatibility issues
}
// Screenshots display
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -167,7 +167,7 @@
$xoopsTpl->assign(
'file',
array('id' => $lid, 'lid' => $lid, 'cid' => $cid, 'title' => $download->getVar('title'), 'imageheader' => wfdownloads_headerImage())
- ); // this definition is not removed for compatibility issues
+ ); // this definition is not removed for backward compatibility issues
include 'footer.php';
}
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -66,7 +66,7 @@
$op = WfdownloadsRequest::getString('op', 'review.add');
switch ($op) {
case "reviews.list" :
- case "list" : // this care is not removed for compatibility issues
+ case "list" : // this care is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
$xoopsOption['template_main'] = 'wfdownloads_reviews.html';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -182,7 +182,7 @@
// Get download informations
$downloadInfo = $download->getDownloadInfo();
-$xoopsTpl->assign('categoryPath', $downloadInfo['path'] . ' > ' . $downloadInfo['title']); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('categoryPath', $downloadInfo['path'] . ' > ' . $downloadInfo['title']); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFDOWNLOADS_DLTIMES, $downloadInfo['hits']));
$xoopsTpl->assign('lang_subdate', $downloadInfo['is_updated']);
$xoopsTpl->append('file', $downloadInfo);
@@ -218,7 +218,7 @@
$downloadByUser['lid'] = (int)$download->getVar('lid');
$downloadByUser['cid'] = (int)$download->getVar('cid');
$downloadByUser['published'] = formatTimestamp($download->getVar('published'), $wfdownloads->getConfig('dateformat'));
- $xoopsTpl->append('down_uid', $downloadByUser); // this definition is not removed for compatibility issues
+ $xoopsTpl->append('down_uid', $downloadByUser); // this definition is not removed for backward compatibility issues
$xoopsTpl->append('downloads_by_user', $downloadByUser);
}
@@ -262,7 +262,7 @@
if ($wfdownloads->getConfig('copyright') == true) {
$xoopsTpl->assign('lang_copyright', $download->getVar('title') . ' © ' . _MD_WFDOWNLOADS_COPYRIGHT . ' ' . formatTimestamp(time(), 'Y'));
}
-$xoopsTpl->assign('down', $downloadInfo); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('down', $downloadInfo); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('download', $downloadInfo);
include XOOPS_ROOT_PATH . '/include/comment_view.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -98,12 +98,12 @@
$xoopsTpl->assign('download_disclaimer', false);
$xoopsTpl->assign('submission_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('disclaimer'), true, true, true, true, true));
- $xoopsTpl->assign('down_disclaimer', false); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('down_disclaimer', false); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign(
'disclaimer',
$myts->displayTarea($wfdownloads->getConfig('disclaimer'), true, true, true, true, true)
- ); // this definition is not removed for compatibility issues
- $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
+ ); // this definition is not removed for backward compatibility issues
+ $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for backward compatibility issues
if (!isset($_REQUEST['lid'])) {
$xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agreed=1");
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-10-07 20:17:51 UTC (rev 12160)
@@ -223,6 +223,23 @@
title="<{$smarty.const._MD_WFDOWNLOADS_POPULARITYMTOL}>"><{$smarty.const._MD_WFDOWNLOADS_POPULARITY}> <img
src="<{xoModuleIcons16 down.gif}>" alt="↓"></a>
<{/if}>
+ |
+ <{if ($orderby == "sizeA")}>
+ <span class='button_green' title="<{$smarty.const._MD_WFDOWNLOADS_SIZELTOH}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 up.gif}>" alt="↑"></span>
+ <{else}>
+ <a class='button_grey' href="viewcat.php?cid=<{$category_cid}>&orderby=sizeA"
+ title="<{$smarty.const._MD_WFDOWNLOADS_SIZELTOH}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 up.gif}>" alt="↑"></a>
+ <{/if}>
+ <{if ($orderby == "sizeD")}>
+ <span class='button_green' title="<{$smarty.const._MD_WFDOWNLOADS_SIZEHTOL}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 down.gif}>" alt="↓"></span>
+ <{else}>
+ <a class='button_grey' href="viewcat.php?cid=<{$category_cid}>&orderby=sizeD"
+ title="<{$smarty.const._MD_WFDOWNLOADS_SIZEHTOL}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 down.gif}>" alt="↓"></a>
+ <{/if}>
</div>
</div>
<{/if}>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -75,8 +75,8 @@
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-$xoopsTpl->assign('cid', $cid); // this definition is not removed for compatibility issues
-$xoopsTpl->assign('category_id', $cid); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('cid', $cid); // this definition is not removed for backward compatibility issues
+$xoopsTpl->assign('category_id', $cid); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('category_cid', $cid);
// Retreiving the top parent category
@@ -84,7 +84,7 @@
$allSubcatsTopParentCid = $wfdownloads->getHandler('category')->getAllSubcatsTopParentCid();
$topCategory = $wfdownloads->getHandler('category')->allCategories[$allSubcatsTopParentCid[$cid]];
$xoopsTpl->assign('topcategory_title', $topCategory->getVar('title'));
- $xoopsTpl->assign('topcategory_image', $topCategory->getVar('imgurl')); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('topcategory_image', $topCategory->getVar('imgurl')); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('topcategory_image_URL', $topCategory->getVar('imgurl'));
$xoopsTpl->assign('topcategory_cid', $topCategory->getVar('cid'));
}
@@ -106,8 +106,8 @@
$catArray['toolbar'] = wfdownloads_toolbar();
$xoopsTpl->assign('catarray', $catArray);
-$xoopsTpl->assign('categoryPath', $wfdownloads->getHandler('category')->getNicePath($cid)); // this definition is not removed for compatibility issues
-$xoopsTpl->assign('module_home', wfdownloads_module_home(true)); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('categoryPath', $wfdownloads->getHandler('category')->getNicePath($cid)); // this definition is not removed for backward compatibility issues
+$xoopsTpl->assign('module_home', wfdownloads_module_home(true)); // this definition is not removed for backward compatibility issues
// Get categories tree
$criteria = new CriteriaCompo();
@@ -179,11 +179,11 @@
: 0;
$infercategories[] = array(
'cid' => $subsubCategory->getVar('cid'),
- 'id' => $subsubCategory->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => $subsubCategory->getVar('cid'), // this definition is not removed for backward compatibility issues
'title' => $subsubCategory->getVar('title'),
'image' => $imageURL,
'image_URL' => $imageURL,
- 'count' => $download_count, // this definition is not removed for compatibility issues
+ 'count' => $download_count, // this definition is not removed for backward compatibility issues
'downloads_count' => $download_count
);
}
@@ -199,18 +199,18 @@
'subcategories',
array(
'title' => $subcategory->getVar('title'),
- 'image' => $imageURL, // this definition is not removed for compatibility issues
+ 'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
- 'id' => $subcategory->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => $subcategory->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => $subcategory->getVar('cid'),
'allowed_download' => in_array($subcategory->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($subcategory->getVar('cid'), $allowedUpCategoriesIds)),
'summary' => $subcategory->getVar('summary'),
'infercategories' => $infercategories,
'subcategories' => $infercategories,
- 'totallinks' => $catdowncount, // this definition is not removed for compatibility issues
+ 'totallinks' => $catdowncount, // this definition is not removed for backward compatibility issues
'downloads_count' => $catdowncount,
- 'count' => $scount, // this definition is not removed for compatibility issues
+ 'count' => $scount, // this definition is not removed for backward compatibility issues
'subcategories_count' => $catdowncount,
)
);
@@ -249,7 +249,7 @@
}
$xoopsTpl->assign('xoops_pagetitle', $categories[$cid]->getVar('title') . ' | ' . $wfdownloads->getModule()->name());
- $xoopsTpl->assign('category_image', $imageURL); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('category_image', $imageURL); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('category_image_URL', $imageURL);
}
@@ -279,7 +279,7 @@
$downloadInfo = $downloads[$i]->getDownloadInfo();
$xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFDOWNLOADS_DLTIMES, $downloadInfo['hits']));
$xoopsTpl->assign('lang_subdate', $downloadInfo['is_updated']);
- $xoopsTpl->append('file', $downloadInfo); // this definition is not removed for compatibility issues
+ $xoopsTpl->append('file', $downloadInfo); // this definition is not removed for backward compatibility issues
$xoopsTpl->append('downloads', $downloadInfo);
}
@@ -312,7 +312,7 @@
$pagenav = new XoopsPageNav($downloads_count, $wfdownloads->getConfig('perpage'), $start, 'start', 'cid=' . $cid);
}
$page_nav = $pagenav->renderNav();
- $xoopsTpl->assign('page_nav', (isset($page_nav) && !empty($page_nav))); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('page_nav', (isset($page_nav) && !empty($page_nav))); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('pagenav', $pagenav->renderNav());
}
@@ -327,7 +327,7 @@
$rsslink = "<a href='" . $rsslink_URL . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTCATRSS . "'><img src='" . XOOPS_URL . "/modules/"
. $wfdownloads->getModule()->getVar('dirname') . "/images/icon/rss.gif' border='0' alt='" . _MD_WFDOWNLOADS_LEGENDTEXTCATRSS . "' title='"
. _MD_WFDOWNLOADS_LEGENDTEXTCATRSS . "'></a>";
- $xoopsTpl->assign('cat_rssfeed_link', $rsslink); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('cat_rssfeed_link', $rsslink); // this definition is not removed for backward compatibility issues
}
include 'footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -107,12 +107,12 @@
$xoopsTpl->assign('download_disclaimer', truee);
$xoopsTpl->assign('download_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true));
- $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign(
'downdisclaimer',
$myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true)
- ); // this definition is not removed for compatibility issues
- $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
+ ); // this definition is not removed for backward compatibility issues
+ $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}&cid={$cid}");
include 'footer.php';
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -506,7 +506,7 @@
'description' => '_MI_WFDOWNLOADS_DISCLAIMERDSC',
'formtype' => 'textarea',
'valuetype' => 'text',
- 'default' => 'We have the right, but not the obligation to monitor and review submissions submitted by users, in the forums. We shall not be responsible for any of the content of these messages. We further reserve the right, to delete, move or edit submissions that the we, in its exclusive discretion, deems abusive, defamatory, obscene or in violation of any Copyright or Trademark laws or otherwise objectionable.'
+ 'default' => _MI_WFDOWNLOADS_DISCLAIMER_DEFAULT
);
@@ -544,7 +544,7 @@
'description' => '_MI_WFDOWNLOADS_DOWNDISCLAIMERDSC',
'formtype' => 'textarea',
'valuetype' => 'text',
- 'default' => 'The file downloads on this site are provided as is without warranty either expressed or implied. Downloaded files should be checked for possible virus infection using the most up-to-date detection and security packages. If you have a question concerning a particular piece of software, feel free to contact the developer. We refuse liability for any damage or loss resulting from the use or misuse of any software offered from this site for downloading. If you have any doubt at all about the safety and operation of software made available to you on this site, do not download it.<br /><br />Contact us if you have questions concerning this disclaimer.'
+ 'default' => _MI_WFDOWNLOADS_DOWNDISCLAIMER_DEFAULT
);
|
