Merge branch 'extended-cookie'

[scuttle] / config.inc.php.example

diff --git a/config.inc.php.example b/config.inc.php.example
index a8c32c9cb264d3b72b246cf94c0caa85bdeb0dd0..f690aee8e8e510fb308ecf911585ef8587cf90cc 100644 (file)
--- a/config.inc.php.example
+++ b/config.inc.php.example
@@ -64,14 +64,18 @@ $adminemail = 'admin@example.org';
 #                       be considered recent.
 # defaultOrderBy:   The default order in which bookmarks will appear.
 #                   Possible values are:
-#                   date_desc   - By date of entry descending.
-#                                 Latest entry first. (Default)
-#                   date_asc    - By date of entry ascending.
-#                                 Earliest entry first.
-#                   title_desc  - By title, descending alphabetically.
-#                   title_asc   - By title, ascending alphabetically.
-#                   url_desc    - By URL, descending alphabetically.
-#                   url_asc     - By URL, ascending alphabetically.
+#                   date_desc     - By date of entry descending.
+#                                   Latest entry first. (Default)
+#                   date_asc      - By date of entry ascending.
+#                                   Earliest entry first.
+#                   mod_date_desc - By modification date descending.
+#                                   Latest modified entry first.
+#                   mod_date_asc  - By modification date ascending.
+#                                   Earliest modified entry first.
+#                   title_desc    - By title, descending alphabetically.
+#                   title_asc     - By title, ascending alphabetically.
+#                   url_desc      - By URL, descending alphabetically.
+#                   url_asc       - By URL, ascending alphabetically.
 # TEMPLATES_DIR: The directory where the template files should be
 #                loaded from (the *.tpl.php files)
 # root         : Set to NULL to autodetect the root url of the website
@@ -120,18 +124,19 @@ $useredir          = FALSE;
 $url_redir         = 'http://www.google.com/url?sa=D&q=';
 
 $filetypes         = array(
-                       'audio' => array('mp3', 'ogg', 'wav'),
-                       'document' => array('doc', 'odt', 'pdf'),
-                       'image' => array('gif', 'jpeg', 'jpg', 'png'),
-                       'video' => array('avi', 'mov', 'mp4', 'mpeg', 'mpg', 'wmv')
+                      'audio'      => array('aac', 'mp3', 'm4a', 'oga', 'ogg', 'wav'),
+                      'document'   => array('doc', 'docx', 'odt', 'pages', 'pdf', 'txt'),
+                      'image'      => array('gif', 'jpe', 'jpeg', 'jpg', 'png', 'svg'),
+                      'bittorrent' => array('torrent'),
+                      'video'      => array('avi', 'flv', 'mov', 'mp4', 'mpeg', 'mpg', 'm4v', 'ogv', 'wmv')
                      );
 
 $reservedusers     = array('all', 'watchlist');
 
 $email_whitelist   = NULL;
 $email_blacklist   = array(
-                       '/(.*-){2,}/',
-                        '/mailinator\.com/i'
+                      '/(.*-){2,}/',
+                      '/mailinator\.com/i'
                      );
 
 include_once 'debug.inc.php';