Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11631] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-06-04 21:27:00
|
Revision: 11631
http://sourceforge.net/p/xoops/svn/11631
Author: luciorota
Date: 2013-06-04 21:26:57 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -18,11 +18,11 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-echo "<div class='adminfooter'>\n"
- ." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
- ." </div>\n"
- ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
- ."</div>";
+echo "<div class='adminfooter'>\n";
+echo " <div style='text-align: center;'>\n";
+echo " <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n";
+echo " </div>\n";
+echo "" . _AM_MODULEADMIN_ADMIN_FOOTER . "\n";
+echo "</div>";
xoops_cp_footer();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -68,13 +68,13 @@
xoops_loadLanguage('main', $xoopsModule->dirname());
// Load handlers
-$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
+$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
+$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
$mirror_handler = xoops_getmodulehandler('mirror', $xoopsModule->dirname());
+$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
+$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
-$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
-$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
-$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
$ip_log_handler = xoops_getmodulehandler('ip_log', $xoopsModule->dirname());
$member_handler = xoops_gethandler("member");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokens.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -121,7 +121,7 @@
if (isset($downloads[$reports[$i]->getVar('lid')])) {
$submitter = isset($users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')]) ? $users[$downloads[$reports[$i]->getVar('lid')]->getVar('submitter')] : false;
$download = $downloads[$reports[$i]->getVar('lid')];
- $download_link = "<a href='" . WFDOWNLOADS_URL . "singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
+ $download_link = "<a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=" . $download->getVar('cid') . "&lid=" . $download->getVar('lid') . "' target='_blank'>" . $download->getVar('title') . "</a>";
$submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
$submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
} else {
@@ -138,7 +138,7 @@
$lid = intval($download->getVar('lid'));
$ingnore_link = "<a href='{$currentFile}?op=brokendownload.ignore&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
- $edit_link = "<a href='" . WFDOWNLOADS_URL . "admin/downloads.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
+ $edit_link = "<a href='" . WFDOWNLOADS_URL . "/admin/downloads.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
$delete_link = "<a href='{$currentFile}?op=brokendownload.delete&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_DELETE_ALT . "' title='" . _AM_WFD_BROKEN_DELETE_ALT . "'>" . $imagearray['deleteimg'] . "</a>";
$ack_image = ($reports[$i]->getVar('acknowledged')) ? $imagearray['ack_yes'] : $imagearray['ack_no'];
$ack_link = "<a href='{$currentFile}?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -23,7 +23,7 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
-include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
+include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
$op = wfdownloads_CleanVars($_REQUEST, 'op', 'categories.list', 'string');
@@ -137,7 +137,7 @@
*/
$tags = array();
$tags['CATEGORY_NAME'] = $_POST['title'];
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $newid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $newid;
$notification_handler = & xoops_gethandler('notification');
$notification_handler -> triggerEvent('global', 0, 'new_category', $tags);
$database_mess = _AM_WFD_CCATEGORY_CREATED;
@@ -156,11 +156,9 @@
$category_handler = xoops_getmodulehandler('category');
$categories = $category_handler->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
-
if ($ok == true) {
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
-
foreach($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
@@ -191,7 +189,7 @@
$error = _AM_WFD_DBERROR;
foreach ($cids as $cid) {
- xoops_groupperm_deletebymoditem ((int)$xoopsModule->getVar('mid'), 'WFDownCatPerm', $cid);
+ xoops_groupperm_deletebymoditem ($xoopsModule->getVar('mid'), 'WFDownCatPerm', $cid);
xoops_groupperm_deletebymoditem ($xoopsModule -> getVar('mid'), 'WFUpCatPerm', $cid);
}
@@ -244,7 +242,7 @@
$sorted_categories = wfd_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_categorylist.html");
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_categorieslist.html");
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFD_CCATEGORY_NOEXISTS);
}
@@ -256,7 +254,6 @@
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
}
- $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
$new_weights = $_POST['new_weights'];
$ids = array();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -21,16 +21,12 @@
$currentFile = basename(__FILE__);
include 'admin_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
+include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'downloads.list';
+
switch ($op) {
- case "download.save" :
- case "addDownload" :
- addDownload();
- break;
-
case "download.edit" :
case "download.add" :
case "Download" :
@@ -42,31 +38,37 @@
$adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, "{$currentFile}?op=downloads.list", 'list');
$adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
echo $adminMenu->renderButton();
-
- Download();
-
+ addDownload();
include 'admin_footer.php';
break;
+ case "download.save" :
+ case "addDownload" :
+ saveDownload();
+ break;
+
case "download.delete" :
- case "delDownload" :
$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- $download_handler = xoops_getmodulehandler('download');
if (!$download = $download_handler->get($lid)) {
- redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
exit();
}
$title = $download->getVar('title');
- if ($ok = true) {
+ if ($ok == true) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
$file = $xoopsModuleConfig['uploaddir'] . "/" . $download->getVar('filename');
if (is_file($file)) {
@chmod($file, 0777);
@unlink($file);
}
- $download_handler->delete($download);
- redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
- exit();
+ if ($download_handler->delete($download)) {
+ redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
+ } else {
+ echo $download->getHtmlErrors();
+ }
} else {
wfdownloads_xoops_cp_header();
xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
@@ -102,16 +104,50 @@
break;
// added - end - March 4 2006 - jpc
+ case "newdownload.approve" :
+ case "approve":
+ $lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
+ $download_handler = xoops_getmodulehandler('download');
+ if (!$download = $download_handler->get($lid)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
+ exit();
+ }
+ // Update the database
+ $download->setVar('published', time());
+ $download->setVar('status', 1);
+ if (!$download_handler->insert($download, true)) {
+ echo $download->getHtmlErrors();
+ exit();
+ }
+ // Trigger notify
+ $title = $download->getVar('title');
+ $cid = $download->getVar('cid');
+ $category = $category_handler->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $tags['CATEGORY_NAME'] = $category->getVar('title');
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $notification_handler = &xoops_gethandler('notification');
+ $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
+ $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
+ if ($download->getVar('notifypub')) {
+ $notification_handler->triggerEvent('file', $lid, 'approve', $tags);
+ }
+ redirect_header($currentFile, 1, _AM_WFD_SUB_NEWFILECREATED);
+ break;
+
case "downloads.list" :
default :
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$categories = $category_handler->getObjects();
- $start1 = wfdownloads_CleanVars($_GET, 'start1', 0, 'int');
- $start2 = wfdownloads_CleanVars($_GET, 'start2', 0, 'int');
- $start3 = wfdownloads_CleanVars($_GET, 'start3', 0, 'int');
- $start4 = wfdownloads_CleanVars($_GET, 'start4', 0, 'int');
+ $start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
+ $start_new = wfdownloads_CleanVars($_GET, 'start_new', 0, 'int');
+ $start_auto_published = wfdownloads_CleanVars($_GET, 'start_auto_published', 0, 'int');
+ $start_expired = wfdownloads_CleanVars($_GET, 'start_expired', 0, 'int');
+ $start_offline = wfdownloads_CleanVars($_GET, 'start_offline', 0, 'int');
$totalcats = wfd_totalcategory();
$categories = $category_handler->getObjects(null, true, false);
@@ -128,8 +164,8 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=list", 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=Download", 'add');
+ $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
echo $adminMenu->renderButton();
if ($totaldownloads > 0) {
@@ -137,7 +173,7 @@
$criteria = new CriteriaCompo();
$criteria->setSort("published");
$criteria->setOrder("DESC");
- $criteria->setStart($start1);
+ $criteria->setStart($start_published);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$published_downloads = $download_handler->getActiveDownloads($criteria);
$published_downloads_count = $download_handler->getActiveCount();
@@ -153,14 +189,40 @@
}
}
- $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start1, 'start1');
+ $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_published, 'start_published');
$GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
+ // New Downloads
+ $criteria = new Criteria("published", 0);
+ $criteria->setStart($start_new);
+ $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
+ $new_downloads = $download_handler->getObjects($criteria);
+ $new_downloads_count = $download_handler->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('new_downloads_count', $new_downloads_count);
+ if ($new_downloads_count > 0) {
+ foreach ($new_downloads as $new_download) {
+ $new_download_array = $new_download->toArray();
+ $new_download_array['rating'] = number_format($new_download_array['rating'], 2);
+ $new_download_array['title_html'] = $myts->htmlSpecialChars($new_download_array['title']);
+ $url = urldecode($myts->htmlSpecialChars($new_download_array['url']));
+ $homepage = $myts->htmlSpecialChars($new_download_array['homepage']);
+ $version = $myts->htmlSpecialChars($new_download_array['version']);
+ $size = $myts->htmlSpecialChars($new_download_array['size']);
+ $platform = $myts->htmlSpecialChars($new_download_array['platform']);
+ $logourl = $myts->htmlSpecialChars($new_download_array['screenshot']);
+ $new_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($new_download_array['submitter']);
+ $new_download_array['date_timestamp'] = formatTimestamp($new_download_array['date'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('new_downloads', $new_download_array);
+ }
+ }
+ $pagenav = new XoopsPageNav($new_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_new, 'start_new');
+ $GLOBALS['xoopsTpl']->assign('new_downloads_pagenav', $pagenav->renderNav());
+
// Auto Published Downloads
$criteria = new Criteria("published", time(), ">");
$criteria->setSort("published");
$criteria->setOrder("ASC");
- $criteria->setStart($start2);
+ $criteria->setStart($start_auto_published);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$auto_published_downloads = $download_handler->getObjects($criteria);
$auto_published_downloads_count = $download_handler->getCount($criteria);
@@ -175,7 +237,7 @@
$GLOBALS['xoopsTpl']->append('auto_published_downloads', $auto_published_download_array);
}
}
- $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start2, 'start2');
+ $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_auto_published, 'start_auto_published');
$GLOBALS['xoopsTpl']->assign('auto_published_downloads_pagenav', $pagenav->renderNav());
// Expired downloads
@@ -184,7 +246,7 @@
$criteria->add(new Criteria("expired", 0, "<>"), 'AND');
$criteria->setSort("expired");
$criteria->setOrder("ASC");
- $criteria->setStart($start3);
+ $criteria->setStart($start_expired);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$expired_downloads = $download_handler->getObjects($criteria);
$expired_downloads_count = $download_handler->getCount($criteria);
@@ -199,20 +261,20 @@
$GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
}
- $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start3, 'start3');
+ $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_expired, 'start_expired');
$GLOBALS['xoopsTpl']->assign('expired_downloads_pagenav', $pagenav->renderNav());
// Offline downloads
$criteria = new Criteria("offline", 1);
$criteria->setSort("published");
$criteria->setOrder("ASC");
- $criteria->setStart($start4);
+ $criteria->setStart($start_offline);
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
$offline_downloads_count = $download_handler->getCount($criteria);
$offline_downloads = $download_handler->getObjects($criteria);
$offline_downloads_count = $download_handler->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offline_downloads_count);
- if ($offline_downloads_count > 0) {
+ if ($offline_downloads_count > 0) {
foreach ($offline_downloads as $offline_download) {
$offline_download_array = $offline_download->toArray();
$offline_download_array['title_html'] = $myts->htmlSpecialChars(trim($offline_download_array['title']));
@@ -223,22 +285,22 @@
$GLOBALS['xoopsTpl']->append('offline_downloads', $offline_download_array);
}
}
- $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start4, 'start4');
+ $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_offline, 'start_offline');
$GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
-
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_downloadlist.html");
} else {
- echo ("debug2");
+ // NOP
}
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_downloadslist.html");
+
include 'admin_footer.php';
break;
}
-function Download()
+function addDownload()
{
- global $xoopsUser, $imagearray;
+ global $xoopsUser, $imagearray, $currentFile;
$download_handler = xoops_getmodulehandler('download');
$category_handler = xoops_getmodulehandler('category');
@@ -364,7 +426,6 @@
$criteria->setGroupby("ratinguser");
$userratings = $rating_handler->getUserAverage($criteria);
-
foreach (array_keys($regvotes) as $i) {
$formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
$useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["avg"] : 0;
@@ -432,9 +493,9 @@
-function addDownload()
+function saveDownload()
{
- global $xoopsUser, $xoopsModuleConfig, $_FILES;
+ global $xoopsUser, $xoopsModuleConfig, $currentFile, $_FILES;
$lid = (!empty($_POST['lid'])) ? intval($_POST['lid']) : 0;
$cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0;
@@ -448,10 +509,7 @@
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
$download = $download_handler->create();
}
-
- /**
- * Define URL
- */
+ /* Define URL */
if (empty($_FILES['userfile']['name'])) {
if ($_POST["url"] && $_POST["url"] != "" && $_POST["url"] != "http://") {
$url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
@@ -480,10 +538,7 @@
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
}
-
- /**
- * Get data from form
- */
+ /* Get data from form */
$screenshot = ($_POST["screenshot"] != "blank.png") ? $_POST["screenshot"] : '';
$screenshot2 = ($_POST["screenshot2"] != "blank.png") ? $_POST["screenshot2"] : '';
$screenshot3 = ($_POST["screenshot3"] != "blank.png") ? $_POST["screenshot3"] : '';
@@ -506,12 +561,12 @@
$notification_handler = &xoops_gethandler('notification');
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . $cid . '&lid=' . $lid;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . '/singlefile.php?cid=' . $cid . '&lid=' . $lid;
$category_handler = xoops_getmodulehandler('category');
$category = $category_handler->get($cid);
$tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
if ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4) {
// Then this change will be automatically approved, so the notification needs to go out.
@@ -521,7 +576,6 @@
}
}
/* End add block */
-
$download->setVar('version', $version);
$download->setVar('url', $url);
$download->setVar('cid', $cid);
@@ -652,13 +706,13 @@
if (!$lid) {
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&lid={$newid}";
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
// changed - start - March 4 2006 - jpc
//$category_handler = xoops_getmodulehandler('category');
//$category = $category_handler->get($cid);
// changed - end - March 4 2006 - jpc
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler = & xoops_gethandler('notification');
$notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
$notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
@@ -666,11 +720,11 @@
if ($lid && $approved && $notifypub) {
$tags = array();
$tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&lid={$lid}";
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
$category_handler = xoops_getmodulehandler('category');
$category = $category_handler->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
$notification_handler = & xoops_gethandler('notification');
$notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
$notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -38,7 +38,7 @@
$screenshot = strtolower($_FILES['uploadfile']['name']);
wfd_uploading($screenshot, XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'], $allowed_mimetypes, "images.php", 1, 0, true);
- include_once WFDOWNLOADS_ROOT_PATH . 'class/img_uploader.php';
+ include_once WFDOWNLOADS_ROOT_PATH . '/class/img_uploader.php';
$uploader = new XoopsMediaImgUploader($uploaddir . "/", $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
redirect_header($currentFile, 2 , _AM_WFD_DOWN_IMAGEUPLOAD);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -51,7 +51,7 @@
$currentFile = basename(__FILE__);
include 'admin_header.php';
-include_once(WFDOWNLOADS_ROOT_PATH . "include/module.php");
+include_once(WFDOWNLOADS_ROOT_PATH . "/include/module.php");
// =========================================================================================
// This function imports data from mydownloads into wf-downloads
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -41,14 +41,14 @@
$indexfooteralign = $_POST['indexfooteralign'];
$xoopsDB->query("update " . $xoopsDB->prefix("wfdownloads_indexpage") . " set indexheading='$indexheading', indexheader='$indexheader', indexfooter='$indexfooter', indeximage='$indeximage', indexheaderalign='$indexheaderalign', indexfooteralign='$indexfooteralign', nohtml='" . intval($nohtml) . "', nosmiley='" . intval($nosmiley) . "', noxcodes='" . intval($noxcodes) . "', noimages='" . intval($noimages) . "', nobreak='" . intval($nobreak) . "' ");
- redirect_header(WFDOWNLOADS_URL.'admin/indexpage.php', 1, _AM_WFD_IPAGE_UPDATED);
+ redirect_header(WFDOWNLOADS_URL . '/admin/indexpage.php', 1, _AM_WFD_IPAGE_UPDATED);
exit();
break;
default:
- include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
+ include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
global $xoopsModuleConfig, $xoopsDB;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -47,6 +47,10 @@
$adminmenu[$i]['link'] = "admin/reviews.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/translations.png';
$i++;
+$adminmenu[$i]['title'] = _MI_WFD_MENU_BROKENS;
+$adminmenu[$i]['link'] = "admin/brokens.php";
+$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/alert.png';
+$i++;
$adminmenu[$i]['title'] = _MI_WFD_MENU_MIRRORS;
$adminmenu[$i]['link'] = "admin/mirrors.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/list.png';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -37,7 +37,6 @@
*/
case "mimetype.edit" :
case "mimetype.add" :
- case 'edit':
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -76,7 +75,10 @@
case 'mimetype.save':
$mime_id = wfdownloads_CleanVars($_POST, 'mime_id', 0, 'int');
- $mimetype = $mime_handler->get($mime_id);
+ if (!$mimetype = $mime_handler->get($mime_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
+ exit();
+ }
$mimetype->setVar('mime_ext', $_POST['mime_ext']);
$mimetype->setVar('mime_name', $_POST['mime_name']);
@@ -93,7 +95,10 @@
case 'mimetype.update';
$mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
- $mimetype = $mime_handler->get($mime_id);
+ if (!$mimetype = $mime_handler->get($mime_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
+ exit();
+ }
if (isset($_REQUEST['admin']) && $_REQUEST['admin'] == true) {
if ($mimetype->getVar('mime_admin') == true) {
@@ -116,7 +121,6 @@
break;
case 'mimetypes.update':
- case 'saveall':
$mime_admin = (isset($_GET['admin']) && $_GET['admin'] == true ) ? $_GET['admin'] : false;
$mime_user = (isset($_GET['user']) && $_GET['user'] == true) ? $_GET['user'] : false;
$type_all = intval($_GET['type_all']);
@@ -139,15 +143,21 @@
case "mimetype.delete":
$mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- $mimetype = $mime_handler->get($mime_id);
+ if (!$mimetype = $mime_handler->get($mime_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
+ exit();
+ }
if ($ok == true) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
if ($mime_handler->delete($mimetype)) {
redirect_header($currentFile, 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
+ exit();
} else {
- $error = "" . _AM_WFD_EVENNEWS_DBERROR . ": <br /><br />" . $sql;
- trigger_error($error, E_USER_ERROR);
+ echo $mimetype->getHtmlErrors();
+ exit();
}
- exit();
} else {
wfdownloads_xoops_cp_header();
xoops_confirm(array('op' => 'mimetype.delete', 'mime_id' => $mime_id, 'ok' => true), $currentFile, _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
@@ -156,7 +166,6 @@
break;
case 'mimetypes.list':
- case 'main':
default:
$start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
@@ -200,7 +209,7 @@
$GLOBALS['xoopsTpl']->assign('mimetypes_pagenav', $pagenav -> renderNav());
}
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_mimetypelist.html");
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_mimetypeslist.html");
include_once "admin_footer.php";
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -28,11 +28,21 @@
case "mirror.delete" :
$mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- $mirror = $mirror_handler->get($mirror_id);
+ if (!$mirror = $mirror_handler->get($mirror_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
+ exit();
+ }
if ($ok = true) {
- $mirror_handler->delete($mirror);
- redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $mirror->getVar('title')));
- exit();
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($mirror_handler->delete($mirror)) {
+ redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $mirror->getVar('title')));
+ exit();
+ } else {
+ echo $mirror->getHtmlErrors();
+ exit();
+ }
} else {
wfdownloads_xoops_cp_header();
xoops_confirm(array('op' => 'del_mirror', 'mirror_id' => $mirror_id, 'ok' => true), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $mirror->getVar('title'), _AM_WFD_BDELETE);
@@ -43,7 +53,10 @@
case "mirror.approve" :
$mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- $mirror = $mirror_handler->get($mirror_id);
+ if (!$mirror = $mirror_handler->get($mirror_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
+ exit();
+ }
if ($ok == true) {
$mirror->setVar('submit', true);
$mirror_handler->insert($mirror);
@@ -59,7 +72,10 @@
case "mirror.edit" :
$mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- $mirror = $mirror_handler->get($mirror_id);
+ if (!$mirror = $mirror_handler->get($mirror_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
+ exit();
+ }
if ($ok == true) {
$mirror->setVar('title', trim($_POST['title']));
$mirror->setVar('homeurl', formatURL(trim($_POST['homeurl'])));
@@ -146,7 +162,7 @@
$GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published -> renderNav());
}
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_mirrorlist.html");
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_mirrorslist.html");
include_once "admin_footer.php";
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -18,29 +18,17 @@
* @author Xoops Development Team
* @version svn:$id$
*/
+$currentFile = basename(__FILE__);
include 'admin_header.php';
-xoops_load('XoopsUserUtility');
-if (!isset($_POST['op'])) {
- $op = isset($_GET['op']) ? $_GET['op'] : 'main';
-} else {
- $op = $_POST['op'];
-}
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'modifications.list';
switch ($op) {
case "listModReqshow":
-
- include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-
- global $xoopsDB, $myts, $mytree, $xoopsModuleConfig, $xoopsUser;
-
wfdownloads_xoops_cp_header();
- //wfdownloads_adminMenu(3, _AM_WFD_MOD_MODREQUESTS);
$requestid = intval($_GET['requestid']);
- $modification_handler = xoops_getmodulehandler('modification');
- $download_handler = xoops_getmodulehandler('download');
- $category_handler = xoops_getmodulehandler('category');
+
$modification = $modification_handler->get($requestid);
$download = $download_handler->get($modification->getVar('lid'));
@@ -235,8 +223,8 @@
$modification_handler = xoops_getmodulehandler('modification');
$modification_handler->approveModification($_POST['requestid']);
- $cid = intval($download->getVar('cid'));
- $lid = intval($download->getVar('lid'));
+ $cid = intval($download->getVar('cid'));
+ $lid = intval($download->getVar('lid'));
/* Added by lankford on 2007/3/21 */
if ($raiseModifyEvents) {
@@ -244,12 +232,12 @@
$notification_handler = &xoops_gethandler('notification');
$tags = array();
$tags['FILE_NAME'] = $download->getVar('title');
- $tags['FILE_URL'] = WFDOWNLOADS_URL.'singlefile.php?cid=' . $cid . '&lid=' . $lid;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . '/singlefile.php?cid=' . $cid . '&lid=' . $lid;
$category_handler = xoops_getmodulehandler('category');
$category = $category_handler->get($cid);
$tags['FILE_VERSION'] = $download->getVar('version');
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL.'viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
$notification_handler->triggerEvent('global', 0, 'filemodified', $tags);
$notification_handler->triggerEvent('category', $cid, 'filemodified', $tags);
@@ -257,39 +245,34 @@
}
/* end add block */
- redirect_header(WFDOWNLOADS_URL.'admin/main.php', 1, _AM_WFD_MOD_REQUPDATED);
+ redirect_header(WFDOWNLOADS_URL . '/admin/main.php', 1, _AM_WFD_MOD_REQUPDATED);
break;
case "ignoreModReq":
$criteria = new Criteria('requestid', intval($_POST['requestid']));
$modification_handler = xoops_getmodulehandler('modification');
$modification_handler->deleteAll($criteria, true);
- redirect_header(WFDOWNLOADS_URL.'admin/main.php', 1, _AM_WFD_MOD_REQDELETED);
+ redirect_header(WFDOWNLOADS_URL . '/admin/main.php', 1, _AM_WFD_MOD_REQDELETED);
break;
+ case "modifications.list" :
case 'main':
default:
+ $start_modification = wfdownloads_CleanVars($_GET, 'start_modification', 0, 'int');
- include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-
- global $xoopsModuleConfig;
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
-
- $modification_handler = xoops_getmodulehandler('modification');
$criteria = new CriteriaCompo();
$criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start);
+ $criteria->setStart($start_modification);
$criteria->setSort("requestdate");
$modifications = $modification_handler->getObjects($criteria);
- $totalmodrequests = $modification_handler->getCount();
+ $modifications_count = $modification_handler->getCount();
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('modifications.php');
- //wfdownloads_adminMenu(3, _AM_WFD_MOD_MODREQUESTS);
echo "
<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MOD_MODREQUESTSINFO . "</legend>\n
- <div style='padding: 8px;'>" . _AM_WFD_MOD_TOTMODREQUESTS . " <b>$totalmodrequests</></div>\n
+ <div style='padding: 8px;'>" . _AM_WFD_MOD_TOTMODREQUESTS . " <b>$modifications_count</></div>\n
</fieldset><br />\n
<table width='100%' cellspacing='1' cellpadding='2' border='0' class='outer'>\n
@@ -300,7 +283,7 @@
<th align='center'><b>" . _AM_WFD_MOD_DATE . "</b></th>\n
<th align='center'><b>" . _AM_WFD_MINDEX_ACTION . "</b></th>\n
</tr>\n";
- if ($totalmodrequests > 0) {
+ if ($modifications_count > 0) {
foreach ($modifications as $modification) {
$submitter = XoopsUserUtility::getUnameFromId($modification->getVar('modifysubmitter'));
$requestdate = formatTimestamp($modification->getVar('requestdate'), $xoopsModuleConfig['dateformat']);
@@ -310,7 +293,7 @@
<td class='even'>" . $modification->getVar('title') . "</td>\n
<td class='even' align='center'>" . $submitter . "</td>\n
<td class='even' align='center'>" . $requestdate . "</td>\n
- <td class='even' align='center'> <a href='".WFDOWNLOADS_URL."admin/modifications.php?op=listModReqshow&requestid=" . intval($modification->getVar('requestid')). "'>"._AM_WFD_MOD_VIEW."</a></td>\n
+ <td class='even' align='center'> <a href='" . WFDOWNLOADS_URL . "/admin/modifications.php?op=listModReqshow&requestid=" . intval($modification->getVar('requestid')). "'>"._AM_WFD_MOD_VIEW."</a></td>\n
</tr>\n";
}
} else {
@@ -319,8 +302,8 @@
echo "</table>\n";
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $page = ($totalmodrequests > $xoopsModuleConfig['admin_perpage']) ? _AM_WFD_MINDEX_PAGE : '';
- $pagenav = new XoopsPageNav($totalmodrequests, $xoopsModuleConfig['admin_perpage'], $start, 'start');
+ $page = ($modifications_count > $xoopsModuleConfig['admin_perpage']) ? _AM_WFD_MINDEX_PAGE : '';
+ $pagenav = new XoopsPageNav($modifications_count, $xoopsModuleConfig['admin_perpage'], $start_modification, 'start_modification');
echo "<div align='right' style='padding: 8px;'>" . $page . '' . $pagenav->renderNav() . '</div>';
include_once "admin_footer.php";
}
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -1,134 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * WF-Downloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-include 'admin_header.php';
-
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'main';
-
-switch ($op) {
- case "approve":
- $lid = intval($_GET['lid']);
- $download_handler = xoops_getmodulehandler('download');
- $download = $download_handler->get($lid);
-
- /**
- * Update the database
- */
- $cid = intval($download->getVar('cid'));
- $download->setVar('published', time());
- $download->setVar('status', 1);
- $download_handler->insert($download, true);
-
- $title = $download->getVar('title');
-
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL.'singlefile.php?cid=' . $cid . '&lid=' . $lid;
-
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
-
- $tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL.'viewcat.php?cid=' . $cid;
- $notification_handler = &xoops_gethandler('notification');
- $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
- $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
-
- if ($download->getVar('notifypub')) {
- $notification_handler->triggerEvent('file', $lid, 'approve', $tags);
- }
- redirect_header(WFDOWNLOADS_URL.'admin/newdownloads.php', 1, _AM_WFD_SUB_NEWFILECREATED);
- break;
-
- // List downloads waiting for validation
- case 'main':
- default:
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- xoops_load('XoopsUserUtility');
-
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
-
- $download_handler = xoops_getmodulehandler('download');
- $criteria = new Criteria("published", 0);
- $new_array_count = $download_handler->getCount($criteria);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $criteria->setStart($start);
- $new_array = $download_handler->getObjects($criteria, false, false);
-
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('newdownloads.php');
- //wfdownloads_adminMenu(3, _AM_WFD_SUB_SUBMITTEDFILES);
-
- echo "
- <fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_SUB_FILESWAITINGINFO . "</legend>\n
- <div style='padding: 8px;'>" . _AM_WFD_SUB_FILESWAITINGVALIDATION . " <b>$new_array_count</b><div>\n
- <div div style='padding: 8px;'>\n
- <li>" . $imagearray['approve'] . " " . _AM_WFD_SUB_APPROVEWAITINGFILE . "\n
- <li>" . $imagearray['editimg'] . " " . _AM_WFD_SUB_EDITWAITINGFILE . "\n
- <li>" . $imagearray['deleteimg'] . " " . _AM_WFD_SUB_DELETEWAITINGFILE . "</div>\n
- </fieldset><br />\n
-
- <table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>\n
- <tr>\n
- <td class='bg3' align='center' width = '3%'><b>" . _AM_WFD_MINDEX_ID . "</b></td>\n
- <td class='bg3' width = '30%'><b>" . _AM_WFD_MINDEX_TITLE . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_MINDEX_POSTER . "</b></td>\n
- <td class='bg3' align='center' width = '15%'><b>" . _AM_WFD_MINDEX_SUBMITTED . "</b></td>\n
- <td class='bg3' align='center' width = '7%'><b>" . _AM_WFD_MINDEX_ACTION . "</b></td>\n
- </tr>\n";
- if ($new_array_count > 0) {
- foreach (array_keys($new_array) as $i) {
- $new = $new_array[$i];
- $rating = number_format($new['rating'], 2);
- $title = $myts->htmlSpecialChars($new['title']);
- $url = $myts->htmlSpecialChars($new['url']);
- $url = urldecode($url);
- $homepage = $myts->htmlSpecialChars($new['homepage']);
- $version = $myts->htmlSpecialChars($new['version']);
- $size = $myts->htmlSpecialChars($new['size']);
- $platform = $myts->htmlSpecialChars($new['platform']);
- $logourl = $myts->htmlSpecialChars($new['screenshot']);
- $submitter = XoopsUserUtility::getUnameFromId($new['submitter']);
- $datetime = formatTimestamp($new['date'], $xoopsModuleConfig['dateformat']);
- $status = "<a href='".WFDOWNLOADS_URL."admin/newdownloads.php?op=approve&lid=" . $new['lid'] . "'>" . $imagearray['approve'] . "</a>";
- $modify = "<a href='".WFDOWNLOADS_URL."admin/main.php?op=Download&lid=" . $new['lid'] . "'>" . $imagearray['editimg'] . "</a>";
- $delete = "<a href='".WFDOWNLOADS_URL."admin/main.php?op=delDownload&lid=" . $new['lid'] . "'>" . $imagearray['deleteimg'] . "</a>";
-
- echo "
- <tr>\n
- <td class='head' align='center'>" . $new['lid'] . "</td>\n
- <td class='even' nowrap><a href='".WFDOWNLOADS_URL."admin/newdownloads.php?op=edit&lid=" . $new['lid'] . "'>" . $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";
- }
- } else {
- echo "<tr ><td align='center' class='head' colspan='6'>" . _AM_WFD_SUB_NOFILESWAITING . "</td></tr>";
- }
- echo "</table>\n";
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $page = ($new_array_count > $xoopsModuleConfig['admin_perpage']) ? _AM_WFD_MINDEX_PAGE : '';
- $pagenav = new XoopsPageNav($new_array_count, $xoopsModuleConfig['admin_perpage'], $start, 'start');
- echo '<div align="right" style="padding: 8px;">' . $page . '' . $pagenav->renderNav() . '</div>';
- include_once "admin_footer.php";
- break;
-}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -28,8 +28,8 @@
$categories = $category_handler->getObjects();
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-$down_cat_form = new XoopsGroupPermForm('', $xoopsModule->getVar('mid'), 'WFDownCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS, $currentFile);
-$up_cat_form = new XoopsGroupPermForm('', $xoopsModule->getVar('mid'), 'WFUpCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS_UP, $currentFile);
+$down_cat_form = new XoopsGroupPermForm(_AM_WFD_FCATEGORY_GROUPPROMPT, $xoopsModule->getVar('mid'), 'WFDownCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS, "admin/{$currentFile}", true);
+$up_cat_form = new XoopsGroupPermForm(_AM_WFD_FCATEGORY_GROUPPROMPT_UP, $xoopsModule->getVar('mid'), 'WFUpCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS_UP, "admin/{$currentFile}", true);
foreach ($categories as $category) {
$down_cat_form->addItem($category->getVar('cid'), $category->getVar('title'), $category->getVar('pid'));
$up_cat_form->addItem($category->getVar('cid'), $category->getVar('title'), $category->getVar('pid'));
@@ -42,6 +42,6 @@
$GLOBALS['xoopsTpl']->assign('down_cat_form', $down_cat_form->render());
$GLOBALS['xoopsTpl']->assign('up_cat_form', $up_cat_form->render());
-$GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_permissions.html");
+$GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_permissions.html");
include_once "admin_footer.php";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -76,7 +76,7 @@
$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");
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_ratingslist.html");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -28,11 +28,21 @@
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 (!$review = $review_handler->get($review_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_REVIEWNOTFOUND);
+ exit();
+ }
if ($ok == true) {
- $review_handler->delete($review);
- redirect_header('reviews.php', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $review->getVar('title')));
- exit();
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($review_handler->delete($review)) {
+ redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $review->getVar('title')));
+ exit();
+ } else {
+ echo $review->getHtmlErrors();
+ exit();
+ }
} else {
wfdownloads_xoops_cp_header();
xoops_confirm(array('op' => 'review.delete', 'review_id' => $review_id, 'ok' => true), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_BDELETE);
@@ -43,7 +53,10 @@
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 (!$review = $review_handler->get($review_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_REVIEWNOTFOUND);
+ exit();
+ }
if ($ok == true) {
$review->setVar('submit', 1);
$review_handler->insert($review);
@@ -59,7 +72,10 @@
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 (!$review = $review_handler->get($review_id)) {
+ redirect_header($currentFile, 4, _AM_WFD_ERROR_REVIEWNOTFOUND);
+ exit();
+ }
if ($ok == true) {
$review->setVar('title', trim($_POST['title']));
$review->setVar('review', trim($_POST['review']));
@@ -146,7 +162,7 @@
$GLOBALS['xoopsTpl']->assign('reviews_published_pagenav', $pagenav_published -> renderNav());
}
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_reviewlist.html");
+ $GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_reviewslist.html");
include_once "admin_footer.php";
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-06-04 18:45:00 UTC (rev 11630)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-06-04 21:26:57 UTC (rev 11631)
@@ -26,7 +26,7 @@
$download = $download_handler->get($lid);
if ($download->getVar('published') == 0 || $download->getVar('published') > time() || $download->getVar('offline') == true || ($download->getVar('expired') == true && $download->getVar('expired') < time()) || $download->getVar('status') == 0) {
//Download not published, expired or taken offline - ...
[truncated message content] |
