|
From: <luc...@us...> - 2013-09-16 18:46:20
|
Revision: 12063
http://sourceforge.net/p/xoops/svn/12063
Author: luciorota
Date: 2013-09-16 18:46:15 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
added: enable/disable brokens reports system (luciorota)
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -28,90 +28,129 @@
$indexAdmin = new ModuleAdmin();
//--------------------------
-$totalcats = wfdownloads_categoriesCount();
-$totalbrokendownloads = $wfdownloads->getHandler('report')->getCount();
-$totalmodrequests = $wfdownloads->getHandler('modification')->getCount();
-$newreviews = $wfdownloads->getHandler('review')->getCount();
-$newmirrors = $wfdownloads->getHandler('mirror')->getCount();
-$totalnewdownloads = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0));
-$totaldownloads = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0, ">"));
+$categories_count = wfdownloads_categoriesCount();
+$brokenDownloads_count = $wfdownloads->getHandler('report')->getCount();
+$modificationRequests_count = $wfdownloads->getHandler('modification')->getCount();
+$newReviews_count = $wfdownloads->getHandler('review')->getCount();
+$newMirrors_count = $wfdownloads->getHandler('mirror')->getCount();
+$newDownloads_count = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0));
+$downloads_count = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0, '>'));
$indexAdmin->addInfoBox(_AM_WFD_MINDEX_DOWNSUMMARY);
// Categories
-if ($totalcats > 0) {
+if ($categories_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="categories.php">' . _AM_WFD_SCATEGORY . '</a><b>'
- . "</infolabel>", $totalcats, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="categories.php">' . _AM_WFD_SCATEGORY . '</a></infolabel>',
+ $categories_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SCATEGORY . "</infolabel>", $totalcats, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SCATEGORY . '</infolabel>',
+ $categories_count,
+ 'green'
);
}
// Downloads
-if ($totaldownloads > 0) {
+if ($downloads_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="downloads.php">' . _AM_WFD_SFILES . '</a><b>'
- . "</infolabel>", $totaldownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="downloads.php">' . _AM_WFD_SFILES . '</a><b></infolabel>',
+ $downloads_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SFILES . "</infolabel>", $totaldownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SFILES . '</infolabel>',
+ $downloads_count,
+ 'green'
);
}
// New/waiting downloads
-if ($totalnewdownloads > 0) {
+if ($newDownloads_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="downloads.php">' . _AM_WFD_SNEWFILESVAL . '</a><b>'
- . "</infolabel>", $totalnewdownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="downloads.php">' . _AM_WFD_SNEWFILESVAL . '</a></infolabel>',
+ $newDownloads_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SNEWFILESVAL . "</infolabel>", $totalnewdownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SNEWFILESVAL . '</infolabel>',
+ $newDownloads_count,
+ 'green'
);
}
// Reviews
-if ($newreviews > 0) {
+if ($wfdownloads->getConfig('enable_reviews') == false) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reviews.php">' . _AM_WFD_SREVIEWS . '</a><b>'
- . "</infolabel>", $newreviews, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SREVIEWS . '</infolabel>',
+ _CO_WFD_DISABLED,
+ 'red'
);
+} elseif ($newReviews_count > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="reviews.php">' . _AM_WFD_SREVIEWS . '</a></infolabel>',
+ $newReviews_count,
+ 'green'
+ );
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SREVIEWS . "</infolabel>", $newreviews, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SREVIEWS . '</infolabel>',
+ $newReviews_count,
+ 'green'
);
}
// Modifications
-if ($totalmodrequests > 0) {
+if ($modificationRequests_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SMODREQUEST . '</a><b>'
- . "</infolabel>", $totalmodrequests, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="reportsmodifications.php">' . _AM_WFD_SMODREQUEST . '</a></infolabel>',
+ $modificationRequests_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SMODREQUEST . "</infolabel>", $totalmodrequests, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SMODREQUEST . '</infolabel>',
+ $modificationRequests_count,
+ 'green'
);
}
// Brokens reports
-if ($totalbrokendownloads > 0) {
+if ($wfdownloads->getConfig('enable_brokenreports') == false) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SBROKENSUBMIT . '</a><b>'
- . "</infolabel>", $totalbrokendownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SBROKENSUBMIT . '</infolabel>',
+ _CO_WFD_DISABLED,
+ 'red'
);
+} elseif ($brokenDownloads_count > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="reportsmodifications.php">' . _AM_WFD_SBROKENSUBMIT . '</a></infolabel>',
+ $brokenDownloads_count,
+ 'green'
+ );
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SBROKENSUBMIT . "</infolabel>", $totalbrokendownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SBROKENSUBMIT . '</infolabel>',
+ $brokenDownloads_count,
+ 'green'
);
}
// Mirrors
-if ($newmirrors > 0) {
+if ($wfdownloads->getConfig('enable_mirrors') == false) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="mirrors.php">' . _AM_WFD_SMIRRORS . '</a><b>'
- . "</infolabel>", $newmirrors, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SMIRRORS . '</infolabel>',
+ _CO_WFD_DISABLED,
+ 'red'
);
+} elseif ($newMirrors_count > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="mirrors.php">' . _AM_WFD_SMIRRORS . '</a></infolabel>',
+ $newMirrors_count,
+ 'green'
+ );
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SMIRRORS . "</infolabel>", $newmirrors, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SMIRRORS . '</infolabel>',
+ $newMirrors_count,
+ 'green'
);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -164,6 +164,11 @@
$GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published->renderNav());
}
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_mirrorslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -74,6 +74,11 @@
$ratings_pagenav = new XoopsPageNav($ratings_count, $wfdownloads->getConfig('admin_perpage'), $start, 'start');
$GLOBALS['xoopsTpl']->assign('ratings_pagenav', $ratings_pagenav->renderNav());
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_ratingslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -23,7 +23,7 @@
$op = WfdownloadsRequest::getString('op', 'reports.modifications.list');
switch ($op) {
- case "reports.update":
+ case "reports.update" :
$lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
if (isset($_GET['ack'])) {
@@ -39,7 +39,7 @@
redirect_header($currentFile, 1, $update_mess);
break;
- case "report.delete":
+ case "report.delete" :
$lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
$report = $wfdownloads->getHandler('report')->getObjects($criteria);
@@ -51,7 +51,7 @@
redirect_header($currentFile, 1, _AM_WFD_BROKENFILEDELETED);
break;
- case "report.ignore":
+ case "report.ignore" :
$lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
$report = $wfdownloads->getHandler('report')->getObjects($criteria);
@@ -61,7 +61,7 @@
redirect_header($currentFile, 1, _AM_WFD_BROKEN_FILEIGNORED);
break;
- case "modification.show":
+ case "modification.show" :
wfdownloads_xoops_cp_header();
$requestid = intval($_GET['requestid']);
@@ -71,12 +71,12 @@
$orig_user = new XoopsUser($download->getVar('submitter'));
$submittername = XoopsUserUtility::getUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
- $submitteremail = $orig_user->getVar("email");
+ $submitteremail = $orig_user->getVar('email');
echo "<div><b>" . _AM_WFD_MOD_MODPOSTER . "</b> $submittername</div>";
- $not_allowed = array("lid", "submitter", "requestid", "modifysubmitter");
+ $not_allowed = array('lid', 'submitter', 'requestid', 'modifysubmitter');
- $sform = new XoopsThemeForm(_AM_WFD_MOD_ORIGINAL, "storyform", "index.php");
+ $sform = new XoopsThemeForm(_AM_WFD_MOD_ORIGINAL, 'storyform', 'index.php');
$keys = $download->getVars();
foreach (array_keys($keys) as $key) {
@@ -87,42 +87,42 @@
$content = $download->getVar($key, 'e');
switch ($key) {
- case "platform":
- case "license":
- case "limitations":
- case "versiontypes":
+ case "platform" :
+ case "license" :
+ case "limitations" :
+ case "versiontypes" :
$tempArray = $wfdownloads->getConfig($key);
$content = $tempArray[$download->getVar($key)];
break;
- case "cid":
+ case "cid" :
$category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $download->getVar($key)));
if (!isset($category_list[0])) {
continue;
}
$content = $category_list[0]->getVar('title', 'e');
break;
- case "screenshot":
- if ($content != "") {
+ case "screenshot" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot2":
- if ($content != "") {
+ case "screenshot2" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot3":
- if ($content != "") {
+ case "screenshot3" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot4":
- if ($content != "") {
+ case "screenshot4" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "features":
- case "requirements":
+ case "features" :
+ case "requirements" :
if ($content != '') {
$downrequirements = explode('|', trim($content));
foreach ($downrequirements as $bi) {
@@ -130,7 +130,7 @@
}
}
break;
- case "dhistory":
+ case "dhistory" :
$content = $myts->displayTarea($content, true, false, false, false, true);
break;
}
@@ -139,11 +139,11 @@
$sform->display();
$modify_user = new XoopsUser($modification->getVar('modifysubmitter'));
- $modifyname = XoopsUserUtility::getUnameFromId(intval($modify_user->getVar('uid')));
- $modifyemail = $modify_user->getVar("email");
+ $modifyname = XoopsUserUtility::getUnameFromId((int)$modify_user->getVar('uid'));
+ $modifyemail = $modify_user->getVar('email');
echo "<div><b>" . _AM_WFD_MOD_MODIFYSUBMITTER . "</b> $modifyname</div>";
- $sform = new XoopsThemeForm(_AM_WFD_MOD_PROPOSED, "storyform", "reportsmodifications.php");
+ $sform = new XoopsThemeForm(_AM_WFD_MOD_PROPOSED, 'storyform', 'reportsmodifications.php');
$keys = $modification->getVars();
foreach (array_keys($keys) as $key) {
if (in_array($key , $not_allowed)) {
@@ -153,42 +153,42 @@
$content = $modification->getVar($key, 'e');
switch ($key) {
- case "platform":
- case "license":
- case "limitations":
- case "versiontypes":
+ case "platform" :
+ case "license" :
+ case "limitations" :
+ case "versiontypes" :
$tempArray = $wfdownloads->getConfig($key);
$content = $tempArray[$modification->getVar($key)];
break;
- case "cid":
- $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $modification->getVar($key)));
+ case "cid" :
+ $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria('cid', $modification->getVar($key)));
if (!isset($category_list[0])) {
continue;
}
$content = $category_list[0]->getVar('title', 'e');
break;
- case "screenshot":
- if ($content != "") {
+ case "screenshot" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot2":
- if ($content != "") {
+ case "screenshot2" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot3":
- if ($content != "") {
+ case "screenshot3" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot4":
- if ($content != "") {
+ case "screenshot4" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "features":
- case "requirements":
+ case "features" :
+ case "requirements" :
if ($content != '') {
$downrequirements = explode('|', trim($content));
foreach ($downrequirements as $bi) {
@@ -196,7 +196,7 @@
}
}
break;
- case "dhistory":
+ case "dhistory" :
$content = $myts->displayTarea($content, true, false, false, false, true);
break;
}
@@ -205,17 +205,17 @@
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('requestid', $requestid));
- $button_tray->addElement(new XoopsFormHidden('lid', intval($modification->getVar('lid'))));
+ $button_tray->addElement(new XoopsFormHidden('lid', (int)$modification->getVar('lid')));
$hidden = new XoopsFormHidden('op', 'modification.change');
$button_tray->addElement($hidden);
if (!$modification->isNew()) {
- $butt_dup = new XoopsFormButton('', '', _AM_WFD_BAPPROVE, 'submit');
- $butt_dup->setExtra('onclick="this.form.elements.op.value=\'modification.change\'"');
- $button_tray->addElement($butt_dup);
+ $approve_button = new XoopsFormButton('', '', _AM_WFD_BAPPROVE, 'submit');
+ $approve_button->setExtra('onclick="this.form.elements.op.value=\'modification.change\'"');
+ $button_tray->addElement($approve_button);
}
- $butt_dupct2 = new XoopsFormButton('', '', _AM_WFD_BIGNORE, 'submit');
- $butt_dupct2->setExtra('onclick="this.form.elements.op.value=\'modification.ignore\'"');
- $button_tray->addElement($butt_dupct2);
+ $ignore_button = new XoopsFormButton('', '', _AM_WFD_BIGNORE, 'submit');
+ $ignore_button->setExtra('onclick="this.form.elements.op.value=\'modification.ignore\'"');
+ $button_tray->addElement($ignore_button);
$sform->addElement($button_tray);
$sform->display();
@@ -266,19 +266,19 @@
redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFD_MOD_REQUPDATED);
break;
- case "modification.ignore":
+ case "modification.ignore" :
$criteria = new Criteria('requestid', intval($_POST['requestid']));
$wfdownloads->getHandler('modification')->deleteAll($criteria, true);
redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFD_MOD_REQDELETED);
break;
- case "reports.modifications.list":
+ case "reports.modifications.list" :
default:
$start_report = WfdownloadsRequest::getInt('start_report', 0);
$criteria = new CriteriaCompo();
$reports_count = $wfdownloads->getHandler('report')->getCount();
- $criteria->setSort("date");
+ $criteria->setSort('date');
$criteria->setOrder('DESC');
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria->setStart($start_report);
@@ -295,11 +295,11 @@
$lids[] = $reports[$i]->getVar('lid');
$uids[] = $reports[$i]->getVar('sender');
}
- $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
+ $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', '(' . implode(',', array_unique($lids)) . ')', 'IN'), true);
foreach (array_keys($downloads) as $i) {
$uids[] = $downloads[$i]->getVar('submitter');
}
- $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
+ $users = $member_handler->getUsers(new Criteria('uid', '(' . implode(',', array_unique($uids)) . ')', 'IN'), true);
foreach ($reports as $report) {
$report_array = $report->toArray();
@@ -318,8 +318,8 @@
$report_array['submitter_email'] = '';
$report_array['submitter_uname'] = $xoopsConfig['anonymous'];
}
- $sender = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')] : "";
- $report_array['reporter_email'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('email') : "";
+ $sender = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')] : '';
+ $report_array['reporter_email'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('email') : '';
$report_array['reporter_uname'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
$report_array['formatted_date'] = formatTimestamp($report->getVar('date'), _DATESTRING);
$GLOBALS['xoopsTpl']->append('reports', $report_array);
@@ -354,6 +354,11 @@
$GLOBALS['xoopsTpl']->assign('modifications_pagenav', $pagenav_modification -> renderNav());
}
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_reportsmodificationslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -176,6 +176,11 @@
$GLOBALS['xoopsTpl']->assign('reviews_published_pagenav', $pagenav_published -> renderNav());
}
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_reviewslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -31,6 +31,11 @@
redirect_header('index.php', 3, _MD_WFD_NODOWNLOAD);
}
+// Check permissions
+if ($wfdownloads->getConfig('enable_brokenreports') == false && !wfdownloads_userIsAdmin()) {
+ redirect_header('index.php', 3, _NOPERM);
+}
+
// Breadcrumb
include_once XOOPS_ROOT_PATH . "/class/tree.php";
$categoriesTree = new XoopsObjectTree($wfdownloads->getHandler('category')->getObjects(), 'cid', 'pid');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-09-15)</u></b>
+<b><u>=> Version 3.23 Beta (2013-09-16)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
@@ -11,8 +11,10 @@
- fixed: deprecated "XoopsTree" (luciorota)
- fixed: html errors in templates (luciorota)
- fixed: deprecated XoopsTree (mamba)
+- added: updating to XOOPS 2.5.7 Multi-page help (mamba)
- added: enable/disable reviews system (luciorota)
- added: enable/disable ratings system (luciorota)
+- added: enable/disable brokens reports system (luciorota)
- added: admin side downloads filter (luciorota)
- added: breadcrumb class (luciorota)
- added: html tags compatible autosummary generator (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -641,3 +641,9 @@
define('_AM_WFD_SEARCH_GREATERTHAN','>');
define('_AM_WFD_SEARCH_LESSTHAN','<');
define('_AM_WFD_SEARCH_CONTAINS','contains');
+
+
+define('_AM_WFD_MIRROR_DISABLED','Warning: mirrors system is disabled in module preferences.');
+define('_AM_WFD_REVIEW_DISABLED','Warning: reviews system is disabled in module preferences.');
+define('_AM_WFD_RATING_DISABLED','Warning: ratings system is disabled in module preferences.');
+define('_AM_WFD_BROKENREPORT_DISABLED','Warning: bokens reports system is disabled in module preferences.');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,4 +1,7 @@
<?php
+define("_CO_WFD_ENABLED","Enabled");
+define("_CO_WFD_DISABLED","Disabled");
+
define("_CO_WFD_MIRROR","Mirror");
define("_CO_WFD_MIRRORS","Mirrors");
define("_CO_WFD_MIRRORS_LIST","Mirrors list");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -110,7 +110,7 @@
define('_MI_WFD_UPLOADDIR','[upload files] Upload directory');
define('_MI_WFD_UPLOADDIRDSC','Upload directory *MUST* be an absolute path!<br />No trailing slash.');
-define('_MI_WFD_ENABLERSS','Enable RSS Feeds');
+define('_MI_WFD_ENABLERSS','[RSS feeds] Enable RSS Feeds');
define('_MI_WFD_ENABLERSSDSC','Select "' . _YES . '" to enable rss feeds.');
define('_MI_WFD_DOWNLOADMINPOSTS',"Minimum posts required to download");
@@ -355,4 +355,7 @@
define("_MI_WFD_REVIEW_ENABLEDSC","If enabled, reviews system (submit and show reviews) is enabled in backend.");
define("_MI_WFD_RATING_ENABLE","[ratings] Enable ratings system");
-define("_MI_WFD_RATING_ENABLEDSC","If enabled, ratings system (vote and show ratings) is enabled in backend.");
\ No newline at end of file
+define("_MI_WFD_RATING_ENABLEDSC","If enabled, ratings system (vote and show ratings) is enabled in backend.");
+
+define("_MI_WFD_BROKENREPORT_ENABLE","[brokens reports] Enable brokens reports system");
+define("_MI_WFD_BROKENREPORT_ENABLEDSC","If enabled, brokens reports system is enabled in backend.");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -234,6 +234,7 @@
$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
$xoopsTpl->assign('use_rss', $wfdownloads->getConfig('enablerss'));
// Copyright
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_mirrors == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_MIRROR_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AMIRRORS_INFO}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_ratings == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_RATING_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_VOTE_DISPLAYVOTES}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_brokenreports == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_BROKENREPORT_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_BROKEN_REPORTINFO}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_reviews == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_REVIEW_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AREVIEWS_INFO}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -3,6 +3,7 @@
<{/if}>
<{if $com_rule <> 0}>
+<a name="comments"></a>
<div class="wfd_foot_commentnav">
<{$commentsnav}>
<{$lang_notice}>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -221,11 +221,15 @@
<a href="submit.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_MODIFY}></a>
|
<{/if}>
+ <{if $download.use_brokenreports == 1}>
<a href="brokenfile.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_REPORTBROKEN}></a>
|
+ <{/if}>
<a target="_top" href="mailto:?subject=<{$download.mail_subject}>&body=<{$download.mail_body}>"><{$smarty.const._MD_WFD_TELLAFRIEND}></a>
+ <{if $com_rule <> 0}>
|
- <a href="singlefile.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._COMMENTS}> (<{$download.comments}>)</a>
+ <a href="#comments"><{$smarty.const._COMMENTS}> (<{$download.comments}>)</a>
+ <{/if}>
</small>
</div>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -47,9 +47,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-15';
-$modversion['release_date'] = '2013/09/15';
-$modversion['releasedate'] = '2013-09-15';
+$modversion['date'] = '2013-09-16';
+$modversion['release_date'] = '2013/09/16';
+$modversion['releasedate'] = '2013-09-16';
$modversion['status'] = 'BETA';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
@@ -317,14 +317,6 @@
//Module config setting
-$modversion['config'][] = array(
- 'name' => 'enablerss',
- 'title' => '_MI_WFD_ENABLERSS',
- 'description' => '_MI_WFD_ENABLERSSDSC',
- 'formtype' => 'yesno',
- 'valuetype' => 'int',
- 'default' => false);
-
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
$editorList = array_flip($editor_handler->getList());
@@ -608,6 +600,14 @@
'default' => 'uploads/' . $modversion['dirname'] . '/images');
$modversion['config'][] = array(
+ 'name' => 'extrasystems_configs',
+ 'title' => '',
+ 'description' => '',
+ 'formtype' => 'line_break',
+ 'valuetype' => 'textbox',
+ 'default' => 'head');
+
+$modversion['config'][] = array(
'name' => 'enable_reviews',
'title' => '_MI_WFD_REVIEW_ENABLE',
'description' => '_MI_WFD_REVIEW_ENABLEDSC',
@@ -640,6 +640,22 @@
'default' => true);
$modversion['config'][] = array(
+ 'name' => 'enable_brokenreports',
+ 'title' => '_MI_WFD_BROKENREPORT_ENABLE',
+ 'description' => '_MI_WFD_BROKENREPORT_ENABLEDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => true);
+
+$modversion['config'][] = array(
+ 'name' => 'enablerss',
+ 'title' => '_MI_WFD_ENABLERSS',
+ 'description' => '_MI_WFD_ENABLERSSDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => false);
+
+$modversion['config'][] = array(
'name' => 'enable_mirrors',
'title' => '_MI_WFD_MIRROR_ENABLE',
'description' => '_MI_WFD_MIRROR_ENABLEDSC',
@@ -656,6 +672,14 @@
'default' => true);
$modversion['config'][] = array(
+ 'name' => 'permissions_configs',
+ 'title' => '',
+ 'description' => '',
+ 'formtype' => 'line_break',
+ 'valuetype' => 'textbox',
+ 'default' => 'head');
+
+$modversion['config'][] = array(
'name' => 'download_minposts',
'title' => '_MI_WFD_DOWNLOADMINPOSTS',
'description' => '_MI_WFD_DOWNLOADMINPOSTSDSC',
|