Merge remote-tracking branch 'origin/master'

[jirafeau.git] / lib / config.original.php

diff --git a/lib/config.original.php b/lib/config.original.php
index b07f0e2386a748ed63fc5f802d5ff63d3ea9214a..c38e640efc8675a7a653113e5aae543e73d4a234 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -58,7 +58,8 @@ $cfg['upload_password'] = array();
  */
 $cfg['upload_ip'] = array();
 /* An empty admin password will disable the classic admin password
  */
 $cfg['upload_ip'] = array();
 /* An empty admin password will disable the classic admin password

- * authentication.
+ * authentication. Note that admin password is a sha256 hash of the original
+ * version.

  */
 $cfg['admin_password'] = '';
 /* If set, let's the user to be authenticated as administrator.
  */
 $cfg['admin_password'] = '';
 /* If set, let's the user to be authenticated as administrator.


@@ -78,13 +79,16 @@ $cfg['admin_http_auth_user'] = '';
  * 'year': file available for one year
  * 'none': unlimited availability
  */
  * 'year': file available for one year
  * 'none': unlimited availability
  */

-$cfg['availabilities'] = array ('minute' => true,
-                                'hour' => true,
-                                'day' => true,
-                                'week' => true,
-                                'month' => true,
-                                'year' => false,
-                                'none' => false);
+$cfg['availabilities'] = array (
+    'minute' => true,
+    'hour' => true,
+    'day' => true,
+    'week' => true,
+    'month' => true,
+    'quarter' => false,
+    'year' => false,
+    'none' => false
+);

 /* Set a default value for the expiration time.
  * The value has to equal one of the enabled options in »availabilities«, e.g. »month«)
  */
 /* Set a default value for the expiration time.
  * The value has to equal one of the enabled options in »availabilities«, e.g. »month«)
  */