From: <ir...@us...> - 2012-09-19 10:47:10
|
Revision: 10185 http://xoops.svn.sourceforge.net/xoops/?rev=10185&view=rev Author: irmtfan Date: 2012-09-19 10:47:00 +0000 (Wed, 19 Sep 2012) Log Message: ----------- fix bug: delete child posts first, pagenav select, missing xoops_module_header smarty Modified Paths: -------------- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt XoopsModules/newbb/branches/irmtfan/newbb/class/post.php XoopsModules/newbb/branches/irmtfan/newbb/edit.php XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php XoopsModules/newbb/branches/irmtfan/newbb/post.php XoopsModules/newbb/branches/irmtfan/newbb/reply.php XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-09-19 10:47:00 UTC (rev 10185) @@ -1,3 +1,16 @@ +date 2012-09-19 +=================================== +1- bug fix: in post delete process: wrongly delete parent post before childs but the right way is deleting childs before deleting parent post.(reverse order deleting) +in newbb/class/post.php + +2- bug fix: solve nested forms issue when the pagenav type is select +in newbb/templates/newbb_viewall.html, newbb/templates/newbb_viewforum.html, +newbb/templates/newbb_viewpost.html, newbb/templates/newbb_viewtopic.html + +3- bug fix: xoops_module_header smarty variable is missing. +newbb/edit.php, newbb/newtopic.php, newbb/post.php, newbb/reply.php + + date 2012-09-18 =================================== 1- bug fix: in topic delete process: in view all and view forum: after delete selected topics all topics and their posts will be wrongly deleted from database.(very important) Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/post.php =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/class/post.php 2012-09-19 10:47:00 UTC (rev 10185) @@ -810,7 +810,8 @@ require_once XOOPS_ROOT_PATH . "/class/xoopstree.php"; $mytree = new XoopsTree($this->db->prefix("bb_posts"), "post_id", "pid"); $arr = $mytree->getAllChild($post->getVar('post_id')); - for ($i = 0; $i < count($arr); $i++) { + // irmtfan - delete childs in a reverse order + for ($i = count($arr) - 1; $i >= 0 ; $i--) { $childpost =& $this->create(false); $childpost->assignVars($arr[$i]); $this->_delete($childpost, $force); Modified: XoopsModules/newbb/branches/irmtfan/newbb/edit.php =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-09-19 10:47:00 UTC (rev 10185) @@ -75,7 +75,10 @@ $xoopsOption['template_main'] = 'newbb_edit_post.html'; $xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0; +// irmtfan add xoops_module_header +$xoopsOption['xoops_module_header']= $xoops_module_header; include XOOPS_ROOT_PATH.'/header.php'; +$xoopsTpl->assign('xoops_module_header', $xoops_module_header); /* $xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES))); Modified: XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-09-19 10:47:00 UTC (rev 10185) @@ -50,7 +50,10 @@ $xoopsOption['template_main'] = 'newbb_edit_post.html'; $xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0; // Disable cache +// irmtfan add xoops_module_header +$xoopsOption['xoops_module_header']= $xoops_module_header; include XOOPS_ROOT_PATH.'/header.php'; +$xoopsTpl->assign('xoops_module_header', $xoops_module_header); /* $xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES))); Modified: XoopsModules/newbb/branches/irmtfan/newbb/post.php =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-09-19 10:47:00 UTC (rev 10185) @@ -411,7 +411,10 @@ $xoopsOption['template_main'] = 'newbb_edit_post.html'; $xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0; +// irmtfan add xoops_module_header +$xoopsOption['xoops_module_header']= $xoops_module_header; include XOOPS_ROOT_PATH . "/header.php"; +$xoopsTpl->assign('xoops_module_header', $xoops_module_header); if ( !empty($_POST['contents_upload']) ) { $attachments_tmp = array(); Modified: XoopsModules/newbb/branches/irmtfan/newbb/reply.php =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-09-19 10:47:00 UTC (rev 10185) @@ -86,7 +86,10 @@ $xoopsOption['template_main'] = 'newbb_edit_post.html'; $xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0; +// irmtfan add xoops_module_header +$xoopsOption['xoops_module_header']= $xoops_module_header; include XOOPS_ROOT_PATH.'/header.php'; +$xoopsTpl->assign('xoops_module_header', $xoops_module_header); /* $xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES))); Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewall.html 2012-09-19 10:47:00 UTC (rev 10185) @@ -123,7 +123,7 @@ </div> <!-- irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" --> <div class="pagenav"> -<{$pagenav}> +<{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --> </div> </div> <div class="clear"></div> @@ -203,7 +203,7 @@ <{if $pagenav}> <!-- irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" --> -<div class="pagenav"><{$pagenav}></div> +<div class="pagenav"><{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --></div> <br /> <{/if}> <div class="clear"></div> Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum.html 2012-09-19 10:47:00 UTC (rev 10185) @@ -76,7 +76,7 @@ </div> <!-- irmtfan hardcode removed style="float: right; text-align:right;" --> <div class="icon_right"> - <{$forum_pagenav}> + <{$forum_pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --> </div> </div> <div class="clear"></div> @@ -184,7 +184,7 @@ <{$forum_addpoll}> <{$forum_post_or_register}> </div> <div class="right"> - <{$forum_pagenav}> + <{$forum_pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --> </div> </div> <div class="clear"></div> Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html 2012-09-19 10:47:00 UTC (rev 10185) @@ -82,7 +82,7 @@ </div> <!-- irmtfan hardcode removed style="padding: 5px;float: right; text-align:right;" --> <div class="pagenav"> - <{$pagenav}> + <{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --> </div> </div> <div class="clear"></div> @@ -116,7 +116,7 @@ </div> <!-- irmtfan hardcode removed style="float: right; text-align:right;" --> <div class="icon_right"> - <{$pagenav}> + <{$pagenav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --> </div> </div> <div class="clear"></div> Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-18 09:51:54 UTC (rev 10184) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html 2012-09-19 10:47:00 UTC (rev 10185) @@ -151,7 +151,7 @@ </div> <!-- irmtfan hardcode removed style="float: right; text-align:right;" --> <div class="icon_right"> - <{$forum_page_nav}> + <{$forum_page_nav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --> </div> </div> <div class="clear"></div> @@ -205,7 +205,7 @@ </div> <!-- irmtfan hardcode removed style="float: right; text-align:right;"" --> <div class="icon_right"> - <{$forum_page_nav}> + <{$forum_page_nav|replace:'form':'div'}> <!-- irmtfan to solve nested forms issue --> </div> </div> <div class="clear"></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |