Thread: [pLog-CVS] plog/class/net prettyrequestgenerator.class.php,1.4,1.5 prettyrequestparser.class.php,1.6
Brought to you by:
jondaley
Update of /cvsroot/plog/plog/class/net In directory sc8-pr-cvs1:/tmp/cvs-serv17110/class/net Modified Files: prettyrequestgenerator.class.php prettyrequestparser.class.php rawrequestgenerator.class.php requestgenerator.class.php Log Message: When browsing an album and clicking a resource, we'll get to another page with some information about the resource, and where potentially we'll be able to add comments (when the feature is available) If the resource is vieweable inline, then we'll see the resource or else we'll get a link to it, to donwload it. It's only be implemented for the 'grey' template set but it'll be added to all the other template sets as well. Index: prettyrequestgenerator.class.php =================================================================== RCS file: /cvsroot/plog/plog/class/net/prettyrequestgenerator.class.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** prettyrequestgenerator.class.php 29 Dec 2003 00:10:34 -0000 1.4 --- prettyrequestgenerator.class.php 30 Dec 2003 20:31:05 -0000 1.5 *************** *** 329,333 **** function resourceLink( $resource ) { ! return $resourceLink = $this->getBaseUrl()."/resource/".$this->_blogInfo->getId()."/".$resource->getFileName(); } --- 329,333 ---- function resourceLink( $resource ) { ! return $resourceLink = $this->getBaseUrl()."/resource/".$this->_blogInfo->getId()."/".$resource->getId(); } *************** *** 340,343 **** --- 340,353 ---- { return $resourceLink = $this->getBaseUrl()."/resserver.php?blogId=".$this->_blogInfo->getId()."&resource=".$resource->getFileName()."&mode=preview"; + } + + /** + * Returns the link to a resource + * + * @param resource Generates the correct link to fetch a resource + */ + function resourceDownloadLink( $resource ) + { + return $resourceLink = $this->getBaseUrl()."/get/".$this->_blogInfo->getId()."/".$resource->getFileName(); } Index: prettyrequestparser.class.php =================================================================== RCS file: /cvsroot/plog/plog/class/net/prettyrequestparser.class.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** prettyrequestparser.class.php 29 Dec 2003 00:10:34 -0000 1.6 --- prettyrequestparser.class.php 30 Dec 2003 20:31:05 -0000 1.7 *************** *** 83,86 **** --- 83,91 ---- break; case "resource": + $resId = $params[count($params)-1]; + $result["resourceId"] = $resId; + $result["op"] = "ViewResource"; + break; + case "get": $resFile = $params[count($params)-1]; $result["resource"] = $resFile; *************** *** 93,98 **** break; } - - //print_r($result); return $result; --- 98,101 ---- Index: rawrequestgenerator.class.php =================================================================== RCS file: /cvsroot/plog/plog/class/net/rawrequestgenerator.class.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rawrequestgenerator.class.php 29 Dec 2003 00:10:34 -0000 1.4 --- rawrequestgenerator.class.php 30 Dec 2003 20:31:05 -0000 1.5 *************** *** 413,419 **** { $this->addParameter( "blogId", $this->_blogInfo->getId()); ! $this->addParameter( "resource", $resource->getFileName()); ! $resourceLink = $this->getResourceServerUrl().$this->getRequest(); return $resourceLink; --- 413,420 ---- { $this->addParameter( "blogId", $this->_blogInfo->getId()); ! $this->addParameter( "resourceId", $resource->getId()); ! $this->addParameter( "op", "ViewResource" ); ! $resourceLink = $this->getIndexUrl().$this->getRequest(); return $resourceLink; *************** *** 430,433 **** --- 431,449 ---- $this->addParameter( "resource", $resource->getFileName()); $this->addParameter( "mode", "preview" ); + + $resourceLink = $this->getResourceServerUrl().$this->getRequest(); + + return $resourceLink; + } + + /** + * Returns the link to a resource + * + * @param resource Generates the correct link to fetch a resource + */ + function resourceDownloadLink( $resource ) + { + $this->addParameter( "blogId", $this->_blogInfo->getId()); + $this->addParameter( "resource", $resource->getFileName()); $resourceLink = $this->getResourceServerUrl().$this->getRequest(); Index: requestgenerator.class.php =================================================================== RCS file: /cvsroot/plog/plog/class/net/requestgenerator.class.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** requestgenerator.class.php 29 Dec 2003 00:10:34 -0000 1.4 --- requestgenerator.class.php 30 Dec 2003 20:31:05 -0000 1.5 *************** *** 285,293 **** * Returns the link to a resource * ! * @param album Generates the correct link to fetch a resource */ function resourceLink( $resource ) { return $this->_rg->resourceLink( $resource ); } --- 285,303 ---- * Returns the link to a resource * ! * @param resource Generates the correct link to fetch a resource */ function resourceLink( $resource ) { return $this->_rg->resourceLink( $resource ); + } + + /** + * Returns the link to download a resource + * + * @param resource The resource + */ + function resourceDownloadLink( $resource ) + { + return $this->_rg->resourceDownloadLink( $resource ); } |