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

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

Revision: 10169
          http://xoops.svn.sourceforge.net/xoops/?rev=10169&view=rev
Author:   irmtfan
Date:     2012-09-10 06:44:36 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
rank smarty variables like 3.08, full URL, up icon

Modified Paths:
--------------
    XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
    XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
    XoopsModules/newbb/branches/irmtfan/newbb/polls.php
    XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
    XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
    XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
    XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
    XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
    XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php

Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt	2012-09-10 06:44:36 UTC (rev 10169)
@@ -1,3 +1,15 @@
+date 2012-09-10
+===============================
+1- back rank_image and rank_title to rank.image rank.title smarty variables to make consistency with old newbb versions.
+in newbb/class/user.php, newbb/templates/newbb_thread.html
+
+2- change some reletive URLs to Full URLs (Roby73/irmtfan)
+in newbb/viewforum.php, newbb/topicmanager.php, newbb/polls.php, newbb/templates/newbb_viewtopic.html
+
+3- add up and down icons smarty variables to templates.
+in newbb/viewpost.php, newbb/templates/newbb_viewpost.html, newbb/templates/newbb_viewtopic.html
+
+
 date 2012-09-09
 ==================
 1- some changes in persian language notifications.

Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/user.php	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/user.php	2012-09-10 06:44:36 UTC (rev 10169)
@@ -174,11 +174,12 @@
 		$userinfo["link"] = "<a href=\"".XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid") ."\">".$userinfo["name"]."</a>";
 		
 		$userinfo["avatar"] = $user->getVar('user_avatar');
-		// START hacked by irmtfan - easier rank getting
+		// START hacked by irmtfan - easier rank getting - consistency with previous version back rank.title and rank.image
         $userrank = $user->rank();
+        $userinfo["rank"]= array();
         if (isset($userrank['image']) && $userrank['image']) {
-        	$userinfo["rank_image"] = $userrank['image'];
-        	$userinfo["rank_title"] = $userrank['title'];
+        	$userinfo["rank"]["image"] = $userrank['image'];
+        	$userinfo["rank"]["title"] = $userrank['title'];
         }
         // END hacked by irmtfan - easier rank getting  - a little correctness dot removed
 		// START hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???

Modified: XoopsModules/newbb/branches/irmtfan/newbb/polls.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/polls.php	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/polls.php	2012-09-10 06:44:36 UTC (rev 10169)
@@ -239,7 +239,8 @@
         xoops_error($poll->getHtmlErrors());
         exit();
     }
-    redirect_header("viewtopic.php?topic_id={$topic_id}",1,_MD_POLL_DBUPDATED);
+    // irmtfan full URL
+    redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id={$topic_id}",1,_MD_POLL_DBUPDATED);
     //exit();
 }
 
@@ -261,7 +262,8 @@
         $expire_text = new XoopsFormText(_MD_POLL_EXPIRATION . "<br /><small>" . _MD_POLL_FORMAT . "<br />" . sprintf(_MD_POLL_CURRENTTIME, formatTimestamp(time(), "Y-m-d H:i:s")) . "</small>", "end_time", 20, 19, $date);
         $poll_form->addElement($expire_text);
     } else {
-        $restart_label = new XoopsFormLabel(_MD_POLL_EXPIRATION, sprintf(_MD_POLL_EXPIREDAT, $date) . "<br /><a href='polls.php?op=restart&amp;poll_id=" . $poll->getVar("poll_id") . "'>" . _MD_POLL_RESTART . "</a>");
+    	    // irmtfan full URL
+        $restart_label = new XoopsFormLabel(_MD_POLL_EXPIRATION, sprintf(_MD_POLL_EXPIREDAT, $date) . "<br /><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/polls.php?op=restart&amp;poll_id=" . $poll->getVar("poll_id") . "'>" . _MD_POLL_RESTART . "</a>");
         $poll_form->addElement($restart_label);
     }
     $weight_text = new XoopsFormText(_MD_POLL_DISPLAYORDER, "weight", 6, 5, $poll->getVar("weight"));
@@ -295,7 +297,8 @@
         unset($color_select, $color_label, $option_id_hidden, $option_text);
         $i++;
     }
