From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Mon, 5 Jul 2010 15:51:41 +0000 (+0000)
Subject: move things around a bit, make config more understandable
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=03587ff3fb1e63e49bb90ff59981563df01d8c54;p=web%2Fkonrad%2Fsmoke.git

move things around a bit, make config more understandable


git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@526 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---

diff --git a/www/config.php.template b/www/config.php.template
index ccc2a13..dbc26d7 100644
--- a/www/config.php.template
+++ b/www/config.php.template
@@ -4,29 +4,6 @@
 //
 // see the documentation on how to make settings
 
-//Template directory
-$template="./template/";
-
-//Renderer options
-// uncomment the ones you want to use
-$twigoptions = array(
-  //cache should be either set to false (no cache) or an explicit writeable path
-  //if not present Twig will use a subdirectory under /tmp, which is not particularly secure
-   //'cache' => '/path/to/compilation_cache',
-   'cache' => false,
-  //character set the templates are written in, default is utf-8
-   //'charset' => 'utf-8',
-  //automatically reload/compile templates when they change
-   //'auto_reload' => false,
-);
-//Renderer extensions
-$twigextensions = array(
-  //'Escaper', //provides the escape filter and autoescaping
-  //'Sandbox', //allows to execute templates in a sandbox
-  //'I18n', //provides the trans filter
-);
-//there is currently no configuration available for these extensions - this may make them pretty useless
-
 ///////////
 //Chose a DB engine
 
@@ -73,14 +50,45 @@ $ClientSessionTimeout=2*3600;
 ///////////
 //Web-Client Configuration
 
-//how long the stuff in a shopping cart is stored
+//Template directory
+$template="./template/";
+
+//Renderer options
+// uncomment the ones you want to use
+$twigoptions = array(
+  //cache should be either set to false (no cache) or an explicit writeable path
+  //if not present Twig will use a subdirectory under /tmp, which is not particularly secure
+   //'cache' => '/path/to/compilation_cache',
+   'cache' => false,
+  //character set the templates are written in, default is utf-8
+   //'charset' => 'utf-8',
+  //automatically reload/compile templates when they change
+   //'auto_reload' => false,
+);
+//Renderer extensions
+$twigextensions = array(
+  //'Escaper', //provides the escape filter and autoescaping
+  //'Sandbox', //allows to execute templates in a sandbox
+  //'I18n', //provides the trans filter
+);
+//there is currently no configuration available for these extensions - this may make them pretty useless
+
+//how long the stuff in a shopping cart is stored, the value is in seconds (1h = 3600s)
 $CartTimeout=3600;
 
 //Authenticated web session timeout - how long an authenticated web session lasts
-// this should usually be a few hours (3600s per hour)
+// this should usually be on the order of 10-30 minutes (the value is in seconds)
 $WebSessionTimeout=1800;
 
 //whether to show errors in the web client - usually turned off in production mode
 $WebShowErrors=false;
 
-?>
+//default shipping for the web UI
+// true if shipping is enforced, false if the user may opt out of chosing a shipping option
+$WebForceShipping=true;
+// the default shipping type as DB ID, you see the ID in the "Edit shipping Options" dialog,
+// the option must be available to users with the flag _web,
+// set this to -1 if you do not want a default option
+$WebDefaultShipping=1;
+
+?>
\ No newline at end of file