[pLog-svn] r6034 - plog/branches/lifetype-1.2/class/net
mark at devel.lifetype.net
mark at devel.lifetype.net
Tue Nov 13 02:23:05 EST 2007
Author: mark
Date: 2007-11-13 02:23:05 -0500 (Tue, 13 Nov 2007)
New Revision: 6034
Modified:
plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php
Log:
Fixed bug http://bugs.lifetype.net/view.php?id=1423
Modified: plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php 2007-11-11 11:30:56 UTC (rev 6033)
+++ plog/branches/lifetype-1.2/class/net/rawrequestgenerator.class.php 2007-11-13 07:23:05 UTC (rev 6034)
@@ -10,7 +10,7 @@
* @see RequestGenerator
* @see BaseRequestGenerator
*/
- class RawRequestGenerator extends BaseRequestGenerator
+ class RawRequestGenerator extends BaseRequestGenerator
{
/**
@@ -34,7 +34,7 @@
{
$this->_params[$paramName] = $paramValue;
}
-
+
/**
* @private
*/
@@ -127,10 +127,10 @@
$this->addParameter( "postCategoryId", $postCategoryIds[0]);
if( $this->_blogInfo != null )
$this->addParameter( "blogId", $this->_blogInfo->getId());
-
+
//$categoryLink = $_SERVER["PHP_SELF"].$rg->getRequest();
$categoryLink = $this->getIndexUrl().$this->getRequest();
-
+
return $categoryLink;
}
@@ -189,10 +189,10 @@
if( $blogInfo == null ) {
$blogInfo = $this->_blogInfo;
}
-
-
+
+
$this->addParameter( "blogId", $blogInfo->getId());
- $link = $this->getIndexUrl().$this->getRequest();
+ $link = $this->getIndexUrl().$this->getRequest();
return $link;
}
@@ -272,11 +272,11 @@
}
/**
- * generates an archive link given a date.
+ * generates an archive link given a date.
*
* @param date A String in the format yyyymm
* @return A valid archive link
- */
+ */
function getArchiveLink( $date )
{
$this->addParameter( "op", "Default" );
@@ -331,7 +331,7 @@
* a valid URL.
*
* @param album The album
- */
+ */
function parentAlbumLink( $album )
{
$this->addParameter( "op", "ViewAlbum" );
@@ -344,11 +344,11 @@
}
/**
- * Given the name of a template file, generate the right link to it.
+ * Given the name of a template file, generate the right link to it.
*
* @param template
* @return A link to the given template file/static page
- */
+ */
function templatePage( $template )
{
$this->addParameter( "op", "Template" );
@@ -368,7 +368,7 @@
function resourceLink( $resource )
{
$blogId = ($resource->getOwnerId() ? $resource->getOwnerId() : $this->_blogInfo->getId());
-
+
$this->addParameter( "op", "ViewResource" );
$this->addParameter( "blogId", $blogId);
$this->addParameter( "resource", $resource->getFileName());
@@ -387,11 +387,11 @@
{
$request = "";
- if( $this->isXHTML())
+ if( $this->isXHTML())
$amp = "&";
else
$amp = "&";
-
+
if( !$this->getIncludeBlogId() && $removeBlogIdIfNecessary )
$this->removeParameter( "blogId" );
@@ -409,7 +409,7 @@
return $request;
}
-
+
/**
* given the parameters, recalculates the current URL. This method also has support
* for paged urls
@@ -426,25 +426,25 @@
$amp = "&";
else
$amp = "&";
-
+
$url = $this->getIndexUrl()."?op=Default{$amp}blogId=".$this->_blogInfo->getId()."{$amp}";
$params = "";
-
+
if( $category )
$params .= "postCategoryId=".$category->getId().$amp;
if( $userInfo )
$params .= "userId=".$userInfo->getId().$amp;
if( $date != -1 )
- $params .= "date=".$date.$amp;
-
+ $params .= "Date=".$date.$amp;
+
if( $params )
$url .= $params;
-
+
$url .= $this->getPageSuffix();
-
+
return( $url );
}
-
+
/**
* Returns the page format for this URL generator
*
@@ -456,10 +456,10 @@
$amp = "&";
else
$amp = "&";
-
+
$pageFormat = $amp."page=";
-
+
return( $pageFormat );
- }
+ }
}
?>
More information about the pLog-svn
mailing list