-    $more_label = new XoopsFormLabel("", "<br /><a href='polls.php?op=addmore&amp;poll_id=" . $poll->getVar("poll_id") . "&amp;topic_id=" . $topic_id . "'>" . _MD_POLL_ADDMORE . "</a>");
+    // irmtfan full URL
+    $more_label = new XoopsFormLabel("", "<br /><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/polls.php?op=addmore&amp;poll_id=" . $poll->getVar("poll_id") . "&amp;topic_id=" . $topic_id . "'>" . _MD_POLL_ADDMORE . "</a>");
     $option_tray->addElement($more_label);
     $poll_form->addElement($option_tray);
     $op_hidden = new XoopsFormHidden("op", "update");

Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_thread.html	2012-09-10 06:44:36 UTC (rev 10169)
@@ -21,8 +21,8 @@
 		<{if $topic_post.poster.uid gt -1}>
 		<td width="20%" class="odd" rowspan="2" valign="top">
 			<{if $topic_post.poster.uid != 0}>
-<!-- START hacked by irmtfan -->
-				<div class="comUserRankText"><{if $topic_post.poster.rank_title !=""}> <{$topic_post.poster.rank_title}><br /><img src="<{$xoops_upload_url}>/<{$topic_post.poster.rank_image}>" alt="<{$topic_post.poster.rank_title}>" /><{/if}></div>
+<!-- START hacked by irmtfan rank_title -> rank.title -->
+				<div class="comUserRankText"><{if $topic_post.poster.rank.title !=""}> <{$topic_post.poster.rank.title}><br /><img src="<{$xoops_upload_url}>/<{$topic_post.poster.rank.image}>" alt="<{$topic_post.poster.rank.title}>" /><{/if}></div>
 <!-- END hacked by irmtfan -->
 
 				<{if $topic_post.poster.avatar != "blank.gif"}>

Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewpost.html	2012-09-10 06:44:36 UTC (rev 10169)
@@ -47,8 +47,8 @@
 	<br />
 
 	<div style="padding: 5px;">
-        <!-- irmtfan correct prev and next icons -->
-		<a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a>&nbsp;&nbsp;<{$previous}>&nbsp;<a href="viewtopic.php?viewmode=flat&amp;order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=prev&amp;topic_time=<{$topic_time}>"><{$smarty.const._MD_PREVTOPIC}></a>&nbsp;&nbsp;<{$next}>&nbsp;<a href="viewtopic.php?viewmode=flat&amp;order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=next&amp;topic_time=<{$topic_time}>"><{$smarty.const._MD_NEXTTOPIC}></a>
+        <!-- irmtfan remove prev and next icons -->
+		<a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a>
 	</div>
 
 	<br />
@@ -111,7 +111,8 @@
 <div>
 	<!-- irmtfan hardcode removed style="float: left; text-align:left;" -->
 	<div class="icon_left">
-		<a id="threadbottom"></a><a href="#threadtop"><{$smarty.const._MD_TOP}></a>
+    	<!-- irmtfan add up button -->
+		<a id="threadbottom"></a><{$p_up}><a href="#threadtop"><{$smarty.const._MD_TOP}></a>
 	</div>
 	<!-- irmtfan hardcode removed style="float: right; text-align:right;" -->
 	<div class="icon_right">

Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html	2012-09-10 06:44:36 UTC (rev 10169)
@@ -96,7 +96,7 @@
 <!-- irmtfan hardcode removed style="float: left; text-align:left;"" -->
 	<span class="icon_left">
         <!-- irmtfan correct prev and next icons -->
-		<a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a>&nbsp;&nbsp;<{$previous}>&nbsp;<a href="viewtopic.php?order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=prev"><{$smarty.const._MD_PREVTOPIC}></a>&nbsp;&nbsp;<{$next}>&nbsp;<a href="viewtopic.php?order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+		<a id="threadtop"></a><{$down}><a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a>&nbsp;&nbsp;<{$previous}>&nbsp;<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=prev"><{$smarty.const._MD_PREVTOPIC}></a>&nbsp;&nbsp;<{$next}>&nbsp;<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
 	</span>
 <!-- irmtfan hardcode removed style="float: right; text-align:right;"" -->
 	<span class="icon_right">
@@ -198,8 +198,8 @@
 
 <div>
 	<div class="left">
