issue95, new sort order to group by tags

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

diff --git a/CHANGELOG b/CHANGELOG
index 790640a7c83d8ce8c4e0d7bc04ace7ee3c37d56c..19f0c5ce0d59fe18713d8c4c48cb0ecd96d800f2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ phpfspot (1.3)
   * fix for PDO sqlite when trying to fetch one single row (contributed by
     Arun Persaud).
   * fix for incorrect SQL query (contributed by Arun Persaud).
+  * new sort order which will group photos by tag-names (alphabetical).
 
  -- Andreas Unterkircher <unki@netshadow.at>  Sat, 12 Jan 2008 11:00:00 +0100
 

diff --git a/phpfspot.class.php b/phpfspot.class.php
index c06ef241d97f20c9d936e4b52df805aeb8203924..329371fa1dbfa19201e9c64f87af5f72b6960d6f 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -53,7 +53,9 @@ class PHPFSPOT {
          'date_asc' => 'Date ↑',
          'date_desc' => 'Date ↓',
          'name_asc' => 'Name ↑',
-         'name_desc' => 'Name ↓'
+         'name_desc' => 'Name ↓',
+         'tags_asc' => 'Tags ↑',
+         'tags_desc' => 'Tags ↓',
       );
 
       /* Check necessary requirements */
@@ -2022,6 +2024,12 @@ class PHPFSPOT {
                return " ORDER BY basename(p.uri) DESC";
             }
             break;
+         case 'tags_asc':
+            return " ORDER BY t.name ASC ,p.time ASC";
+            break;
+         case 'tags_desc':
+            return " ORDER BY t.name DESC ,p.time ASC";
+            break;
       }
 
    } // get_sort_order()