Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10094] XoopsModules/newbb/branches/alfred/newbb
|
From: <dh...@us...> - 2012-08-23 18:22:59
|
Revision: 10094
http://xoops.svn.sourceforge.net/xoops/?rev=10094&view=rev
Author: dhcst
Date: 2012-08-23 18:22:48 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Fix permission create new forum
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-08-23 18:20:19 UTC (rev 10093)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-08-23 18:22:48 UTC (rev 10094)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_permissions.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_permissions.php 69 2012-08-21 19:33:07Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -139,13 +139,6 @@
}
}
-xoops_cp_header();
-echo "<fieldset>";
-if ($newXoopsModuleGui) echo $indexAdmin->addNavigation('admin_permissions.php');
-//if (!$newXoopsModuleGui) loadModuleAdminMenu(3);
-// else echo $indexAdmin->addNavigation('admin_permissions.php');
-echo "<fieldset>";
-if (!$newXoopsModuleGui) echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$action = isset($_REQUEST['action']) ? strtolower($_REQUEST['action']) : "";
$module_id = $xoopsModule->getVar('mid');
$newbbperm_handler =& xoops_getmodulehandler('permission', 'newbb');
@@ -153,6 +146,9 @@
switch($action) {
case "template":
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_permissions.php');
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$opform = new XoopsSimpleForm(_AM_NEWBB_PERM_ACTION, 'actionform', 'admin_permissions.php', "get");
$op_select = new XoopsFormSelect("", 'action');
$op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -204,6 +200,7 @@
$ret .= '</td></tr>';
$ret .= '</table></form>';
echo $ret;
+ xoops_cp_footer();
break;
case "template_save":
@@ -219,8 +216,11 @@
$perm_template = $newbbperm_handler->getTemplate();
if ($perm_template === null) {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE);
+ exit();
}
-
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_permissions.php');
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$opform = new XoopsSimpleForm(_AM_NEWBB_PERM_ACTION, 'actionform', 'admin_permissions.php', "get");
$op_select = new XoopsFormSelect("", 'action');
$op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -254,6 +254,7 @@
$tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
$fmform->addElement($tray);
$fmform->display();
+ xoops_cp_footer();
break;
case "apply_save":
@@ -262,11 +263,14 @@
if ($forum < 1) continue;
$newbbperm_handler->applyTemplate($forum, $module_id);
}
+ mod_clearCacheFile("permission","newbb");
redirect_header("admin_permissions.php", 2, _AM_NEWBB_PERM_TEMPLATE_APPLIED);
break;
default:
-
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_permissions.php');
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$opform = new XoopsSimpleForm(_AM_NEWBB_PERM_ACTION, 'actionform', 'admin_permissions.php', "get");
$op_select = new XoopsFormSelect("", 'action');
$op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -333,11 +337,9 @@
// Since we can not control the permission update, a trick is used here
$permission_handler =& xoops_getmodulehandler("permission", "newbb");
$permission_handler->createPermData();
-
+ mod_clearCacheFile("permission","newbb");
+ xoops_cp_footer();
break;
}
-mod_clearCacheFile("forum","newbb");
-mod_clearCacheFile("permission","newbb");
-echo "</fieldset></fieldset>";
-xoops_cp_footer();
+
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-08-23 18:20:19 UTC (rev 10093)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-08-23 18:22:48 UTC (rev 10094)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
* @since 4.00
- * @version $Id: viewforum.php 62 2012-08-17 10:15:26Z alfred $
+ * @version $Id$
* @package module::newbb
*/
@@ -21,7 +21,7 @@
/*
* Build the page query
*/
-$query_vars = array("forum", "type", "status", "mode", "sort", "order", "start", "since");
+$query_vars = array("forum", "type", "status", "sort", "order", "start", "since");
$query_array = array();
foreach ($query_vars as $var) {
if (!empty($_GET[$var])) $query_array[$var] = "{$var}={$_GET[$var]}";
@@ -44,10 +44,8 @@
$forum_id = intval($_GET['forum']);
$type = @intval($_GET['type']);
$status = (!empty($_GET['status']) && in_array($_GET['status'], array("active", "pending", "deleted", "digest", "unreplied", "unread")))? $_GET['status'] : "";
-$mode = (!empty($status) && in_array($status, array("active", "pending", "deleted")))? 2 : (!empty($_GET['mode']) ? intval($_GET['mode']) : 0);
$forum_handler = xoops_getmodulehandler('forum', 'newbb');
-
$forum_obj = $forum_handler->get($forum_id);
if (!$forum_obj) {
@@ -55,7 +53,7 @@
exit();
}
-if (!$forum_handler->getPermission($forum_obj) || !$forum_handler->getPermission($forum_obj,'view')) {
+if (!$forum_handler->getPermission($forum_obj)) {
redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php", 2, _NOPERM);
exit();
}
@@ -83,11 +81,12 @@
/* Only admin has access to admin mode */
if (!$isadmin) {
$status = (!empty($status) && in_array($status, array("active", "pending", "deleted"))) ? "" : $status;
- $mode = 0;
}
-$xoopsTpl->assign('mode', $mode);
$xoopsTpl->assign('status', $status);
+if ( $isadmin ) {
+ $xoopsTpl->assign('forum_index_cpanel',array("link" => "admin/index.php", "name" => _MD_ADMINCP));
+}
if ($xoopsModuleConfig['wol_enabled']) {
$online_handler =& xoops_getmodulehandler('online', 'newbb');
@@ -189,16 +188,16 @@
$xoopsTpl->assign_by_ref('topics', $allTopics);
$xoopsTpl->assign('sticky', $sticky);
-$xoopsTpl->assign('rating_enable', $xoopsModuleConfig['rating_enabled']);
-$xoopsTpl->assign('img_newposts', newbb_displayImage('topic_new',_MD_NEWPOSTS));
-$xoopsTpl->assign('img_hotnewposts', newbb_displayImage('topic_hot_new',_MD_MORETHAN));
-$xoopsTpl->assign('img_folder', newbb_displayImage('topic',_MD_NONEWPOSTS));
-$xoopsTpl->assign('img_hotfolder', newbb_displayImage('topic_hot',_MD_MORETHAN2));
-$xoopsTpl->assign('img_locked', newbb_displayImage('topic_locked',_MD_TOPICLOCKED));
+$xoopsTpl->assign('rating_enable', $xoopsModuleConfig['rating_enabled']);
+$xoopsTpl->assign('img_newposts', newbb_displayImage('topic_new',_MD_NEWPOSTS));
+$xoopsTpl->assign('img_hotnewposts',newbb_displayImage('topic_hot_new',_MD_MORETHAN));
+$xoopsTpl->assign('img_folder', newbb_displayImage('topic',_MD_NONEWPOSTS));
+$xoopsTpl->assign('img_hotfolder', newbb_displayImage('topic_hot',_MD_MORETHAN2));
+$xoopsTpl->assign('img_locked', newbb_displayImage('topic_locked',_MD_TOPICLOCKED));
-$xoopsTpl->assign('img_sticky', newbb_displayImage('topic_sticky',_MD_TOPICSTICKY));
-$xoopsTpl->assign('img_digest', newbb_displayImage('topic_digest',_MD_TOPICDIGEST));
-$xoopsTpl->assign('img_poll', newbb_displayImage('poll',_MD_TOPICHASPOLL));
+$xoopsTpl->assign('img_sticky', newbb_displayImage('topic_sticky',_MD_TOPICSTICKY));
+$xoopsTpl->assign('img_digest', newbb_displayImage('topic_digest',_MD_TOPICDIGEST));
+$xoopsTpl->assign('img_poll', newbb_displayImage('poll',_MD_TOPICHASPOLL));
$xoopsTpl->assign('mark_read', XOOPS_URL."/modules/newbb/viewforum.php?mark=1&{$page_query}");
$xoopsTpl->assign('mark_unread', XOOPS_URL."/modules/newbb/viewforum.php?mark=2&{$page_query}");
@@ -266,7 +265,6 @@
$page_query_nav = implode("&", array_values($query_nav));
unset($query_nav);
$nav = new XoopsPageNav($all_topics, $xoopsModuleConfig['topics_per_page'], $start, "start", $page_query_nav);
- //if (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
if ($xoopsModuleConfig['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
elseif ($xoopsModuleConfig['pagenav_display'] == 'bild')
@@ -284,8 +282,6 @@
mod_loadFunctions("forum", "newbb");
$xoopsTpl->assign('forum_jumpbox', newbb_make_jumpbox($forum_id));
}
-$xoopsTpl->assign('menumode',$menumode);
-$xoopsTpl->assign('menumode_other',$menumode_other);
if ($xoopsModuleConfig['show_permissiontable']) {
$perm_handler = xoops_getmodulehandler('permission', 'newbb');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
