X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/6c49ea194c030a04ce8b303aae2a51dce01c7382..4c5e2caa3a0fedd86292b213c3bb3aa8c812d8c2:/lib/config.original.php

diff --git a/lib/config.original.php b/lib/config.original.php
index d955d19..76d5870 100644
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -2,6 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -34,8 +35,6 @@ $cfg['var_root'] = '';
 $cfg['lang'] = 'auto';
 $cfg['style'] = 'modern';
 $cfg['rewrite'] = false;
-/* An empty admin password will disable the admin interface. */
-$cfg['admin_password'] = '';
 /* preview: false (will download file) or true (will preview in browser if
  * possible) . */
 $cfg['preview'] = true;
@@ -43,10 +42,6 @@ $cfg['preview'] = true;
  * true: Will show a download page (with preview if permited and possible).
  * false: Will directly download file or preview (if permited and possible). */
 $cfg['download_page'] = false;
-/* Block feature:
-   The scripting interface can propose to create, read, write, delete blocks
-   of data. */
-$cfg['enable_blocks'] = false;
 /* Encryption feature. disable it by default.
  * By enabling it, file-level deduplication won't work. */
 $cfg['enable_crypt'] = false;
@@ -59,10 +54,21 @@ $cfg['link_name_lenght'] = 8;
  * ... and so on
  */
 $cfg['upload_password'] = array();
-
+/* An empty admin password will disable the classic admin password
+ * authentication.
+ */
+$cfg['admin_password'] = '';
+/* If set, let's the user to be authenticated as administrator.
+ * The user provided here is the user authenticated by HTTP authentication.
+ * Note that Jirafeau does not manage the HTTP login part, it just check
+ * that the provided user is logged.
+ * If admin_password parameter is also set, admin_password is ignored.
+ */
+$cfg['admin_http_auth_user'] = '';
 /* Installation is done ? */
 $cfg['installation_done'] = false;
 
+/* Try to include user's local configuration. */
 if ((basename (__FILE__) != 'config.local.php')
     && file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
 {