Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11620] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-06-03 19:30:35
|
Revision: 11620
http://sourceforge.net/p/xoops/svn/11620
Author: luciorota
Date: 2013-06-03 19:30:30 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
module standardization: header.php, admin/admin_header.php, xoops_version.php
module standardization: standardize directories/files names/structures
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js
XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/modifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/newdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/wfdownloads_top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/wfdownloads.sql
Property Changed:
----------------
XoopsModules/wfdownloads/trunk/wfdownloads/
Index: XoopsModules/wfdownloads/trunk/wfdownloads
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads 2013-06-03 19:30:30 UTC (rev 11620)
Property changes on: XoopsModules/wfdownloads/trunk/wfdownloads
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.project
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -19,7 +19,6 @@
* @version svn:$id$
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-$thisModuleDirname = basename(dirname(dirname( __FILE__ ) ));
// Include xoops admin header
include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
@@ -27,27 +26,17 @@
include_once XOOPS_ROOT_PATH . '/class/tree.php';
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
xoops_load ('XoopsUserUtility');
+$myts = &MyTextSanitizer::getInstance();
$module_handler =& xoops_gethandler('module');
-$xoopsModule = & $module_handler->getByDirname($thisModuleDirname);
+$xoopsModule = & $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-$pathImageModule = XOOPS_URL . '/modules/'. $thisModuleDirname .'/images';
+$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
-$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
-$myts = &MyTextSanitizer::getInstance();
-
-
-$imagearray = array(
+/*$imagearray = array(
'editimg' => "<img src='" . $pathIcon16 . '/edit.png'."' alt='" . _AM_WFD_ICO_EDIT . "' title='" . _AM_WFD_ICO_EDIT . "' align='middle'>",
'deleteimg' => "<img src='" . $pathIcon16 . '/delete.png'."' alt='" . _AM_WFD_ICO_DELETE . "' title='" . _AM_WFD_ICO_DELETE . "' align='middle'>",
'online' => "<img src='" . $pathIcon16 . '/1.png'."' alt='" . _AM_WFD_ICO_ONLINE . "' title='" . _AM_WFD_ICO_ONLINE . "' align='middle'>",
@@ -64,32 +53,33 @@
'ack_no' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFD_ICO_REPORT . "' title='" . _AM_WFD_ICO_REPORT . "' align='middle'>",
'con_yes' => "<img src='" . $pathIcon16 . '/on.png'."' alt='" . _AM_WFD_ICO_CONFIRM . "' title='" . _AM_WFD_ICO_CONFIRM . "' align='middle'>",
'con_no' => "<img src='" . $pathIcon16 . '/off.png'."' alt='" . _AM_WFD_ICO_CONBROKEN . "' title='" . _AM_WFD_ICO_CONBROKEN . "' align='middle'>"
- );
+ );*/
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+if ( file_exists($GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/moduleadmin.php');
} else {
- redirect_header("../../../admin.php", 5, _AM_WFD_MODULEADMIN_MISSING, false);
+ echo xoops_error('/' . $xoopsModule->getInfo('dirmoduleadmin') . '/moduleadmin/ is required!!!');
}
+// Load language files
+xoops_loadLanguage('admin', $xoopsModule->dirname());
+xoops_loadLanguage('modinfo', $xoopsModule->dirname());
+xoops_loadLanguage('main', $xoopsModule->dirname());
+
+// Load handlers
+$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
+$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
+$mirror_handler = xoops_getmodulehandler('mirror', $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());
+
+$member_handler = xoops_gethandler("member");
+
+
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
include_once(XOOPS_ROOT_PATH . "/class/template.php");
$xoopsTpl = new XoopsTpl();
}
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDirname);
-xoops_loadLanguage('modinfo', $thisModuleDirname);
-xoops_loadLanguage('main', $thisModuleDirname);
-
-// LOad handlers
-$report_handler = xoops_getmodulehandler('report', $thisModuleDirname);
-$review_handler = xoops_getmodulehandler('review', $thisModuleDirname);
-$mirror_handler = xoops_getmodulehandler('mirror', $thisModuleDirname);
-$modification_handler = xoops_getmodulehandler('modification', $thisModuleDirname);
-$download_handler = xoops_getmodulehandler('download', $thisModuleDirname);
-$category_handler = xoops_getmodulehandler('category', $thisModuleDirname);
-$mime_handler = xoops_getmodulehandler('mimetype', $thisModuleDirname);
-
-$member_handler = xoops_gethandler("member");
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -18,21 +18,13 @@
* @author Xoops Development Team
* @version svn:$id$
*/
- $currentFile = basename(__FILE__);
+$currentFile = basename(__FILE__);
include 'admin_header.php';
-$op = '';
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'brokendownloads.list', 'string');
+$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
-if (!isset($_POST['op'])) {
- $op = isset($_GET['op']) ? $_GET['op'] : 'listBrokenDownloads';
-} else {
- $op = $_POST['op'];
-}
-
-$lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
-
-switch ($op)
-{
+switch ($op) {
case "updateNotice":
$report_handler = xoops_getmodulehandler('report');
if (isset($_GET['ack'])) {
@@ -49,6 +41,7 @@
redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, $update_mess);
break;
+ case "brokendownload.delete" :
case "delBrokenDownloads":
$criteria = new Criteria('lid', intval($lid));
$report_handler = xoops_getmodulehandler('report');
@@ -62,6 +55,7 @@
redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKENFILEDELETED);
break;
+ case "brokendownload.ignore" :
case "ignoreBrokenDownloads":
$criteria = new Criteria('lid', intval($lid));
$report_handler = xoops_getmodulehandler('report');
@@ -69,24 +63,19 @@
if (isset($report[0])) {
$report_handler->delete($report[0], true);
}
-
redirect_header(WFDOWNLOADS_URL.'admin/brokendown.php?op=default', 1, _AM_WFD_BROKEN_FILEIGNORED);
break;
default:
+ case "brokendownloads.list" :
case "listBrokenDownloads":
case "default":
-
- global $xoopsDB, $imagearray, $xoopsModule;
$report_handler = xoops_getmodulehandler('report');
$reports = $report_handler->getObjects();
$totalbrokendownloads = count($reports);
wfdownloads_xoops_cp_header();
-
- //wfdownloads_adminMenu(3, _AM_WFD_BROKEN_FILE);
-
echo "
<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_BROKEN_REPORTINFO . "</legend>\n
<div style='padding: 8px;'>" . _AM_WFD_BROKEN_REPORTSNO . " <b>$totalbrokendownloads</b><div>\n
@@ -110,77 +99,76 @@
</tr>\n
";
- if ($totalbrokendownloads == 0) {
- echo "<tr align = 'center'><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_BROKEN_NOFILEMATCH . "</td></tr>";
- } else {
- foreach (array_keys($reports) as $i) {
- $lids[] = $reports[$i]->getVar('lid');
- $uids[] = $reports[$i]->getVar('sender');
- }
- $download_handler = xoops_getmodulehandler('download');
- $downloads = $download_handler->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
+ if ($totalbrokendownloads == 0) {
+ echo "<tr align = 'center'><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_BROKEN_NOFILEMATCH . "</td></tr>";
+ } else {
+ foreach (array_keys($reports) as $i) {
+ $lids[] = $reports[$i]->getVar('lid');
+ $uids[] = $reports[$i]->getVar('sender');
+ }
+ $download_handler = xoops_getmodulehandler('download');
+ $downloads = $download_handler->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
- foreach (array_keys($downloads) as $i) {
- $uids[] = $downloads[$i]->getVar('submitter');
- }
+ foreach (array_keys($downloads) as $i) {
+ $uids[] = $downloads[$i]->getVar('submitter');
+ }
- $member_handler = xoops_gethandler('member');
- $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
+ $member_handler = xoops_gethandler('member');
+ $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
- foreach (array_keys($reports) as $i) {
- // Does the download exists ?
- 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>";
- $submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
- $submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
- } else {
- $submitter = '';
- $download_link = _AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS;
- $submitteremail = '';
- $submitteruname = $xoopsConfig['anonymous'];
- }
-
- $sender = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')] : "";
- $senderemail = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('email') : "";
- $sendername = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
+ foreach (array_keys($reports) as $i) {
+ // Does the download exists ?
+ 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>";
+ $submitteremail = is_object($submitter) ? $submitter->getVar('email') : '';
+ $submitteruname = is_object($submitter) ? $submitter->getVar('uname') : $xoopsConfig['anonymous'];
+ } else {
+ $submitter = '';
+ $download_link = _AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS;
+ $submitteremail = '';
+ $submitteruname = $xoopsConfig['anonymous'];
+ }
- $lid = intval($download->getVar('lid'));
+ $sender = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')] : "";
+ $senderemail = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('email') : "";
+ $sendername = isset($users[$reports[$i]->getVar('sender')]) ? $users[$reports[$i]->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
- $ingnore_link = "<a href='" . WFDOWNLOADS_URL ."admin/brokendown.php?op=ignoreBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
- $edit_link = "<a href='" . WFDOWNLOADS_URL . "admin/main.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
- $delete_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=delBrokenDownloads&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='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
- $con_image = ($reports[$i]->getVar('confirmed')) ? $imagearray['con_yes'] : $imagearray['con_no'];
- $con_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&con=" . $reports[$i]->getVar('confirmed') . "' alt='" . _AM_WFD_BROKEN_CONFIRM_ALT . "' title='" . _AM_WFD_BROKEN_CONFIRM_ALT . "'>" . $con_image . " </a>\n";
-
- echo "
- <tr align = 'center'>\n
- <td class = 'head'>" . $reports[$i]->getVar('reportid') . "</td>\n
- <td class = 'even' align = 'left'>$download_link</td>\n
+ $lid = intval($download->getVar('lid'));
+
+ $ingnore_link = "<a href='" . WFDOWNLOADS_URL ."admin/brokendown.php?op=ignoreBrokenDownloads&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_IGNORE_ALT . "' title='" . _AM_WFD_BROKEN_IGNORE_ALT . "'>" . $imagearray['ignore'] . "</a>";
+ $edit_link = "<a href='" . WFDOWNLOADS_URL . "admin/main.php?op=Download&lid=" . $lid . "' alt='" . _AM_WFD_BROKEN_EDIT_ALT . "' title='" . _AM_WFD_BROKEN_EDIT_ALT . "'> " . $imagearray['editimg'] . " </a>";
+ $delete_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=delBrokenDownloads&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='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&ack=" . $reports[$i]->getVar('acknowledged') . "' alt='" . _AM_WFD_BROKEN_ACK_ALT . "' title='" . _AM_WFD_BROKEN_ACK_ALT . "'>" . $ack_image . "</a>";
+ $con_image = ($reports[$i]->getVar('confirmed')) ? $imagearray['con_yes'] : $imagearray['con_no'];
+ $con_link = "<a href='" . WFDOWNLOADS_URL . "admin/brokendown.php?op=updateNotice&lid=" . $lid . "&con=" . $reports[$i]->getVar('confirmed') . "' alt='" . _AM_WFD_BROKEN_CONFIRM_ALT . "' title='" . _AM_WFD_BROKEN_CONFIRM_ALT . "'>" . $con_image . " </a>\n";
+
+ echo "
+ <tr align = 'center'>\n
+ <td class = 'head'>" . $reports[$i]->getVar('reportid') . "</td>\n
+ <td class = 'even' align = 'left'>$download_link</td>\n
+ ";
+ if ($senderemail == "") {
+ echo "<td class = 'even'>" . $sendername . " (" . $reports[$i]->getVar('ip') . ")";
+ } else {
+ echo "<td class = 'even'><a href='mailto:" . $senderemail . "'>" . $sendername . "</a> (" . $reports[$i]->getVar('ip') . ")";
+ }
+ if ($submitteremail == '') {
+ echo "<td class = 'even'>" . $submitteruname;
+ } else {
+ echo "<td class = 'even'><a href='mailto:" . $submitteremail . "'>".$submitteruname."</a>";
+ }
+ echo "
+ </td>\n
+ <td class='even' align='center'>" . formatTimestamp($reports[$i]->getVar('date'), $xoopsModuleConfig['dateformat']) . "</td>\n
+ <td align='center' class = 'even' nowrap>\n
+ $ingnore_link $edit_link $delete_link $ack_link $con_link
+ </td></tr>\n
";
- if ($senderemail == "") {
- echo "<td class = 'even'>" . $sendername . " (" . $reports[$i]->getVar('ip') . ")";
- } else {
- echo "<td class = 'even'><a href='mailto:" . $senderemail . "'>" . $sendername . "</a> (" . $reports[$i]->getVar('ip') . ")";
}
- if ($submitteremail == '') {
- echo "<td class = 'even'>" . $submitteruname;
- } else {
- echo "<td class = 'even'><a href='mailto:" . $submitteremail . "'>".$submitteruname."</a>";
- }
- echo "
- </td>\n
- <td class='even' align='center'>" . formatTimestamp($reports[$i]->getVar('date'), $xoopsModuleConfig['dateformat']) . "</td>\n
- <td align='center' class = 'even' nowrap>\n
- $ingnore_link $edit_link $delete_link $ack_link $con_link
- </td></tr>\n
- ";
}
- }
- echo"</table>";
+ echo"</table>";
+ include 'admin_footer.php';
}
-//xoops_cp_footer();
-include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -23,26 +23,8 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
-function createcat($cid = 0)
-{
- include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
- $category_handler = xoops_getmodulehandler('category');
-
- $heading = _AM_WFD_CCATEGORY_CREATENEW;
- if ($cid > 0) {
- $category = $category_handler->get($cid);
- $heading = _AM_WFD_CCATEGORY_MODIFY;
- } else {
- $category = $category_handler->create();
- }
- $sform = $category->getForm($heading);
- $sform -> display();
-}
-
-
-
$op = wfdownloads_CleanVars($_REQUEST, 'op', 'categories.list', 'string');
switch ($op) {
@@ -225,19 +207,24 @@
case "category.add" :
case "category.edit" :
case "modCat":
- $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
-
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_MI_WFD_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
$adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
- createcat($cid);
- xoops_cp_footer();
+ if (isset($_REQUEST['cid'])) {
+ $category = $category_handler->get($_REQUEST['cid']);
+ } else {
+ $category = $category_handler->create();
+ }
+ $form = $category->getForm();
+ $form -> display();
+
+ include 'admin_footer.php';
break;
case 'categories.list' :
@@ -248,7 +235,7 @@
echo $indexAdmin->addNavigation($currentFile);
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+ $adminMenu->addItemButton(_MI_WFD_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
$adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
echo $adminMenu->renderButton();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/cookies.js 2013-06-03 19:30:30 UTC (rev 11620)
@@ -11,11 +11,11 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
/**
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -20,12 +20,222 @@
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
-include_once XOOPS_ROOT_PATH . '/class/tree.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" :
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+
+ $adminMenu = new ModuleAdmin();
+ $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();
+
+ include 'admin_footer.php';
+ 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);
+ exit();
+ }
+ $title = $download->getVar('title');
+ if ($ok = true) {
+ $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();
+ } 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);
+ xoops_cp_footer();
+ }
+ break;
+
+ case "vote.delete" :
+ case "delVote" :
+ $rating_handler = xoops_getmodulehandler('rating');
+ $rating = $rating_handler->get($_GET['rid']);
+ if ($rating_handler->delete($rating, true)) {
+ wfd_updaterating(intval($rating->getVar('lid')));
+ }
+ redirect_header($currentFile, 1, _AM_WFD_VOTE_VOTEDELETED);
+ break;
+
+ // added - start - March 4 2006 - jpc
+ case "patch_formulize" :
+ if(!isset($_POST['patch_formulize'])) {
+ print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
+ print "<input type = submit name=patch_formulize value=\"Apply Patch for Formulize\">";
+ print "</form>";
+ } else {
+ global $xoopsDB;
+ $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_cat") . " ADD formulize_fid int(5) NOT NULL default '0';";
+ $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_downloads") . " ADD formulize_idreq int(5) NOT NULL default '0';";
+ foreach($sqls as $sql)
+ if(!$result = $xoopsDB->queryF($sql))
+ exit("Error patching for Formulize.<br>SQL dump:<br>" . $sql . "<br>Please contact <a hre...@fr...>Freeform Solutions</a> for assistance.");
+ print "Patching for Formulize completed.";
+ }
+ break;
+ // added - end - March 4 2006 - jpc
+
+ 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');
+
+ $totalcats = wfd_totalcategory();
+ $categories = $category_handler->getObjects(null, true, false);
+
+ $totalbrokendownloads = $report_handler->getCount();
+ $totalmodrequests = $modification_handler->getCount();
+ $newreviews = $review_handler->getCount();
+ $newmirrors = $mirror_handler->getCount();
+ $totalnewdownloads = $download_handler->getCount(new Criteria("published", 0));
+ $totaldownloads = $download_handler->getCount(new Criteria("published", 0, ">"));
+
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ 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');
+ echo $adminMenu->renderButton();
+
+ if ($totaldownloads > 0) {
+ // Published Downloads
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("published");
+ $criteria->setOrder("DESC");
+ $criteria->setStart($start1);
+ $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
+ $published_downloads = $download_handler->getActiveDownloads($criteria);
+ $published_downloads_count = $download_handler->getActiveCount();
+ $GLOBALS['xoopsTpl']->assign('published_downloads_count', $published_downloads_count);
+ if ($published_downloads_count > 0) {
+ foreach ($published_downloads as $published_download) {
+ $published_download_array = $published_download->toArray();
+ $published_download_array['title_html'] = $myts->htmlSpecialChars(trim($published_download_array['title']));
+ $published_download_array['category_title'] = $categories[$published_download_array['cid']]['title'];
+ $published_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($published_download_array['submitter']);
+ $published_download_array['published_timestamp'] = formatTimestamp($published_download_array['published'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('published_downloads', $published_download_array);
+ }
+ }
+
+ $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start1, 'start1');
+ $GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
+
+ // Auto Published Downloads
+ $criteria = new Criteria("published", time(), ">");
+ $criteria->setSort("published");
+ $criteria->setOrder("ASC");
+ $criteria->setStart($start2);
+ $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
+ $auto_published_downloads = $download_handler->getObjects($criteria);
+ $auto_published_downloads_count = $download_handler->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('auto_published_downloads_count', $auto_published_downloads_count);
+ if ($auto_published_downloads_count > 0) {
+ foreach ($auto_published_downloads as $auto_published_download) {
+ $auto_published_download_array = $auto_published_download->toArray();
+ $auto_published_download_array['title_html'] = $myts->htmlSpecialChars(trim($auto_published_download_array['title']));
+ $auto_published_download_array['category_title'] = $categories[$auto_published_download_array['cid']]['title'];
+ $auto_published_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($auto_published_download_array['submitter']);
+ $auto_published_download_array['published_timestamp'] = formatTimestamp($auto_published_download_array['published'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('auto_published_downloads', $auto_published_download_array);
+ }
+ }
+ $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start2, 'start2');
+ $GLOBALS['xoopsTpl']->assign('auto_published_downloads_pagenav', $pagenav->renderNav());
+
+ // Expired downloads
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("expired", time(), "<"), 'AND');
+ $criteria->add(new Criteria("expired", 0, "<>"), 'AND');
+ $criteria->setSort("expired");
+ $criteria->setOrder("ASC");
+ $criteria->setStart($start3);
+ $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
+ $expired_downloads = $download_handler->getObjects($criteria);
+ $expired_downloads_count = $download_handler->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expired_downloads_count);
+ if ($expired_downloads_count > 0) {
+ foreach ($expired_downloads as $expired_download) {
+ $expired_download_array = $expired_download->toArray();
+ $expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
+ $expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
+ $expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
+ $expired_download_array['published_timestamp'] = formatTimestamp($expired_download_array['published'], _DATESTRING);
+ $GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
+ }
+ }
+ $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start3, 'start3');
+ $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->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) {
+ foreach ($offline_downloads as $offline_download) {
+ $offline_download_array = $offline_download->toArray();
+ $offline_download_array['title_html'] = $myts->htmlSpecialChars(trim($offline_download_array['title']));
+ $offline_download_array['category_title'] = $categories[$offline_download_array['cid']]['title'];
+ $offline_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offline_download_array['submitter']);
+ $offline_download_array['published_timestamp'] = formatTimestamp($offline_download_array['published'], _DATESTRING);
+
+ $GLOBALS['xoopsTpl']->append('offline_downloads', $offline_download_array);
+ }
+ }
+ $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start4, 'start4');
+ $GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
+
+ $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_downloadlist.html");
+ } else {
+ echo ("debug2");
+ }
+ include 'admin_footer.php';
+ break;
+}
+
+
+
function Download()
{
global $xoopsUser, $imagearray;
@@ -36,15 +246,6 @@
$numrows = $category_handler->getCount();
if ($numrows) {
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation($currentFile);
-
- $adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=downloads.list", 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
- echo $adminMenu->renderButton();
-
// allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
@@ -77,7 +278,7 @@
// changed - start - March 4 2006 - jpc
if ((isset($_POST['submit_category']) && !empty($_POST['submit_category'])) || $lid) {
-
+
$fid = $category->getVar('formulize_fid');
$customArray = array();
if($fid) {
@@ -227,7 +428,6 @@
echo "</table>\n";
echo "</fieldset>\n";
}
- xoops_cp_footer();
}
@@ -321,7 +521,7 @@
}
}
/* End add block */
-
+
$download->setVar('version', $version);
$download->setVar('url', $url);
$download->setVar('cid', $cid);
@@ -439,7 +639,7 @@
//if (!$lid)
if(!$owner) {
- $id_req = $entries[$fid][0];
+ $id_req = $entries[$fid][0];
$download->setVar('formulize_idreq', $id_req);
}
}
@@ -481,203 +681,3 @@
redirect_header($currentFile, 1, $message);
}
-
-
-
-// Page start here
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'main';
-switch ($op) {
- case "download.save" :
- case "addDownload" :
- addDownload();
- break;
-
- case "download.edit" :
- case "download.add" :
- case "Download" :
- Download();
- 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);
- exit();
- }
- $title = $download->getVar('title');
- if ($ok = true) {
- $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();
- } 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);
- xoops_cp_footer();
- }
- break;
-
- case "vote.delete" :
- case "delVote" :
- $rating_handler = xoops_getmodulehandler('rating');
- $rating = $rating_handler->get($_GET['rid']);
- if ($rating_handler->delete($rating, true)) {
- wfd_updaterating(intval($rating->getVar('lid')));
- }
- redirect_header($currentFile, 1, _AM_WFD_VOTE_VOTEDELETED);
- break;
-
- // added - start - March 4 2006 - jpc
- case "patch_formulize" :
- if(!isset($_POST['patch_formulize'])) {
- print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
- print "<input type = submit name=patch_formulize value=\"Apply Patch for Formulize\">";
- print "</form>";
- } else {
- global $xoopsDB;
- $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_cat") . " ADD formulize_fid int(5) NOT NULL default '0';";
- $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_downloads") . " ADD formulize_idreq int(5) NOT NULL default '0';";
- foreach($sqls as $sql)
- if(!$result = $xoopsDB->queryF($sql))
- exit("Error patching for Formulize.<br>SQL dump:<br>" . $sql . "<br>Please contact <a hre...@fr...>Freeform Solutions</a> for assistance.");
- print "Patching for Formulize completed.";
- }
- break;
- // added - end - March 4 2006 - jpc
-
- case "downloads.list" :
- case 'main' :
- 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');
-
- $totalcats = wfd_totalcategory();
- $categories = $category_handler->getObjects(null, true, false);
-
- $totalbrokendownloads = $report_handler->getCount();
- $totalmodrequests = $modification_handler->getCount();
- $newreviews = $review_handler->getCount();
- $newmirrors = $mirror_handler->getCount();
- $totalnewdownloads = $download_handler->getCount(new Criteria("published", 0));
- $totaldownloads = $download_handler->getCount(new Criteria("published", 0, ">"));
-
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation($currentFile);
-
- $adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, $currentFile . "?op=list", 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=Download", 'add');
- echo $adminMenu->renderButton();
-
- if ($totaldownloads > 0) {
- // Published Downloads
- $criteria = new CriteriaCompo();
- $criteria->setSort("published");
- $criteria->setOrder("DESC");
- $criteria->setStart($start1);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $published_downloads = $download_handler->getActiveDownloads($criteria);
- $published_downloads_count = $download_handler->getActiveCount();
- $GLOBALS['xoopsTpl']->assign('published_downloads_count', $published_downloads_count);
- if ($published_downloads_count > 0) {
- foreach ($published_downloads as $published_download) {
- $published_download_array = $published_download->toArray();
- $published_download_array['title_html'] = $myts->htmlSpecialChars(trim($published_download_array['title']));
- $published_download_array['category_title'] = $categories[$published_download_array['cid']]['title'];
- $published_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($published_download_array['submitter']);
- $published_download_array['published_timestamp'] = formatTimestamp($published_download_array['published'], _DATESTRING);
- $GLOBALS['xoopsTpl']->append('published_downloads', $published_download_array);
- }
- }
- $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start1, 'start1');
- $GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
-
- // Auto Published Downloads
- $criteria = new Criteria("published", time(), ">");
- $criteria->setSort("published");
- $criteria->setOrder("ASC");
- $criteria->setStart($start2);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $auto_published_downloads = $download_handler->getObjects($criteria);
- $auto_published_downloads_count = $download_handler->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('auto_published_downloads_count', $auto_published_downloads_count);
- if ($auto_published_downloads_count > 0) {
- foreach ($auto_published_downloads as $auto_published_download) {
- $auto_published_download_array = $auto_published_download->toArray();
- $auto_published_download_array['title_html'] = $myts->htmlSpecialChars(trim($auto_published_download_array['title']));
- $auto_published_download_array['category_title'] = $categories[$auto_published_download_array['cid']]['title'];
- $auto_published_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($auto_published_download_array['submitter']);
- $auto_published_download_array['published_timestamp'] = formatTimestamp($auto_published_download_array['published'], _DATESTRING);
- $GLOBALS['xoopsTpl']->append('auto_published_downloads', $auto_published_download_array);
- }
- }
- $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start2, 'start2');
- $GLOBALS['xoopsTpl']->assign('auto_published_downloads_pagenav', $pagenav->renderNav());
-
- // Expired downloads
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria("expired", time(), "<"), 'AND');
- $criteria->add(new Criteria("expired", 0, "<>"), 'AND');
- $criteria->setSort("expired");
- $criteria->setOrder("ASC");
- $criteria->setStart($start3);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $expired_downloads = $download_handler->getObjects($criteria);
- $expired_downloads_count = $download_handler->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expired_downloads_count);
- if ($expired_downloads_count > 0) {
- foreach ($expired_downloads as $expired_download) {
- $expired_download_array = $expired_download->toArray();
- $expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
- $expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
- $expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
- $expired_download_array['published_timestamp'] = formatTimestamp($expired_download_array['published'], _DATESTRING);
- $GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
- }
- }
- $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start3, 'start3');
- $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->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) {
- foreach ($offline_downloads as $offline_download) {
- $offline_download_array = $offline_download->toArray();
- $offline_download_array['title_html'] = $myts->htmlSpecialChars(trim($offline_download_array['title']));
- $offline_download_array['category_title'] = $categories[$offline_download_array['cid']]['title'];
- $offline_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offline_download_array['submitter']);
- $offline_download_array['published_timestamp'] = formatTimestamp($offline_download_array['published'], _DATESTRING);
-
- $GLOBALS['xoopsTpl']->append('offline_downloads', $offline_download_array);
- }
- }
- $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start4, 'start4');
- $GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
-
- $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_downloadlist.html");
- }
- include 'admin_footer.php';
- break;
-}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/funcs.js 2013-06-03 19:30:30 UTC (rev 11620)
@@ -11,143 +11,142 @@
* WF-Downloads module
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @package wfdownload
* @since 3.23
- * @author WF-Sections, Xoops Development Team, luciorota
- * @version svn:$Id$
+ * @author Xoops Development Team
+ * @version svn:$id$
*/
function smartsectionPageWrap(id, page) {
- var revisedMessage;
- var textareaDom = xoopsGetElementById(id);
- xoopsInsertText(textareaDom, page);
- textareaDom.focus();
- return;
+ var revisedMessage;
+ var textareaDom = xoopsGetElementById(id);
+ xoopsInsertText(textareaDom, page);
+ textareaDom.focus();
+ return;
}
function addSelectedItemsToParent() {
- self.opener.addToParentList(window.document.forms[0].destList);
- window.close();
+ self.opener.addToParentList(window.document.forms[0].destList);
+ window.close();
}
// Fill the selcted item list with the items already present in parent.
function fillInitialDestList() {
- var destList = window.document.forms[0].destList;
- var srcList = self.opener.window.document.forms[0].elements['moderators[]'];
- for (var count = destList.options.length - 1; count >= 0; count--) {
- destList.options[count] = null;
- }
- for(var i = 0; i < srcList.options.length; i++) {
- if (srcList.options[i] != null)
- destList.options[i] = new Option(srcList.options[i].text);
+ var destList = window.document.forms[0].destList;
+ var srcList = self.opener.window.document.forms[0].elements['moderators[]'];
+ for (var count = destList.options.length - 1; count >= 0; count--) {
+ destList.options[count] = null;
+ }
+ for(var i = 0; i < srcList.options.length; i++) {
+ if (srcList.options[i] != null)
+ destList.options[i] = new Option(srcList.options[i].text);
}
}
// Add the selected items from the source to destination list
function addSrcToDestList() {
- destList = window.document.forms[0].destList;
- srcList = window.document.forms[0].srcList;
- var len = destList.length;
- for(var i = 0; i < srcList.length; i++) {
- if ((srcList.options[i] != null) && (srcList.options[i].selected)) {
- //Check if this value already exist in the destList or not
- //if not then add it otherwise do not add it.
- var found = false;
- for(var count = 0; count < len; count++) {
- if (destList.options[count] != null) {
- if (srcList.options[i].text == destList.options[count].text) {
- found = true;
- break;
- }
- }
- }
- if (found != true) {
- destList.options[len] = new Option(srcList.options[i].text);
- len++;
- }
- }
- }
+ destList = window.document.forms[0].destList;
+ srcList = window.document.forms[0].srcList;
+ var len = destList.length;
+ for(var i = 0; i < srcList.length; i++) {
+ if ((srcList.options[i] != null) && (srcList.options[i].selected)) {
+ //Check if this value already exist in the destList or not
+ //if not then add it otherwise do not add it.
+ var found = false;
+ for(var count = 0; count < len; count++) {
+ if (destList.options[count] != null) {
+ if (srcList.options[i].text == destList.options[count].text) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (found != true) {
+ destList.options[len] = new Option(srcList.options[i].text);
+ len++;
+ }
+ }
+ }
}
// Deletes from the destination list.
function deleteFromDestList() {
- var destList = window.document.forms[0].destList;
- var len = destList.options.length;
- for(var i = (len-1); i >= 0; i--) {
- if ((destList.options[i] != null) && (destList.options[i].selected == true)) {
- destList.options[i] = null;
- }
- }
+ var destList = window.document.forms[0].destList;
+ var len = destList.options.length;
+ for(var i = (len-1); i >= 0; i--) {
+ if ((destList.options[i] != null) && (destList.options[i].selected == true)) {
+ destList.options[i] = null;
+ }
+ }
}
-
function small_window(myurl, w, h) {
- // La ventana se llama "Add_from_Src_to_Dest"
- var newWindow;
- LeftPosition = (screen.width) ? (screen.width-w)/2 : 0;
- TopPosition = (screen.height) ? (screen.height-h)/2 : 0;
- newWindow = window.open(myurl, "Add_from_Src_to_Dest", 'left='+LeftPosition+',top='+TopPosition+',width='+w+', height='+h+',scrollBars=yes,resizable=yes,toolbar=no,menubar=no,location=no,directories=no');
+ // La ventana se llama "Add_from_Src_to_Dest"
+ var newWindow;
+ LeftPosition = (screen.width) ? (screen.width-w)/2 : 0;
+ TopPosition = (screen.height) ? (screen.height-h)/2 : 0;
+ newWindow = window.open(myurl, "Add_from_Src_to_Dest", 'left='+LeftPosition+',top='+TopPosition+',width='+w+', height='+h+',scrollBars=yes,resizable=yes,toolbar=no,menubar=no,location=no,directories=no');
}
// Adds the list of selected items selected in the child
// window to its list. It is called by child window to do so.
function addToParentList(sourceList) {
- destinationList = window.document.forms[0].elements['moderators[]'];
- for(var count = destinationList.options.length - 1; count >= 0; count--) {
- destinationList.options[count] = null;
- }
- for(var i = 0; i < sourceList.options.length; i++) {
- if (sourceList.options[i] != null)
- destinationList.options[i] = new Option(sourceList.options[i].text, sourceList.options[i].value );
- }
+ destinationList = window.document.forms[0].elements['moderators[]'];
+ for(var count = destinationList.options.length - 1; count >= 0; count--) {
+ destinationList.options[count] = null;
+ }
+ for(var i = 0; i < sourceList.options.length; i++) {
+ if (sourceList.options[i] != null)
+ destinationList.options[i] = new Option(sourceList.options[i].text, sourceList.options[i].value );
+ }
}
// Marks all the items as selected for the submit button.
function selectList(sourceList) {
- sourceList = window.document.forms[0].elements['moderators[]'];
- for(var i = 0; i < sourceList.options.length; i++) {
- if (sourceList.options[i] != null)
- sourceList.options[i].selected = true;
- }
- return true;
+ sourceList = window.document.forms[0].elements['moderators[]'];
+ for(var i = 0; i < sourceList.options.length; i++) {
+ if (sourceList.options[i] != null)
+ sourceList.options[i].selected = true;
+ }
+ return true;
}
// Deletes the selected items of supplied list.
function deleteSelectedItemsFromList(sourceList) {
- var maxCnt = sourceList.options.length;
- for(var i = maxCnt - 1; i >= 0; i--) {
- if ((sourceList.options[i] != null) && (sourceList.options[i].selected == true)) {
- sourceList.options[i] = null;
- }
- }
+ var maxCnt = sourceList.options.length;
+ for(var i = maxCnt - 1; i >= 0; i--) {
+ if ((sourceList.options[i] != null) && (sourceList.options[i].selected == true)) {
+ sourceList.options[i] = null;
+ }
+ }
}
function goto_URL(object)
{
- window.location.href = object.options[object.selectedIndex].value;
+ window.location.href = object.options[object.selectedIndex].value;
}
function toggle(id)
{
- if (document.getElementById) { obj = document.getElementById(id); }
- if (document.all) { obj = document.all[id]; }
- if (document.layers) { obj = document.layers[id]; }
- if (obj) {
- if (obj.style.display == "none") {
- obj.style.display = "";
- } else {
- obj.style.display = "none";
- }
- }
-
- var expDays = 365;
- var exp = new Date();
- exp.setTime(exp.getTime() + (expDays*24*60*60*1000));
-
- setCookie(window.location.pathname+"_wfdownloads_collaps_" + obj.id , obj.style.display, exp);
-
- return false;
+ if (document.getElementById) { obj = document.getElementById(id); }
+ if (document.all) { obj = document.all[id]; }
+ if (document.layers) { obj = document.layers[id]; }
+ if (obj) {
+ if (obj.style.display == "none") {
+ obj.style.display = "";
+ } else {
+ obj.style.display = "none";
+ }
+ }
+
+ var expDays = 365;
+ var exp = new Date();
+ exp.setTime(exp.getTime() + (expDays*24*60*60*1000));
+
+ setCookie(window.location.pathname+"_wfdownloads_collaps_" + obj.id , obj.style.display, exp);
+
+ return false;
}
var iconClose = new Image();
@@ -157,10 +156,10 @@
function toggleIcon ( iconName )
{
- if ( document.images[iconName].src == window.iconOpen.src ) {
- document.images[iconName].src = window.iconClose.src;
- } else if ( document.images[iconName].src == window.iconClose.src ) {
- document.images[iconName].src = window.iconOpen.src;
- }
- return;
+ if ( document.images[iconName].src == window.iconOpen.src ) {
+ document.images[iconName].src = window.iconClose.src;
+ } else if ( document.images[iconName].src == window.iconClose.src ) {
+ document.images[iconName].src = window.iconOpen.src;
+ }
+ return;
}
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php 2013-06-03 19:23:41 UTC (rev 11619)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/imageupload.php 2013-06-03 19:30:30 UTC (rev 11620)
@@ -18,19 +18,18 @@
* @author Xoops Development Team
* @version svn:$id$
*/
+$currentFile = basename(__FILE__);
include 'admin_header.php';
-include_once XOOPS_ROOT_PATH . '/class/tree.php';
-include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
-
-$op = wfdownloads_CleanVars($_REQUEST, 'op', 'default', 'string');
+$op = wfdownloads_Clean...
[truncated message content] |
