Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12991] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/newbb
|
From: <be...@us...> - 2015-02-18 15:24:30
|
Revision: 12991
http://sourceforge.net/p/xoops/svn/12991
Author: beckmi
Date: 2015-02-18 15:24:25 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
4.33 RC8
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.post.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.topic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_cat_manager.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_digest.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_manager.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_prune.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_reorder.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_groupmod.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_permissions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_report.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_synchronization.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_type_manager.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_votedata.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/list_topic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block_tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/digest.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/forum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/icon.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/moderate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/newbbtree.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/online.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.forum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/plugin/userlog.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/post.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/rate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/read.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/readforum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/readtopic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/report.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/stats.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/text.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/topic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/topic.renderer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/tree.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/type.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/uploader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/user.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/userstats.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/xmlrss.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/xoopsformloader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/delete.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/dl_attachment.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/edit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/display.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/form.forum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/form.post.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.config.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.forum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.image.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.ini.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.language.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.read.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.recon.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.render.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.rpc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.session.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.stats.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.text.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.time.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.topic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.user.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.welcome.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/functions.welcome.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/images.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/module.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/notification.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/plugin.dist.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/plugin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/plugin.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/include/vars.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/forum_newpost_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/forum_newthread_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/forum_report.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/global_digest_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/global_newforum_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/global_newfullpost_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/global_newpost_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/language/italian/mail_template/thread_newpost_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/list.topic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/moderate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/newtopic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/notification_update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/polls.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/post.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/print.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/ratethread.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/reply.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/report.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/rss.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/seo_url.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/css/language/english/style.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/css/language/persian/style.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/images/icon/pdf.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/newbb_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/newbb_thread.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/newbb_viewforum.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates/newbb_viewtopic.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates_fulldiv_opacity/css/language/english/style.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates_fulldiv_opacity/newbb_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/templates_fulldiv_opacity/newbb_viewforum.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/topicmanager.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/update_type.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/view.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/viewforum.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/viewpost.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/viewtopic.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/votepolls.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/xoops_version.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.post.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.post.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.post.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -9,7 +9,7 @@
* @version $Id $
* @package module::newbb
*/
-include_once dirname(__FILE__) . "/header.php";
+include_once __DIR__ . "/header.php";
$topic_id = isset($_POST['topic_id']) ? intval($_POST['topic_id']) : 0;
$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
@@ -22,7 +22,6 @@
if ( empty($post_id) || empty($op)) {
// irmtfan - issue with javascript:history.go(-1)
redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_NORIGHTTOACCESS);
- exit();
}
$post_handler =& xoops_getmodulehandler('post', 'newbb');
@@ -39,7 +38,6 @@
if (!$isadmin) {
redirect_header("index.php", 2, _MD_NORIGHTTOACCESS);
- exit();
}
switch ($op) {
@@ -208,5 +206,5 @@
redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_DBUPDATED);
}
// irmtfan move to footer.php
-include_once dirname(__FILE__) . "/footer.php";
+include_once __DIR__ . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.topic.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.topic.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/action.topic.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -9,7 +9,7 @@
* @version $Id $
* @package module::newbb
*/
-include_once dirname(__FILE__) . "/header.php";
+include_once __DIR__ . "/header.php";
$forum_id = isset($_POST['forum_id']) ? intval($_POST['forum_id']) : 0;
$topic_id = !empty($_POST['topic_id']) ? $_POST['topic_id'] : null;
@@ -19,7 +19,6 @@
if ( empty($topic_id) || empty($op)) {
// irmtfan - issue with javascript:history.go(-1)
redirect_header($_SERVER['HTTP_REFERER'], 2, _MD_NORIGHTTOACCESS);
- exit();
}
$topic_id = array_values($topic_id);
@@ -30,7 +29,6 @@
if (!$isadmin) {
redirect_header("index.php", 2, _MD_NORIGHTTOACCESS);
- exit();
}
switch ($op) {
case "restore":
@@ -172,5 +170,5 @@
redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
}
// irmtfan move to footer.php
-include_once dirname(__FILE__) . "/footer.php";
+include_once __DIR__ . "/footer.php";
include XOOPS_ROOT_PATH.'/footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/about.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/about.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -29,7 +29,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include( "admin_header.php" );
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
if ($newXoopsModuleGui) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_blocks.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_blocks.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_blocks.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -33,5 +33,5 @@
// - XOOPS block admin for each modules - //
// GIJOE <http://www.peak.ne.jp/> //
// ------------------------------------------------------------------------- //
-include("admin_header.php");
+include_once __DIR__ . '/admin_header.php';
header("Location: ".XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&selmod=".$xoopsModule->getVar("mid"));
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_cat_manager.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_cat_manager.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include('admin_header.php');
+include_once __DIR__ . '/admin_header.php';
mod_loadFunctions("render", "newbb");
xoops_cp_header();
echo "<fieldset>";
@@ -71,7 +71,7 @@
$category_obj->setVar('cat_image', '');
$category_obj->setVar('cat_description', '');
$category_obj->setVar('cat_order', 0);
- $category_obj->setVar('cat_url', 'http://www.simple-xoops.de newBB Support');
+ $category_obj->setVar('cat_url', 'http://xoops.org newBB Support');
}
$sform->addElement(new XoopsFormText(_AM_NEWBB_SETCATEGORYORDER, 'cat_order', 5, 10, $category_obj->getVar('cat_order')), false);
@@ -159,7 +159,6 @@
$category_handler->applyPermissionTemplate($category_obj);
}
redirect_header("admin_cat_manager.php", 2, $message);
- exit();
default:
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_digest.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_digest.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_digest.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -29,7 +29,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include('admin_header.php');
+include_once __DIR__ . '/admin_header.php';
include_once XOOPS_ROOT_PATH."/class/pagenav.php";
$op = !empty($_GET['op'])? $_GET['op'] : (!empty($_POST['op'])?$_POST['op']:"default");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_manager.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_manager.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
include XOOPS_ROOT_PATH . "/class/xoopstree.php";
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
mod_loadFunctions("forum", "newbb");
@@ -71,7 +71,6 @@
} else {
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
}
- exit();
} else {
$box = '<select name="dest_forum">';
$box .= '<option value=0 selected>' . _SELECT . '</option>';
@@ -126,7 +125,6 @@
} else {
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
}
- exit();
} else {
$box = '<select name="dest_forum">';
@@ -193,10 +191,8 @@
}
}
redirect_header("admin_forum_manager.php", 2, $message);
- exit();
} else {
redirect_header("admin_forum_manager.php?op=mod&forum=" . $forum_obj->getVar('forum_id') . "", 2, _AM_NEWBB_FORUM_ERROR);
- exit();
}
case "mod":
@@ -219,7 +215,6 @@
$forum_handler->delete($forum_obj);
mod_clearCacheFile("forum", "newbb");
redirect_header("admin_forum_manager.php?op=manage", 1, _AM_NEWBB_FORUMREMOVED);
- exit();
}
break;
@@ -291,7 +286,7 @@
$f_move_link = "<a href=\"admin_forum_manager.php?op=moveforum&forum=" . $f . "\">".newbb_displayImage('admin_move',_AM_NEWBB_MOVE)."</a>";
$f_merge_link = "<a href=\"admin_forum_manager.php?op=mergeforum&forum=" . $f . "\">".newbb_displayImage('admin_merge',_AM_NEWBB_MERGE)."</a>";
- $class = ((++$i)%2)?"odd":"even";
+ $class = (($i++)%2)?"odd":"even";
$echo .= "<tr class='".$class."' align='left'><td></td>";
$echo .= "<td><strong>" . $f_link . "</strong></td>";
$echo .= "<td align='center'>" . $f_edit_link . "</td>";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_prune.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_prune.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_prune.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -24,7 +24,7 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-include("admin_header.php");
+include_once __DIR__ . '/admin_header.php';
include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/xoopsformloader.php";
xoops_cp_header();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_reorder.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_reorder.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_forum_reorder.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
if (isset($_POST['cat_orders'])) $cat_orders = $_POST['cat_orders'];
if (isset($_POST['orders'])) $orders = $_POST['orders'];
@@ -36,14 +36,14 @@
if (isset($_POST['forum'])) $forum = $_POST['forum'];
if (!empty($_POST['submit'])) {
- for ($i = 0; $i < count($cat_orders); $i++) {
+ for ($i = 0; $i < count($cat_orders); ++$i) {
$sql = "update " . $xoopsDB->prefix("bb_categories") . " set cat_order = " . $cat_orders[$i] . " WHERE cat_id=$cat[$i]";
if (!$result = $xoopsDB->query($sql)) {
redirect_header("admin_forum_reorder.php", 1, _AM_NEWBB_FORUM_ERROR);
}
}
- for ($i = 0; $i < count($orders); $i++) {
+ for ($i = 0; $i < count($orders); ++$i) {
$sql = "update " . $xoopsDB->prefix("bb_forums") . " set forum_order = " . $orders[$i] . " WHERE forum_id=".$forum[$i];
if (!$result = $xoopsDB->query($sql)) {
redirect_header("admin_forum_reorder.php", 1, _AM_NEWBB_FORUM_ERROR);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_groupmod.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_groupmod.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_groupmod.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://www.mymyxoops.org/, http://simple-xoops.de/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include('admin_header.php');
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
echo "<fieldset>";
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/class/xoopsformloader.php";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_permissions.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_permissions.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://www.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/class/xoopsformloader.php";
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
@@ -172,7 +172,7 @@
$ii = 0;
$option_ids = array();
foreach ($perms as $perm) {
- $ii++;
+ ++$ii;
if ($ii % 5 ==0) {
$ret_ele .= '</tr><tr>';
}
@@ -209,13 +209,11 @@
} else {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE_ERROR);
}
- exit();
case "apply":
$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');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_report.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_report.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_report.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -29,7 +29,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include('admin_header.php');
+include_once __DIR__ . '/admin_header.php';
include_once XOOPS_ROOT_PATH."/class/pagenav.php";
$op = !empty($_POST['submit']) ? "save" : ( !empty($_POST['delete']) ? "delete" : "default");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_synchronization.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_synchronization.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_synchronization.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,7 +10,7 @@
* @package module::newbb
*/
// irmtfan - TODO - should be changed completly with Newbb new function newbb_synchronization
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
mod_loadFunctions("recon", "newbb");
$form = '<fieldset>';
@@ -28,7 +28,6 @@
$result = newbb_synchronization("forum");
if (!empty($result)) {
redirect_header("admin_synchronization.php", 2, _AM_NEWBB_SYNC_TYPE_FORUM . "<br />" . _AM_NEWBB_DATABASEUPDATED);
- exit();
}
break;
// irmtfan rewrite topic sync
@@ -47,14 +46,12 @@
}
$result = newbb_synchronization("topic");
redirect_header("admin_synchronization.php?type=topic&start=".($start+$limit)."&limit={$limit}", 2, _AM_NEWBB_SYNCHING." {$count}: {$start} - ".($start+$limit));
- exit();
break;
// irmtfan rewrite post sync
case "post":
$result = newbb_synchronization("post");
if (!empty($result)) {
redirect_header("admin_synchronization.php", 2, _AM_NEWBB_SYNC_TYPE_POST . "<br />" . _AM_NEWBB_DATABASEUPDATED);
- exit();
}
break;
// irmtfan - user is not in recon functions - only here
@@ -94,7 +91,6 @@
}
redirect_header("admin_synchronization.php?type=user&start=".($start+$limit)."&limit={$limit}", 2, _AM_NEWBB_SYNCHING." {$count}: {$start} - ".($start+$limit));
- exit();
break;
// irmtfan rewrite stats reset
case "stats":
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_type_manager.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_type_manager.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_type_manager.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -11,7 +11,7 @@
* @package module::newbb
*/
-include('admin_header.php');
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
echo "<fieldset>";
echo "<br />";
@@ -83,7 +83,6 @@
$types_obj = $type_handler->getAll();
if (count($types_obj) ==0) {
redirect_header(xoops_getenv("PHP_SELF"), 2, _AM_NEWBB_TYPE_ADD);
- exit();
}
echo "<a style='border: 1px solid #5E5D63; color: #000000; font-family: verdana, tahoma, arial, helvetica, sans-serif; font-size: 1em; padding: 4px 8px; text-align:center;' href='".xoops_getenv("PHP_SELF")."?op=add'>";
@@ -150,7 +149,6 @@
case "apply":
if (!$templates = mod_loadCacheFile("type_template")) {
redirect_header(xoops_getenv("PHP_SELF")."?op=template", 2, _AM_NEWBB_TYPE_TEMPLATE);
- exit();
}
$category_handler =& xoops_getmodulehandler('category', 'newbb');
@@ -222,7 +220,6 @@
case "save_apply":
if (!$templates = mod_loadCacheFile("type_template")) {
redirect_header(xoops_getenv("PHP_SELF")."?op=template", 2, _AM_NEWBB_TYPE_TEMPLATE);
- exit();
}
foreach ($_POST["forums"] as $forum) {
if ($forum < 1) continue;
@@ -238,13 +235,11 @@
$categories = $category_handler->getList($criteria_category);
if (empty($categories)) {
redirect_header("admin_cat_manager.php", 2, _AM_NEWBB_CREATENEWCATEGORY);
- exit();
}
$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
$forums = $forum_handler->getTree(array_keys($categories));
if (empty($forums)) {
redirect_header("admin_forum_manager.php", 2, _AM_NEWBB_CREATENEWFORUM);
- exit();
}
foreach (array_keys($forums) as $c) {
@@ -286,19 +281,16 @@
case "edit_forum":
if (empty($_POST["forum"]) || $_POST["forum"] < 1) {
redirect_header(xoops_getenv("PHP_SELF")."?op=forum", 2, _AM_NEWBB_TYPE_FORUM);
- exit();
}
$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
if ( !$forum_obj = $forum_handler->get(intval($_POST["forum"])) ) {
redirect_header(xoops_getenv("PHP_SELF")."?op=forum", 2, _AM_NEWBB_TYPE_FORUM);
- exit();
}
$types_obj = $type_handler->getAll();
if (count($types_obj) ==0) {
redirect_header(xoops_getenv("PHP_SELF"), 2, _AM_NEWBB_TYPE_ADD);
- exit();
}
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_ACTION . "</legend>";
@@ -364,7 +356,6 @@
case "save_forum":
if (empty($_POST["forum"]) || $_POST["forum"] < 1) {
redirect_header(xoops_getenv("PHP_SELF")."?op=forum", 2, _AM_NEWBB_TYPE_FORUM);
- exit();
}
$type_handler->updateByForum(intval($_POST["forum"]), $_POST["type_order"]);
redirect_header(xoops_getenv("PHP_SELF")."?op=forum", 2, _MD_DBUPDATED);
@@ -426,7 +417,7 @@
}
echo "<tr><td colspan='4'>";
} else {
- for ($i = 0; $i < 10; $i++) {
+ for ($i = 0; $i < 10; ++$i) {
echo "<tr class='odd' align='left'>";
echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
if ($isColorpicker) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_votedata.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_votedata.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/admin_votedata.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
$op = !empty($_GET['op'])? $_GET['op'] : (!empty($_POST['op'])?$_POST['op']:"");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/index.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/index.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-include('admin_header.php');
+include_once __DIR__ . '/admin_header.php';
mod_loadFunctions("stats", "newbb");
$attach_path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/';
@@ -116,7 +116,6 @@
$res = newbb_admin_mkdir($path);
$msg = ($res)?_AM_NEWBB_DIRCREATED:_AM_NEWBB_DIRNOTCREATED;
redirect_header('index.php', 2, $msg . ': ' . $path);
- exit();
break;
case "setperm":
@@ -124,7 +123,6 @@
$res = newbb_admin_chmod($path, 0777);
$msg = ($res)?_AM_NEWBB_PERMSET:_AM_NEWBB_PERMNOTSET;
redirect_header('index.php', 2, $msg . ': ' . $path);
- exit();
break;
case "senddigest":
@@ -132,7 +130,6 @@
$res = $digest_handler->process(true);
$msg = ($res)?_AM_NEWBB_DIGEST_FAILED:_AM_NEWBB_DIGEST_SENT;
redirect_header('index.php', 2, $msg);
- exit();
break;
case "default":
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/menu.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/admin/menu.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -38,48 +38,97 @@
$newModuleGui = true;
}
-$i=0;
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_INDEX;
-$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/home.png' : "assets/images/menu/home.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_CATEGORY;
-$adminmenu[$i]['link'] = "admin/admin_cat_manager.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/category.png' : "assets/images/menu/cat.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_FORUM;
-$adminmenu[$i]['link'] = "admin/admin_forum_manager.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/forums.png' : "assets/images/menu/forum.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_PERMISSION;
-$adminmenu[$i]['link'] = "admin/admin_permissions.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/permissions.png' : "assets/images/menu/permissions.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_ORDER;
-$adminmenu[$i]['link'] = "admin/admin_forum_reorder.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/compfile.png' : "assets/images/menu/order.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_PRUNE;
-$adminmenu[$i]['link'] = "admin/admin_forum_prune.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/update.png' : "assets/images/menu/prune.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_REPORT;
-$adminmenu[$i]['link'] = "admin/admin_report.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/content.png' : "assets/images/menu/report.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_DIGEST;
-$adminmenu[$i]['link'] = "admin/admin_digest.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/digest.png' : "assets/images/menu/digest.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_VOTE;
-$adminmenu[$i]['link'] = "admin/admin_votedata.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/button_ok.png' : "assets/images/menu/votedata.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_TYPE;
-$adminmenu[$i]['link'] = "admin/admin_type_manager.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/type.png' : "assets/images/menu/type.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_GROUPMOD;
-$adminmenu[$i]['link'] = "admin/admin_groupmod.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/groupmod.png' : "assets/images/menu/groupmod.png";
+
+$adminmenu[] = array(
+ 'title' => _AM_MODULEADMIN_HOME,
+ 'link' => 'admin/index.php',
+ 'icon' => $pathIcon32 . '/home.png'
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_INDEX,
+ 'link' => "admin/index.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/home.png' : "assets/images/menu/home.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_CATEGORY,
+ 'link' => "admin/admin_cat_manager.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/category.png' : "assets/images/menu/cat.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_FORUM,
+ 'link' => "admin/admin_forum_manager.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/forums.png' : "assets/images/menu/forum.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_PERMISSION,
+ 'link' => "admin/admin_permissions.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/permissions.png' : "assets/images/menu/permissions.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_ORDER,
+ 'link' => "admin/admin_forum_reorder.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/compfile.png' : "assets/images/menu/order.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_PRUNE,
+ 'link' => "admin/admin_forum_prune.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/update.png' : "assets/images/menu/prune.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_REPORT,
+ 'link' => "admin/admin_report.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/content.png' : "assets/images/menu/report.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_DIGEST,
+ 'link' => "admin/admin_digest.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/digest.png' : "assets/images/menu/digest.png",
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_VOTE,
+ 'link' => "admin/admin_votedata.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/button_ok.png' : "assets/images/menu/votedata.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_TYPE,
+ 'link' => "admin/admin_type_manager.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/type.png' : "assets/images/menu/type.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_GROUPMOD,
+ 'link' => "admin/admin_groupmod.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/groupmod.png' : "assets/images/menu/groupmod.png"
+);
+
+
if (!$newModuleGui) {
- $adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_BLOCK;
- $adminmenu[$i]['link'] = "admin/admin_blocks.php";
- $adminmenu[$i++]['icon'] = "assets/images/menu/blocks.png";
+ $adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_BLOCK,
+ 'link' => "admin/admin_blocks.php",
+ 'icon' => "assets/images/menu/blocks.png"
+ );
}
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_SYNC;
-$adminmenu[$i]['link'] = "admin/admin_synchronization.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/synchronized.png' : "assets/images/menu/synchronization.png";
-$adminmenu[$i]['title'] = _MI_NEWBB_ADMENU_ABOUT;
-$adminmenu[$i]['link'] = "admin/about.php";
-$adminmenu[$i++]['icon'] = ($newModuleGui) ? '../../'.$pathIcon32.'/about.png' : "assets/images/menu/about.png";
+
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_SYNC,
+ 'link' => "admin/admin_synchronization.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/synchronized.png' : "assets/images/menu/synchronization.png"
+);
+
+$adminmenu[] = array(
+ 'title' => _MI_NEWBB_ADMENU_ABOUT,
+ 'link' => "admin/about.php",
+ 'icon' => ($newModuleGui) ? '../../' . $pathIcon32 . '/about.png' : "assets/images/menu/about.png"
+);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/list_topic.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/list_topic.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/list_topic.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -11,14 +11,14 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
if (defined('LIST_TOPIC_DEFINED')) return;
define('LIST_TOPIC_DEFINED',true);
-include_once dirname(dirname(__FILE__)) . "/include/functions.ini.php";
-require_once dirname(dirname(__FILE__)) . "/class/topic.renderer.php";
-include_once dirname(dirname(__FILE__)) . "/footer.php"; // to include js/style files like validate function
+include_once dirname(__DIR__) . "/include/functions.ini.php";
+require_once dirname(__DIR__) . "/class/topic.renderer.php";
+include_once dirname(__DIR__) . "/footer.php"; // to include js/style files like validate function
xoops_loadLanguage("main","newbb");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -28,7 +28,7 @@
// URL: http://xoopsforge.com, http://xoops.org.cn //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
// irmtfan use full path because block maybe used outside newbb
include_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.ini.php";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block_tag.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block_tag.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/blocks/newbb_block_tag.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,7 +10,7 @@
* @package module::newbb/tag
*/
-// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
/**#@+
* Function to display tag cloud
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/category.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/category.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,7 +10,7 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
class Category extends XoopsObject
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/digest.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/digest.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/digest.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -72,7 +72,7 @@
$content = "";
if ($digest_count > 0) {
$linebreak = ($isHtml) ? "<br />" : "\n";
- for ($i = 0;$i < $digest_count;$i++) {
+ for ($i = 0;$i < $digest_count;++$i) {
if ($isHtml) {
$content .= ($i + 1) . ". <a href=" . $this->items[$i]['link'] . ">" . $this->items[$i]['title'] . "</a>";
} else {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/forum.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/forum.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/forum.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
class Forum extends XoopsObject
{
@@ -286,7 +286,6 @@
if (!$result = $this->db->query($sql, $xoopsModuleConfig['topics_per_page'], $start)) {
redirect_header('index.php', 2, _MD_ERROROCCURED);
- exit();
}
$sticky = 0;
@@ -300,7 +299,7 @@
while ($myrow = $this->db->fetchArray($result)) {
if ($myrow['topic_sticky']) {
- $sticky++;
+ ++$sticky;
}
// ------------------------------------------------------
@@ -337,7 +336,7 @@
if ($totalpages > 1) {
$topic_page_jump .= ' ';
$append = false;
- for ($i = 1; $i <= $totalpages; $i++) {
+ for ($i = 1; $i <= $totalpages; ++$i) {
if ($i > 3 && $i < $totalpages) {
if (!$append) {
$topic_page_jump .= "...";
@@ -889,7 +888,7 @@
}
$forums_obj = $this->getByPermission($cat_id, $perm_string, $tags);
- require_once dirname(__FILE__) . "/tree.php";
+ require_once __DIR__ . "/tree.php";
$forums_structured = array();
foreach (array_keys($forums_obj) as $key) {
$forums_structured[$forums_obj[$key]->getVar("cat_id")][$key] =& $forums_obj[$key];
@@ -923,7 +922,7 @@
if (!is_array($tags) || count($tags)==0) $tags = array("forum_id", "parent_forum", "forum_name", "forum_order", "cat_id");
$forums_obj =& $this->getByPermission($cat_id, $perm_string, $tags);
- require_once(dirname(__FILE__) . "/tree.php");
+ require_once(__DIR__ . "/tree.php");
$forums_structured = array();
foreach (array_keys($forums_obj) as $key) {
$forum_obj =& $forums_obj[$key];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/icon.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/icon.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/icon.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,7 +10,7 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
/**
* Set forum image
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/moderate.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/moderate.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/moderate.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,7 +10,7 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
/**
* A handler for User moderation management
@@ -85,7 +85,7 @@
$ip = empty($ip) ? newbb_getIP(true) : $ip;
if (!empty($ip)) {
$ip_segs = explode(".", $ip);
- for ($i = 1 ; $i <= 4; $i++) {
+ for ($i = 1 ; $i <= 4; ++$i) {
$ips[] = $this->db->quoteString(implode(".", array_slice($ip_segs, 0, $i)));
}
$ip_criteria = "ip IN(".implode(",", $ips).")";
@@ -128,7 +128,7 @@
$uid_criteria = empty($uid) ? "uid=0" : "uid=" . intval($uid); // irmtfan - uid=0 for anons
if (!empty($ip)) {
$ip_segs = explode(".", $ip);
- for ($i = 1; $i <= 4; $i++) {
+ for ($i = 1; $i <= 4; ++$i) {
$ips[] = $this->db->quoteString(implode(".", array_slice($ip_segs, 0, $i)));
}
$ip_criteria = "ip IN(".implode(",", $ips).")";
@@ -167,7 +167,7 @@
} else {
$ip_segs = explode(".", $item);
$segs = min(count($ip_segs), 4);
- for ($i = 1; $i <= $segs; $i++) {
+ for ($i = 1; $i <= $segs; ++$i) {
$ips[] = $this->db->quoteString(implode(".", array_slice($ip_segs, 0, $i)));
}
$criteria = "ip IN(".implode(",", $ips).")";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/newbbtree.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/newbbtree.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/newbbtree.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -29,7 +29,7 @@
// Project: Article Project //
// ------------------------------------------------------------------------ //
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
include_once XOOPS_ROOT_PATH . "/class/xoopstree.php";
class NewBBTree extends XoopsTree
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/online.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/online.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/online.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,7 +10,7 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
@@ -89,14 +89,14 @@
$num_user = 0;
$users_id = array();
$users_online = array();
- for ($i = 0; $i < $num_total; $i++) {
+ for ($i = 0; $i < $num_total; ++$i) {
if (empty($users[$i]['online_uid'])) continue;
$users_id[] = $users[$i]['online_uid'];
$users_online[$users[$i]['online_uid']] = array(
"link" => XOOPS_URL . "/userinfo.php?uid=" . $users[$i]['online_uid'],
"uname" => $users[$i]['online_uname'],
);
- $num_user ++;
+ ++$num_user;
}
$num_anonymous = $num_total - $num_user;
$online = array();
@@ -147,14 +147,14 @@
$num_user = 0;
$users_id = array();
$users_online = array();
- for ($i = 0; $i < $num_total; $i++) {
+ for ($i = 0; $i < $num_total; ++$i) {
if (empty($users[$i]['online_uid'])) continue;
$users_id[] = $users[$i]['online_uid'];
$users_online[$users[$i]['online_uid']] = array(
"link" => XOOPS_URL . "/userinfo.php?uid=" . $users[$i]['online_uid'],
"uname" => $users[$i]['online_uname'],
);
- $num_user ++;
+ ++$num_user;
}
$num_anonymous = $num_total - $num_user;
$online = array();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.category.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.category.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,9 +10,9 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
-//defined("NEWBB_HANDLER_PERMISSION") || include dirname(__FILE__).'/permission.php';
+//defined("NEWBB_HANDLER_PERMISSION") || include __DIR__.'/permission.php';
//define("NEWBB_HANDLER_PERMISSION_CATEGORY", 1);
class NewbbPermissionCategoryHandler extends NewbbPermissionHandler
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.forum.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.forum.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.forum.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,9 +10,9 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
-//defined("NEWBB_HANDLER_PERMISSION") || include dirname(__FILE__).'/permission.php';
+//defined("NEWBB_HANDLER_PERMISSION") || include __DIR__.'/permission.php';
//define("NEWBB_HANDLER_PERMISSION_FORUM", 1);
if ( defined('FORUM_PERM_ITEMS') && class_exists("NewbbForumPermissionHandler") ) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/permission.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -10,7 +10,7 @@
* @package module::newbb
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
define("NEWBB_HANDLER_PERMISSION", 1);
@@ -38,7 +38,7 @@
function &_loadHandler($name) {
if ( !isset($this->_handler[$name]) ) {
- require_once dirname(__FILE__)."/permission.{$name}.php";
+ require_once __DIR__."/permission.{$name}.php";
$className = "NewbbPermission".ucfirst($name)."Handler";
$this->_handler[$name] = new $className($this->db);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/plugin/userlog.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/plugin/userlog.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/plugin/userlog.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
class NewbbUserlogPlugin extends Userlog_Module_Plugin_Abstract implements UserlogPluginInterface
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/post.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/post.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/post.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -29,7 +29,7 @@
// Project: Article Project //
// ------------------------------------------------------------------------ //
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
newbb_load_object();
@@ -370,7 +370,7 @@
$uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $post_NO ++;
+ ++$post_NO;
if (strtolower($order) == "desc") $post_no = $total_posts - ($start + $post_NO) + 1;
else $post_no = $start + $post_NO;
@@ -496,7 +496,7 @@
$thread_action = array();
// irmtfan add pdf permission
- if (file_exists(XOOPS_ROOT_PATH."/Frameworks/tcpdf/tcpdf.php") && $topic_handler->getPermission($forum_id, $topic_status, "pdf") ) {
+ if (file_exists(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php') && $topic_handler->getPermission($forum_id, $topic_status, "pdf") ) {
$thread_action['pdf']['image'] = newbb_displayImage('pdf', _MD_PDF);
$thread_action['pdf']['link'] = XOOPS_URL."/modules/newbb/makepdf.php?type=post&pageid=0";
$thread_action['pdf']['name'] = _MD_PDF;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/rate.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/rate.php 2015-02-18 14:52:02 UTC (rev 12990)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/class/rate.php 2015-02-18 15:24:25 UTC (rev 12991)
@@ -29,7 +29,7 @@
// Project: Article Project //
// ------------------------------------------------------------------------ //
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
newbb_load_object();
Modified: XoopsModules/modulepacks/...
[truncated message content] |