-    <!-- irmtfan correct prev and next icons -->
-		<a id="threadbottom"></a><a href="#threadtop"><{$smarty.const._MD_TOP}></a>&nbsp;&nbsp;<{$previous}>&nbsp;<a href="viewtopic.php?viewmode=flat&amp;order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=prev"><{$smarty.const._MD_PREVTOPIC}></a>&nbsp;&nbsp;<{$next}>&nbsp;<a href="viewtopic.php?viewmode=flat&amp;order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+    <!-- irmtfan correct prev and next icons add up-->
+		<a id="threadbottom"></a><{$p_up}><a href="#threadtop"><{$smarty.const._MD_TOP}></a>&nbsp;&nbsp;<{$previous}>&nbsp;<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?viewmode=flat&amp;order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=prev"><{$smarty.const._MD_PREVTOPIC}></a>&nbsp;&nbsp;<{$next}>&nbsp;<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?viewmode=flat&amp;order=<{$order_current}>&amp;topic_id=<{$topic_id}>&amp;forum=<{$forum_id}>&amp;move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
 	</div>
 <!-- irmtfan hardcode removed style="float: right; text-align:right;"" -->
 	<div class="icon_right">

Modified: XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php	2012-09-10 06:44:36 UTC (rev 10169)
@@ -103,7 +103,8 @@
             //sync($topic_id, "topic");
             //xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
         }
-        echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+        // irmtfan full URL
+        echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
 	} elseif ('restore' == $mode) {  
 		//$topic_handler =& xoops_getmodulehandler('topic', 'newbb');
         $forums = array();
@@ -123,7 +124,7 @@
 			$forum_handler->synchronization($forums_obj[$id]);
 		}
 		unset($topics_obj, $forums_obj);		
-        echo $action[$mode]['msg']."<p><a href='viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+        echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
 	
     } elseif ('merge' == $mode) {
 		$post_handler =& xoops_getmodulehandler('post', 'newbb');
@@ -191,9 +192,10 @@
         
 	    }
         echo $action[$mode]['msg'].
-        		"<p><a href='".XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$newtopic'>"._MD_VIEWTHETOPIC."</a></p>".
-        		"<p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p>".
-        		"<p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+        	// irmtfan full URL
+        		"<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$newtopic'>"._MD_VIEWTHETOPIC."</a></p>".
+        		"<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p>".
+        		"<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
 	} elseif ('move' == $mode) {
         if ($newforum > 0) {
             $topic_id = $topic_id[0];
@@ -209,8 +211,8 @@
             }
 			$forum_handler->synchronization($forum);
 			$forum_handler->synchronization($newforum);
-
-        	echo $action[$mode]['msg']."<p><a href='viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+// irmtfan full URL
+        	echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
         } else {
     		redirect_header("javascript:history.go(-1)",2,_MD_ERRORFORUM);
         }
@@ -248,7 +250,8 @@
 				$userstats_handler->insert($user_stat);
 			}
         }
-        echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"._MD_VIEWTHETOPIC."</a></p><p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNFORUMINDEX."</a></p>";
+// irmtfan full URL
+        echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"._MD_VIEWTHETOPIC."</a></p><p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNFORUMINDEX."</a></p>";
     }
 } else {  // No submit
     $mode = $_GET['mode'];

Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php	2012-09-10 06:44:36 UTC (rev 10169)
@@ -95,10 +95,11 @@
 }
 
 if ($forum_handler->getPermission($forum_obj, "post")) {
-	$xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?forum={$forum_id}\">".newbb_displayImage('t_new', _MD_POSTNEW)."</a>");
+	// irmtfan full URL
+	$xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/newtopic.php?forum={$forum_id}\">".newbb_displayImage('t_new', _MD_POSTNEW)."</a>");
 	if ($forum_handler->getPermission($forum_obj, "addpoll") && $pollmodules) {
 		$t_poll = newbb_displayImage('t_poll',_MD_ADDPOLL);
-		$xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
+		$xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/newtopic.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
  	}
 } else {
     if ( !empty($GLOBALS["xoopsModuleConfig"]["show_reg"]) && !is_object($xoopsUser)) {

Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php	2012-09-09 18:20:46 UTC (rev 10168)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php	2012-09-10 06:44:36 UTC (rev 10169)
@@ -370,7 +370,8 @@
 	$lang_title .= ' ('.XoopsUser::getUnameFromId($uid).')';
 }	
 $xoopsTpl->assign('lang_title',$lang_title);
-$xoopsTpl->assign('up',newbb_displayImage('up',_MD_TOP));
+// irmtfan up to p_up
+$xoopsTpl->assign('p_up',newbb_displayImage('up',_MD_TOP));
 $xoopsTpl->assign('groupbar_enable', $xoopsModuleConfig['groupbar_enabled']);
 $xoopsTpl->assign('anonymous_prefix', $xoopsModuleConfig['anonymous_prefix']);
 $xoopsTpl->assign('down',newbb_displayImage('down', _MD_BOTTOM));

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