Add support for pretty urls. So now instead of urls like:

  http://example.com/gallery3/index.php/albums/2
  http://example.com/gallery3/index.php/photos/9

You'll see urls like:
  http://example.com/gallery3/index.php/Family/Weddings
  http://example.com/gallery3/index.php/Family/Weddings/Bob.jpg

1 files changed, 10 insertions, 10 deletions

diff --git a/core/models/item.php b/core/models/item.php
index ed82da52..e5e8c556 100644
--- a/core/models/item.php
+++ b/core/models/item.php
@@ -147,7 +147,7 @@ class Item_Model extends ORM_MPTT {
    * photo: /var/albums/album1/album2/photo.jpg
    */
   public function file_path() {
-    return VARPATH . "albums/" . $this->_relative_path();
+    return VARPATH . "albums/" . $this->relative_path();
   }
 
   /**
@@ -156,8 +156,8 @@ class Item_Model extends ORM_MPTT {
    */
   public function file_url($full_uri=false) {
     return $full_uri ?
-      url::abs_file("var/albums/" . $this->_relative_path()) :
-      url::file("var/albums/" . $this->_relative_path());
+      url::abs_file("var/albums/" . $this->relative_path()) :
+      url::file("var/albums/" . $this->relative_path());
   }
 
   /**
@@ -165,7 +165,7 @@ class Item_Model extends ORM_MPTT {
    * photo: /var/albums/album1/photo.thumb.jpg
    */
   public function thumb_path() {
-    return VARPATH . "thumbs/" . $this->_relative_path() .
+    return VARPATH . "thumbs/" . $this->relative_path() .
       ($this->type == "album" ? "/.album.jpg" : "");
   }
 
@@ -175,8 +175,8 @@ class Item_Model extends ORM_MPTT {
    */
   public function thumb_url($full_uri=true) {
     return ($full_uri ?
-            url::abs_file("var/thumbs/" . $this->_relative_path()) :
-            url::file("var/thumbs/" . $this->_relative_path()))  .
+            url::abs_file("var/thumbs/" . $this->relative_path()) :
+            url::file("var/thumbs/" . $this->relative_path()))  .
       ($this->type == "album" ? "/.album.jpg" : "");
   }
 
@@ -185,7 +185,7 @@ class Item_Model extends ORM_MPTT {
    * photo: /var/albums/album1/photo.resize.jpg
    */
   public function resize_path() {
-    return VARPATH . "resizes/" . $this->_relative_path() .
+    return VARPATH . "resizes/" . $this->relative_path() .
       ($this->type == "album" ? "/.album.jpg" : "");
   }
 
@@ -195,8 +195,8 @@ class Item_Model extends ORM_MPTT {
    */
   public function resize_url($full_uri=true) {
     return ($full_uri ?
-            url::abs_file("var/resizes/" . $this->_relative_path()) :
-            url::file("var/resizes/" . $this->_relative_path())) .
+            url::abs_file("var/resizes/" . $this->relative_path()) :
+            url::file("var/resizes/" . $this->relative_path())) .
       ($this->type == "album" ? "/.album.jpg" : "");
   }
 
@@ -204,7 +204,7 @@ class Item_Model extends ORM_MPTT {
    * Return the relative path to this item's file.
    * @return string
    */
-  private function _relative_path() {
+  public function relative_path() {
     if (empty($this->relative_path)) {
       foreach ($this->parents() as $parent) {
         if ($parent->id > 1) {