Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10102] XoopsModules/newbb/branches/irmtfan/newbb
|
From: <ir...@us...> - 2012-08-25 12:17:36
|
Revision: 10102
http://xoops.svn.sourceforge.net/xoops/?rev=10102&view=rev
Author: irmtfan
Date: 2012-08-25 12:17:27 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_digest.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_prune.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_reorder.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_groupmod.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_header.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_type_manager.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_votedata.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/index.php
XoopsModules/newbb/branches/irmtfan/newbb/admin/menu.php
XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block_tag.php
XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php
XoopsModules/newbb/branches/irmtfan/newbb/class/newbbtree.php
XoopsModules/newbb/branches/irmtfan/newbb/class/permission.forum.php
XoopsModules/newbb/branches/irmtfan/newbb/class/permission.php
XoopsModules/newbb/branches/irmtfan/newbb/class/post.php
XoopsModules/newbb/branches/irmtfan/newbb/class/rate.php
XoopsModules/newbb/branches/irmtfan/newbb/class/read.php
XoopsModules/newbb/branches/irmtfan/newbb/class/readforum.php
XoopsModules/newbb/branches/irmtfan/newbb/class/readtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/class/tree.php
XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
XoopsModules/newbb/branches/irmtfan/newbb/class/xoopsformloader.php
XoopsModules/newbb/branches/irmtfan/newbb/docs/changelog.txt
XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
XoopsModules/newbb/branches/irmtfan/newbb/include/form.forum.php
XoopsModules/newbb/branches/irmtfan/newbb/include/form.post.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.image.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.ini.php
XoopsModules/newbb/branches/irmtfan/newbb/include/functions.user.php
XoopsModules/newbb/branches/irmtfan/newbb/include/module.php
XoopsModules/newbb/branches/irmtfan/newbb/include/module.v100.php
XoopsModules/newbb/branches/irmtfan/newbb/include/module.v220.php
XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php
XoopsModules/newbb/branches/irmtfan/newbb/include/plugin.php
XoopsModules/newbb/branches/irmtfan/newbb/include/search.inc.php
XoopsModules/newbb/branches/irmtfan/newbb/include/sitemap.plugin.php
XoopsModules/newbb/branches/irmtfan/newbb/index.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/german/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/german/blocks.php
XoopsModules/newbb/branches/irmtfan/newbb/language/german/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/german/modinfo.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
XoopsModules/newbb/branches/irmtfan/newbb/notification_update.php
XoopsModules/newbb/branches/irmtfan/newbb/post.php
XoopsModules/newbb/branches/irmtfan/newbb/ratethread.php
XoopsModules/newbb/branches/irmtfan/newbb/reply.php
XoopsModules/newbb/branches/irmtfan/newbb/report.php
XoopsModules/newbb/branches/irmtfan/newbb/rss.php
XoopsModules/newbb/branches/irmtfan/newbb/search.php
XoopsModules/newbb/branches/irmtfan/newbb/seo.php
XoopsModules/newbb/branches/irmtfan/newbb/sql/mysql.400.sql
XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_online.html
XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/votepolls.php
XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10095.txt
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/mime/index.html
XoopsModules/newbb/branches/irmtfan/newbb/templates/images/rpg/index.html
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/about.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: about.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: about.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_blocks.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_blocks.php,v 1.1.1.1 2005/10/19 15:58:11 phppp Exp $
+// $Id: admin_blocks.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_cat_manager.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_cat_manager.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_cat_manager.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_digest.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_digest.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_digest.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_digest.php,v 1.1.1.1 2005/10/19 15:58:11 phppp Exp $
+// $Id: admin_digest.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_manager.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_manager.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_manager.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_forum_manager.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_prune.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_prune.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_prune.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_prune.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_forum_prune.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_reorder.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_reorder.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_forum_reorder.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_reorder.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_forum_reorder.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_groupmod.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_groupmod.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_groupmod.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -96,4 +96,4 @@
echo "</form></fieldset>";
echo "</fieldset>";
xoops_cp_footer();
-?>
+?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_header.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_header.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_header.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_header.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_header.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_permissions.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_permissions.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_permissions.php,v 1.1.1.1 2005/10/19 15:58:12 phppp Exp $
+// $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/irmtfan/newbb/admin/admin_report.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_report.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_report.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_report.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_synchronization.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
* @since 4.00
- * @version $Id$
+ * @version $Id: admin_synchronization.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb
*/
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_type_manager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_type_manager.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_type_manager.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
* @since 4.00
- * @version $Id$
+ * @version $Id: admin_type_manager.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb
*/
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_votedata.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_votedata.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/admin_votedata.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_votedata.php,v 1.1.1.1 2005/10/19 15:58:12 phppp Exp $
+// $Id: admin_votedata.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/index.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/index.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: index.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: index.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -151,6 +151,17 @@
$xoopspoll = &$module_handler->getByDirname('umfrage');
if (is_object($xoopspoll)) $isOK = $xoopspoll->getVar('isactive');
}
+
+ $memlimit_iniphp = return_bytes( @ini_get('memory_limit') );
+ $postmaxsize_iniphp = return_bytes( @ini_get('post_max_size') );
+ if ( $postmaxsize_iniphp < $memlimit_iniphp ) {
+ $uploadlimit = sprintf(_AM_NEWBB_MEMLIMITOK,return_bytes( $postmaxsize_iniphp, true ) );
+ $uploadfarbe = 'Green';
+ } else {
+ $uploadlimit = _AM_NEWBB_MEMLIMITTOLARGE;
+ $uploadfarbe = 'Red';
+ }
+
if ($newXoopsModuleGui) {
$indexAdmin->addInfoBox(_AM_NEWBB_PREFERENCES) ;
@@ -159,6 +170,7 @@
$indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" .'NetPBM'.': %s'."</infotext>", array_key_exists('netpbm',$imageLibs) ? _AM_NEWBB_AUTODETECTED.$imageLibs['netpbm'] :_AM_NEWBB_NOTAVAILABLE, 'Green') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" ._AM_NEWBB_GDLIB1.' %s'. "</infotext>", array_key_exists('gd1',$imageLibs) ? _AM_NEWBB_AUTODETECTED.$imageLibs['gd1'] :_AM_NEWBB_NOTAVAILABLE, 'Red') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" ._AM_NEWBB_GDLIB2.' %s'. "</infotext>", array_key_exists('gd2',$imageLibs) ? _AM_NEWBB_AUTODETECTED.$imageLibs['gd2'] :_AM_NEWBB_NOTAVAILABLE, 'Green' ) ;
+ $indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" ._AM_NEWBB_UPLOAD.' %s'. "</infotext>", $uploadlimit ,$uploadfarbe ) ;
$indexAdmin->addInfoBox(_AM_NEWBB_BOARDSUMMARY) ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_BOARDSUMMARY, "<infolabel>" ._AM_NEWBB_TOTALTOPICS.': %s' . "</infolabel>", get_total_topics(), 'Green') ;
@@ -358,4 +370,21 @@
}
mod_clearCacheFile("config","newbb");
mod_clearCacheFile("permission","newbb");
+
+function return_bytes ($size_str, $b=false)
+{
+ if ($b == false) {
+ switch (substr ($size_str, -1))
+ {
+ case 'M': case 'm': return (int)$size_str * 1048576;
+ case 'K': case 'k': return (int)$size_str * 1024;
+ case 'G': case 'g': return (int)$size_str * 1073741824;
+ default: return $size_str;
+ }
+ } else {
+ $base = log($size_str) / log(1024);
+ $suffix = array("", "KB", "MB", "GB", "TB");
+ return pow(1024, $base - floor($base)) . ' ' . $suffix[floor($base)];
+ }
+}
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/admin/menu.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/admin/menu.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/admin/menu.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: menu.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,5 +1,5 @@
<?php
-// $Id: newbb_block.php,v 1.1.1.2 2005/10/19 16:23:31 phppp Exp $
+// $Id: newbb_block.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -54,7 +54,7 @@
global $xoopsConfig;
global $access_forums;
global $xoopsLogger;
-
+
mod_loadFunctions("time", "newbb");
$myts =& MyTextSanitizer::getInstance();
@@ -95,7 +95,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
$query = 'SELECT'.
@@ -166,8 +166,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
$topic['seo_forum_url'] = seo_urls($seo_forum_url);
@@ -179,11 +179,11 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
$block['seo_top_alltopics'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -203,7 +203,6 @@
{
global $xoopsConfig;
global $access_forums;
-
mod_loadFunctions("time", "newbb");
$myts = MyTextSanitizer::getInstance();
$block = array();
@@ -243,7 +242,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
if (!isset($access_forums)) {
@@ -322,8 +321,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -336,9 +335,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -394,7 +393,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
if (!empty($options[6])) {
@@ -475,8 +474,8 @@
$topic['post_text'] = $post_text;
}
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -490,9 +489,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
Modified: XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block_tag.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block_tag.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/blocks/newbb_block_tag.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
* @since 4.00
- * @version $Id$
+ * @version $Id: newbb_block_tag.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb/tag
*/
Added: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10095.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10095.txt (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10095.txt 2012-08-25 12:17:27 UTC (rev 10102)
@@ -0,0 +1,40 @@
+date: 2012-08-25
+================================================
+1- Extra new lines removed from php files.
+newbb/votepolls.php, newbb/include/notification.inc.php, newbb/class/permission.forum.php, newbb/admin/admin_groupmod.php
+
+2- Apply Alfred Id in the head of php files:
+newbb/class/xoopsformloader.php, newbb/votepolls.php, newbb/class/tree.php, newbb/topicmanager.php, newbb/class/readtopic.php
+newbb/class/readforum.php, newbb/class/read.php, newbb/ratethread.php, newbb/class/rate.php, newbb/class/newbbtree.php
+newbb/blocks/newbb_block_tag.php, newbb/index.php, newbb/admin/*.php,
+newbb/include/sitemap.plugin.php, newbb/include/search.inc.php, newbb/include/notification.inc.php, newbb/include/functions.user.php,
+newbb/include/module.v100.php, newbb/include/module.v220.php, newbb/include/module.php, newbb/include/functions.ini.php
+newbb/include/form.forum.php,
+newbb/notification_update.php, newbb/report.php, newbb/reply.php
+
+3- Change the status of module to RC4.
+newbb/xoops_version.php
+
+4- Solve SEO (replace files from Alfred)
+newbb/viewpost.php, newbb/viewtopic.php, newbb/blocks/newbb_block.php
+
+5- Add do_latestedit config to display the latest edit (do_latestedit=0) or all edit (do_latestedit=1) by Alfred
+newbb/class/post.php, newbb/include/plugin.php
+
+6- Replace files from Alfred (better code, bug fixes, merge and develop):
+newbb/class/permission.php, newbb/class/forum.php, newbb/sql/mysql.400.sql, newbb/rss.php, newbb/admin/admin_permissions.php
+newbb/include/functions.image.php, newbb/include/form.post.php, newbb/viewforum.php
+newbb/seo.php, newbb/post.php, newbb/search.php, newbb/docs/changelog.txt, newbb/language/german/*.php
+
+7- Add new language definitions.
+newbb/language/english/admin.php, newbb/language/english/main.php, newbb/language/persian/admin.php, newbb/language/persian/main.php,
+newbb/docs/lang_diff.txt
+
+8- Fix Undefined variable: pseudo_height (Cesag/irmtfan)
+in newbb/include/functions.image.php line 86
+
+9- Change the default syncOnUpdate value to false. It is dangerous because it will delete all pending and deleted posts/topics/forums from database on update.
+newbb/include/plugin.php
+
+10- easier group getting - reduce queries - use Xoops API instead of directly access to db (irmtfan)
+newbb/class/user.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php 2012-08-25 11:05:56 UTC (rev 10101)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/forum.php 2012-08-25 12:17:27 UTC (rev 10102)
@@ -1,909 +1,907 @@
-<?php
-/**
- * Newbb module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package newbb
- * @since 4.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id: forum.php 2169 2008-09-23 13:37:10Z phppp $
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- exit();
-}
-
-class Forum extends XoopsObject
-{
-
- function Forum()
- {
- $this->__construct();
- }
-
-
- function __construct()
- {
- $this->XoopsObject();
- $this->initVar('forum_id', XOBJ_DTYPE_INT);
- $this->initVar('forum_name', XOBJ_DTYPE_TXTBOX);
- $this->initVar('forum_desc', XOBJ_DTYPE_TXTBOX);
- $this->initVar('forum_moderator', XOBJ_DTYPE_ARRAY, serialize(array()));
- $this->initVar('forum_topics', XOBJ_DTYPE_INT);
- $this->initVar('forum_posts', XOBJ_DTYPE_INT);
- $this->initVar('forum_last_post_id', XOBJ_DTYPE_INT);
- $this->initVar('cat_id', XOBJ_DTYPE_INT);
- $this->initVar('parent_forum', XOBJ_DTYPE_INT);
- $this->initVar('hot_threshold', XOBJ_DTYPE_INT, 20);
- $this->initVar('attach_maxkb', XOBJ_DTYPE_INT, 500);
- $this->initVar('attach_ext', XOBJ_DTYPE_SOURCE, "zip|jpg|gif|png");
- $this->initVar('forum_order', XOBJ_DTYPE_INT, 99);
- $this->initVar("dohtml", XOBJ_DTYPE_INT, 1);
- }
-
- function disp_forumModerators()
- {
- global $xoopsModuleConfig;
-
- $ret = "";
- if (!$valid_moderators = $this->getVar("forum_moderator")) {
- return $ret;
- }
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.user.php";
- $moderators = newbb_getUnameFromIds($valid_moderators, !empty($xoopsModuleConfig['show_realname']), true);
- $ret = implode(", ", $moderators);
- return $ret;
- }
-}
-
-class NewbbForumHandler extends XoopsPersistableObjectHandler
-{
-
- function __construct(&$db)
- {
- parent::__construct($db, "bb_forums", 'Forum', 'forum_id', 'forum_name');
- }
-
- function NewbbForumHandler(&$db)
- {
- $this->__construct($db);
- }
-
-
- function insert($forum)
- {
- if (!parent::insert($forum, true)) {
- return false;
- }
-
- if ($forum->isNew()) {
- $this->applyPermissionTemplate($forum);
- }
-
- return $forum->getVar('forum_id');
- }
-
- function delete(&$forum)
- {
- global $xoopsModule;
- // RMV-NOTIFY
- xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'forum', $forum->getVar('forum_id'));
- // Get list of all topics in forum, to delete them too
- $topic_handler =& xoops_getmodulehandler('topic', 'newbb');
- $topic_handler->deleteAll(new Criteria("forum_id", $forum->getVar('forum_id')), true, true);
- $this->updateAll("parent_forum", $forum->getVar('parent_forum'), new Criteria("parent_forum", $forum->getVar('forum_id')));
- $this->deletePermission($forum);
- return parent::delete($forum);
- }
-
- function getIdsByPermission($perm = "access")
- {
- $perm_handler = xoops_getmodulehandler('permission', 'newbb');
- return $perm_handler->getForums($perm);
- }
-
- function &getByPermission($cat = 0, $permission = "access", $tags = null, $asObject = true)
- {
- $_cachedForums = array();
- if ( !$valid_ids = $this->getIdsByPermission($permission) ) {
- return $_cachedForums;
- }
-
- $criteria = new CriteriaCompo( new Criteria("forum_id", "(" . implode(", ", $valid_ids) . ")", "IN") );
- if (is_numeric($cat) && $cat> 0) {
- $criteria->add(new Criteria("cat_id", intval($cat)));
- } elseif (is_array($cat) && count($cat) >0) {
- $criteria->add(new Criteria("cat_id", "(" . implode(", ", $cat) . ")", "IN"));
- }
- $criteria->setSort("forum_order");
- $criteria->setOrder("ASC");
- $_cachedForums =& $this->getAll($criteria, $tags, $asObject);
- return $_cachedForums;
- }
-
- function &getForumsByCategory($categoryid = 0, $permission = "", $asObject = true, $tags = null)
- {
- $forums =& $this->getByPermission($categoryid, $permission, $tags);
- if ($asObject) return $forums;
-
- $forums_array = array();
- $array_cat=array();
- $array_forum=array();
- if (!is_array($forums)) return array();
- foreach (array_keys($forums) as $forumid) {
- $forum =& $forums[$forumid];
- $forums_array[$forum->getVar('parent_forum')][$forumid] = array(
- 'cid' => $forum->getVar('cat_id'),
- 'title' => $forum->getVar('forum_name')
- );
- }
- if (!isset($forums_array[0])) {
- $ret = array();
- return $ret;
- }
- foreach ($forums_array[0] as $key => $forum) {
- if (isset($forums_array[$key])) {
- $forum['sub'] = $forums_array[$key];
- }
- $array_forum[$forum['cid']][$key] = $forum;
- }
- ksort($array_forum);
- unset($forums);
- unset($forums_array);
- return $array_forum;
- }
-
- function getAllTopics(&$forum, $criteria = null)
- {
- global $xoopsModule, $xoopsConfig, $xoopsModuleConfig, $myts, $xoopsUser, $viewall_forums;
-
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.render.php";
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.session.php";
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.time.php";
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.read.php";
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.topic.php";
-
- $criteria_vars = array("startdate", "start", "sort", "order", "type", "status", "excerpt");
- foreach ($criteria_vars as $var) {
- ${$var} = $criteria[$var];
- }
-
- $topic_lastread = newbb_getcookie('LT', true);
-
- if (is_object($forum)) {
- $criteria_forum = ' AND t.forum_id = ' . $forum->getVar('forum_id');
- $hot_threshold = $forum->getVar('hot_threshold');
- } else {
- $hot_threshold = 10;
- if (is_array($forum) && count($forum) > 0) {
- $criteria_forum = ' AND t.forum_id IN (' . implode(',', array_keys($forum)) . ')';
- } elseif (!empty($forum)) {
- $criteria_forum = ' AND t.forum_id =' . intval($forum);
- } else {
- $criteria_forum = '';
- }
- }
-
- $criteria_post = ($startdate) ? ' p.post_time > ' . $startdate : " 1 = 1 ";
- $criteria_topic = empty($type) ? '' : " AND t.type_id={$type}";
- $criteria_extra = '';
- $criteria_approve = ' AND t.approved = 1';
- $post_on = ' p.post_id = t.topic_last_post_id';
- $leftjoin = ' LEFT JOIN ' . $this->db->prefix('bb_posts') . ' p ON p.post_id = t.topic_last_post_id';
- $sort_array = array();
- switch ($status) {
- case 'digest':
- $criteria_extra = ' AND t.topic_digest = 1';
- break;
-
- case 'unreplied':
- $criteria_extra = ' AND t.topic_replies < 1';
- break;
-
- case 'unread':
- if (empty($xoopsModuleConfig["read_mode"])) {
- } elseif ($xoopsModuleConfig["read_mode"] ==2) {
- $leftjoin .= ' LEFT JOIN ' . $this->db->prefix('bb_reads_topic') . ' r ON r.read_item = t.topic_id';
- $criteria_post .= ' AND (r.read_id IS NULL OR r.post_id < t.topic_last_post_id)';
- } elseif ($xoopsModuleConfig["read_mode"] == 1) {
- $topics = array();
- $topic_lastread = newbb_getcookie('LT', true);
- if (count($topic_lastread)>0) {
- foreach ($topic_lastread as $id => $time) {
- if ($time > $time_criterion) $topics[] = $id;
- }
- }
- if (count($topics)>0) {
- $criteria_extra = ' AND t.topic_id NOT IN (' . implode(",", $topics) . ')';
- }
- if ($lastvisit = max($GLOBALS['last_visit'], $startdate)) {
- $criteria_post = ' p.post_time > ' . max($GLOBALS['last_visit'], $startdate);
- }
- }
- break;
-
- case 'pending':
- $post_on = ' p.topic_id = t.topic_id';
- $criteria_post .= ' AND p.pid = 0';
- $criteria_approve = ' AND t.approved = 0';
- break;
-
- case 'deleted':
- $criteria_approve = ' AND t.approved = -1';
- break;
-
- case 'all': // For viewall.php; do not display sticky topics at first
- case 'active': // same as "all"
- break;
-
- default:
- if ($startdate > 0) {
- $criteria_post = ' (p.post_time > ' . $startdate . ' OR t.topic_sticky=1)';
- }
- $sort_array[] = 't.topic_sticky DESC';
- break;
- }
-
- $select = 't.*, ' .
- ' p.post_time as last_post_time, p.poster_name as last_poster_name, p.icon, p.post_id, p.uid';
- $from = $this->db->prefix("bb_topics") . ' t ' . $leftjoin;
- $where = $criteria_post. $criteria_topic. $criteria_forum . $criteria_extra . $criteria_approve;
-
- if ($excerpt) {
- $select .= ', p.post_karma, p.require_reply, pt.post_text';
- $from .= ' LEFT JOIN ' . $this->db->prefix('bb_posts_text') . ' pt ON pt.post_id = t.topic_last_post_id';
- }
- if ($sort == "u.uname") {
- $sort = "t.topic_poster";
- }
-
- $sort_array[] = trim($sort . ' ' . $order);
- $sortby = implode(", ", array_filter($sort_array) );
- if (empty($sortby)) $sortby = 't.topic_last_post_id DESC';
-
-
- $sql = 'SELECT ' . $select .
- ' FROM ' . $from .
- ' WHERE ' . $where .
- ' ORDER BY ' . $sortby;
-
- if (!$result = $this->db->query($sql, $xoopsModuleConfig['topics_per_page'], $start)) {
- redirect_header('index.php', 2, _MD_ERROROCCURED);
- exit();
- }
-
- $sticky = 0;
- $topics = array();
- $posters = array();
- $reads = array();
- $types = array();
-
- $type_handler =& xoops_getmodulehandler('type', 'newbb');
- $typen = $type_handler->getByForum($forum->getVar('forum_id'));
- while ($myrow = $this->db->fetchArray($result)) {
-
- if ($myrow['topic_sticky']) {
- $sticky++;
- }
-
- // ------------------------------------------------------
- // topic_icon: priority: sticky -> digest -> regular
-
- if ($myrow['topic_haspoll']) {
- if ($myrow['topic_sticky']) {
- $topic_icon = newbb_displayImage('topic_sticky', _MD_TOPICSTICKY) . '<br />' . newbb_displayImage('poll', _MD_TOPICHASPOLL);
- } else {
- $topic_icon = newbb_displayImage('poll', _MD_TOPICHASPOLL);
- }
- } elseif ($myrow['topic_sticky']) {
- $topic_icon = newbb_displayImage('topic_sticky', _MD_TOPICSTICKY);
- } elseif (!empty($myrow['icon'])) {
- $topic_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($myrow['icon']) . '" alt="" />';
- } else {
- $topic_icon = '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
- }
-
- // ------------------------------------------------------
- // rating_img
- $rating = number_format($myrow['rating'] / 2, 0);
- $rating_img = newbb_displayImage( ($rating < 1) ? 'blank' : 'rate' . $rating );
-
- // ------------------------------------------------------
- // topic_page_jump
- $topic_page_jump = '';
- $topic_page_jump_icon = '';
- $totalpages = ceil(($myrow['topic_replies'] + 1) / $xoopsModuleConfig['posts_per_page']);
- if ($totalpages > 1) {
- $topic_page_jump .= ' ';
- $append = false;
- for ($i = 1; $i <= $totalpages; $i++) {
- if ($i > 3 && $i < $totalpages) {
- if (!$append) {
- $topic_page_jump .= "...";
- $append = true;
- }
- } else {
- $topic_page_jump .= '[<a href="' . XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'] . '&start=' . (($i - 1) * $xoopsModuleConfig['posts_per_page']) . '">' . $i . '</a>]';
- $topic_page_jump_icon = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $myrow['post_id'] . "&start=" . (($i - 1) * $xoopsModuleConfig['posts_per_page']) . "'>" . newbb_displayImage('lastposticon',_MD_NEWBB_GOTOLASTPOST) . "</a>";
- }
- }
- }
- else {
- $topic_page_jump_icon = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $myrow['post_id'] . "'>" . newbb_displayImage('lastposticon',_MD_NEWBB_GOTOLASTPOST) . "</a>";
- }
-
- // ------------------------------------------------------
- // => topic array
- if (!empty($viewall_forums[$myrow['forum_id']])) {
- $forum_link = '<a href="' . XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $myrow['forum_id'] . '">' . $viewall_forums[$myrow['forum_id']]['forum_name'] . '</a>';
- } else {
- $forum_link = '';
- }
-
- $topic_title = $myts->htmlSpecialChars( $myrow['topic_title'] );
- if ($myrow['type_id'] > 0) {
- $topic_title = '<font color="'.$typen[$myrow["type_id"]]["type_color"].'">['.$typen[$myrow["type_id"]]["type_name"].']</font> '.$topic_title.'';
- }
- if ($myrow['topic_digest']) {
- $topic_title = "<span class='digest'>" . $topic_title . "</span>";
- }
-
- if ( $excerpt == 0 ) {
- $topic_excerpt = "";
- } elseif ( ($myrow['post_karma'] > 0 || $myrow['require_reply'] > 0) && !newbb_isAdmin($forum) ) {
- $topic_excerpt = "";
- } else {
- $topic_excerpt = xoops_substr(newbb_html2text($myts->displayTarea($myrow['post_text'])), 0, $excerpt);
- $topic_excerpt = str_replace("[", "[", $myts->htmlSpecialChars($topic_excerpt));
- }
-
- /* users */
- $posters[$myrow['topic_poster']] = 1;
- $posters[$myrow['uid']] = 1;
- // reads
- if (!empty($xoopsModuleConfig["read_mode"])) {
- $reads[$myrow['topic_id']] = ($xoopsModuleConfig["read_mode"] == 1) ? $myrow['last_post_time'] : $myrow["topic_last_post_id"];
- }
-
- $topic_poster = newbb_getUnameFromId($myrow['topic_poster'], $xoopsModuleConfig['show_realname'], true);
- $topic_last_poster = newbb_getUnameFromId($myrow['uid'], $xoopsModuleConfig['show_realname'], true);
- $topic_isRead = newbb_isRead("topic", $reads);
-
- $topic_prefix = (!empty($typen[$myrow['type_id']])) ? getTopicTitle("", $typen[$myrow['type_id']]["type_name"], $typen[$myrow['type_id']]["type_color"]) : "";
-
- // ------------------------------------------------------
- // topic_folder: priority: newhot -> hot/new -> regular
- if ($myrow['topic_status'] == 1) {
- $topic_folder = 'topic_locked';
- $topic_folder_text = _MD_TOPICLOCKED;
- } else {
- if ($myrow['topic_digest']) {
- $topic_folder = 'topic_digest';
- $topic_folder_text = _MD_TOPICDIGEST;
- } elseif ($myrow['topic_replies'] >= $hot_threshold) {
- $topic_folder = empty($topic_isRead[$myrow['topic_id']]) ? 'topic_hot_new' : 'topic_hot';
- $topic_folder_text = empty($topic_isRead[$myrow['topic_id']]) ? _MD_MORETHAN : _MD_MORETHAN2;
- } else {
- $topic_folder = empty($topic_isRead[$myrow['topic_id']]) ? 'topic_new' : 'topic';
- $topic_folder_text = empty($topic_isRead[$myrow['topic_id']]) ? _MD_NEWPOSTS : _MD_NONEWPOSTS;
- }
- }
-
-
- $topics[$myrow['topic_id']] = array(
- 'topic_id' => $myrow['topic_id'],
- 'topic_icon' => $topic_icon,
- 'type_id' => $myrow['type_id'],
- 'type_text' => $topic_prefix,
- 'topic_title' => $topic_title,
- //'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
- 'topic_link' => 'viewtopic.php?topic_id=' . $myrow['topic_id'],
- 'rating_img' => $rating_img,
- 'topic_page_jump' => $topic_page_jump,
- 'topic_page_jump_icon' => $topic_page_jump_icon,
- 'topic_replies' => $myrow['topic_replies'],
- 'topic_poster_uid' => $myrow['topic_poster'],
- 'topic_poster_name' => $myts->htmlSpecialChars( ($myrow['poster_name']) ? $myrow['poster_name'] : $xoopsConfig['anonymous'] ),
- 'topic_views' => $myrow['topic_views'],
- 'topic_time' => newbb_formatTimestamp($myrow['topic_time']),
- 'topic_last_posttime' => newbb_formatTimestamp($myrow['last_post_time']),
- 'topic_last_poster_uid' => $myrow['uid'],
- 'topic_last_poster_name' => $myts->htmlSpecialChars( ($myrow['last_poster_name']) ? $myrow['last_poster_name'] : $xoopsConfig['anonymous'] ),
- 'topic_forum_link' => $forum_link,
- 'topic_excerpt' => $topic_excerpt,
- 'stick' => empty($myrow['topic_sticky']),
- //"stats" => array($myrow['topic_status'], $myrow['topic_digest'], $myrow['topic_replies']),
- "topic_poster" => $topic_poster,
- "topic_last_poster" => $topic_last_poster,
- "topic_folder" => newbb_displayImage($topic_folder,$topic_folder_text),
- );
-
-
- }
-
- if ( count($topics) > 0) {
- $sql = " SELECT DISTINCT topic_id FROM " . $this->db->prefix("bb_posts").
- " WHERE attachment != ''" .
- " AND topic_id IN (" . implode(',', array_keys($topics)) . ")";
- if ($result = $this->db->query($sql)) {
- while (list($topic_id) = $this->db->fetchRow($result)) {
- $topics[$topic_id]['attachment'] = ' ' . newbb_displayImage('attachment', _MD_TOPICSHASATT);
- }
- }
- }
- return array($topics, $sticky);
- }
-
- function getTopicCount(&$forum, $startdate, $type)
- {
- global $xoopsModuleConfig;
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.session.php";
-
- $criteria_extra = '';
- $criteria_approve = ' AND t.approved = 1'; // any others?
- $leftjoin = ' LEFT JOIN ' . $this->db->prefix('bb_posts') . ' p ON p.post_id = t.topic_last_post_id';
- $criteria_post = ' p.post_time > ' . $startdate;
- switch ($type) {
- case 'digest':
- $criteria_extra = ' AND topic_digest = 1';
- break;
- case 'unreplied':
- $criteria_extra = ' AND topic_replies < 1';
- break;
- case 'unread':
- if (empty($xoopsModuleConfig["read_mode"])) {
- } elseif ($xoopsModuleConfig["read_mode"] ==2) {
- $leftjoin .= ' LEFT JOIN ' . $this->db->prefix('bb_reads_topic') . ' r ON r.read_item = t.topic_id';
- $criteria_post .= ' AND (r.read_id IS NULL OR r.post_id < t.topic_last_post_id)';
- } elseif ($xoopsModuleConfig["read_mode"] == 1) {
- $criteria_post = ' p.post_time > ' . max($GLOBALS['last_visit'], $startdate);
- $topics = array();
- $topic_lastread = newbb_getcookie('LT', true);
- if (count($topic_lastread)>0) foreach ($topic_lastread as $id=>$time) {
- if ($time > $time_criterion) $topics[] = $id;
- }
- if (count($topics)>0) {
- $criteria_extra = ' AND t.topic_id NOT IN (' . implode(",", $topics) . ')';
- }
- }
- break;
- case 'pending':
- $criteria_approve = ' AND t.approved = 0';
- break;
- case 'deleted':
- $criteria_approve = ' AND t.approved = -1';
- break;
- case 'all':
- break;
- default:
- $criteria_post = ' (p.post_time > ' . $startdate . ' OR t.topic_sticky=1)';
- break;
- }
- if (is_object($forum)) {
- $criteria_forum = ' AND t.forum_id = ' . $forum->getVar('forum_id');
- } else {
- if (is_array($forum) && count($forum) > 0) {
- $criteria_forum = ' AND t.forum_id IN (' . implode(',', array_keys($forum)) . ')';
- } elseif (!empty($forum)) {
- $criteria_forum = ' AND t.forum_id =' . intval($forum);
- } else {
- $criteria_forum = '';
- }
- }
-
- $sql = 'SELECT COUNT(*) as count FROM ' . $this->db->prefix("bb_topics") . ' t ' . $leftjoin;
- $sql .= ' WHERE ' . $criteria_post . $criteria_forum . $criteria_extra . $criteria_approve;
- if (!$result = $this->db->query($sql)) {
- //xoops_error($this->db->error().'<br />'.$sql);
- return null;
- }
- $myrow = $this->db->fetchArray($result);
- $count = $myrow['count'];
- return $count;
- }
-
- // get permission
- function getPermission($forum, $type = "access", $checkCategory = true)
- {
- global $xoopsUser, $xoopsModule;
- static $_cachedPerms;
-
- if ($type == "all") return true;
- if ($GLOBALS["xoopsUserIsAdmin"] && $xoopsModule->getVar("dirname") == "newbb") {
- return true;
- }
-
- if (!is_object($forum)) $forum =& $this->get($forum);
-
- if (!empty($checkCategory)) {
- $category_handler =& xoops_getmodulehandler('category', 'newbb');
- $categoryPerm = $category_handler->getPermission($forum->getVar('cat_id'));
- if (!$categoryPerm) return false;
- }
-
- $type = strtolower($type);
- if ("moderate" == $type) {
- require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.user.php";
- $permission = newbb_isModerator($forum);
- } else {
- $forum_id = $forum->getVar('forum_id');
- $perm_handler =& xoops_getmodulehandler('permission', 'newbb');
- $permission = $perm_handler->getPermission("forum", $type, $forum_id);
- }
- return $permission;
- }
-
- function deletePermission(&$forum)
- {
- $perm_handler =& xoops_getmodulehandler('permission', 'newbb');
- return $perm_handler->deleteByForum($forum->getVar("forum_id"));
- }
-
- function applyPermissionTemplate(&$forum)
- {
- $perm_handler =& xoops_getmodulehandler('permission', 'newbb');
- return $perm_handler->applyTemplate($forum->getVar("forum_id"));
- }
-
- /*
- function isForum($forum)
- {
- $count = false;
- $sql = 'SELECT COUNT(*) as count FROM ' . $this->db->prefix("bb_forums");
- $sql .= ' WHERE forum_id=' . $forum ;
- if ($result = $this->db->query($sql)) {
- $myrow = $this->db->fetchArray($result);
- $count = $myrow['count'];
- }
- return $count;
- }
- */
-
- /**
- * clean orphan items from database
- *
- * @return bool true on success
- */
- function cleanOrphan()
- {
- parent::cleanOrphan($this->db->prefix("bb_categories"), "cat_id");
-
- if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
- /*
- $sql = "DELETE FROM ".$this->table.
- " WHERE (parent_forum >0 AND parent_forum NOT IN ( SELECT DISTINCT forum_id FROM ".$this->table.") )";
- */
- $sql = " DELETE {$this->table} FROM {$this->table}" .
- " LEFT JOIN {$this->table} AS aa ON {$this->table}.parent_forum = aa.forum_id ".
- " WHERE {$this->table}.parent_forum>0 AND (aa.forum_id IS NULL)";
- if (!$result = $this->db->queryF($sql)):
- //xoops_error("cleanOrphan error:". $sql);
- endif;
- else:
- $this->identifierName = "parent_forum";
- $forum_list = $this->getList(new Criteria("parent_forum", 0, ">"));
- $this->identifierName = "forum_name";
- if ($parent_forums = @array_values($forum_list)) {
- $parent_list = $this->getIds(new Criteria("forum_id", "(" . implode(", ", $parent_forums) . ")", "IN"));
- foreach ($forum_list as $forum_id => $parent_forum) {
- if (in_array($parent_forum, $parent_list)) continue;
- $forum_obj =& $this->get($forum_id);
- $this->delete($forum_obj);
- unset($forum_obj);
- }
- }
- endif;
- ...
[truncated message content] |
