better array construction for base_16_to_64 construction

[jirafeau_project.git] / lib / config.php

diff --git a/lib/config.php b/lib/config.php
index 141d12cb3b16874d800c3fe90730283d74281d7b..31fbded779434b1a96c9f0ac67102c1fc78579ab 100644 (file)
--- a/lib/config.php
+++ b/lib/config.php
@@ -16,27 +16,38 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+ 
 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
-
-// don't forget the ending '/'
+ global $cfg;
+ 
+/* don't forget the ending '/' */
 $cfg['web_root'] = '';
-
 $cfg['var_root'] = '';
 
-$cfg['lang'] = '';
-
-$cfg['style'] = 'default';
-
+/* Lang choice between 'auto', 'en' and 'fr'.
+   'auto' mode will take the user's browser informations. Will take english if
+   user's langage is not available.
+ */
+$cfg['lang'] = 'auto';
+$cfg['style'] = 'industrial';
 $cfg['rewrite'] = false;
-
-$cfg['password'] = '';
-
-if((basename(__FILE__) != 'config.local.php') && file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
-  require(JIRAFEAU_ROOT . 'lib/config.local.php');
+/* 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;
+/* Download page:
+ * 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;
+
+if ((basename (__FILE__) != 'config.local.php')
+    && file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
+{
+    require (JIRAFEAU_ROOT.'lib/config.local.php');
 }
 
 ?>