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

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

Revision: 9668
          http://xoops.svn.sourceforge.net/xoops/?rev=9668&view=rev
Author:   dhcst
Date:     2012-06-18 07:52:39 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Fix path for seo

Modified Paths:
--------------
    XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
    XoopsModules/newbb/branches/alfred/newbb/moderate.php
    XoopsModules/newbb/branches/alfred/newbb/viewforum.php
    XoopsModules/newbb/branches/alfred/newbb/viewpost.php
    XoopsModules/newbb/branches/alfred/newbb/viewtopic.php

Modified: XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php	2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php	2012-06-18 07:52:39 UTC (rev 9668)
@@ -485,7 +485,7 @@
 			}
 			require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 			$nav = new XoopsPageNav($count_topic, $this->config['topics_per_page'], @$this->vars["start"], "start", implode("&", $args));
-			if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
+			if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) ." /" . $nav->url;
 			if ($this->config['pagenav_display'] == 'select')
 				$navi = $nav->renderSelect(); 
 			elseif ($this->config['pagenav_display'] == 'bild')

Modified: XoopsModules/newbb/branches/alfred/newbb/moderate.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/moderate.php	2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/moderate.php	2012-06-18 07:52:39 UTC (rev 9668)
@@ -205,6 +205,7 @@
 	if ( $moderate_count > $xoopsModuleConfig['topics_per_page']) {
 		include XOOPS_ROOT_PATH.'/class/pagenav.php';
 		$nav = new XoopsPageNav($all_topics, $xoopsModuleConfig['topics_per_page'], $start, "start", 'forum='.$forum_id.'&sort='.$sortname);
+        if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) ." /" . $nav->url;
 		echo '<tr><td colspan="6">'.$nav->renderNav(4).'</td></tr>';
 	}
 	

Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php	2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php	2012-06-18 07:52:39 UTC (rev 9668)
@@ -261,7 +261,8 @@
 	$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 (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL.$nav->url;
+	//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(); 
 	elseif ($xoopsModuleConfig['pagenav_display'] == 'bild')

Modified: XoopsModules/newbb/branches/alfred/newbb/viewpost.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewpost.php	2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/viewpost.php	2012-06-18 07:52:39 UTC (rev 9668)
@@ -333,7 +333,8 @@
 if ( $postCount > $post_perpage ) {
     include XOOPS_ROOT_PATH.'/class/pagenav.php';
     $nav = new XoopsPageNav($postCount, $post_perpage, $start, "start", 'forum='.$forum_id.'&amp;viewmode='.$viewmode.'&amp;status='.$status.'&amp;uid='.$uid.'&amp;order='.$order."&amp;mode=".$mode);
-	if (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
+	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(); 
 	elseif ($xoopsModuleConfig['pagenav_display'] == 'bild')

Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php	2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php	2012-06-18 07:52:39 UTC (rev 9668)
@@ -255,7 +255,10 @@
 if ( $total_posts > $xoopsModuleConfig['posts_per_page'] ) {
     include XOOPS_ROOT_PATH.'/class/pagenav.php';    
     $nav = new XoopsPageNav($total_posts, $xoopsModuleConfig['posts_per_page'] , $start , "start", 'topic_id='.$topic_id.'&amp;order='.$order.'&amp;status='.$status."&amp;mode=".$mode);
-	if (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
+	if (!isset($xoopsModuleConfig['do_rewrite'])) 
+        $nav->url = formatURL($_SERVER['SERVER_NAME']) . $nav->url;
+    else 
+	    $nav->url = XOOPS_URL . $nav->url;
     if ($xoopsModuleConfig['pagenav_display'] == 'select') {
 	    $navi = $nav->renderSelect(); 
 	} elseif ($xoopsModuleConfig['pagenav_display'] == 'bild') {		

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