Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11924] XoopsModules/wfdownloads/trunk/wfdownloads
|
From: <luc...@us...> - 2013-08-15 22:09:43
|
Revision: 11924
http://sourceforge.net/p/xoops/svn/11924
Author: luciorota
Date: 2013-08-15 22:09:40 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -20,6 +20,7 @@
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
+
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
@@ -173,7 +174,7 @@
$wfdownloads->getHandler('report')->deleteAll($download_criteria);
$wfdownloads->getHandler('download')->deleteAll($download_criteria);
foreach (array_keys($downloads) as $lid) {
- xoops_comment_delete($xoopsModule->getVar('mid'), (int)$lid);
+ xoops_comment_delete($xoopsModule->mid(), (int)$lid);
}
// all downloads for each category is deleted, now delete the category data
@@ -181,8 +182,8 @@
$error = _AM_WFD_DBERROR;
foreach ($cids as $cid) {
- xoops_groupperm_deletebymoditem ($xoopsModule->getVar('mid'), 'WFDownCatPerm', $cid);
- xoops_groupperm_deletebymoditem ($xoopsModule -> getVar('mid'), 'WFUpCatPerm', $cid);
+ xoops_groupperm_deletebymoditem ($xoopsModule->mid(), 'WFDownCatPerm', $cid);
+ xoops_groupperm_deletebymoditem ($xoopsModule -> mid(), 'WFUpCatPerm', $cid);
}
redirect_header($currentFile, 1, _AM_WFD_CCATEGORY_DELETED);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -27,7 +27,7 @@
include_once WFDOWNLOADS_ROOT_PATH . '"/class/xoopstree.php';
//include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'downloads.list';
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'downloads.list', 'string');
switch ($op) {
case "download.edit" :
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -21,15 +21,16 @@
$currentFile = basename(__FILE__);
include 'admin_header.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+
if ($wfdownloads->getHandler('category')->getCount() == 0) {
redirect_header('categories.php', 1, _AM_WFD_CCATEGORY_NOEXISTS);
exit();
}
$categories = $wfdownloads->getHandler('category')->getObjects();
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-$down_cat_form = new XoopsGroupPermForm(_AM_WFD_FCATEGORY_GROUPPROMPT, $xoopsModule->getVar('mid'), 'WFDownCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS, "admin/{$currentFile}", true);
-$up_cat_form = new XoopsGroupPermForm(_AM_WFD_FCATEGORY_GROUPPROMPT_UP, $xoopsModule->getVar('mid'), 'WFUpCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS_UP, "admin/{$currentFile}", true);
+$down_cat_form = new XoopsGroupPermForm(_AM_WFD_FCATEGORY_GROUPPROMPT, $xoopsModule->mid(), 'WFDownCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS, "admin/{$currentFile}", true);
+$up_cat_form = new XoopsGroupPermForm(_AM_WFD_FCATEGORY_GROUPPROMPT_UP, $xoopsModule->mid(), 'WFUpCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS_UP, "admin/{$currentFile}", true);
foreach ($categories as $category) {
$down_cat_form->addItem($category->getVar('cid'), $category->getVar('title'), $category->getVar('pid'));
$up_cat_form->addItem($category->getVar('cid'), $category->getVar('title'), $category->getVar('pid'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -38,7 +38,7 @@
$modhandler = xoops_gethandler('module');
$wfModule = $modhandler->getByDirname("wfdownloads");
$config_handler = xoops_gethandler('config');
- $wf_mid = intval($wfModule->getVar('mid'));
+ $wf_mid = intval($wfModule->mid());
$wfModuleConfig = $config_handler->getConfigsByCat(0, $wf_mid);
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -39,7 +39,7 @@
$wfModule = $module_handler->getByDirname("wfdownloads");
$config_handler = xoops_gethandler('config');
- $wfModule_mid = $wfModule->getVar('mid');
+ $wfModule_mid = $wfModule->mid();
$wfModuleConfig = $config_handler->getConfigsByCat(0, $wfModule_mid);
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -70,11 +70,11 @@
$form -> addElement(new XoopsFormText(_AM_WFD_FCATEGORY_WEIGHT, 'weight', 10, 80, $this->getVar('weight')), false);
$gperm_handler = & xoops_gethandler('groupperm');
- $groups = $gperm_handler -> getGroupIds('WFDownCatPerm', $this->getVar('cid'), $xoopsModule->getVar('mid'));
+ $groups = $gperm_handler -> getGroupIds('WFDownCatPerm', $this->getVar('cid'), $xoopsModule->mid());
$groups_down_select = new XoopsFormSelectGroup(_AM_WFD_FCATEGORY_GROUPPROMPT, "groups", true, $groups, 5, true);
$groups_down_select->setDescription(_AM_WFD_FCATEGORY_GROUPPROMPT_DESC);
$form -> addElement($groups_down_select);
- $up_groups = $gperm_handler -> getGroupIds('WFUpCatPerm', $this->getVar('cid'), $xoopsModule -> getVar('mid'));
+ $up_groups = $gperm_handler -> getGroupIds('WFUpCatPerm', $this->getVar('cid'), $xoopsModule -> mid());
$groups_up_select = new XoopsFormSelectGroup(_AM_WFD_FCATEGORY_GROUPPROMPT_UP, "up_groups", true, $up_groups, 5, true);
$groups_up_select->setDescription(_AM_WFD_FCATEGORY_GROUPPROMPT_UP_DESC);
$form -> addElement($groups_up_select);
@@ -194,7 +194,7 @@
$gperm_handler = xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $categoryids = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $xoopsModule->getVar('mid'));
+ $categoryids = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $xoopsModule->mid());
return $this->getObjects(new Criteria('cid', "(" . implode(',', $categoryids) . ")", "IN"), $id_as_key, $as_object);
}
@@ -210,7 +210,7 @@
$gperm_handler = xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $categoryids = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $xoopsModule->getVar('mid'));
+ $categoryids = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $xoopsModule->mid());
return $this->getObjects(new Criteria('cid', "(" . implode(',', $categoryids) . ")", "IN"), $id_as_key, $as_object);
}
@@ -219,7 +219,7 @@
$gperm_handler = xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
- $categoryids = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $xoopsModule->getVar('mid'));
+ $categoryids = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $xoopsModule->mid());
return $this->getObjects(new Criteria('cid', "(" . implode(',', $categoryids) . ")", "IN"), $id_as_key, $as_object);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -793,7 +793,7 @@
// add criteria for categories that the user has permissions for
$gperm_handler = xoops_gethandler('groupperm');
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $categoryids = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $xoopsModule->getVar('mid'));
+ $categoryids = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $xoopsModule->mid());
$criteria->add(new Criteria('cid', "(" . implode(',', $categoryids) . ")", "IN"));
return $criteria;
}
@@ -849,7 +849,7 @@
$wfdownloads->getHandler('review')->deleteAll($criteria);
$wfdownloads->getHandler('report')->deleteAll($criteria);
// delete comments
- xoops_comment_delete(intval($xoopsModule->getVar('mid')), intval($download->getVar('lid')));
+ xoops_comment_delete(intval($xoopsModule->mid()), intval($download->getVar('lid')));
// added - start - March 4 2006 - jpc
if(file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php") AND $download->getVar("formulize_idreq") > 0) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -72,7 +72,7 @@
function initModule()
{
global $xoopsModule;
- if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $this->dirname) {
+ if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->dirname() == $this->dirname) {
$this->module = $xoopsModule;
} else {
$hModule = xoops_gethandler('module');
@@ -85,7 +85,7 @@
{
$this->addLog('INIT CONFIG');
$hModConfig = xoops_gethandler('config');
- $this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid'));
+ $this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->mid());
}
function initHandler($name)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -46,7 +46,7 @@
//This is needed or it will not work in blocks.
global $wfdownloads_isAdmin;
// Find if the user is admin of the module
-$wfdownloads_isAdmin = $xoopsUser->isAdmin($xoopsModule->getVar('mid'));
+$wfdownloads_isAdmin = $xoopsUser->isAdmin($xoopsModule->mid());
/*
include_once PUBLISHER_ROOT_PATH . '/include/functions.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -573,7 +573,7 @@
$id = intval($id);
$result = true;
- $mid = $wfdownloads->getModule()->getVar('mid');
+ $mid = $wfdownloads->getModule()->mid();
$gperm_handler = xoops_gethandler('groupperm');
// First, if the permissions are already there, delete them
@@ -839,7 +839,7 @@
$groups = (is_object($xoopsUser)) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$gperm_handler = & xoops_gethandler('groupperm');
- $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfdownloads->getModule()->getVar('mid'));
+ $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfdownloads->getModule()->mid());
return count($allowed_cats);
}
@@ -909,7 +909,7 @@
if (!is_dir(XOOPS_ROOT_PATH . "/" . $imgSource . "/" . $image) && file_exists(XOOPS_ROOT_PATH . "/" . $imgSource . "/" . $image)) {
$showImage .= "<img src='" . XOOPS_URL . "/" . $imgSource . "/" . $image . "' border='0' alt='" . $altText . "' /></a>";
} else {
- if ($xoopsUser && $xoopsUser->isAdmin($wfdownloads->getModule()->getVar('mid'))) {
+ if ($xoopsUser && $xoopsUser->isAdmin($wfdownloads->getModule()->mid())) {
$showImage .= "<img src='" . XOOPS_URL . "/modules/wfdownloads/images/brokenimg.png' alt='" . _MD_WFD_ISADMINNOTICE . "' /></a>";
} else {
$showImage .= "<img src='" . XOOPS_URL . "/modules/wfdownloads/images/blank.png' alt=" . $altText . " /></a>";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -22,11 +22,11 @@
{
global $xoopsModule, $xoopsModuleConfig, $xoopsConfig, $xoopsDB;
- if (empty($xoopsModule) || $xoopsModule->getVar('dirname') != 'wfdownloads') {
+ if (empty($xoopsModule) || $xoopsModule->dirname() != 'wfdownloads') {
$module_handler =& xoops_gethandler('module');
$module =& $module_handler->getByDirname('wfdownloads');
$config_handler =& xoops_gethandler('config');
- $config =& $config_handler->getConfigsByCat(0,intval($module->getVar('mid')));
+ $config =& $config_handler->getConfigsByCat(0,intval($module->mid()));
} else {
$module =& $xoopsModule;
$config =& $xoopsModuleConfig;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -31,7 +31,7 @@
$groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$gperm_handler = xoops_gethandler('groupperm');
- $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfModule->getVar('mid'));
+ $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $wfModule->mid());
$criteria = new CriteriaCompo(new Criteria("cid", "(" . implode(',', $allowed_cats) . ")", "IN"));
if ($userid != 0) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -64,7 +64,7 @@
$countin = 0;
$groups = (is_object($xoopsUser)) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
-$module_id = $xoopsModule->getVar('mid');
+$module_id = $xoopsModule->mid();
/**
* Begin Main page download info
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -25,7 +25,7 @@
$cid = WfdownloadsRequest::getInt('cid', 0);
-if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->getVar('mid'))) {
+if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->mid())) {
redirect_header('index.php', 3, _NOPERM);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -36,7 +36,7 @@
$xoopsTpl->assign('catarray', $catArray);
// Get number of downloads...
-$allowedCategories = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $xoopsModule->getVar('mid'));
+$allowedCategories = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $xoopsModule->mid());
// ... in the last week
$oneWeekAgo = strtotime("-1 week"); //$oneWeekAgo = time() - 3600*24*7; //@TODO: Change to strtotime (TODAY-1week);
$criteria = new Criteria("published", $oneWeekAgo, ">=");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -25,7 +25,7 @@
$cid = WfdownloadsRequest::getInt('cid', 0);
-if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->getVar('mid'))) {
+if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->mid())) {
redirect_header('index.php',3, _NOPERM);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/rss.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/rss.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -40,7 +40,7 @@
$groups = (is_object($xoopsUser)) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$gperm_handler = &xoops_gethandler('groupperm');
-$allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, intval($xoopsModule->getVar('mid')));
+$allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, intval($xoopsModule->mid()));
if (!$category->isNew()) {
if (!in_array($category->getVar('cid'), $allowed_cats)) {
@@ -63,7 +63,7 @@
$xoopsTpl->caching = true;
-$xoopsTpl->cache_lifetime = $xoopsConfig['module_cache'][intval($xoopsModule->getVar('mid'))];
+$xoopsTpl->cache_lifetime = $xoopsConfig['module_cache'][intval($xoopsModule->mid())];
if( ! $xoopsTpl->is_cached('db:'.$xoopsOption['template_main'], $cache_prefix) ) {
// Get content
$limit = 30;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -44,11 +44,11 @@
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
if (in_array(XOOPS_GROUP_ANONYMOUS, $groups)) {
- if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->getVar('mid'))) {
+ if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->mid())) {
redirect_header(XOOPS_URL . '/user.php', 3, _MD_WFD_NEEDLOGINVIEW);
}
} else {
- if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->getVar('mid'))) {
+ if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->mid())) {
redirect_header('index.php', 3, _NOPERM);
}
}
@@ -100,7 +100,7 @@
global $xoopsDB;
$module_handler =& xoops_gethandler('module');
$formulizeModule =& $module_handler->getByDirname("formulize");
- $formulizeConfig =& $config_handler->getConfigsByCat(0, $formulizeModule->getVar('mid'));
+ $formulizeConfig =& $config_handler->getConfigsByCat(0, $formulizeModule->mid());
$formulize_fid = $category->getVar('formulize_fid');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/topten.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/topten.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -24,7 +24,7 @@
$xoopsOption['template_main'] = 'wfdownloads_topten.html';
$groups = (is_object($xoopsUser)) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
-$module_id = $xoopsModule->getVar('mid');
+$module_id = $xoopsModule->mid();
include XOOPS_ROOT_PATH . '/header.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -28,11 +28,11 @@
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
if (in_array(XOOPS_GROUP_ANONYMOUS, $groups)) {
- if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->getVar('mid'))) {
+ if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->mid())) {
redirect_header(XOOPS_URL . '/user.php', 3, _MD_WFD_NEEDLOGINVIEW);
}
} else {
- if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->getVar('mid'))) {
+ if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->mid())) {
redirect_header('index.php', 3, _NOPERM);
}
}
@@ -91,7 +91,7 @@
* Display Sub-categories for selected Category
*/
if (is_array($arr) > 0 && !isset($_GET['list']) && !isset($_GET['selectdate'])) {
- $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $xoopsModule->getVar('mid'));
+ $allowed_cats = $gperm_handler->getItemIds("WFDownCatPerm", $groups, $xoopsModule->mid());
$listings = wfd_getTotalItems(0, $allowed_cats);
$scount = 1;
foreach(array_keys($arr) as $i) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -44,7 +44,7 @@
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
-if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->getVar('mid'))) {
+if (!$gperm_handler->checkRight("WFDownCatPerm", $cid, $groups, $xoopsModule->mid())) {
redirect_header('index.php', 3, _NOPERM);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-08-15 21:46:08 UTC (rev 11923)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-08-15 22:09:40 UTC (rev 11924)
@@ -137,7 +137,7 @@
global $xoopsModule, $xoopsModuleConfig, $xoopsUser;
// check if submissions are allowed
$isSubmissionAllowed = false;
-if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
+if (is_object($xoopsModule) && $xoopsModule->dirname() == $modversion['dirname'] && $xoopsModule->isactive()) {
if (is_object($xoopsUser) && ($xoopsModuleConfig['submissions'] == 2 || $xoopsModuleConfig['submissions'] == 4)) {
// if user is a registered user
$groups = $xoopsUser->getGroups();
|
