issue85, fixed order-by-photo name

diff --git a/phpfspot.class.php b/phpfspot.class.php
index b3ad278458a350089ae2ea5ac6e09107e1d9be0b..6d3ddddc681e83dc4e7c3186c54d9951210c48a9 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -1955,7 +1955,7 @@ class PHPFSPOT {
                return " ORDER BY p.name ASC";
             }
             else {
-               return " ORDER BY p.uri ASC";
+               return " ORDER BY basename(p.uri) ASC";
             }
             break;
          case 'name_desc':
@@ -1963,7 +1963,7 @@ class PHPFSPOT {
                return " ORDER BY p.name DESC";
             }
             else {
-               return " ORDER BY p.uri DESC";
+               return " ORDER BY basename(p.uri) DESC";
             }
             break;
       }

diff --git a/phpfspot_db.php b/phpfspot_db.php
index e9c99ce62ad906e5345a154c275f1d5d6959bd59..df41e73e7bd9cc31881ca8d916ffaf405f26e878 100644 (file)
--- a/phpfspot_db.php
+++ b/phpfspot_db.php
@@ -73,6 +73,7 @@ class PHPFSPOT_DB {
                $this->setConnStatus(false);
             }
             else {
+               sqlite3_create_function($this->db, 'basename', 1, 'basename');
                $this->setConnStatus(true);
             }
             break;