[xoops-svn] SF.net SVN: xoops:[10171] XoopsModules/newbb/branches/irmtfan/newbb

[<ir...@us...>]

Revision: 10171
          http://xoops.svn.sourceforge.net/xoops/?rev=10171&view=rev
Author:   irmtfan
Date:     2012-09-11 10:41:55 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
fix viewtopic admin mode, fix notification redirect, revoke last rev 10170 in xoops_version.php

Revision Links:
--------------
    http://xoops.svn.sourceforge.net/xoops/?rev=10170&view=rev

Modified Paths:
--------------
    XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
    XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php
    XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html
    XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
    XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
    XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php

Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt	2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt	2012-09-11 10:41:55 UTC (rev 10171)
@@ -1,3 +1,16 @@
+date 2012-09-11
+===============================
+1- bug fix: viewtopic admin mode action incorrectly on the topic instead of selected posts of the topic.(important)
+in newbb/templates/newbb_viewtopic.html
+2- change some reletive URLs to Full URLs (Roby73/irmtfan)
+in newbb/notification.inc.ini
+3- bug fix: redirect was not correct in subdomain (value=xoops_url removed)
+in newbb/templates/newbb_notification_select.html
+4- advertise post should not have admin buttons.
+in newbb/templates/newbb_thread.html
+5- revoke the last change rev 10170 and revert to rev 10102
+in newbb/xoops_version.php
+
 date 2012-09-10
 ===============================
 1- bug fix: notification not show in newbb/viewtopic.php?post_id=XXXX URLs

Modified: XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php	2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/notification.inc.php	2012-09-11 10:41:55 UTC (rev 10171)
@@ -52,7 +52,8 @@
 		// Assume we have a valid forum id
 		$sql = 'SELECT forum_name FROM ' . $xoopsDB->prefix('bb_forums') . ' WHERE forum_id = '.$item_id;
 		if (!$result = $xoopsDB->query($sql)) {
-			  redirect_header("index.php", 2, _MD_ERRORFORUM);
+			// irmtfan full URL
+			  redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . "index.php", 2, _MD_ERRORFORUM);
     		exit();
 		}
 		$result_array = $xoopsDB->fetchArray($result);
@@ -65,7 +66,8 @@
 		// Assume we have a valid topid id
 		$sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM '.$xoopsDB->prefix('bb_topics') . ' t, ' . $xoopsDB->prefix('bb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = '. $item_id . ' limit 1';
 		if (!$result = $xoopsDB->query($sql)) {
-			  redirect_header("index.php", 2, _MD_ERROROCCURED);
+			// irmtfan full URL
+			  redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . "index.php", 2, _MD_ERROROCCURED);
     		exit();
 		}
 		$result_array = $xoopsDB->fetchArray($result);
@@ -78,7 +80,8 @@
 		// Assume we have a valid post id
 		$sql = 'SELECT subject,topic_id,forum_id FROM ' . $xoopsDB->prefix('bb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
 		if (!$result = $xoopsDB->query($sql)) {
-			  redirect_header("index.php", 2, _MD_ERROROCCURED);
+			// irmtfan full URL
+			  redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . "index.php", 2, _MD_ERROROCCURED);
     		exit();
 		}
 		$result_array = $xoopsDB->fetchArray($result);

Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html	2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_notification_select.html	2012-09-11 10:41:55 UTC (rev 10171)
@@ -1,7 +1,8 @@
 <{if $xoops_notification.show}>
 	<form name="notification_select" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$xoops_notification.target_page}>" method="post">
 		<h4 class="txtcenter"><{$lang_activenotifications}>	</h4>
-		<input type="hidden" name="not_redirect" value="<{$xoops_url}><{$xoops_notification.redirect_script}>" />
+        <!-- irmtfan remove value=xoops_url -->
+		<input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" />
 		<input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo $GLOBALS['xoopsSecurity']->createToken();<{/php}>" />
 		<table class="outer">		  
 			<tr>

Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html	2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html	2012-09-11 10:41:55 UTC (rev 10171)
@@ -131,7 +131,8 @@
 					</td>
 <!--  irmtfan removed hardcode style="text-align:right;" -->
 					<td class="right">
-						<{if $mode gt 1}>
+						<!--  irmtfan if the post is not advertise -->
+						<{if $mode gt 1 && $topic_post.poster.uid gt -1}>
 							<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&amp;op=split&amp;mode=1" target="_self" title="<{$smarty.const._MD_SPLIT_ONE}>"><{$smarty.const._MD_SPLIT_ONE}></a> | 
 							<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&amp;op=split&amp;mode=2" target="_self" title="<{$smarty.const._MD_SPLIT_TREE}>"><{$smarty.const._MD_SPLIT_TREE}></a> | 
 							<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&amp;op=split&amp;mode=3" target="_self" title="<{$smarty.const._MD_SPLIT_ALL}>"><{$smarty.const._MD_SPLIT_ALL}></a> | 

Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html	2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html	2012-09-11 10:41:55 UTC (rev 10171)
@@ -53,8 +53,8 @@
 <!-- irmtfan hardcode removed style="float: right; text-align: right;" -->
 	<div class="icon_right" id="admin">
 		<{if $mode gt 1}>
-            <!-- irmtfan mistype forum_posts_admin => form_posts_admin  -->
-			<form name="form_posts_admin" action="topicmanager.php" method="POST" onsubmit="javascript: if(window.document.form_posts_admin.op.value &lt; 1){return false;}">
+            <!-- irmtfan mistype forum_posts_admin => form_posts_admin - action="topicmanager.php" => action="action.post.php" -->
+			<form name="form_posts_admin" action="action.post.php" method="POST" onsubmit="javascript: if(window.document.form_posts_admin.op.value &lt; 1){return false;}">
 				<{$smarty.const._ALL}>: <input type="checkbox" name="post_check" id="post_check" value="1" onclick="xoopsCheckAll('form_posts_admin', 'post_check');" /> 
             <!-- irmtfan mistype mode => op  -->
 				<select name="op">

Modified: XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php	2012-09-10 10:57:32 UTC (rev 10170)
+++ XoopsModules/newbb/branches/irmtfan/newbb/xoops_version.php	2012-09-11 10:41:55 UTC (rev 10171)
@@ -721,8 +721,7 @@
 $modversion['notification']['category'][1]['title'] = _MI_NEWBB_THREAD_NOTIFY;
 $modversion['notification']['category'][1]['description'] = _MI_NEWBB_THREAD_NOTIFYDSC;
 $modversion['notification']['category'][1]['subscribe_from'] = 'viewtopic.php';
-// irmtfan remove because "item_name" can be "topic_id" and/or "post_id"
-// $modversion['notification']['category'][1]['item_name'] = 'topic_id';
+$modversion['notification']['category'][1]['item_name'] = 'topic_id';
 $modversion['notification']['category'][1]['allow_bookmark'] = 1;
 
 $modversion['notification']['category'][2]['name'] = 'forum';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.