[pLog-svn] r4746 - in plog/branches/lifetype-1.2/class: data/pager net template/smarty/plugins
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Feb 17 17:08:40 EST 2007
Author: oscar
Date: 2007-02-17 17:08:40 -0500 (Sat, 17 Feb 2007)
New Revision: 4746
Modified:
plog/branches/lifetype-1.2/class/data/pager/pager.class.php
plog/branches/lifetype-1.2/class/net/customrequestgenerator.class.php
plog/branches/lifetype-1.2/class/net/modrewriterequestgenerator.class.php
plog/branches/lifetype-1.2/class/net/prettyrequestgenerator.class.php
plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php
plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php
Log:
Fix for issue 1181 (http://bugs.lifetype.net/view.php?id=1181) -- the pager was not obeying the actual format for the page_suffix setting and it would cause issues with suffixes where "{page}" was not the last entity in the format definition.
Modified: plog/branches/lifetype-1.2/class/data/pager/pager.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/data/pager/pager.class.php 2007-02-17 19:43:56 UTC (rev 4745)
+++ plog/branches/lifetype-1.2/class/data/pager/pager.class.php 2007-02-17 22:08:40 UTC (rev 4746)
@@ -58,7 +58,6 @@
var $_endPage;
var $_pageLinks;
-
/**
* Constructor of the pager
*
@@ -247,8 +246,19 @@
{
$i = 1;
$pages = Array();
+
+ // check wether we need to perform a replacement or not...
+ // if not, we'll just append the page number at the end of the string
+ $replace = strpos( $this->_baseUrl, "{page}" );
+
while( $i <= $this->_totalPages ) {
- $pages[$i] = $this->_baseUrl.$i;
+ if( $replace ) {
+ $pages[$i] = str_replace( "{page}", $i, $this->_baseUrl );
+ }
+ else {
+ $pages[$i] = $this->_baseUrl.$i;
+ }
+
$i++;
}
Modified: plog/branches/lifetype-1.2/class/net/customrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/customrequestgenerator.class.php 2007-02-17 19:43:56 UTC (rev 4745)
+++ plog/branches/lifetype-1.2/class/net/customrequestgenerator.class.php 2007-02-17 22:08:40 UTC (rev 4746)
@@ -489,10 +489,9 @@
*
* @return A page suffix
*/
- function getPageSuffix( $page = "" )
+ function getPageSuffix()
{
$pageFormat = $this->_config->getValue( "page_suffix_format" );
- $pageFormat = str_replace( "{page}", $page, $pageFormat );
return( $pageFormat );
}
Modified: plog/branches/lifetype-1.2/class/net/modrewriterequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/modrewriterequestgenerator.class.php 2007-02-17 19:43:56 UTC (rev 4745)
+++ plog/branches/lifetype-1.2/class/net/modrewriterequestgenerator.class.php 2007-02-17 22:08:40 UTC (rev 4746)
@@ -457,9 +457,7 @@
$url = $this->blogLink();
}
- $pageFormat = ".page.";
-
- return( $url.$pageFormat );
+ return( $url.$this->getPageSuffix());
}
/**
@@ -467,10 +465,9 @@
*
* @return A page suffix
*/
- function getPageSuffix( $page = "" )
+ function getPageSuffix()
{
- $pageFormat = ".page.".$page;
-
+ $pageFormat = ".page.";
return( $pageFormat );
}
}
Modified: plog/branches/lifetype-1.2/class/net/prettyrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/prettyrequestgenerator.class.php 2007-02-17 19:43:56 UTC (rev 4745)
+++ plog/branches/lifetype-1.2/class/net/prettyrequestgenerator.class.php 2007-02-17 22:08:40 UTC (rev 4746)
@@ -348,7 +348,7 @@
$url = $this->blogLink( null, true );
}
- return( $url."/page/" );
+ return( $url.$this->getPageSuffix());
}
/**
@@ -356,10 +356,9 @@
*
* @return A page suffix
*/
- function getPageSuffix( $page = "" )
+ function getPageSuffix()
{
- $pageFormat = "/page/".$page;
-
+ $pageFormat = "/page/";
return( $pageFormat );
}
}
Modified: plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php 2007-02-17 19:43:56 UTC (rev 4745)
+++ plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php 2007-02-17 22:08:40 UTC (rev 4746)
@@ -440,7 +440,7 @@
if( $params )
$url .= $params;
- $url .= "page=";
+ $url .= $this->getPageSuffix();
return( $url );
}
@@ -450,14 +450,14 @@
*
* @return A page suffix
*/
- function getPageSuffix( $page = "" )
+ function getPageSuffix()
{
if( $this->isXHTML())
$amp = "&";
else
$amp = "&";
- $pageFormat = $amp."page=".$page;
+ $pageFormat = $amp."page=";
return( $pageFormat );
}
Modified: plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php 2007-02-17 19:43:56 UTC (rev 4745)
+++ plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php 2007-02-17 22:08:40 UTC (rev 4746)
@@ -84,6 +84,8 @@
$page_string = '';
+ $pageLinks = $pager->getPageLinks();
+
if( $style == "links" ) {
if ( $total_pages == 1 )
return '';
@@ -93,7 +95,7 @@
$init_page_max = ( $total_pages > $beginning ) ? $beginning : $total_pages;
for($i = 1; $i < $init_page_max + 1; $i++) {
- $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"{$base_url}{$i}\">$i</a>";
+ $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"".$pageLinks[$i]."\">$i</a>";
if ( $i < $init_page_max ) {
$page_string .= $separator;
}
@@ -107,7 +109,7 @@
for($i = $init_page_min - $middle; $i < $init_page_max + ($middle + 1); $i++) {
- $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"{$base_url}{$i}\">$i</a>";
+ $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"".$pageLinks[$i]."\">$i</a>";
if ( $i < $init_page_max + 1 ) {
$page_string .= $separator;
}
@@ -120,7 +122,7 @@
}
for($i = $total_pages - ($end - 1); $i < $total_pages + 1; $i++) {
- $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"{$base_url}{$i}\">$i</a>";
+ $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"".$pageLinks[$i]."\">$i</a>";
if( $i < $total_pages ) {
$page_string .= $separator;
}
@@ -128,7 +130,7 @@
}
else {
for($i = 1; $i < $total_pages + 1; $i++) {
- $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"{$base_url}{$i}\">$i</a>";
+ $page_string .= ( $i == $on_page ) ? " <span class=\"pagerCurrent\">$i</span>" : " <a class=\"pagerLink\" href=\"".$pageLinks[$i]."\">$i</a>";
if ( $i < $total_pages ) {
$page_string .= $separator;
}
@@ -137,11 +139,11 @@
if ( $add_prevnext_text ) {
if ( $on_page > 1 ) {
- $page_string = ' <a class="pagerLinkPrevPage" href="'.$base_url.( $on_page - 1 ).'">'.$prevText.'</a> '.$page_string;
+ $page_string = ' <a class="pagerLinkPrevPage" href="'.$pageLinks[$on_page - 1 ].'">'.$prevText.'</a> '.$page_string;
}
if ( $on_page < $total_pages ) {
- $page_string .= ' <a class="pagerLinkNextPage" href="'.$base_url.( $on_page + 1 ).'">'.$nextText.'</a>';
+ $page_string .= ' <a class="pagerLinkNextPage" href="'.$pageLinks[$on_page + 1].'">'.$nextText.'</a>';
}
}
}
More information about the pLog-svn
mailing list