Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8784] XoopsModules/xforum/releases/5.83/htdocs/modules/ xforum
|
From: <wis...@us...> - 2012-01-23 06:09:22
|
Revision: 8784
http://xoops.svn.sourceforge.net/xoops/?rev=8784&view=rev
Author: wishcraft
Date: 2012-01-23 06:09:15 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
X-Forum 5.83 (XOOPS 2.5) - Admin Fixes [Multifielding] & Globalisation - Patched Bug Fixes
Modified Paths:
--------------
XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/class/forum.php
XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/functions.php
XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/search.inc.php
XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/viewall.php
Modified: XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/class/forum.php
===================================================================
--- XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/class/forum.php 2012-01-23 04:04:49 UTC (rev 8783)
+++ XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/class/forum.php 2012-01-23 06:09:15 UTC (rev 8784)
@@ -684,18 +684,21 @@
static $_cachedPerms;
include_once XOOPS_ROOT_PATH.'/modules/xforum/include/functions.php';
-
+
if($type == "all") return true;
+
if (forum_isAdministrator()) return true;
+
if (!is_object($xforum)) $xforum = $this->get($xforum);
+
if ($xforum->getVar('forum_type')) return false;// if forum inactive, all has no access except admin
-
+
if(!empty($checkCategory)){
$category_handler = xoops_getmodulehandler('category', 'xforum');
$categoryPerm = $category_handler->getPermission($xforum->getVar('cat_id'));
if (!$categoryPerm) return false;
}
-
+
$type = strtolower($type);
if ("moderate" == $type) {
$permission = (forum_isModerator($xforum))?1:0;
@@ -704,11 +707,15 @@
$perm_type = 'forum';
$perm_item = (in_array($type, $perms))?'forum_' . $type:"forum_access";
if (!isset($_cachedPerms[$perm_type])) {
+
$getpermission = xoops_getmodulehandler('permission', 'xforum');
+
$_cachedPerms[$perm_type] = $getpermission->getPermissions($perm_type);
}
+
$permission = (isset($_cachedPerms[$perm_type][$xforum->getVar('forum_id')][$perm_item])) ? 1 : 0;
}
+
return $permission;
}
Modified: XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/functions.php
===================================================================
--- XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/functions.php 2012-01-23 04:04:49 UTC (rev 8783)
+++ XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/functions.php 2012-01-23 06:09:15 UTC (rev 8784)
@@ -277,11 +277,14 @@
if(!$mid){
if (!isset($forum_mid)) {
if(is_object($GLOBALS['xforumModule'])&& 'xforum' == $GLOBALS['xforumModule']->dirname()){
+
$forum_mid = $GLOBALS['xforumModule']->getVar('mid');
}else{
+
$modhandler = xoops_gethandler('module');
+
$GLOBALS['xforumModule'] = $modhandler->getByDirname('xforum');
- $forum_mid = $xforum->getVar('mid');
+ $forum_mid = $GLOBALS['xforumModule']->getVar('mid');
unset($xforum);
}
}
@@ -657,10 +660,10 @@
function chronolabs_inline($flash = false)
{
- $ret = '<div style="clear:both; height 10px;"> </div>
+ /*$ret = '<div style="clear:both; height 10px;"> </div>
<div style="clear:both; height 10px;"><center><img src="http://www.chronolabs.org.au/images/banners/loader/supportimage.php?flash=false" /></center></div>
<div style="clear:both;">Chronolabs offer limited free support should you want some development work done please contact us <a href="http://www.chronolabs.org.au/liaise/">on the question for a quote form.</a> We offer a wide range of XOOPS Professional Solution and have options for Basic SEO and marketing of your site as well as Search Engine Optimization for <a href="http://www.xoops.org/">XOOPS</a>. If you are looking for work done with this module/application or are looking for development on your site please contact us.</div>';
- return $ret;
+ return $ret;*/
}
}
//trabis
Modified: XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/search.inc.php
===================================================================
--- XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/search.inc.php 2012-01-23 04:04:49 UTC (rev 8783)
+++ XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/include/search.inc.php 2012-01-23 06:09:15 UTC (rev 8784)
@@ -14,31 +14,42 @@
$uid = (is_object($GLOBALS['xoopsUser'])&&$GLOBALS['xoopsUser']->isactive())?$GLOBALS['xoopsUser']->getVar('uid'):0;
if(!isset($allowedForums[$uid])){
+
$GLOBALS['forum_handler'] = xoops_getmodulehandler('forum', 'xforum');
if (is_array($xforums) && count($xforums) > 0) {
$xforums = array_map('intval', $xforums);
foreach($xforums as $xforumid){
+
$_forum = $GLOBALS['forum_handler']->get($xforumid);
- if($forum_handler->getPermission($_forum)) {
+
+ if($GLOBALS['forum_handler']->getPermission($_forum)) {
$allowedForums[$uid][$xforumid] = $_forum;
}
+
unset($_forum);
}
}
elseif (is_numeric($xforums) && $xforums > 0) {
+
$xforumid = $xforums;
$_forum = $GLOBALS['forum_handler']->get($xforumid);
- if($forum_handler->getPermission($_forum)) {
+
+ if($GLOBALS['forum_handler']->getPermission($_forum)) {
$allowedForums[$uid][$xforumid] = $_forum;
}
+
unset($_forum);
}
else {
+
$xforums = $GLOBALS['forum_handler']->getForums();
+
foreach($xforums as $xforumid => $_forum){
- if($forum_handler->getPermission($_forum)) {
+
+ if($GLOBALS['forum_handler']->getPermission($_forum)) {
$allowedForums[$uid][$xforumid] = $_forum;
}
+
unset($_forum);
}
unset($xforums);
Modified: XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/viewall.php
===================================================================
--- XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/viewall.php 2012-01-23 04:04:49 UTC (rev 8783)
+++ XoopsModules/xforum/releases/5.83/htdocs/modules/xforum/viewall.php 2012-01-23 06:09:15 UTC (rev 8784)
@@ -37,10 +37,11 @@
$GLOBALS['xoopsOption']['template_main'] = 'xforum_viewall.html';
+include XOOPS_ROOT_PATH."/header.php";
+
if(!empty($GLOBALS['xforumModuleConfig']['rss_enable'])){
$GLOBALS['xoTheme']->addLink('alternate', XOOPS_URL.'/modules/'.$GLOBALS['xforumModule']->getVar('dirname').'/rss.php', array('type'=>"application/rss+xml", 'title' => $GLOBALS['xforumModule']->getVar('name')));
}
-include XOOPS_ROOT_PATH."/header.php";
$GLOBALS['forum_handler'] = xoops_getmodulehandler('forum', 'xforum');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
