[xoops-svn] SF.net SVN: xoops:[9737] XoopsModules/newbb/branches/alfred/newbb

[<dh...@us...>]

Revision: 9737
          http://xoops.svn.sourceforge.net/xoops/?rev=9737&view=rev
Author:   dhcst
Date:     2012-06-29 11:22:41 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
fix topicmanager.php

Modified Paths:
--------------
    XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
    XoopsModules/newbb/branches/alfred/newbb/viewforum.php
    XoopsModules/newbb/branches/alfred/newbb/xoops_version.php

Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php	2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php	2012-06-29 11:22:41 UTC (rev 9737)
@@ -53,7 +53,7 @@
 $forum_handler =& xoops_getmodulehandler('forum', 'newbb');
 
 if ( !$forum ) {
-	$topic_obj =& $topic_handler->get($topic_id);
+	$topic_obj =& $topic_handler->get(intval($topic_id));	
     $forum = $topic_obj->getVar("forum_id");
 	unset($topic_obj);
 }
@@ -63,7 +63,6 @@
 	$online_handler->init($forum);
 }
 
-
 $action_array = array('merge', 'delete','move','lock','unlock','sticky','unsticky','digest','undigest');
 foreach ($action_array as $_action) {
     $action[$_action] = array(
@@ -86,6 +85,7 @@
 
 if ( isset($_POST['submit']) ) {
 	$mode = $_POST['mode'];
+
 	if ('delete' == $mode) {  
 		foreach ($topic_id as $tid) {
             $topic_obj =& $topic_handler->get($tid);
@@ -219,11 +219,16 @@
             exit();
         }
 		
-        $sql = sprintf("UPDATE %s SET ".$action[$mode]['sql']." WHERE topic_id = %u", $xoopsDB->prefix("bb_topics"), $topic_id);
-        if ( !$r = $xoopsDB->query($sql) ) {
-    		redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_ERROR_BACK.'<br />sql:'.$sql);
-	        exit();
-        }
+		if (!empty($action[$mode]['sql'])) {
+			$sql = sprintf("UPDATE %s SET ".$action[$mode]['sql']." WHERE topic_id = %u", $xoopsDB->prefix("bb_topics"), $topic_id);
+			if ( !$r = $xoopsDB->query($sql) ) {
+				redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_ERROR_BACK.'<br />sql:'.$sql);
+				exit();
+			}
+        } else {
+			redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_ERROR_BACK);
+			exit();
+		}
         if ('digest' == $mode && $xoopsDB->getAffectedRows()) {
 	    	$topic_obj =& $topic_handler->get($topic_id);
             $stats_handler =& xoops_getmodulehandler('stats', 'newbb');

Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php	2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php	2012-06-29 11:22:41 UTC (rev 9737)
@@ -261,7 +261,6 @@
 	$page_query_nav = implode("&amp;", array_values($query_nav));
 	unset($query_nav);	
 	$nav = new XoopsPageNav($all_topics, $xoopsModuleConfig['topics_per_page'], $start, "start", $page_query_nav);
-	//if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) . $nav->url;
 	if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
 	if ($xoopsModuleConfig['pagenav_display'] == 'select')
 		$navi = $nav->renderSelect(); 

Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php	2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php	2012-06-29 11:22:41 UTC (rev 9737)
@@ -27,7 +27,7 @@
 $modversion['status_version'] 		= "4.2";
 
 //about
-$modversion['release_date']     	= '2012/06/17';
+$modversion['release_date']     	= '2012/06/29';
 $modversion["module_website_url"] 	= "http://www.simple-xoops.de/";
 $modversion["module_website_name"] 	= "SIMPLE-XOOPS";
 $modversion["module_status"] 		= "RC 1";

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