Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11605] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-05-30 21:46:37
|
Revision: 11605
http://sourceforge.net/p/xoops/svn/11605
Author: luciorota
Date: 2013-05-30 21:46:33 +0000 (Thu, 30 May 2013)
Log Message:
-----------
admin side: review uses templates
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_downloadlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mimetypelist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -83,3 +83,6 @@
$modification_handler = xoops_getmodulehandler('modification', $GLOBALS['xoopsModule']->getVar('dirname'));
$download_handler = xoops_getmodulehandler('download', $GLOBALS['xoopsModule']->getVar('dirname'));
$category_handler = xoops_getmodulehandler('category', $GLOBALS['xoopsModule']->getVar('dirname'));
+$mime_handler = xoops_getmodulehandler('mimetype', $GLOBALS['xoopsModule']->getVar('dirname'));
+
+$member_handler = xoops_gethandler("member");
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -52,7 +52,6 @@
$cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
wfdownloads_xoops_cp_header();
- //wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$sform = new XoopsThemeForm(_AM_WFD_CCATEGORY_MOVE, "move", xoops_getenv('PHP_SELF'));
@@ -179,7 +178,7 @@
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
- foreach($arr as $child) {
+ foreach($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -56,28 +56,22 @@
echo "</fieldset><br />\n";
if ($lid) {
- $download = $download_handler->get($lid);
- $title = _AM_WFD_FILE_MODIFYFILE;
- // added - start - March 4 2006 - jpc
- $cid = intval($download->getVar('cid'));
- $category = $category_handler->get($cid);
- // added - end - March 4 2006 - jpc
- // changed - start - April 22 2006 - jwe
- //$title = _AM_WFD_FILE_MODIFYFILE;
+ if (!$download = $download_handler->get($lid)) {
+ redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ exit();
+ }
+ $cid = $download->getVar('cid');
+ if(!$category = $category_handler->get($cid)) {
+ redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
+ exit();
+ }
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
- // changed - end - April 22 2006 - jwe
} else {
$download = $download_handler->create();
- $title = _AM_WFD_FILE_CREATENEWFILE;
- // added - start - March 4 2006 - jpc
- $cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0 ;
+ $cid = wfdownloads_CleanVars($_POST, 'cid', 0, 'int');
+ $category = $category_handler->get($cid);
$download->setVar('cid', $cid);
- $category = $category_handler->get($cid);
- // added - end - March 4 2006 - jpc
- // changed - start - April 22 2006 - jwe
- //$title = _AM_WFD_FILE_CREATENEWFILE;
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_DOWNLOADTITLE);
- // changed - end - April 22 2006 - jwe
}
// changed - start - March 4 2006 - jpc
@@ -99,7 +93,7 @@
$owner = getEntryOwner($entry);
$member_handler =& xoops_gethandler('member');
- $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
+ $owner_groups =& $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $owner_groups;
}
@@ -497,6 +491,7 @@
addDownload();
break;
+ case "download.edit" :
case "download.add" :
case "Download" :
Download();
@@ -507,7 +502,10 @@
$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
$download_handler = xoops_getmodulehandler('download');
- $download = $download_handler->get($lid);
+ if (!$download = $download_handler->get($lid)) {
+ redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ exit();
+ }
$title = $download->getVar('title');
if ($ok = true) {
$file = $xoopsModuleConfig['uploaddir'] . "/" . $download->getVar('filename');
@@ -560,7 +558,6 @@
$categories = $category_handler->getObjects();
- $start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
$start1 = wfdownloads_CleanVars($_GET, 'start1', 0, 'int');
$start2 = wfdownloads_CleanVars($_GET, 'start2', 0, 'int');
$start3 = wfdownloads_CleanVars($_GET, 'start3', 0, 'int');
@@ -590,7 +587,7 @@
$criteria = new CriteriaCompo();
$criteria->setSort("published");
$criteria->setOrder("DESC");
- $criteria->setStart($start);
+ $criteria->setStart($start1);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$published_downloads = $download_handler->getActiveDownloads($criteria);
$published_downloads_count = $download_handler->getActiveCount();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -44,15 +44,14 @@
$sform -> addElement(new XoopsFormText(_AM_WFD_MIME_EXTF, 'mime_ext', 5, 60, $mimetype->getVar('mime_ext', 'e')), true);
$sform -> addElement(new XoopsFormText(_AM_WFD_MIME_NAMEF, 'mime_name', 50, 255, $mimetype->getVar('mime_name', 'e')), true);
$sform -> addElement(new XoopsFormTextArea(_AM_WFD_MIME_TYPEF, 'mime_type', $mimetype->getVar('mime_types', 'e'), 7, 60));
- $madmin_radio = new XoopsFormRadioYN(_AM_WFD_MIME_ADMINF, 'mime_admin', $mimetype->getVar('mime_admin', 'e'), ' ' . _YES . '', ' ' . _NO . '');
+ $madmin_radio = new XoopsFormRadioYN(_AM_WFD_MIME_ADMINF, 'mime_admin', $mimetype->getVar('mime_admin', 'e'), ' ' . _YES . '', ' ' . _NO . '');
$sform -> addElement($madmin_radio);
- $muser_radio = new XoopsFormRadioYN(_AM_WFD_MIME_USERF, 'mime_user', $mimetype->getVar('mime_user', 'e'), ' ' . _YES . '', ' ' . _NO . '');
+ $muser_radio = new XoopsFormRadioYN(_AM_WFD_MIME_USERF, 'mime_user', $mimetype->getVar('mime_user', 'e'), ' ' . _YES . '', ' ' . _NO . '');
$sform -> addElement($muser_radio);
$button_tray = new XoopsFormElementTray('', '');
$hidden = new XoopsFormHidden('op', 'save');
$button_tray -> addElement($hidden);
-
if (!$mime_id) {
$butt_create = new XoopsFormButton('', '', _AM_WFD_MIME_CREATE, 'submit');
$butt_create -> setExtra('onclick="this.form.elements.op.value=\'save\'"');
@@ -74,7 +73,6 @@
$butt_cancel -> setExtra('onclick="history.go(-1)"');
$button_tray -> addElement($butt_cancel);
}
-
$sform -> addElement($button_tray);
$sform -> display();
@@ -93,18 +91,16 @@
switch ($op) {
case 'openurl':
$fileext = trim($_POST['fileext']);
- $url = "http://filext.com/detaillist.php?extdetail=" . $fileext . "";
+ $url = "http://filext.com/detaillist.php?extdetail={$fileext}";
if (!headers_sent()) {
header("Location: $url");
} else {
- echo "<meta http-equiv='refresh' content='0;url=$url target='_blank''>\r\n";
+ echo "<meta http-equiv='refresh' content='0;url={$url} target='_blank''>\r\n";
}
break;
case 'update';
- $mime_id = (isset($_REQUEST['mime_id'])) ? intval($_REQUEST['mime_id']) : 0;
-
- $mime_handler = xoops_getmodulehandler('mimetype');
+ $mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
$mimetype = $mime_handler->get($mime_id);
if (isset($_REQUEST['admin']) && $_REQUEST['admin'] == 1) {
@@ -128,24 +124,22 @@
redirect_header(WFDOWNLOADS_URL . "admin/mimetypes.php?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
break;
+ case 'mimetype.save':
case 'save':
- $mime_id = (isset($_POST['mime_id']) && $_POST['mime_id'] > 0) ? $_POST['mime_id'] : 0;
+ $mime_id = wfdownloads_CleanVars($_POST, 'mime_id', 0, 'int');
+ $mimetype = $mime_handler->get($mime_id);
- $mime_handler = xoops_getmodulehandler('mimetype');
- $mimetype = $mime_handler->get($mime_id);
$mimetype->setVar('mime_ext', $_POST['mime_ext']);
$mimetype->setVar('mime_name', $_POST['mime_name']);
$mimetype->setVar('mime_types', $_POST['mime_type']);
- $mimetype->setVar('mime_admin', intval($_POST['mime_admin']));
- $mimetype->setVar('mime_user', intval($_POST['mime_user']));
-
- $result = $mime_handler->insert($mimetype);
- $error = "Could not update mimetype information:";
- if (!$result) {
+ $mimetype->setVar('mime_admin', (int)$_POST['mime_admin']);
+ $mimetype->setVar('mime_user', (int)$_POST['mime_user']);
+ if (!$mime_handler->insert($mimetype)) {
+ $error = "Could not update mimetype information:";
trigger_error($error, E_USER_ERROR);
}
$dbupted = ($mime_id == 0) ? _AM_WFD_MIME_CREATED : _AM_WFD_MIME_MODIFIED;
- redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, $dbupted);
+ redirect_header('amimetypes.php', 1, $dbupted);
break;
case 'saveall':
@@ -167,16 +161,14 @@
redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, _AM_WFD_MIME_MODIFIED);
break;
+ case "mimetype.delete":
case "delete":
- global $xoopsDB;
-
- $confirm = (isset($_POST['confirm'])) ? 1 : 0;
-
- $mime_handler = xoops_getmodulehandler('mimetype');
- $mimetype = $mime_handler->get($_REQUEST['mime_id']);
- if ($confirm) {
+ $mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $mimetype = $mime_handler->get($mime_id);
+ if ($ok == true) {
if ($mime_handler->delete($mimetype)) {
- redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
+ redirect_header('mimetypes.php', 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
} else {
$error = "" . _AM_WFD_EVENNEWS_DBERROR . ": <br /><br />" . $sql;
trigger_error($error, E_USER_ERROR);
@@ -184,24 +176,23 @@
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'delete', 'mime_id' => $mimetype->getVar('mime_id'), 'confirm' => 1), WFDOWNLOADS_URL . 'admin/mimetypes.php', _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
+ xoops_confirm(array('op' => 'mimetype.delete', 'mime_id' => $mime_id, 'ok' => true), WFDOWNLOADS_URL . 'admin/mimetypes.php', _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
xoops_cp_footer();
}
break;
+ case 'mimetype.edit':
case 'edit':
wfdownloads_xoops_cp_header();
- //wfdownloads_adminMenu(7, _AM_WFD_MMIMETYPES);
edit_mimetype($_GET['mime_id']);
xoops_cp_footer();
break;
+ case 'mimetypes.list':
case 'main':
default:
- global $xoopsUser, $xoopsDB, $xoopsModuleConfig;
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ $start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
- $mime_handler = xoops_getmodulehandler('mimetype');
$criteria = new CriteriaCompo();
$criteria->setSort("mime_name");
$criteria->setStart($start);
@@ -212,7 +203,6 @@
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('mimetypes.php');
- //wfdownloads_adminMenu(7, _AM_WFD_MMIMETYPES);
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_MODIFYF . "</legend>\n";
echo "<div style='padding: 8px;'>" . _AM_WFD_MIME_INFOTEXT . "</div>\n";
@@ -297,7 +287,6 @@
$page = ($mime_num > 20) ? _AM_WFD_MINDEX_PAGE : '';
$pagenav = new XoopsPageNav($mime_num, 20, $start, 'start');
echo "<div align='right' style='padding: 8px;'>" . $page . '' . $pagenav -> renderNav() . '</div>';
- //xoops_cp_footer();
include_once "admin_footer.php";
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -19,243 +19,135 @@
* @version svn:$Id$
*/
include 'admin_header.php';
+$review_handler = xoops_getmodulehandler('review');
-$op = '';
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'reviews.list', 'string');
+$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
-if (!isset($_POST['op']))
-{
- $op = isset($_GET['op']) ? $_GET['op'] : 'reviews';
-}
-else
-{
- $op = $_POST['op'];
-}
+switch ($op) {
+ case "review.delete" :
+ $review_id = wfdownloads_CleanVars($_REQUEST, 'review_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $review = $review_handler->get($review_id);
+ if ($ok == true) {
+ $review_handler->delete($review);
+ redirect_header('review.php', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $review->getVar('title')));
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ xoops_confirm(array('op' => 'review.delete', 'review_id' => $review_id, 'ok' => true), 'review.php', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_BDELETE);
+ xoops_cp_footer();
+ }
+ break;
-$lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
+ case "review.approve":
+ $review_id = wfdownloads_CleanVars($_REQUEST, 'review_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $review = $review_handler->get($review_id);
+ if ($ok == true) {
+ $review->setVar('submit', 1);
+ $review_handler->insert($review);
+ redirect_header('review.php?op=default', 1, sprintf( _AM_WFD_REV_REVIEW_UPDATED, $review->getVar('title')));
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ xoops_confirm(array('op' => 'review.approve', 'review_id' => $review->getVar('review_id'), 'ok' => true), 'review.php', _AM_WFD_REVIEW_APPROVETHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_REVIEW_APPROVETHIS);
+ xoops_cp_footer();
+ }
+ break;
-switch ($op)
-{
- case "del_review":
+ case "review.edit":
+ $review_id = wfdownloads_CleanVars($_REQUEST, 'review_id', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ $review = $review_handler->get($review_id);
+ if ($ok == true) {
+ $review->setVar('title', trim($_POST['title']));
+ $review->setVar('review', trim($_POST['review']));
+ $review->setVar('rated', (int)$_POST['rated']);
+ $review->setVar('submit', (int)$_POST['approve']);
+ $review_handler->insert($review);
+ redirect_header('review.php', 1, _AM_WFD_REV_REVIEW_UPDATED);
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('review.php');
+ $sform = $review->getForm();
+ $sform -> display();
+ xoops_cp_footer();
+ }
+ break;
- $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
- $review_handler = xoops_getmodulehandler('review');
- $review_id = intval($_REQUEST['review_id']);
- $review = $review_handler->get($review_id);
- if ($confirm)
- {
- $review_handler->delete($review);
- redirect_header(WFDOWNLOADS_URL.'admin/review.php?op=default', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $review->getVar('title')));
- exit();
- }
- else
- {
- wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'del_review', 'review_id' => $review->getVar('review_id'), 'confirm' => 1), WFDOWNLOADS_URL.'admin/review.php?op=default', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_BDELETE);
- xoops_cp_footer();
- }
- break;
+ case "reviews.list":
+ default:
+ $start_waiting = wfdownloads_CleanVars($_GET, 'start_waiting', 0, 'int');
+ $start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
- case "approve_review":
+ $criteria_waiting = new Criteria("submit", false);
+ $num_waiting = $review_handler->getCount($criteria_waiting);
+ $criteria_waiting->setSort("date");
+ $criteria_waiting->setOrder("DESC");
+ $criteria_waiting->setLimit($xoopsModuleConfig['admin_perpage']);
+ $criteria_waiting->setStart($start_waiting);
+ $reviews_waiting = $review_handler->getObjects($criteria_waiting);
- $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
- $review_handler = xoops_getmodulehandler('review');
- $review_id = intval($_REQUEST['review_id']);
- $review = $review_handler->get($review_id);
- if ($confirm)
- {
- $review->setVar('submit', 1);
- $review_handler->insert($review);
- redirect_header(WFDOWNLOADS_URL.'admin/review.php?op=default', 1, sprintf( _AM_WFD_REV_REVIEW_UPDATED, $review->getVar('title')));
- exit();
- }
- else
- {
- wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'approve_review', 'review_id' => $review->getVar('review_id'), 'confirm' => 1), WFDOWNLOADS_URL.'admin/review.php?op=default', _AM_WFD_REVIEW_APPROVETHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_REVIEW_APPROVETHIS);
- xoops_cp_footer();
- }
- break;
+ $criteria_published = new Criteria("submit", true);
+ $num_published = $review_handler->getCount($criteria_published);
+ $criteria_published->setSort("date");
+ $criteria_published->setOrder("DESC");
+ $criteria_published->setLimit($xoopsModuleConfig['admin_perpage']);
+ $criteria_published->setStart($start_published);
+ $reviews_published = $review_handler->getObjects($criteria_published);
- case "edit_review":
-
- $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
- $review_handler = xoops_getmodulehandler('review');
- $review_id = intval($_REQUEST['review_id']);
- $review = $review_handler->get($review_id);
- if ($confirm)
- {
- $review->setVar('title', trim($_POST['title']));
- $review->setVar('review', trim($_POST['review']));
- $review->setVar('rated', intval($_POST['rated']));
- $review->setVar('submit', intval($_POST['approve']));
- $review_handler->insert($review);
- redirect_header(WFDOWNLOADS_URL.'admin/review.php?op=default', 1, _AM_WFD_REV_REVIEW_UPDATED);
- exit();
- }
- else
- {
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('review.php');
- //wfdownloads_adminMenu(4, _AM_WFD_AREVIEWS);
- $sform = $review->getForm();
- $sform -> display();
- xoops_cp_footer();
- }
- break;
+ $GLOBALS['xoopsTpl']->assign('reviews_waiting_count', $num_waiting);
+ $GLOBALS['xoopsTpl']->assign('reviews_published_count', $num_published);
- default:
- case "reviews":
- case "default":
- global $xoopsDB, $imagearray, $xoopsModule;
- xoops_load('XoopsUserUtility');
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $start2 = isset($_GET['start2']) ? intval($_GET['start2']) : 0;
-
- $review_handler = xoops_getmodulehandler('review');
- $criteria = new Criteria("submit", 0);
- $criteria2 = new Criteria("submit", 1);
- $num = $review_handler->getCount($criteria);
- $num2 = $review_handler->getCount($criteria2);
- $criteria->setSort("date");
- $criteria2->setSort("date");
- $criteria->setOrder("DESC");
- $criteria2->setOrder("DESC");
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria2->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start);
- $criteria2->setStart($start2);
- $reviews = $review_handler->getObjects($criteria);
- $reviews2 = $review_handler->getObjects($criteria2);
-
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('review.php');
- //wfdownloads_adminMenu(4, _AM_WFD_AREVIEWS);
-
- echo "
- <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_AREVIEWS_INFO . "</legend>\n
- <div style='padding: 8px;'>" . _AM_WFD_AREVIEWS_WAITING . " <b>$num</b><div>\n
- <div style='padding: 8px;'>" . _AM_WFD_REV_REVIEW_TOTAL . " <b>$num2</b><div>\n
- <div style='padding: 8px;'>\n
- <li>" . $imagearray['approve'] . " " . _AM_WFD_AREVIEWS_APPROVE . "\n
- <li>" . $imagearray['editimg'] . " " . _AM_WFD_AREVIEWS_EDIT . "\n
- <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_AREVIEWS_DELETE . "</div>\n
- </div>\n
- </fieldset><br />\n
-
- <table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>\n
- <tr>\n
- <td class='head' align='center' width = '100%' colspan='6'><b>" . _AM_WFD_REV_REVIEW_WAITING . "</b></td>\n
- </tr><br /><br />\n
- <tr>\n
- <td class='bg3' align='center' width = '3%'><b>" . _AM_WFD_REV_ID . "</b></td>\n
- <td class='bg3' width = '20%'><b>" . _AM_WFD_REV_TITLE . "</b></td>\n
- <td class='bg3' width = '30%'><b>" . _AM_WFD_REV_REVIEWTITLE . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_REV_POSTER . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_REV_SUBMITDATE . "</b></td>\n
- <td class='bg3' align='center' width = '7%'><b>" . _AM_WFD_REV_ACTION . "</b></td>\n
- </tr>\n
- ";
- if ($num > 0)
- {
- foreach (array_keys($reviews) as $i)
- {
- $lids[] = $reviews[$i]->getVar('lid');
- $uids[] = $reviews[$i]->getVar('uid');
+ if ($num_waiting > 0) {
+ foreach ($reviews_waiting as $review_waiting) {
+ $lids_waiting[] = $review_waiting->getVar('lid');
+ $uids_waiting[] = $review_waiting->getVar('uid');
+ }
+ $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_waiting)) . ")", "IN"), true, false);
+ $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['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($num_waiting, $xoopsModuleConfig['admin_perpage'] , $start_waiting, 'start_waiting');
+ $GLOBALS['xoopsTpl']->assign('reviews_waiting_pagenav', $pagenav_waiting -> renderNav());
}
- $download_handler = xoops_getmodulehandler('download');
- $member_handler = xoops_gethandler("member");
- $downloads = $download_handler->getList(new Criteria("lid", "(".implode(',', $lids).")", "IN"));
- $users = $member_handler->getUserList(new Criteria("uid", "(".implode(',', $uids).")"));
-
- foreach (array_keys($reviews) as $i) {
- $review_id = $reviews[$i]->getVar('review_id');
- $review_title = $reviews[$i]->getVar('title');
- $title = isset($downloads[$reviews[$i]->getVar('lid')]) ? $downloads[$reviews[$i]->getVar('lid')] : "";
- $submitter = XoopsUserUtility::getUnameFromId(intval($reviews[$i]->getVar('uid')));
- $datetime = formatTimestamp($reviews[$i]->getVar('date'), $xoopsModuleConfig['dateformat']);
- $status = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=approve_review&review_id=" . intval($review_id) . "'>" . $imagearray['approve'] . "</a>";
- $modify = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id) . "'>" . $imagearray['editimg'] . "</a>";
- $delete = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=del_review&review_id=" . intval($review_id) . "'>" . $imagearray['deleteimg'] . "</a>";
- echo "
- <tr>\n
- <td class='head' align='center'>" . $review_id . "</td>\n
- <td class='even' nowrap><a href='".WFDOWNLOADS_URL."admin/main.php?op=Download&lid=" . intval($reviews[$i]->getVar('lid')) . "'>" . $title . "</a></td>\n
- <td class='even' nowrap><a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id) . "'>" . $review_title . "</a></td>\n
- <td class='even' align='center' nowrap>$submitter</td>\n
- <td class='even' align='center'>" . $datetime . "</td>\n
- <td class='even' align='center' nowrap>$status $modify $delete</td>\n
- </tr>\n
- ";
+ if ($num_published > 0) {
+ foreach ($reviews_published as $review_published) {
+ $lids_published[] = $review_published->getVar('lid');
+ $uids_published[] = $review_published->getVar('uid');
+ }
+ $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_published)) . ")", "IN"), true, false);
+ $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['formatted_date'] = formatTimestamp($review_published->getVar('date'), _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('reviews_published', $review_published_array);
+ }
+ //Include page navigation
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav_published = new XoopsPageNav($num_published, $xoopsModuleConfig['admin_perpage'] , $start_published, 'start_published');
+ $GLOBALS['xoopsTpl']->assign('reviews_published_pagenav', $pagenav_published -> renderNav());
}
- }
- else
- {
- echo "<tr><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_REV_NOWAITINGREVIEWS . "</td></tr>";
- }
- echo "</table>\n";
- echo "
- <table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>\n
- <tr>\n
- <td class='head' align='center' width = '100%' colspan='6'><b>" . _AM_WFD_REV_REVIEW_PUBLISHED . "</b></td>\n
- </tr><br /><br />\n
- <tr>\n
- <td class='bg3' align='center' width = '3%'><b>" . _AM_WFD_REV_ID . "</b></td>\n
- <td class='bg3' width = '20%'><b>" . _AM_WFD_REV_TITLE . "</b></td>\n
- <td class='bg3' width = '30%'><b>" . _AM_WFD_REV_REVIEWTITLE . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_REV_POSTER . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_REV_SUBMITDATE . "</b></td>\n
- <td class='bg3' align='center' width = '7%'><b>" . _AM_WFD_REV_ACTION . "</b></td>\n
- </tr>\n
- ";
- if ($num2 > 0)
- {
- foreach (array_keys($reviews2) as $i2)
- {
- $lids2[] = $reviews2[$i2]->getVar('lid');
- $uids2[] = $reviews2[$i2]->getVar('uid');
- }
- $download_handler = xoops_getmodulehandler('download');
- $member_handler = xoops_gethandler("member");
+ $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_reviewlist.html");
- $downloads = $download_handler->getList(new Criteria("lid", "(".implode(',', $lids2).")", "IN"));
- $users = $member_handler->getUserList(new Criteria("uid", "(".implode(',', $uids2).")"));
-
- foreach (array_keys($reviews2) as $i2) {
- $review_id2 = $reviews2[$i2]->getVar('review_id');
- $review_title2 = $reviews2[$i2]->getVar('title');
- $title2 = isset($downloads[$reviews2[$i2]->getVar('lid')]) ? $downloads[$reviews2[$i2]->getVar('lid')] : "";
- $submitter2 = XoopsUserUtility::getUnameFromId(intval($reviews2[$i2]->getVar('uid')));
- $datetime2 = formatTimestamp($reviews2[$i2]->getVar('date'), $xoopsModuleConfig['dateformat']);
- $modify2 = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id2) . "'>" . $imagearray['editimg'] . "</a>";
- $delete2 = "<a href='".WFDOWNLOADS_URL."admin/review.php?op=del_review&review_id=" . intval($review_id2) . "'>" . $imagearray['deleteimg'] . "</a>";
- echo "
- <tr>\n
- <td class='head' align='center'>" . $review_id2 . "</td>\n
- <td class='even' nowrap><a href='".WFDOWNLOADS_URL."admin/main.php?op=Download&lid=" . intval($reviews2[$i2]->getVar('lid')) . "'>" . $title2 . "</a></td>\n
- <td class='even' nowrap><a href='".WFDOWNLOADS_URL."admin/review.php?op=edit_review&review_id=" . intval($review_id2) . "'>" . $review_title2 . "</a></td>\n
- <td class='even' align='center' nowrap>$submitter2</td>\n
- <td class='even' align='center'>" . $datetime2 . "</td>\n
- <td class='even' align='center' nowrap>$modify2 $delete2</td>\n
- </tr>\n
- ";
- }
- }
- else
- {
- echo "<tr><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_REV_NOPUBLISHEDREVIEWS . "</td></tr>";
- }
- echo "</table>\n";
-
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($num, $xoopsModuleConfig['admin_perpage'] , $start, 'start');
- echo "<div text-align='right'>" . $pagenav -> renderNav() . '</div>';
-//xoops_cp_footer();
-include_once "admin_footer.php";
- break;
-
-}
\ No newline at end of file
+ include_once "admin_footer.php";
+ break;
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -25,7 +25,6 @@
switch ($op) {
case 'vote.delete' :
- case "delVote":
$rid = wfdownloads_CleanVars($_GET, 'rid', null, 'int');
$lid = wfdownloads_CleanVars($_GET, 'lid', null, 'int');
$rating_handler->deleteAll(new Criteria("ratingid", $rid), true);
@@ -72,10 +71,11 @@
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav(_AM_WFD_MINDEX_PAGE, 20, $start, 'start');
- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+ $ratings_pagenav = new XoopsPageNav($votes, $xoopsModuleConfig['admin_perpage'], $start, 'start');
+ $GLOBALS['xoopsTpl']->assign('ratings_pagenav', $ratings_pagenav->renderNav());
$GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_votedatalist.html");
+
include 'admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-05-30 21:46:33 UTC (rev 11605)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta 1 (2013-05-29)</u></b>
+<b><u>=> Version 3.23 (2013-05-25)</u></b>
- refactorized admin menu (luciorota)
- added: sort subcategories by cid or title or weight (luciorota)
- fixed: update procedure now updates also permissions (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -61,12 +61,12 @@
define("_AM_WFS_MVOTEDATA","Vote Data");
// waiting reviews
define("_AM_WFD_AREVIEWS","Reviews Management");
-define("_AM_WFD_AREVIEWS_WAITING","Reviews Waiting Validation:");
+define("_AM_WFD_AREVIEWS_WAITING","Reviews Waiting Validation");
define("_AM_WFD_AREVIEWS_INFO","Reviews Management Information");
-define("_AM_WFD_AREVIEWS_APPROVE","<b>Approve</b> new review without validation.");
+define("_AM_WFD_AREVIEWS_APPROVE","Approve new review without validation");
define("_AM_WFD_AREVIEWS_APPROVED","Review has been approved.");
-define("_AM_WFD_AREVIEWS_EDIT","<b>Edit</b> new review and then approve.");
-define("_AM_WFD_AREVIEWS_DELETE","<b>Delete</b> the new review information.");
+define("_AM_WFD_AREVIEWS_EDIT","Edit new review and then approve");
+define("_AM_WFD_AREVIEWS_DELETE","Delete the new review information");
// Catgeory defines
define("_AM_WFD_CCATEGORY_CREATENEW","Create New Category");
@@ -315,22 +315,22 @@
define("_AM_WFD_MOD_SUMMARY","Summary: ");
//Reviews defines
-define("_AM_WFD_REV_SNEWMNAMEDESC","Approve Review: ");
+define("_AM_WFD_REV_SNEWMNAMEDESC","Approve Review");
define("_AM_WFD_REV_ID","ID");
define("_AM_WFD_REV_TITLE","Title");
define("_AM_WFD_REV_REVIEWTITLE","Review Title");
define("_AM_WFD_REV_POSTER","Submitter");
define("_AM_WFD_REV_SUBMITDATE","Submitted");
-define("_AM_WFD_REV_FTITLE","Review Title: ");
-define("_AM_WFD_REV_FRATING","Review Rating: ");
-define("_AM_WFD_REV_FDESCRIPTION","Review Description: ");
-define("_AM_WFD_REV_FAPPROVE","Review Approve: ");
+define("_AM_WFD_REV_FTITLE","Review Title");
+define("_AM_WFD_REV_FRATING","Review Rating");
+define("_AM_WFD_REV_FDESCRIPTION","Review Description");
+define("_AM_WFD_REV_FAPPROVE","Review Approve");
define("_AM_WFD_REV_ACTION","Action");
define("_AM_WFD_REV_NOWAITINGREVIEWS","No Waiting Reviews Found");
define("_AM_WFD_REVIEW_APPROVETHIS","Approve Review");
define("_AM_WFD_REV_NOPUBLISHEDREVIEWS","No Published Reviews Found");
define("_AM_WFD_REV_REVIEW_UPDATED","Selected Review Modified and Database Updated Successfully");
-define("_AM_WFD_REV_REVIEW_TOTAL","Total Reviews:");
+define("_AM_WFD_REV_REVIEW_TOTAL","Total Reviews");
define("_AM_WFD_REV_REVIEW_WAITING","Waiting Reviews");
define("_AM_WFD_REV_REVIEW_PUBLISHED","Published Reviews");
@@ -583,3 +583,6 @@
define("_AM_WFD_CATEGORIES_REORDERED","Categories reordered");
define("_AM_WFD_FILE_SUBMITTER","Submitter User");
define("_AM_WFD_FILE_SUBMITTER_DESC","Leave this as it is, Unless you want to change who submitted the download");
+define("_AM_WFD_FCATEGORY_CATEGORIES_LIST","Categories List");
+define("_AM_WFD_DOWN_ERROR_FILENOTFOUND","Error: File not found on server.");
+define("_AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND","Error: Category not found on server.");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html 2013-05-30 21:46:33 UTC (rev 11605)
@@ -1,39 +1,38 @@
<form action="category.php" method="post" id="categoriesform">
-<table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFD_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFD_FCATEGORY_DESCRIPTION}></th>
- <th><{$smarty.const._AM_WFD_FCATEGORY_WEIGHT}></th>
- <th><{$smarty.const._AM_WFD_ACTION}></th>
- </tr>
-<{foreach item=sorted_category from=$sorted_categories}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}>
- <{$sorted_category.category.title}>
- </td>
- <td><{$sorted_category.category.description}></td>
- <td>
- <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5" value="<{$sorted_category.category.weight}>" />
- </td>
- <td>
- <a href="category.php?op=category.edit&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
-
- <a href="category.php?op=category.delete&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
-
- <a href="category.php?op=category.move&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFD_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFD_BMOVE}>" alt="<{$smarty.const._AM_WFD_BMOVE}>" /></a>
- </td>
- </tr>
-<{/foreach}>
- <tr class="<{cycle values='odd, even'}>">
- <td colspan="2">
- </td>
- <td>
- <{$token}>
- <input type="hidden" name="op" value="categories.reorder" />
- <input type="submit" name="submit" value="<{$smarty.const._AM_WFD_BUTTON_CATEGORIES_REORDER}>" />
- </td>
- <td colspan="1">
- </td>
- </tr>
-</table>
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_FCATEGORY_CATEGORIES_LIST}></legend>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_WEIGHT}></th>
+ <th><{$smarty.const._AM_WFD_FCATEGORY_DESCRIPTION}></th>
+ <th><{$smarty.const._AM_WFD_ACTION}></th>
+ </tr>
+ <{foreach item=sorted_category from=$sorted_categories}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td>
+ <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}><{$sorted_category.category.title}>
+ </td>
+ <td>
+ <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5" value="<{$sorted_category.category.weight}>" />
+ </td>
+ <td><{$sorted_category.category.description}></td>
+ <td>
+ <a href="category.php?op=category.edit&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href="category.php?op=category.delete&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ <a href="category.php?op=category.move&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFD_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFD_BMOVE}>" alt="<{$smarty.const._AM_WFD_BMOVE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ <tr>
+ <td colspan="1"> </td>
+ <td>
+ <{$token}>
+ <input type="hidden" name="op" value="categories.reorder" />
+ <input type="submit" name="submit" value="<{$smarty.const._AM_WFD_BUTTON_CATEGORIES_REORDER}>" />
+ </td>
+ <td colspan="2"> </td>
+ </tr>
+ </table>
+</fieldset>
</form>
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_downloadlist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_downloadlist.html 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_downloadlist.html 2013-05-30 21:46:33 UTC (rev 11605)
@@ -1,7 +1,6 @@
<form action="download.php" method="post" id="downloadsform">
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MINDEX_PUBLISHEDDOWN}></legend>
- <br />
<{if ($published_downloads_count == 0)}>
<{$smarty.const._AM_WFD_MINDEX_NODOWNLOADSFOUND}>
<{else}>
@@ -14,7 +13,6 @@
<th><{$smarty.const._AM_WFD_MINDEX_SUBMITTED}></th>
<th><{$smarty.const._AM_WFD_MINDEX_ONLINESTATUS}></th>
<th><{$smarty.const._AM_WFD_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFD_MINDEX_LOG}></th>
<th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
</tr>
<{foreach item=download from=$published_downloads}>
@@ -38,10 +36,10 @@
<img src="<{xoModuleIcons16 off.png}>" />
<{/if}>
</td>
- <td><a href='ip_log.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFD_IP_LOGS}></a></td>
<td>
<a href='download.php?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='download.php?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ <a href='ip_log.php?lid=<{$download.lid}>' title="<{$smarty.const._AM_WFD_IP_LOGS}>"><{$smarty.const._AM_WFD_IP_LOGS}></a>
</td>
</tr>
<{/foreach}>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mimetypelist.html
===================================================================
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html 2013-05-30 21:46:33 UTC (rev 11605)
@@ -1,39 +1,91 @@
-<fieldset><legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_VOTE_DISPLAYVOTES}></legend>
- <div style='padding: 8px;'>
- <div><b><{$smarty.const._AM_WFD_VOTE_USERAVG}></b> <{$useravgrating}></div>
- <div><b><{$smarty.const._AM_WFD_VOTE_TOTALRATE}></b> <{$votes}></div>
- <div>
- <img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /> <{$smarty.const._AM_WFD_VOTE_DELETEDSC}>
- </div>
+<fieldset>
+ <legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AREVIEWS_INFO}></legend>
+ <p>
+ <{$smarty.const._AM_WFD_AREVIEWS_WAITING}>: <{$reviews_waiting_count}>
+ <br />
+ <{$smarty.const._AM_WFD_REV_REVIEW_TOTAL}>: <{$reviews_published_count}>
+ <br />
+ <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" /> <{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>
+ <br />
+ <img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" /> <{$smarty.const._AM_WFD_AREVIEWS_EDIT}>
+ <br />
+ <img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" /> <{$smarty.const._AM_WFD_AREVIEWS_DELETE}>
+ </p>
</fieldset>
<br />
-<{if ($votes == 0)}>
-<{$smarty.const._AM_WFD_VOTE_NOVOTES}>
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_REV_REVIEW_WAITING}></legend>
+<{if ($reviews_waiting_count == 0)}>
+ <{$smarty.const._AM_WFD_REV_NOWAITINGREVIEWS}>
<{else}>
-<table class='outer'>
- <tr>
- <th><{$smarty.const._AM_WFD_VOTE_ID}></th>
- <th><{$smarty.const._AM_WFD_VOTE_USER}></th>
- <th><{$smarty.const._AM_WFD_VOTE_IP}></th>
- <th><{$smarty.const._AM_WFD_VOTE_FILETITLE}></th>
- <th><{$smarty.const._AM_WFD_VOTE_RATING}></th>
- <th><{$smarty.const._AM_WFD_VOTE_DATE}></th>
- <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
- </tr>
-<{foreach item=rating from=$ratings}>
- <tr>
- <td class='head'><{$rating.ratingid}></td>
- <td class='even'><{$rating.submitter_uname}></td>
- <td class='even'><{$rating.ratinghostname}></td>
- <td class='even'><{$rating.download_title}></td>
- <td class='even'><{$rating.rating}></td>
- <td class='even'><{$rating.formatted_date}></td>
- <td class='even'>
- <a href='votedata.php?op=vote.delete&lid=<{$rating.lid}>&rid=<{$rating.rid}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
- </td>
- </tr>
-<{/foreach}>
-</table>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFD_REV_ID}></th>
+ <th><{$smarty.const._AM_WFD_REV_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_REV_REVIEWTITLE}></th>
+ <th><{$smarty.const._AM_WFD_REV_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_REV_SUBMITDATE}></th>
+ <th><{$smarty.const._AM_WFD_REV_ACTION}></th>
+ </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'>
+ <a href='download.php?op=download.edit&lid=<{$review_waiting.lid}>'><{$review_waiting.download_title}></a>
+ </td>
+ <td class='even'>
+ <a href='review.php?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'>
+ <a href='review.php?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='review.php?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='review.php?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>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$reviews_waiting_pagenav}>
<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_REV_REVIEW_PUBLISHED}></legend>
+<{if ($reviews_published_count == 0)}>
+ <{$smarty.const._AM_WFD_REV_NOPUBLISHEDREVIEWS}>
+<{else}>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFD_REV_ID}></th>
+ <th><{$smarty.const._AM_WFD_REV_TITLE}></th>
+ <th><{$smarty.const._AM_WFD_REV_REVIEWTITLE}></th>
+ <th><{$smarty.const._AM_WFD_REV_POSTER}></th>
+ <th><{$smarty.const._AM_WFD_REV_SUBMITDATE}></th>
+ <th><{$smarty.const._AM_WFD_REV_ACTION}></th>
+ </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'>
+ <a href='download.php?op=download.edit&lid=<{$review_published.lid}>'><{$review_published.download_title}></a>
+ </td>
+ <td class='even'>
+ <a href='review.php?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'>
+ <a href='review.php?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='review.php?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>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$reviews_published_pagenav}>
+<{/if}>
+</fieldset>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html 2013-05-30 21:46:33 UTC (rev 11605)
@@ -1,39 +1,44 @@
-<fieldset><legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_VOTE_DISPLAYVOTES}></legend>
- <div style='padding: 8px;'>
- <div><b><{$smarty.const._AM_WFD_VOTE_USERAVG}></b> <{$useravgrating}></div>
- <div><b><{$smarty.const._AM_WFD_VOTE_TOTALRATE}></b> <{$votes}></div>
- <div>
+<fieldset><legend style='font-weight: bold;'><{$smarty.const._AM_WFD_VOTE_DISPLAYVOTES}></legend>
+ <p>
+ <{$smarty.const._AM_WFD_VOTE_USERAVG}>: <{$useravgrating}>
+ <br />
+ <{$smarty.const._AM_WFD_VOTE_TOTALRATE}>: <{$votes}>
+ <br />
<img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /> <{$smarty.const._AM_WFD_VOTE_DELETEDSC}>
- </div>
+ </p>
</fieldset>
<br />
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_VOTE_DISPLAYVOTES}></legend>
<{if ($votes == 0)}>
-<{$smarty.const._AM_WFD_VOTE_NOVOTES}>
+ <{$smarty.const._AM_WFD_VOTE_NOVOTES}>
<{else}>
-<table class='outer'>
- <tr>
- <th><{$smarty.const._AM_WFD_VOTE_ID}></th>
- <th><{$smarty.const._AM_WFD_VOTE_USER}></th>
- <th><{$smarty.const._AM_WFD_VOTE_IP}></th>
- <th><{$smarty.const._AM_WFD_VOTE_FILETITLE}></th>
- <th><{$smarty.const._AM_WFD_VOTE_RATING}></th>
- <th><{$smarty.const._AM_WFD_VOTE_DATE}></th>
- <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
- </tr>
-<{foreach item=rating from=$ratings}>
- <tr>
- <td class='head'><{$rating.ratingid}></td>
- <td class='even'><{$rating.submitter_uname}></td>
- <td class='even'><{$rating.ratinghostname}></td>
- <td class='even'><{$rating.download_title}></td>
- <td class='even'><{$rating.rating}></td>
- <td class='even'><{$rating.formatted_date}></td>
- <td class='even'>
- <a href='votedata.php?op=vote.delete&lid=<{$rating.lid}>&rid=<{$rating.rid}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
- </td>
- </tr>
-<{/foreach}>
-</table>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFD_VOTE_ID}></th>
+ <th><{$smarty.const._AM_WFD_VOTE_USER}></th>
+ <th><{$smarty.const._AM_WFD_VOTE_IP}></th>
+ <th><{$smarty.const._AM_WFD_VOTE_FILETITLE}></th>
+ <th><{$smarty.const._AM_WFD_VOTE_RATING}></th>
+ <th><{$smarty.const._AM_WFD_VOTE_DATE}></th>
+ <th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=rating from=$ratings}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td class='head'><{$rating.ratingid}></td>
+ <td class='even'><{$rating.submitter_uname}></td>
+ <td class='even'><{$rating.ratinghostname}></td>
+ <td class='even'><{$rating.download_title}></td>
+ <td class='even'><{$rating.rating}></td>
+ <td class='even'><{$rating.formatted_date}></td>
+ <td class='even'>
+ <a href='votedata.php?op=vote.delete&lid=<{$rating.lid}>&rid=<{$rating.rid}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$ratings_pagenav}>
<{/if}>
+</fieldset>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-05-29 21:00:23 UTC (rev 11604)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-05-30 21:46:33 UTC (rev 11605)
@@ -239,9 +239,11 @@
$i++;
$modversion['templates'][$i]['file'] = 'wfdownloads_admin_reviewlist.html';
$modversion['templates'][$i]['description'] = '';
+$i++;
+$modversion['templates'][$i]['file'] = 'wfdownloads_admin_mimetypelist.html';
+$modversion['templates'][$i]['description'] = '';
-
//Module config setting
$modversion['config'][] = array(
'name' => 'enablerss',
|
