Merge remote-tracking branch 'origin/master'

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

diff --git a/lib/config.original.php b/lib/config.original.php
index 05631e6cfa5728b2646847fadea0446dbaed3810..c38e640efc8675a7a653113e5aae543e73d4a234 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -17,13 +17,13 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
 global $cfg;
- 
+
 /* Don't forget the ending '/' */
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';
@@ -58,7 +58,8 @@ $cfg['upload_password'] = array();
  */
 $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.
@@ -78,13 +79,20 @@ $cfg['admin_http_auth_user'] = '';
  * '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«)
+ */
+$cfg['availability_default'] = 'month';
 /* Set maximal upload size expressed in MB.
  * 0 mean unlimited upload size.
  */