Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11601] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-05-28 18:51:14
|
Revision: 11601
http://sourceforge.net/p/xoops/svn/11601
Author: luciorota
Date: 2013-05-28 18:51:10 +0000 (Tue, 28 May 2013)
Log Message:
-----------
admin side: categories manager improved using templates
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.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/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -71,3 +71,8 @@
} else {
redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH . "/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -22,38 +22,35 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
-$op = '';
-
function createcat($cid = 0)
{
- include_once WFDOWNLOADS_ROOT_PATH.'class/wfd_lists.php';
+ include_once WFDOWNLOADS_ROOT_PATH . 'class/wfd_lists.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$category_handler = xoops_getmodulehandler('category');
$heading = _AM_WFD_CCATEGORY_CREATENEW;
-
- if ($cid > 0)
- {
+ 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 = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'main';
-switch ($op)
-{
- case "move":
- if (!isset($_POST['ok']))
- {
- $cid = (isset($_POST['cid'])) ? intval($_POST['cid']) : intval($_GET['cid']);
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'categories.list', 'string');
+
+switch ($op) {
+ case "category.move" :
+ case "move" :
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+ if ($ok == false) {
+ $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
+
wfdownloads_xoops_cp_header();
//wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
@@ -64,60 +61,47 @@
$categories = $category_handler->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
$sform->addElement(new XoopsFormLabel(_AM_WFD_BMODIFY, $mytree->makeSelBox('target', 'title')));
-
- $create_tray = new XoopsFormElementTray('', '');
- $create_tray -> addElement(new XoopsFormHidden('source', $cid));
- $create_tray -> addElement(new XoopsFormHidden('ok', 1));
- $create_tray -> addElement(new XoopsFormHidden('op', 'move'));
- $butt_save = new XoopsFormButton('', '', _AM_WFD_BMOVE, 'submit');
- $butt_save -> setExtra('onclick="this.form.elements.op.value=\'move\'"');
- $create_tray -> addElement($butt_save);
- $butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'submit');
- $butt_cancel -> setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
- $create_tray -> addElement($butt_cancel);
+ $create_tray = new XoopsFormElementTray('', '');
+ $create_tray -> addElement(new XoopsFormHidden('source', $cid));
+ $create_tray -> addElement(new XoopsFormHidden('ok', true));
+ $create_tray -> addElement(new XoopsFormHidden('op', 'category.move'));
+ $butt_save = new XoopsFormButton('', '', _AM_WFD_BMOVE, 'submit');
+ $butt_save -> setExtra('onclick="this.form.elements.op.value=\'category.move\'"');
+ $create_tray -> addElement($butt_save);
+ $butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'submit');
+ $butt_cancel -> setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
+ $create_tray -> addElement($butt_cancel);
$sform -> addElement($create_tray);
$sform -> display();
xoops_cp_footer();
- }
- else
- {
- global $xoopsDB;
-
- $source = intval($_POST['source']);
- $target = intval($_POST['target']);
- if ($target == $source)
- {
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?op=move&ok=0&cid=$source', 5, _AM_WFD_CCATEGORY_MODIFY_FAILED);
+ } else {
+ $source = wfdownloads_CleanVars($_POST, 'source', 0, 'int');
+ $target = wfdownloads_CleanVars($_POST, 'target', 0, 'int');
+ if ($target == $source) {
+ redirect_header(WFDOWNLOADS_URL . "admin/category.php?op=category.move&ok=0&cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILED);
}
-
- if (!$target)
- {
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?op=move&ok=0&cid=$source', 5, _AM_WFD_CCATEGORY_MODIFY_FAILEDT);
+ if (!$target) {
+ redirect_header(WFDOWNLOADS_URL . "admin/category.php?op=category.move&ok=0&cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILEDT);
}
$download_handler = xoops_getmodulehandler('download');
- $result = $download_handler->updateAll("cid", $target, new Criteria("cid", intval($source)), true);
- if (!$result)
- {
+ $result = $download_handler->updateAll("cid", $target, new Criteria("cid", $source), true);
+ if (!$result) {
$error = _AM_WFD_DBERROR;
trigger_error($error, E_USER_ERROR);
}
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?op=default', 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
exit();
}
break;
- case "addCat":
-
- global $xoopsDB, $myts, $_FILES, $xoopsModuleConfig;
-
- $cid = (isset($_POST["cid"])) ? intval($_POST["cid"]) : 0;
+ case "category.save" :
+ case "addCat" :
+ $cid = wfdownloads_CleanVars($_POST, 'cid', 0, 'int');
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
-// hack upload - start
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
-// hack upload - end
- $pid = (isset($_POST["pid"])) ? intval($_POST["pid"]) : 0;
- $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? intval($_POST["weight"]) : 0;
- $spotlighthis = (isset($_POST["lid"])) ? intval($_POST["lid"]) : 0;
+ $pid = (isset($_POST["pid"])) ? (int)$_POST["pid"] : 0;
+ $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int)$_POST["weight"] : 0;
+ $spotlighthis = (isset($_POST["lid"])) ? (int)$_POST["lid"] : 0;
$spotlighttop = (isset($_POST["spotlighttop"]) && ($_POST["spotlighttop"] == 1)) ? 1 : 0;
$imgurl = ($_POST["imgurl"] && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
@@ -128,22 +112,18 @@
$dobr = isset($_POST['dobr']);
$category_handler = xoops_getmodulehandler('category');
- if (!$cid)
- {
+ if (!$cid) {
$category = $category_handler->create();
- }
- else {
+ } else {
$category = $category_handler->get($cid);
$childcats = $category_handler->getChildCats($category);
if ($pid == $cid || in_array($pid, array_keys($childcats))) {
$category->setErrors(_AM_WFD_CCATEGORY_CHILDASPARENT);
}
}
-
// added - start - March 4 2006 - jpc
- $formulize_fid = (isset($_POST["formulize_fid"])) ? intval($_POST["formulize_fid"]) : 0;
+ $formulize_fid = (isset($_POST["formulize_fid"])) ? (int)$_POST["formulize_fid"] : 0;
// added - end - March 4 2006 - jpc
-
$category->setVar('title', $_POST["title"]);
$category->setVar('description', $_POST["description"]);
$category->setVar('summary', $_POST["summary"]);
@@ -157,75 +137,61 @@
$category->setVar('spotlighthis', $spotlighthis);
$category->setVar('spotlighttop', $spotlighttop);
$category->setVar('imgurl', $imgurl);
-
// added - start - March 4 2006 - jpc
$category->setVar('formulize_fid', $formulize_fid);
// added - end - March 4 2006 - jpc
-
$result = $category_handler->insert($category);
if (!$result) {
echo $category->getHtmlErrors();
}
- if (!$cid)
- {
+ if (!$cid) {
if ($cid == 0) {
- $newid = intval($category->getVar('cid'));
+ $newid = (int)$category->getVar('cid');
}
wfd_save_Permissions($down_groups, $newid, 'WFDownCatPerm');
-// hack upload - start
wfd_save_Permissions($up_groups, $newid, 'WFUpCatPerm');
-// hack upload - end
/**
* Notify of new category
*/
- global $xoopsModule;
$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;
- }
- else
- {
+ } else {
$database_mess = _AM_WFD_CCATEGORY_MODIFIED;
wfd_save_Permissions($down_groups, $cid, 'WFDownCatPerm');
-// hack upload - start
wfd_save_Permissions($up_groups, $cid, 'WFUpCatPerm');
-// hack upload - end
}
- redirect_header(WFDOWNLOADS_URL.'admin/category.php', 1, $database_mess);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, $database_mess);
break;
- case "del":
-
- global $xoopsDB, $xoopsModule;
-
- $cid = (isset($_POST['cid']) && is_numeric($_POST['cid'])) ? intval($_POST['cid']) : intval($_GET['cid']);
- $ok = (isset($_POST['ok']) && $_POST['ok'] == 1) ? intval($_POST['ok']) : 0;
+ case "category.delete" :
+ case "del" :
+ $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
$category_handler = xoops_getmodulehandler('category');
$categories = $category_handler->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
- if ($ok == 1)
- {
+ if ($ok == true) {
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
- foreach($arr as $child)
- {
+ foreach($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
}
$cids[] = $cid;
- $criteria = new Criteria("cid", "(".implode(',', $cids).")", "IN");
+ $criteria = new Criteria("cid", "(" . implode(',', $cids) . ")", "IN");
$download_handler = xoops_getmodulehandler('download');
//get list of downloads in these subcategories
$downloads = $download_handler->getList($criteria);
- $download_criteria = new Criteria("lid", "(".implode(',', array_keys($downloads)).")", "IN");
+ $download_criteria = new Criteria("lid", "(" . implode(',', array_keys($downloads)) . ")", "IN");
$rating_handler = xoops_getmodulehandler('rating');
$report_handler = xoops_getmodulehandler('report');
@@ -235,7 +201,7 @@
$report_handler->deleteAll($download_criteria);
$download_handler->deleteAll($download_criteria);
foreach (array_keys($downloads) as $lid) {
- xoops_comment_delete($xoopsModule->getVar('mid'), intval($lid));
+ xoops_comment_delete($xoopsModule->getVar('mid'), (int)$lid);
}
// all downloads for each category is deleted, now delete the category data
@@ -243,68 +209,77 @@
$error = _AM_WFD_DBERROR;
foreach ($cids as $cid) {
- xoops_groupperm_deletebymoditem (intval($xoopsModule->getVar('mid')), 'WFDownCatPerm', $cid);
-// hack upload - start
+ xoops_groupperm_deletebymoditem ((int)$xoopsModule->getVar('mid'), 'WFDownCatPerm', $cid);
xoops_groupperm_deletebymoditem ($xoopsModule -> getVar('mid'), 'WFUpCatPerm', $cid);
-// hack upload - end
}
- redirect_header(WFDOWNLOADS_URL.'admin/category.php', 1, _AM_WFD_CCATEGORY_DELETED);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_DELETED);
exit();
- }
- else
- {
+ } else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'del', 'cid' => $cid, 'ok' => 1), 'category.php', _AM_WFD_CCATEGORY_AREUSURE);
+ xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), 'category.php', _AM_WFD_CCATEGORY_AREUSURE);
xoops_cp_footer();
}
break;
+ case "category.add" :
+ case "category.edit" :
case "modCat":
- $cid = (isset($_POST['cid'])) ? intval($_POST['cid']) : 0;
+ $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
wfdownloads_xoops_cp_header();
- //wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('category.php');
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
+ $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+ echo $adminMenu->renderButton();
+
createcat($cid);
xoops_cp_footer();
break;
- case 'main':
- default:
-
+ case 'categories.list' :
+ case 'main' :
+ default :
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('category.php');
- //wfdownloads_adminMenu(2, _AM_WFD_MCATEGORY);
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
+ $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+ echo $adminMenu->renderButton();
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$totalcats = wfd_totalcategory();
-
- if ($totalcats > 0)
- {
- $sform = new XoopsThemeForm(_AM_WFD_CCATEGORY_MODIFY, "category", $_SERVER['REQUEST_URI']);
- $category_handler = xoops_getmodulehandler('category');
- $categories = $category_handler->getObjects();
- $mytree = new XoopsObjectTree($categories, "cid", "pid");
- $sform->addElement(new XoopsFormLabel(_AM_WFD_CCATEGORY_MODIFY_TITLE, $mytree->makeSelBox('cid', 'title')));
-
- $dup_tray = new XoopsFormElementTray('', '');
- $dup_tray -> addElement(new XoopsFormHidden('op', 'modCat'));
- $butt_dup = new XoopsFormButton('', '', _AM_WFD_BMODIFY, 'submit');
- $butt_dup -> setExtra('onclick="this.form.elements.op.value=\'modCat\'"');
- $dup_tray -> addElement($butt_dup);
- $butt_move = new XoopsFormButton('', '', _AM_WFD_BMOVE, 'submit');
- $butt_move -> setExtra('onclick="this.form.elements.op.value=\'move\'"');
- $dup_tray -> addElement($butt_move);
- $butt_dupct = new XoopsFormButton('', '', _AM_WFD_BDELETE, 'submit');
- $butt_dupct -> setExtra('onclick="this.form.elements.op.value=\'del\'"');
- $dup_tray -> addElement($butt_dupct);
- $sform -> addElement($dup_tray);
- $sform -> display();
+ if ($totalcats > 0) {
+ $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");
+ } else {
+ redirect_header('category.php?op=category.add', 1, _AM_WFD_CCATEGORY_NOEXISTS);
}
-
- createcat(0);
-//xoops_cp_footer();
-include 'admin_footer.php';
+ include 'admin_footer.php';
break;
+
+case 'categories.reorder' :
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+ $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ if (isset($_POST['category_ids']) && count($_POST['category_ids']) > 0) {
+ $new_weights = $_POST['new_weights'];
+ $ids = array();
+ foreach ($new_weights as $cid => $new_weight ) {
+ $category = $category_handler->get($cid);
+ $category->setVar('weight', $new_weight);
+ if (!$category_handler->insert($category)) {
+ redirect_header('category.php', 3, $category->getErrors());
+ }
+ unset($category);
+ }
+ redirect_header('category.php?op=categories.list', 1, _AM_WFD_CATEGORIES_REORDERED);
+ exit();
+ }
+ break;
}
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -27,6 +27,7 @@
function Download()
{
+ global $xoopsUser, $imagearray;
$download_handler = xoops_getmodulehandler('download');
$category_handler = xoops_getmodulehandler('category');
@@ -39,15 +40,15 @@
echo $indexAdmin->addNavigation('download.php');
$adminMenu = new ModuleAdmin();
- $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=list', 'list');
- $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=Download', 'add');
+ $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=downloads.list', 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?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";
$mime_handler = xoops_getmodulehandler('mimetype');
- $criteria = new Criteria("mime_admin", 1);
+ $criteria = new Criteria("mime_admin", true);
$mimetypes = $mime_handler->getList($criteria);
$allowmimetypes = implode(' | ', $mimetypes);
echo $allowmimetypes;
@@ -62,7 +63,7 @@
$category = $category_handler->get($cid);
// added - end - March 4 2006 - jpc
// changed - start - April 22 2006 - jwe
- //$title = _AM_WFD_FILE_MODIFYFILE;
+ //$title = _AM_WFD_FILE_MODIFYFILE;
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
// changed - end - April 22 2006 - jwe
} else {
@@ -85,7 +86,6 @@
$fid = $category->getVar('formulize_fid');
$customArray = array();
if($fid) {
- global $xoopsUser;
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
@@ -112,13 +112,12 @@
$sform->display();
// changed - end - March 4 2006 - jpc
} else {
- redirect_header(WFDOWNLOADS_URL.'admin/category.php?', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ redirect_header(WFDOWNLOADS_URL . 'admin/category.php?', 1, _AM_WFD_CCATEGORY_NOEXISTS);
exit();
}
+ // Vote data list/manager
if ($lid) {
- global $imagearray;
- // Vote data
$rating_handler = xoops_getmodulehandler('rating');
$totalvotes = $rating_handler->getCount();
@@ -136,7 +135,7 @@
$anon_criteria->setOrder("DESC");
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_RATINGINFOMATION . "</legend>\n";
- echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>" . $totalvotes . "<br /><br />\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>{$totalvotes}<br /><br />\n";
printf(_AM_WFD_VOTE_REGUSERVOTES, $votesreg);
@@ -148,18 +147,18 @@
</div>\n
<table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
<tr>\n
- <th align='center'>" . _AM_WFD_VOTE_USER . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_IP . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th align='center'>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ <th>" . _AM_WFD_VOTE_USER . "</td>\n
+ <th>" . _AM_WFD_VOTE_IP . "</td>\n
+ <th>" . _AM_WFD_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFD_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
</tr>\n
";
if ($votesreg == 0) {
- echo "<tr><td align='center' colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
} else {
foreach (array_keys($regvotes) as $i) {
$uids[] = $regvotes[$i]->getVar('ratinguser');
@@ -177,14 +176,14 @@
$ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
echo "
- <tr><td align='center' class='head'>$ratinguname</td>\n
- <td align='center' class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td align='center' class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
- <td align='center' class='even'>$useravgrating</th>\n
- <td align='center' class='even'>$uservotes</th>\n
- <td align='center' class='even'>$formatted_date</th>\n
- <td align='center' class='even'>\n
- <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=delVote&lid=" . $lid . "&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <tr><td class='head'>$ratinguname</td>\n
+ <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$useravgrating</th>\n
+ <td class='even'>$uservotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -194,17 +193,17 @@
<br />\n
<table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
<tr>\n
- <th align='center'>" . _AM_WFD_VOTE_USER . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_IP . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th align='center'>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th align='center'>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ <th>" . _AM_WFD_VOTE_USER . "</td>\n
+ <th>" . _AM_WFD_VOTE_IP . "</td>\n
+ <th>" . _AM_WFD_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFD_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
</tr>\n
";
if ($votesanon == 0) {
- echo "<tr><td colspan='7' align='center' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
$criteria = new Criteria("ratinguser", 0);
$userratings = $rating_handler->getUserAverage($criteria);
@@ -218,40 +217,29 @@
$ratinguname = $GLOBALS['xoopsConfig']['anonymous'];
echo "
- <tr><td align='center' class='head'>$ratinguname</td>\n
- <td align='center' class='even'>" . $anonvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td align='center' class='even'>" . $anonvotes[$i]->getVar('rating') . "</th>\n
- <td align='center' class='even'>$useravgrating</th>\n
- <td align='center' class='even'>$uservotes</th>\n
- <td align='center' class='even'>$formatted_date</th>\n
- <td align='center' class='even'>\n
- <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=delVote&lid=" . $lid . "&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <tr><td class='head'>$ratinguname</td>\n
+ <td class='even'>" . $anonvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $anonvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$useravgrating</th>\n
+ <td class='even'>$uservotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&lid=" . $lid . "&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
}
- echo "
- </table>\n
- </fieldset>\n
- ";
+ echo "</table>\n";
+ echo "</fieldset>\n";
}
xoops_cp_footer();
}
-function delVote()
-{
- global $_GET;
- $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(WFDOWNLOADS_URL . 'admin/download.php', 1, _AM_WFD_VOTE_VOTEDELETED);
-}
+
function addDownload()
{
- global $xoopsUser, $xoopsModuleConfig;
+ global $xoopsUser, $xoopsModuleConfig, $_FILES;
$lid = (!empty($_POST['lid'])) ? intval($_POST['lid']) : 0;
$cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0;
@@ -260,11 +248,9 @@
$download_handler = xoops_getmodulehandler('download');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
-
$download = $download_handler->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
-
$download = $download_handler->create();
}
@@ -286,8 +272,6 @@
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
} else {
- global $_FILES;
-
$down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", "download.php", 0, 0);
$url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
$size = $down['size'];
@@ -401,19 +385,15 @@
$publishdate = $_POST['was_published'];
$expiredate = $_POST['was_expired'];
}
-
- if ($approved == 1 && empty($publishdate))
- {
+ if ($approved == 1 && empty($publishdate)) {
$publishdate = time();
}
-
if (isset($_POST['publishdateactivate'])) {
$publishdate = strtotime($_POST['published']['date']) + $_POST['published']['time'];
}
if ($_POST['clearpublish']) {
$publishdate = $download->getVar('published');
}
-
if (isset($_POST['expiredateactivate'])) {
$expiredate = strtotime($_POST['expired']['date']) + $_POST['expired']['time'];
}
@@ -431,44 +411,43 @@
$download->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
}
-
// added - start - March 4 2006 - jpc
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
- $fid = $category->getVar('formulize_fid');
- if($fid) {
- global $xoopsUser;
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $category_handler = xoops_getmodulehandler('category');
+ $category = $category_handler->get($cid);
+ $fid = $category->getVar('formulize_fid');
+ if($fid) {
+ global $xoopsUser;
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
+ $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
- if ($lid) {
- $entries[$fid][0] = $download->getVar('formulize_idreq');
- if($entries[$fid][0]) {
- $owner = getEntryOwner($entries[$fid][0]);
- } else {
- print "no idreq";
- $entries[$fid][0] = "";
- $owner = "";
- }
- $cid = $download->getVar('cid');
+ if ($lid) {
+ $entries[$fid][0] = $download->getVar('formulize_idreq');
+ if($entries[$fid][0]) {
+ $owner = getEntryOwner($entries[$fid][0]);
} else {
- $entries[$fid][0] = "";
- $owner = "";
+ print "no idreq";
+ $entries[$fid][0] = "";
+ $owner = "";
}
- $member_handler =& xoops_gethandler('member');
- $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
- $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $owner_groups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
+ $cid = $download->getVar('cid');
+ } else {
+ $entries[$fid][0] = "";
+ $owner = "";
+ }
+ $member_handler =& xoops_gethandler('member');
+ $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
+ $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $owner_groups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
- //if (!$lid)
- if(!$owner) {
- $id_req = $entries[$fid][0];
- $download->setVar('formulize_idreq', $id_req);
- }
- }
+ //if (!$lid)
+ if(!$owner) {
+ $id_req = $entries[$fid][0];
+ $download->setVar('formulize_idreq', $id_req);
+ }
+ }
// added - end - March 4 2006 - jpc
$download_handler->insert($download);
$newid = intval($download->getVar('lid'));
@@ -479,7 +458,6 @@
$tags = array();
$tags['FILE_NAME'] = $title;
$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);
@@ -514,23 +492,24 @@
// Page start here
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'main';
switch ($op) {
- case "addDownload":
+ case "download.save" :
+ case "addDownload" :
addDownload();
break;
- case "Download":
+ case "download.add" :
+ case "Download" :
Download();
break;
- case "delDownload":
- global $xoopsModule, $xoopsModuleConfig;
- $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
- $lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
- $lid = (isset($_POST['lid'])) ? intval($_POST['lid']) : $lid;
+ case "download.delete" :
+ case "delDownload" :
+ $lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
+ $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
$download_handler = xoops_getmodulehandler('download');
$download = $download_handler->get($lid);
$title = $download->getVar('title');
- if ($confirm) {
+ if ($ok = true) {
$file = $xoopsModuleConfig['uploaddir'] . "/" . $download->getVar('filename');
if (is_file($file)) {
@chmod($file, 0777);
@@ -541,23 +520,42 @@
exit();
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'delDownload', 'lid' => $lid, 'confirm' => 1, 'title' => $title), 'download.php', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
+ xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), 'download.php', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
xoops_cp_footer();
}
break;
- case "delVote":
- delVote();
+ 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(WFDOWNLOADS_URL . 'admin/download.php', 1, _AM_WFD_VOTE_VOTEDELETED);
break;
// added - start - March 4 2006 - jpc
- case "patch_formulize":
- patch_formulize();
+ case "patch_formulize" :
+ if(!isset($_POST['patch_formulize'])) {
+ print "<form action=\"download.php?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 'main':
- default:
+ case "downloads.list" :
+ case 'main' :
+ default :
global $xoopsUser, $xoopsDB, $xoopsConfig;
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$start = wfdownloads_CleanVars($_GET, 'start', 0, 'int');
@@ -669,24 +667,3 @@
include_once "admin_footer.php";
break;
}
-
-
-
-// added - start - March 4 2006 - jpc
-function patch_formulize()
-{
- if(!isset($_POST['patch_formulize'])) {
- print "<form action=\"download.php?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.";
- }
-}
-// added - end - March 4 2006 - jpc
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -43,14 +43,14 @@
$adminmenu[$i]['link'] = "admin/index.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
$i++;
-$adminmenu[$i]['title'] = _MI_WFD_MDOWNLOADS;
+$adminmenu[$i]['title'] = _MI_WFD_CATEGORIES_MANAGEMENT;
+$adminmenu[$i]['link'] = "admin/category.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_WFD_DOWNLOADS_MANAGEMENT;
$adminmenu[$i]['link'] = "admin/download.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/download.png';
$i++;
-$adminmenu[$i]['title'] = _MI_WFD_MCATEGORY;
-$adminmenu[$i]['link'] = "admin/category.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
-$i++;
$adminmenu[$i]['title'] = _MI_WFD_INDEXPAGE;
$adminmenu[$i]['link'] = "admin/indexpage.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/index.png';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -39,7 +39,6 @@
$this->initVar('doimage', XOBJ_DTYPE_INT, true); // boolean
$this->initVar('dobr', XOBJ_DTYPE_INT, true); // boolean
$this->initVar('weight', XOBJ_DTYPE_INT, 0);
-
// added - start - March 4 2006 - jpc
$this->initVar('formulize_fid', XOBJ_DTYPE_INT, 0);
// added - end - March 4 2006 - jpc
@@ -47,26 +46,12 @@
function getForm($heading) {
global $xoopsModule, $xoopsModuleConfig ;
+
$sform = new XoopsThemeForm($heading, "op", $_SERVER['REQUEST_URI']);
$sform -> setExtra('enctype="multipart/form-data"');
- $member_handler = & xoops_gethandler('member');
- $group_list = $member_handler -> getGroupList();
+ $sform -> addElement(new XoopsFormText(_AM_WFD_FCATEGORY_TITLE, 'title', 50, 255, $this->getVar('title', 'e')), true);
- $cid = intval($this->getVar('cid'));
- $mid = intval($xoopsModule->getVar('mid'));
-
- $gperm_handler = & xoops_gethandler('groupperm');
- $groups = $gperm_handler -> getGroupIds('WFDownCatPerm', $cid, $mid);
- $groups = $groups;
- $sform -> addElement(new XoopsFormSelectGroup(_AM_WFD_FCATEGORY_GROUPPROMPT, "groups", true, $groups, 5, true));
-
-// hack upload - start
- $up_groups = $gperm_handler -> getGroupIds('WFUpCatPerm', $this->getVar('cid'), $xoopsModule -> getVar('mid'));
- $up_groups = $up_groups;
- $sform -> addElement(new XoopsFormSelectGroup(_AM_WFD_FCATEGORY_GROUPPROMPT_UP, "up_groups", true, $up_groups, 5, true));
-// hack upload - end
-
$totalcats = wfd_totalcategory();
if ($totalcats > 0) {
$category_handler = xoops_getmodulehandler('category');
@@ -74,53 +59,54 @@
$mytree = new XoopsObjectTree($categories, "cid", "pid");
$sform->addElement(new XoopsFormLabel(_AM_WFD_FCATEGORY_SUBCATEGORY, $mytree->makeSelBox('pid', 'title', "-", $this->getVar('pid', 'e'),true)));
}
- $sform -> addElement(new XoopsFormText(_AM_WFD_FCATEGORY_TITLE, 'title', 50, 255, $this->getVar('title', 'e')), true);
+
$sform -> addElement(new XoopsFormText(_AM_WFD_FCATEGORY_WEIGHT, 'weight', 10, 80, $this->getVar('weight')), false);
- $graph_array = & WfsLists :: getListTypeAsArray(XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['catimage'], $type = "images");
- $indeximage_select = new XoopsFormSelect('', 'imgurl', $this->getVar('imgurl'));
- $indeximage_select -> addOptionArray($graph_array);
- $indeximage_select -> setExtra("onchange='showImgSelected(\"image\", \"imgurl\", \"" . $xoopsModuleConfig['catimage'] . "\", \"\", \"" . XOOPS_URL . "\")'");
- $indeximage_tray = new XoopsFormElementTray(_AM_WFD_FCATEGORY_CIMAGE, ' ');
- $indeximage_tray -> addElement($indeximage_select);
- if ($this->getVar('imgurl') != "") {
- $indeximage_tray -> addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/" . $xoopsModuleConfig['catimage'] . "/" . $this->getVar('imgurl') . "' name='image' id='image' alt='' title='image' />"));
- } else {
- $indeximage_tray -> addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' name='image' id='image' alt='' title='image' />"));
- }
+ $gperm_handler = & xoops_gethandler('groupperm');
+ $groups = $gperm_handler -> getGroupIds('WFDownCatPerm', $this->getVar('cid'), $xoopsModule->getVar('mid'));
+ $sform -> addElement(new XoopsFormSelectGroup(_AM_WFD_FCATEGORY_GROUPPROMPT, "groups", true, $groups, 5, true));
+ $up_groups = $gperm_handler -> getGroupIds('WFUpCatPerm', $this->getVar('cid'), $xoopsModule -> getVar('mid'));
+ $sform -> addElement(new XoopsFormSelectGroup(_AM_WFD_FCATEGORY_GROUPPROMPT_UP, "up_groups", true, $up_groups, 5, true));
+
+ $graph_array = & WfsLists :: getListTypeAsArray(XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['catimage'], $type = "images");
+ $indeximage_select = new XoopsFormSelect('', 'imgurl', $this->getVar('imgurl'));
+ $indeximage_select -> addOptionArray($graph_array);
+ $indeximage_select -> setExtra("onchange='showImgSelected(\"image\", \"imgurl\", \"" . $xoopsModuleConfig['catimage'] . "\", \"\", \"" . XOOPS_URL . "\")'");
+ $indeximage_tray = new XoopsFormElementTray(_AM_WFD_FCATEGORY_CIMAGE, ' ');
+ $indeximage_tray -> addElement($indeximage_select);
+ if ($this->getVar('imgurl') != "") {
+ $indeximage_tray -> addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/" . $xoopsModuleConfig['catimage'] . "/" . $this->getVar('imgurl') . "' name='image' id='image' alt='' title='image' />"));
+ } else {
+ $indeximage_tray -> addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' name='image' id='image' alt='' title='image' />"));
+ }
$sform -> addElement($indeximage_tray);
+
$sform -> addElement(new XoopsFormDhtmlTextArea(_AM_WFD_FCATEGORY_DESCRIPTION, 'description', $this->getVar('description', 'e'), 15, 60), true);
+
$sform -> addElement(new XoopsFormTextArea(_AM_WFD_FCATEGORY_SUMMARY, 'summary', $this->getVar('summary'), 10, 60));
- $options_tray = new XoopsFormElementTray(_AM_WFD_TEXTOPTIONS, '<br />');
-
- $html_checkbox = new XoopsFormCheckBox('', 'dohtml', intval($this->getVar('dohtml')));
- $html_checkbox -> addOption(1, _AM_WFD_ALLOWHTML);
- $options_tray -> addElement($html_checkbox);
-
- $smiley_checkbox = new XoopsFormCheckBox('', 'dosmiley', intval($this->getVar('dosmiley')));
- $smiley_checkbox -> addOption(1, _AM_WFD_ALLOWSMILEY);
- $options_tray -> addElement($smiley_checkbox);
-
- $xcodes_checkbox = new XoopsFormCheckBox('', 'doxcode', intval($this->getVar('doxcode')));
- $xcodes_checkbox -> addOption(1, _AM_WFD_ALLOWXCODE);
- $options_tray -> addElement($xcodes_checkbox);
-
- $noimages_checkbox = new XoopsFormCheckBox('', 'doimage', intval($this->getVar('doimage')));
- $noimages_checkbox -> addOption(1, _AM_WFD_ALLOWIMAGES);
- $options_tray -> addElement($noimages_checkbox);
-
- $breaks_checkbox = new XoopsFormCheckBox('', 'dobr', intval($this->getVar('dobr')));
- $breaks_checkbox -> addOption(1, _AM_WFD_ALLOWBREAK);
- $options_tray -> addElement($breaks_checkbox);
+ $options_tray = new XoopsFormElementTray(_AM_WFD_TEXTOPTIONS, '<br />');
+ $html_checkbox = new XoopsFormCheckBox('', 'dohtml', intval($this->getVar('dohtml')));
+ $html_checkbox -> addOption(1, _AM_WFD_ALLOWHTML);
+ $options_tray -> addElement($html_checkbox);
+ $smiley_checkbox = new XoopsFormCheckBox('', 'dosmiley', intval($this->getVar('dosmiley')));
+ $smiley_checkbox -> addOption(1, _AM_WFD_ALLOWSMILEY);
+ $options_tray -> addElement($smiley_checkbox);
+ $xcodes_checkbox = new XoopsFormCheckBox('', 'doxcode', intval($this->getVar('doxcode')));
+ $xcodes_checkbox -> addOption(1, _AM_WFD_ALLOWXCODE);
+ $options_tray -> addElement($xcodes_checkbox);
+ $noimages_checkbox = new XoopsFormCheckBox('', 'doimage', intval($this->getVar('doimage')));
+ $noimages_checkbox -> addOption(1, _AM_WFD_ALLOWIMAGES);
+ $options_tray -> addElement($noimages_checkbox);
+ $breaks_checkbox = new XoopsFormCheckBox('', 'dobr', intval($this->getVar('dobr')));
+ $breaks_checkbox -> addOption(1, _AM_WFD_ALLOWBREAK);
+ $options_tray -> addElement($breaks_checkbox);
$sform -> addElement($options_tray);
// added - start - March 4 2006 - jpc
if(file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
-
$fids = allowedForms();
-
$fids_select = array();
$fids_select[0] = _AM_WFD_FFS_STANDARD_FORM;
foreach( $fids as $fid )
@@ -129,37 +115,31 @@
$formulize_forms = new XoopsFormSelect(_AM_WFD_FFS_CUSTOM_FORM, "formulize_fid", $this->getVar('formulize_fid') );
$formulize_forms -> addOptionArray( $fids_select );
$sform -> addElement($formulize_forms);
- }
+ }
// added - end - March 4 2006 - jpc
-
- $button_tray = new XoopsFormElementTray('', '');
- $hidden = new XoopsFormHidden('op', 'save');
- $button_tray -> addElement($hidden);
-
+ $button_tray = new XoopsFormElementTray('', '');
+ $hidden = new XoopsFormHidden('op', 'save');
+ $button_tray -> addElement($hidden);
if ($this->isNew()) {
- $butt_create = new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'addCat\'"');
+ $butt_create = new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit');
+ $butt_create -> setExtra('onclick="this.form.elements.op.value=\'addCat\'"');
$button_tray -> addElement($butt_create);
-
- $butt_clear = new XoopsFormButton('', '', _AM_WFD_BRESET, 'reset');
+ $butt_clear = new XoopsFormButton('', '', _AM_WFD_BRESET, 'reset');
$button_tray -> addElement($butt_clear);
-
- $butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
- $butt_cancel -> setExtra('onclick="history.go(-1)"');
+ $butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
+ $butt_cancel -> setExtra('onclick="history.go(-1)"');
$button_tray -> addElement($butt_cancel);
} else {
- $sform->addElement(new XoopsFormHidden('cid', $cid));
- $butt_create = new XoopsFormButton('', '', _AM_WFD_BMODIFY, 'submit');
- $butt_create -> setExtra('onclick="this.form.elements.op.value=\'addCat\'"');
+ $sform->addElement(new XoopsFormHidden('cid', $this->getVar('cid')));
+ $butt_create = new XoopsFormButton('', '', _AM_WFD_BMODIFY, 'submit');
+ $butt_create -> setExtra('onclick="this.form.elements.op.value=\'addCat\'"');
$button_tray -> addElement($butt_create);
-
- $butt_delete = new XoopsFormButton('', '', _AM_WFD_BDELETE, 'submit');
- $butt_delete -> setExtra('onclick="this.form.elements.op.value=\'delCat\'"');
+ $butt_delete = new XoopsFormButton('', '', _AM_WFD_BDELETE, 'submit');
+ $butt_delete -> setExtra('onclick="this.form.elements.op.value=\'delCat\'"');
$button_tray -> addElement($butt_delete);
-
- $butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
- $butt_cancel -> setExtra('onclick="history.go(-1)"');
+ $butt_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
+ $butt_cancel -> setExtra('onclick="history.go(-1)"');
$button_tray -> addElement($butt_cancel);
}
$sform -> addElement($button_tray);
@@ -207,8 +187,6 @@
return $this->getObjects(new Criteria('cid', "(".implode(',', $categoryids).")", "IN"), $id_as_key, $as_object);
}
-// hack upload - start
-
/**
* Get categories that the current user has permissions for
*
@@ -233,7 +211,6 @@
$categoryids = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $wfModule->getVar('mid'));
return $this->getObjects(new Criteria('cid', "(" . implode(',', $categoryids) . ")", "IN"), $id_as_key, $as_object);
}
-// hack upload - end
function getChildCats($category) {
$allcats = $this->getObjects();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -18,11 +18,7 @@
* @author WF-Sections, Xoops Development Team, luciorota
* @version svn:$Id$
*/
-if (!class_exists("XoopsPersistableObjectHandler")) {
- include_once XOOPS_ROOT_PATH."/modules/wfdownloads/class/object.php";
-}
/*
-
CREATE TABLE wfdownloads_mimetypes (
mime_id int(11) NOT NULL auto_increment,
mime_ext varchar(60) NOT NULL default '',
@@ -32,7 +28,6 @@
mime_user int(1) NOT NULL default '0',
KEY mime_id (mime_id)
) ENGINE=MyISAM;
-
*/
class WfdownloadsMimetype extends XoopsObject {
function WfdownloadsMimetype() {
@@ -40,8 +35,8 @@
$this->initVar('mime_ext', XOBJ_DTYPE_TXTBOX, "");
$this->initVar('mime_types', XOBJ_DTYPE_TXTAREA, "");
$this->initVar('mime_name', XOBJ_DTYPE_TXTBOX, "");
- $this->initVar('mime_admin', XOBJ_DTYPE_INT, 1);
- $this->initVar('mime_user', XOBJ_DTYPE_INT, 0);
+ $this->initVar('mime_admin', XOBJ_DTYPE_INT, true); // boolean
+ $this->initVar('mime_user', XOBJ_DTYPE_INT, false); // boolean
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-05-28 18:51:10 UTC (rev 11601)
@@ -1,9 +1,11 @@
-<b><u>=> Version 3.23 (2013-05-21)</u></b>
+<b><u>=> Version 3.23 (2013-05-25)</u></b>
- refactorized admin menu (luciorota)
- added: sort subcategories by cid or title or weight (luciorota)
- fixed: update procedure now updates also permissions (luciorota)
- fixed: language definition in modinfo.php (luciorota)
- fixed: deprecated "XoopsTree" (luciorota)
+- fixed: templates (luciorota)
+- removed: unapgraded languages (luciorota)
<b><u>=> Version 3.22 RC3 (2013-05-19)</u></b>
- added permission: upload by category (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -24,6 +24,40 @@
+/**
+ * Recursively sort categories by level and weight
+ *
+ * @param integer $pid
+ * @param integer $level
+ * @return array array of arrays: 'pid', 'cid', 'level', 'category' as array
+ *
+ * @access public
+ * @author luciorota
+ */
+function wfd_sortCategories($pid = 0, $level = 0)
+{
+ $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("pid", $pid));
+ $criteria->setSort("weight");
+ $criteria->setOrder("ASC");
+ $subcategories = $category_handler->getObjects($criteria);
+ if (count($subcategories) > 0) {
+ $level++;
+ foreach ($subcategories as $subcategory) {
+ $pid = $subcategory->getVar('pid');
+ $cid = $subcategory->getVar('cid');
+ $sorted[] = array('pid' => $pid, 'cid' => $cid, 'level' => $level, 'category' => $subcategory->toArray());
+ if ($subsorted = wfd_sortCategories($cid, $level)) {
+ $sorted = array_merge($sorted, $subsorted);
+ }
+ }
+ }
+ return $sorted;
+}
+
+
+
function wfdownloads_CleanVars(&$global, $key, $default = '', $type = 'int') {
switch ($type) {
case 'array':
@@ -759,9 +793,9 @@
/**
* displayicons()
*
- * @param $time
- * @param integer $status
- * @param integer $counter
+ * @param $time
+ * @param integer $status
+ * @param integer $counter
* @return
*/
function wfd_displayicons($time, $status = 0, $counter = 0)
@@ -808,7 +842,7 @@
/**
* convertorderbyin()
*
- * @param $orderby
+ * @param $orderby
* @return
**/
function convertorderbyin($orderby)
@@ -884,7 +918,7 @@
/**
* PrettySize()
*
- * @param $size
+ * @param $size
* @return
**/
function wfd_PrettySize($size)
@@ -912,8 +946,8 @@
/**
* updaterating()
*
- * @param $sel_id
- * @return updates rating data in itemtable for a given item
+ * @param $sel_id
+ * @return updates rating data in itemtable for a given item
**/
function wfd_updaterating($sel_id)
{
@@ -939,7 +973,7 @@
/**
* totalcategory()
*
- * @param integer $pid
+ * @param integer $pid
* @return
**/
function wfd_totalcategory()
@@ -958,9 +992,9 @@
/**
* getTotalItems()
*
- * @param integer $sel_id
- * @param integer $get_child
- * @return the total number of items in items table that are accociated with a given table $table id
+ * @param integer $sel_id
+ * @param integer $get_child
+ * @return the total number of items in items table that are accociated with a given table $table id
**/
function wfd_getTotalItems($sel_id = 0, $ids = array())
{
@@ -1037,14 +1071,14 @@
/**
* down_createthumb()
*
- * @param $img_name
- * @param $img_path
- * @param $img_savepath
- * @param integer $width
- * @param integer $height
- * @param integer $quality
- * @param integer $update
- * @param integer $aspect
+ * @param $img_name
+ * @param $img_path
+ * @param $img_savepath
+ * @param integer $width
+ * @param integer $height
+ * @param integer $quality
+ * @param integer $update
+ * @param integer $aspect
* @return
**/
function down_createthumb($img_name, $img_path, $img_savepath, $width = 100, $height = 100, $quality = 100, $update = 0, $aspect = 1)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-05-28 16:21:46 UTC (rev 11600)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-05-28 18:51:10 UTC (rev 11601)
@@ -72,7 +72,7 @@
define("_AM_WFD_CCATEGORY_CREATENEW","Create New Category");
define("_AM_WFD_CCATEGORY_MODIFY","Modify Category");
define("_AM_WFD_CCATEGORY_MOVE","Move Category Files");
-define("_AM_WFD_CCATEGORY_MODIFY_TITLE","Category Title:");
+define("_AM_WFD_CCATEGORY_MODIFY_TITLE","Category Title");
define("_AM_WFD_CCATEGORY_MODIFY_FAILED","Failed Moving Files: Cannot move to this Category");
define("_AM_WFD_CCATEGORY_MODIFY_FAILEDT","Failed Moving Files: Cannot find this Category");
define("_AM_WFD_CCATEGORY_MODIFY_MOVED","Files Moved");
@@ -82,12 +82,12 @@
define("_AM_WFD_CCATEGORY_AREUSURE","WARNING: Are you sure you want to delete this Category and ALL its Files and Comments?");
define("_AM_WFD_CCATEGORY_NOEXISTS","You must create a Category before you can add a new file");
define("_AM_WFD_FCATEGORY_GROUPPROMPT","Category Access Permissions:<div style='padding-top: 8px;'><span style='font-weight: normal;'>Select user groups who will have access to this Category.</span></div>");
-define("_AM_WFD_FCATEGORY_TITLE","Category Title:");
-define("_AM_WFD_FCATEGORY_WEIGHT","Category Weight:");
-define("_AM_WFD_FCATEGORY_SUBCATEGORY","Set As Sub-Category:");
-define("_AM_WFD_FCATEGORY_CIMAGE","Select Category Image:");
-define("_AM_WFD_FCATEGORY_DESCRIPTION","Set Category Description:");
-define("_AM_WFD_FCATEGORY_SUMMARY","Set Category Summary:");
+define("_AM_WFD_FCATEGORY_TITLE",...
[truncated message content] |
