Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8916] XoopsModules/newbb/branches/alfred/newbb
|
From: <dh...@us...> - 2012-02-08 21:06:33
|
Revision: 8916
http://xoops.svn.sourceforge.net/xoops/?rev=8916&view=rev
Author: dhcst
Date: 2012-02-08 21:06:23 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Fix for Xoops 2.5.5
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/header.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -136,7 +136,7 @@
break;
case "save":
-
+ mod_clearCacheFile("permission_category","newbb");
if ($cat_id) {
$category_obj =& $category_handler->get($cat_id);
$message = _AM_NEWBB_CATEGORYUPDATED;
@@ -157,7 +157,7 @@
}
if ($cat_id = $category_obj->getVar("cat_id") && $cat_isNew) {
$category_handler->applyPermissionTemplate($category_obj);
- }
+ }
redirect_header("admin_cat_manager.php", 2, $message);
exit();
@@ -212,7 +212,7 @@
echo "</fieldset>";
break;
}
-mod_clearFile("","xoops_newbb");
+mod_clearCacheFile("permission_category","newbb");
echo "</fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -66,7 +66,7 @@
$forum_handler->updateAll("cat_id", $cid, new Criteria("forum_id", "(".implode(", ", $forums).")", "IN") );
}
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MOVED);
} else {
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
@@ -120,7 +120,7 @@
//mod_clearCacheFile("forum", "newbb");
$forum_handler->synchronization($forum_dest);
unset($forum_dest);
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MERGED);
} else {
@@ -172,7 +172,7 @@
$forum_obj->setVar('cat_id', $_POST['cat_id']);
if ($forum_handler->insert($forum_obj)) {
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
if (!empty($_POST["perm_template"])) {
$groupperm_handler = xoops_getmodulehandler('permission', $xoopsModule->getVar("dirname"));
$perm_template = $groupperm_handler->getTemplate();
@@ -217,7 +217,7 @@
} else {
$forum_obj =& $forum_handler->get($_POST['forum']);
$forum_handler->delete($forum_obj);
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header("admin_forum_manager.php?op=manage", 1, _AM_NEWBB_FORUMREMOVED);
exit();
}
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -208,12 +208,12 @@
case "template_save":
$res = $newbbperm_handler->setTemplate($_POST['perms'], $groupid = 0);
- if ($res) {
+ if ($res) {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE_CREATED);
} else {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE_ERROR);
}
- break;
+ exit();
case "apply":
$perm_template = $newbbperm_handler->getTemplate();
@@ -336,7 +336,7 @@
break;
}
-mod_clearCacheFile("","xoops_newbb");
+mod_clearCacheFile("forum","newbb");
echo "</fieldset></fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -356,9 +356,7 @@
$moderate_handler->clearGarbage();
}
- }
- mod_clearFile("","xoops_newbb");
- mod_clearFile("","newbb");
+ }
echo "</fieldset>";
xoops_cp_footer();
break;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -191,13 +191,13 @@
function getTemplate()
{
- $perms = mod_loadFile("perm_template", "xoops_newbb");
+ $perms = mod_loadFile("perm_template", "newbb");
return $perms;
}
function setTemplate($perms)
{
- return mod_createFile($perms, "perm_template", "xoops_newbb");
+ return mod_createFile($perms, "perm_template", "newbb");
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -60,21 +60,21 @@
function deleteByForum($forum_id)
{
- mod_clearCacheFile("permission_forum", "xoops_newbb");
+ mod_clearCacheFile("permission_forum", "newbb");
$handler =& $this->_loadHandler("forum");
return $handler->deleteByForum($forum_id);
}
function deleteByCategory($cat_id)
{
- mod_clearCacheFile("permission_category", "xoops_newbb");
+ mod_clearCacheFile("permission_category", "newbb");
$handler =& $this->_loadHandler("category");
return $handler->deleteByCategory($cat_id);
}
function setCategoryPermission($category, $groups = array())
{
- mod_clearCacheFile("permission_category", "xoops_newbb");
+ mod_clearCacheFile("permission_category", "newbb");
$handler =& $this->_loadHandler("category");
return $handler->setCategoryPermission($category, $groups);
}
@@ -214,7 +214,7 @@
}
if ($this->_checkRight($perm, $itemid, $groupid, $mid)) return true;
load_functions("cache");
- mod_clearCacheFile("permission", "xoops_newbb");
+ mod_clearCacheFile("permission", "newbb");
$this->addRight($perm, $itemid, $groupid, $mid);
return true;
}
@@ -254,7 +254,7 @@
function deleteRight($perm, $itemid, $groupid, $mid = null)
{
- mod_clearCacheFile("permission", "xoops_newbb");
+ mod_clearCacheFile("permission", "newbb");
if (empty($mid)) {
if (is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == "newbb") {
$mid = $GLOBALS["xoopsModule"]->getVar("mid");
@@ -285,7 +285,7 @@
function applyTemplate($forum, $mid = 0)
{
- mod_clearCacheFile("permission_forum", "xoops_newbb");
+ mod_clearCacheFile("permission_forum", "newbb");
$handler = $this->_loadHandler("forum");
return $handler->applyTemplate($forum, $mid);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -477,7 +477,7 @@
}
$thread_action['print']['image'] = newbb_displayImage('printer', _MD_PRINT);
- $thread_action['print']['link'] = "print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
+ $thread_action['print']['link'] = XOOPS_URL."/modules/newbb/print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
$thread_action['print']['name'] = _MD_PRINT;
$thread_action['print']['target'] = '_blank';
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -13,7 +13,7 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php";
/* for seo */
-$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php","print.php","makepdf.php");
+$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php");
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
