Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12028] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-09-12 16:17:58
|
Revision: 12028
http://sourceforge.net/p/xoops/svn/12028
Author: luciorota
Date: 2013-09-12 16:17:55 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
fixed submit error when formulize module is present but not installed/active
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.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_disclaimer.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -319,8 +319,8 @@
$report_array['submitter_uname'] = $xoopsConfig['anonymous'];
}
$sender = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')] : "";
- $report_array['sender_email'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('email') : "";
- $report_array['sender_uname'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
+ $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);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -101,17 +101,17 @@
$start_waiting = WfdownloadsRequest::getInt('start_waiting', 0);
$start_published = WfdownloadsRequest::getInt('start_published', 0);
- $criteria_waiting = new Criteria("submit", 0); // false
- $waiting_count = $wfdownloads->getHandler('review')->getCount();
- $criteria_waiting->setSort("date");
+ $criteria_waiting = new Criteria('submit', 0); // false
+ $waiting_count = $wfdownloads->getHandler('review')->getCount($criteria_waiting);
+ $criteria_waiting->setSort('date');
$criteria_waiting->setOrder('DESC');
$criteria_waiting->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_waiting->setStart($start_waiting);
$reviews_waiting = $wfdownloads->getHandler('review')->getObjects($criteria_waiting);
- $criteria_published = new Criteria("submit", 1); // true
- $published_count = $wfdownloads->getHandler('review')->getCount();
- $criteria_published->setSort("date");
+ $criteria_published = new Criteria('submit', 1); // true
+ $published_count = $wfdownloads->getHandler('review')->getCount($criteria_published);
+ $criteria_published->setSort('date');
$criteria_published->setOrder('DESC');
$criteria_published->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_published->setStart($start_published);
@@ -130,22 +130,24 @@
$uids_waiting[] = $review_waiting->getVar('uid');
}
if (isset($lids_waiting)){
- $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_waiting)) . ")", "IN"), true, false);
+ $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', '(' . implode(',', array_unique($lids_waiting)) . ')', 'IN'), true, false);
}
if (isset($uids_waiting)){
- $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_waiting) . ")"));
+ $users = $member_handler->getUserList(new Criteria('uid', '(' . implode(',', $uids_waiting) . ')'));
}
foreach ($reviews_waiting as $review_waiting) {
$review_waiting_array = $review_waiting->toArray();
- $review_waiting_array['download_title'] = isset($downloads[$review_waiting->getVar('lid')]) ? $downloads[$review_waiting->getVar('lid')]['title'] : "";
- $review_waiting_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($review_waiting->getVar('uid'));
+ $review_waiting_array['download_title'] = isset($downloads[$review_waiting->getVar('lid')]) ? $downloads[$review_waiting->getVar('lid')]['title'] : '';
+ $review_waiting_array['reviewer_uname'] = XoopsUserUtility::getUnameFromId($review_waiting->getVar('uid'));
+ $reviewer = $member_handler->getUser($review_waiting->getVar('uid'));
+ $review_waiting_array['reviewer_email'] = is_object($reviewer) ? $reviewer->email() : '';
$review_waiting_array['formatted_date'] = formatTimestamp($review_waiting->getVar('date'), _DATESTRING);
$GLOBALS['xoopsTpl']->append('reviews_waiting', $review_waiting_array);
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav_waiting = new XoopsPageNav($waiting_count, $wfdownloads->getConfig('admin_perpage') , $start_waiting, 'start_waiting');
- $GLOBALS['xoopsTpl']->assign('reviews_waiting_pagenav', $pagenav_waiting -> renderNav());
+ $GLOBALS['xoopsTpl']->assign('reviews_waiting_pagenav', $pagenav_waiting->renderNav());
}
if ($published_count > 0) {
@@ -154,15 +156,17 @@
$uids_published[] = $review_published->getVar('uid');
}
if (isset($lids_published)){
- $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_published)) . ")", "IN"), true, false);
+ $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', '(' . implode(',', array_unique($lids_published)) . ')', 'IN'), true, false);
}
if (isset($uids_published)){
- $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_published) . ")"));
+ $users = $member_handler->getUserList(new Criteria('uid', '(' . implode(',', $uids_published) . ')'));
}
foreach ($reviews_published as $review_published) {
$review_published_array = $review_published->toArray();
- $review_published_array['download_title'] = isset($downloads[$review_published->getVar('lid')]) ? $downloads[$review_published->getVar('lid')]['title'] : "";
- $review_published_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($review_published->getVar('uid'));
+ $review_published_array['download_title'] = isset($downloads[$review_published->getVar('lid')]) ? $downloads[$review_published->getVar('lid')]['title'] : '';
+ $review_published_array['reviewer_uname'] = XoopsUserUtility::getUnameFromId($review_published->getVar('uid'));
+ $reviewer = $member_handler->getUser($review_published->getVar('uid'));
+ $review_published_array['reviewer_email'] = is_object($reviewer) ? $reviewer->email() : '';
$review_published_array['formatted_date'] = formatTimestamp($review_published->getVar('date'), _DATESTRING);
$GLOBALS['xoopsTpl']->append('reviews_published', $review_published_array);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -362,7 +362,7 @@
}
// changed - start - March 4 2006 - jpc
- if(file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php')) {
+ if(wfdownloads_checkModule('formulize')) {
$sform->addElement(new XoopsFormHidden('cid', $this->getVar('cid', 'e')));
} else {
$categories = $this->wfdownloads->getHandler('category')->getUserUpCategories();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -123,15 +123,14 @@
$gperm_handler = xoops_gethandler('groupperm');
$category_handler = xoops_getmodulehandler('category', $module->dirname());
-
$cids = $category_handler->getIds();
if (count($cids) > 0) {
- echo "<br /><B>Adding upload permissions to categories</B><br />";
+ echo "<br /><b>Adding upload permissions to categories</b><br />";
foreach ($cids as $cid) {
- $down_groups_ids = $gperm_handler->getGroupIds('WFDownCatPerm', $cid, $module->mid());
- foreach ($down_groups_ids as $down_group_id) {
+ $allowedDownGroupsIds = $gperm_handler->getGroupIds('WFDownCatPerm', $cid, $module->mid());
+ foreach ($allowedDownGroupsIds as $allowedDownGroupsId) {
//$gperm_handler->deleteByModule($module->mid(), 'WFUpCatPerm', $cid);
- $gperm_handler->addRight('WFUpCatPerm', $cid, $down_group_id, $module->mid());
+ $gperm_handler->addRight('WFUpCatPerm', $cid, $allowedDownGroupsId, $module->mid());
}
}
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -165,7 +165,7 @@
define("_AM_WFD_MINDEX_AUTOEXPIRE","Auto expire downloads");
define("_AM_WFD_MINDEX_OFFLINEDOWN","Offline downloads");
define("_AM_WFD_MINDEX_ID","ID");
-define("_AM_WFD_MINDEX_TITLE","File title");
+define("_AM_WFD_MINDEX_TITLE","Download title");
define("_AM_WFD_MINDEX_POSTER","Poster");
define("_AM_WFD_MINDEX_SUBMITTED","Submission date");
define("_AM_WFD_MINDEX_ONLINESTATUS","Online status");
@@ -317,10 +317,10 @@
//Reviews defines
define("_AM_WFD_REV_SNEWMNAMEDESC","Approve review");
define("_AM_WFD_REV_ID","ID");
-define("_AM_WFD_REV_TITLE","Title");
+define("_AM_WFD_REV_TITLE","Download title");
define("_AM_WFD_REV_REVIEWTITLE","Review title");
-define("_AM_WFD_REV_POSTER","Submitter");
-define("_AM_WFD_REV_SUBMITDATE","Submitted");
+define("_AM_WFD_REV_POSTER","Reviewer");
+define("_AM_WFD_REV_SUBMITDATE","Date");
define("_AM_WFD_REV_FTITLE","Review title");
define("_AM_WFD_REV_FRATING","Review rating");
define("_AM_WFD_REV_FDESCRIPTION","Review description");
@@ -417,10 +417,10 @@
define("_AM_WFD_BROKEN_CONFIRM_ALT","Confirm state of broken file report");
define("_AM_WFD_BROKEN_ID","ID");
-define("_AM_WFD_BROKEN_TITLE","Title");
+define("_AM_WFD_BROKEN_TITLE","Dowonload title");
define("_AM_WFD_BROKEN_REPORTER","Reporter");
-define("_AM_WFD_BROKEN_FILESUBMITTER","Submitter");
-define("_AM_WFD_BROKEN_DATESUBMITTED","Submit date");
+define("_AM_WFD_BROKEN_FILESUBMITTER","Download submitter");
+define("_AM_WFD_BROKEN_DATESUBMITTED","Report date");
define("_AM_WFD_BROKEN_ACTION","Action");
define("_AM_WFD_BROKEN_NOFILEMATCH","There are no broken reports that match this criteria");
define("_AM_WFD_BROKENFILEDELETED","Download description removed from database and broken report removed");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -48,13 +48,15 @@
redirect_header('index.php', 5, _MD_WFD_NOTALLOWESTOSUBMIT);
}
-// Check posts if user is not an ADMIN
+// If user is not an ADMIN check posts
if (is_object($xoopsUser) && !$xoopsUser->isAdmin()) {
if ($xoopsUser->getVar('posts') < $wfdownloads->getConfig('upload_minposts')) {
redirect_header("index.php", 5, _MD_WFD_UPLOADMINPOSTS);
}
}
+
+
if (!empty($_POST['submit'])) {
$notify = !empty($_POST['notify']) ? true : false;
@@ -374,7 +376,10 @@
redirect_header('index.php', 2, _MD_WFD_THANKSFORINFO);
}
} else {
- if ($wfdownloads->getConfig('showdisclaimer') && !isset($_GET['agree'])) {
+ $lid = WfdownloadsRequest::getInt('lid', 0);
+ $cid = WfdownloadsRequest::getInt('cid', 0);
+
+ if ($wfdownloads->getConfig('showdisclaimer') && !isset($_POST['agree'])) {
// Show disclaimers
$xoopsOption['template_main'] = 'wfdownloads_disclaimer.html';
include XOOPS_ROOT_PATH . '/header.php';
@@ -403,79 +408,79 @@
$xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}");
}
+ $xoopsTpl->assign('lid', $lid);
+ $xoopsTpl->assign('cid', $cid);
+
$xoopsTpl->assign('categoryPath', _MD_WFD_DISCLAIMERAGREEMENT);
$xoopsTpl->assign('module_home', wfdownloads_module_home(true));
include XOOPS_ROOT_PATH . '/footer.php';
exit();
- }
- // Show submit form
- if (isset($_REQUEST['lid']) && is_object($xoopsUser)) {
- $user_id = $xoopsUser->uid();
- $lid = WfdownloadsRequest::getInt('lid');
- $download = $wfdownloads->getHandler('download')->get($lid);
- if ($user_id !== $download->getVar('submitter')) {
- redirect_header('index.php', 5, _MD_WFD_NOTALLOWEDTOMOD);
+ } else {
+ // Show submit form
+ if ($lid != 0) {
+ $download = $wfdownloads->getHandler('download')->get($lid);
+ // Check if current user is the download submitter
+ if ($xoopsUser->uid() != $download->getVar('submitter')) {
+ redirect_header('index.php', 5, _MD_WFD_NOTALLOWEDTOMOD);
+ }
+ $cid = $download->getVar('cid');
+ } else {
+ $download = $wfdownloads->getHandler('download')->create();
+ $cid = WfdownloadsRequest::getInt('cid', 0);
+ $download->setVar('cid', $cid);
}
- $cid = $download->getVar('cid');
- } else {
- $lid = 0;
- $download = $wfdownloads->getHandler('download')->create();
- $cid = !empty($_POST['cid']) ? (int)$_POST['cid'] : 0;
- $download->setVar('cid', $cid);
- }
- if (!empty($_GET['cid'])) {
- $download->setVar('cid', (int)$_GET['cid']);
- } //Added by Lankford on 2008/2/20.
-
- if (isset($_POST['submit_category']) && !empty($_POST['submit_category'])) {
- $category = $wfdownloads->getHandler('category')->get($cid);
- $fid = $category->getVar('formulize_fid');
- $customArray = array();
- if (wfdownloads_checkModule('formulize') && $fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $customArray['fid'] = $fid;
- $customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
- $customArray['entry'] = $download->getVar('formulize_idreq');
- $customArray['go_back'] = '';
- $customArray['parentLinks'] = '';
- if (wfdownloads_checkModule('formulize') < 300)
- $owner = getEntryOwner($entry);
- else
- $owner = getEntryOwner($entry, $fid);
- $owner_groups = $member_handler->getGroupsByUser($owner, FALSE);
- $customArray['owner_groups'] = $owner_groups;
+ if (isset($_POST['submit_category']) && !empty($_POST['submit_category'])) {
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $fid = $category->getVar('formulize_fid');
+ $customArray = array();
+ if (wfdownloads_checkModule('formulize') && $fid) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $customArray['fid'] = $fid;
+ $customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
+ $customArray['entry'] = $download->getVar('formulize_idreq');
+ $customArray['go_back'] = '';
+ $customArray['parentLinks'] = '';
+ // Check formulize version
+ if (wfdownloads_checkModule('formulize') < 300)
+ $owner = getEntryOwner($entry);
+ else
+ $owner = getEntryOwner($entry, $fid);
+ $owner_groups = $member_handler->getGroupsByUser($owner, FALSE);
+ $customArray['owner_groups'] = $owner_groups;
+ }
+ $sform = $download->getForm($customArray);
+ } elseif (wfdownloads_checkModule('formulize')) {
+ $sform = $download->getCategoryForm();
+ } else {
+ $sform = $download->getForm();
}
- $sform = $download->getForm($customArray);
- } elseif (wfdownloads_checkModule('formulize')) {
- $sform = $download->getCategoryForm();
- } else {
- $sform = $download->getForm();
- }
- $xoopsOption['template_main'] = 'wfdownloads_submit.html';
- include XOOPS_ROOT_PATH . '/header.php';
+ $xoopsOption['template_main'] = 'wfdownloads_submit.html';
+ include XOOPS_ROOT_PATH . '/header.php';
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
- $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
+ $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
- $catarray['imageheader'] = wfdownloads_headerImage();
+ $catarray['imageheader'] = wfdownloads_headerImage();
- // Breadcrumb
- $breadcrumb = new WfdownloadsBreadcrumb();
- $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
- $breadcrumb->addLink(_MD_WFD_SUBMITDOWNLOAD, '');
- $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
+ // Breadcrumb
+ $breadcrumb = new WfdownloadsBreadcrumb();
+ $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
+ $breadcrumb->addLink(_MD_WFD_SUBMITDOWNLOAD, '');
+ $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
- $xoopsTpl -> assign('catarray', $catarray);
- $xoopsTpl->assign('categoryPath', _MD_WFD_SUBMITDOWNLOAD);
- $xoopsTpl->assign('module_home', wfdownloads_module_home(true));
- $xoopsTpl -> assign('submit_form' , $sform->render());
+ $xoopsTpl->assign('catarray', $catarray);
+ $xoopsTpl->assign('categoryPath', _MD_WFD_SUBMITDOWNLOAD);
+ $xoopsTpl->assign('module_home', wfdownloads_module_home(true));
+ $xoopsTpl->assign('submit_form' , $sform->render());
- include XOOPS_ROOT_PATH . '/footer.php';
+ include XOOPS_ROOT_PATH . '/footer.php';
+ exit();
+ }
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -49,7 +49,7 @@
<td> </td>
<td> </td>
<td align='center'>
- <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFD_SEARCH}>' value='<{$smarty.const._AM_WFD_SEARCH}>' name='submit'>
+ <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFD_FILTER}>' value='<{$smarty.const._AM_WFD_FILTER}>' name='submit'>
</td>
</tr>
<input id='op' type='hidden' value='downloads.filter' name='op'>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -26,37 +26,37 @@
<table class='outer'>
<tr>
<th><{$smarty.const._AM_WFD_BROKEN_ID}></th>
+ <th><{$smarty.const._AM_WFD_BROKEN_DATESUBMITTED}></th>
+ <th><{$smarty.const._AM_WFD_BROKEN_REPORTER}></th>
<th><{$smarty.const._AM_WFD_BROKEN_TITLE}></th>
- <th><{$smarty.const._AM_WFD_BROKEN_REPORTER}></th>
<th><{$smarty.const._AM_WFD_BROKEN_FILESUBMITTER}></th>
- <th><{$smarty.const._AM_WFD_BROKEN_DATESUBMITTED}></th>
<th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
</tr>
<{foreach item=report from=$reports}>
<tr class="<{cycle values='even, odd'}>">
<td><{$report.reportid}></td>
+ <td><{$report.formatted_date}></td>
<td>
- <{if ($report.download_lid) == false}>
- <{$smarty.const._AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS}>
+ <{if ($report.reporter_email) == ''}>
+ <{$report.reporter_uname}> (<{$report.ip}>)
<{else}>
- <a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=<{$report.download_cid}>&lid=<{$report.download_lid}>' target='_blank'><{$report.download_title}></a>
+ <a href='mailto:<{$report.reporter_email}>'><{$report.reporter_uname}></a> (<{$report.ip}>)
<{/if}>
</td>
<td>
- <{if ($report.sender_email) == ''}>
- <{$report.sender_uname}> (<{$report.ip}>)
+ <{if ($report.download_lid) == false}>
+ <{$smarty.const._AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS}>
<{else}>
- <a href='mailto:<{$report.sender_email}>'><{$report.sender_uname}></a> (<{$report.ip}>)
+ <a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=<{$report.download_cid}>&lid=<{$report.download_lid}>' target='_blank'><{$report.download_title}></a>
<{/if}>
</td>
<td>
<{if ($report.submitter_email) == ''}>
<{$report.submitter_uname}>
<{else}>
- <a href='mailto:<{$report.sender_email}>'><{$report.submitter_uname}></a>
+ <a href='mailto:<{$report.submitter_email}>'><{$report.submitter_uname}></a>
<{/if}>
</td>
- <td><{$report.formatted_date}></td>
<td align='center'>
<a href='?op=report.ignore&lid=' alt='' title=''>
<img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" alt="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" />
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -33,16 +33,22 @@
</tr>
<{foreach item=review_waiting from=$reviews_waiting}>
<tr class="<{cycle values='even, odd'}>">
- <td class='head'><{$review_waiting.review_id}></td>
- <td class='even'>
+ <td><{$review_waiting.review_id}></td>
+ <td>
<a href='download.php?op=download.edit&lid=<{$review_waiting.lid}>'><{$review_waiting.download_title}></a>
</td>
- <td class='even'>
+ <td>
<a href='?op=review.edit&review_id=<{$review_waiting.review_id}>'><{$review_waiting.title}></a>
</td>
- <td class='even'><{$review_waiting.submitter_uname}></td>
- <td class='even'><{$review_waiting.formatted_date}></td>
- <td class='even' align='center'>
+ <td>
+ <{if ($review_waiting.reviewer_email) == ''}>
+ <{$review_waiting.reviewer_uname}>
+ <{else}>
+ <a href='mailto:<{$report.submitter_email}>'><{$review_waiting.reviewer_uname}></a>
+ <{/if}>
+ </td>
+ <td><{$review_waiting.formatted_date}></td>
+ <td align='center'>
<a href='?op=review.approve&review_id=<{$review_waiting.review_id}>'><img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" /></a>
<a href='?op=review.edit&review_id=<{$review_waiting.review_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" /></a>
<a href='?op=review.delete&review_id=<{$review_waiting.review_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" /></a>
@@ -72,16 +78,22 @@
</tr>
<{foreach item=review_published from=$reviews_published}>
<tr class="<{cycle values='even, odd'}>">
- <td class='head'><{$review_published.review_id}></td>
- <td class='even'>
+ <td><{$review_published.review_id}></td>
+ <td>
<a href='download.php?op=download.edit&lid=<{$review_published.lid}>'><{$review_published.download_title}></a>
</td>
- <td class='even'>
+ <td>
<a href='?op=review.edit&review_id=<{$review_published.review_id}>'><{$review_published.title}></a>
</td>
- <td class='even'><{$review_published.submitter_uname}></td>
- <td class='even'><{$review_published.formatted_date}></td>
- <td class='even' align='center'>
+ <td>
+ <{if ($review_published.reviewer_email) == ''}>
+ <{$review_published.reviewer_uname}>
+ <{else}>
+ <a href='mailto:<{$review_published.reviewer_email}>'><{$review_published.reviewer_uname}></a>
+ <{/if}>
+ </td>
+ <td><{$review_published.formatted_date}></td>
+ <td align='center'>
<a href='?op=review.edit&review_id=<{$review_published.review_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" /></a>
<a href='?op=review.delete&review_id=<{$review_published.review_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" /></a>
</td>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -21,13 +21,12 @@
<b><{$smarty.const._MD_WFD_DOYOUAGREE}></b>
<br />
<br />
- <input type='button' onclick='location="<{$agree_location}>"' class='formButton' value='<{$smarty.const._MD_WFD_AGREE}>' alt='<{$smarty.const._MD_WFD_AGREE}>' />
+ <input type='submit' class='formButton' value='<{$smarty.const._MD_WFD_AGREE}>' alt='<{$smarty.const._MD_WFD_AGREE}>' />
<input type='button' onclick='javascript:history.go(-1)' class='formButton' value='<{$smarty.const._CANCEL}>' alt='<{$smarty.const._CANCEL}>' />
- <{if $down_disclaimer == true}>
- <input type='hidden' name='lid' value='1' />
- <input type='hidden' name='cid' value='1' />
- <{/if}>
+ <input type='hidden' name='lid' value='<{$lid}>' />
+ <input type='hidden' name='cid' value='<{$cid}>' />
+ <input type='hidden' name='agree' value='1' />
</div>
</form>
<br />
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -47,10 +47,10 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-10';
-$modversion['release_date'] = '2013/09/10';
-$modversion['releasedate'] = "2013-09-10";
-$modversion['status'] = "BETA";
+$modversion['date'] = '2013-09-11';
+$modversion['release_date'] = '2013/09/11';
+$modversion['releasedate'] = '2013-09-11';
+$modversion['status'] = 'BETA';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
//about
@@ -58,7 +58,7 @@
$modversion["module_website_name"] = "XOOPS";
$modversion["module_status"] = "BETA";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.5";
+$modversion['min_xoops'] = '2.5.5';
$modversion['min_admin'] = '1.1';
$modversion['min_db'] = array(
'mysql' => '5.0.7',
|
