Merge branch 'master' into next-release

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

diff --git a/lib/config.original.php b/lib/config.original.php
index c666d03fa169c9e675f0f4e96f4f4f04c26b076c..d261f682b1083b9b0ca0f30fbcd36fbfc8029ce4 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -100,13 +100,23 @@ $cfg['upload_ip_nopassword'] = array();
  */
 $cfg['admin_password'] = '';
 
  */
 $cfg['admin_password'] = '';
 

-/* If set, let the user be authenticated as administrator.
- * The user provided here is the user authenticated by HTTP authentication.
+/* If set, let the users be authenticated as administrator.
+ * The users provided here are authenticated by HTTP authentication.

  * Note that Jirafeau does not manage the HTTP login part, it just checks
  * Note that Jirafeau does not manage the HTTP login part, it just checks

- * that the provided user is logged in.
+ * that one of the provided users is logged in.
+ * May be an array for multiple users or a string for a single user.
+ * The option to provide a string is for backward compatibility.

  * If »admin_password« parameter is set, then the »admin_password« is ignored.
  */
  * If »admin_password« parameter is set, then the »admin_password« is ignored.
  */

-$cfg['admin_http_auth_user'] = '';
+$cfg['admin_http_auth_user'] = array();
+
+/* List of IP allowed to access the admin interface.
+ * If the list is empty, then there is no admin interface restriction based on IP.
+ * Elements of the list can be a single IP (e.g. "123.45.67.89") or
+ * an IP range (e.g. "123.45.0.0/16").
+ * Note that CIDR notation is available for IPv4 only for the moment.
+ */
+$cfg['admin_ip'] = array();

 
 /* Allow user to select different options for file expiration time.
  * Possible values in array:
 
 /* Allow user to select different options for file expiration time.
  * Possible values in array:


@@ -142,6 +152,11 @@ $cfg['availability_default'] = 'month';
  */
 $cfg['one_time_download'] = true;
 
  */
 $cfg['one_time_download'] = true;
 

+/* When set to "true", the checkbox for deleting the file after the first download
+ * is preselected.
+ */
+$cfg['one_time_download_preselected'] = false;
+

 /* Set maximal upload size expressed in MB.
  * »0« means unlimited upload size.
  */
 /* Set maximal upload size expressed in MB.
  * »0« means unlimited upload size.
  */