Merge with master

web/install/bootstrap.php

@@ -20,7 +20,7 @@
 /*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-
+define('THELIA_INSTALL_MODE', true);
 include __DIR__ . "/../../core/bootstrap.php";
 
 $thelia = new \Thelia\Core\Thelia("install", false);

web/install/config.php

@@ -93,8 +93,8 @@ $_SESSION['install']['step'] = $step;
             <input id="email_contact" class="form-control" type="text" name="email_contact" placeholder="foo@bar.com" value="" required>
         </div>
         <div class="form-group">
-            <label for="site_name">Site name :</label>
-            <input id="site_name" class="form-control" type="text" name="site_name" placeholder="" value="" required>
+            <label for="site_name">Company name :</label>
+            <input id="site_name" class="form-control" type="text" name="company_name" placeholder="" value="" required>
         </div>
         <div class="clearfix">
             <div class="control-btn">

web/install/end.php

@@ -35,23 +35,38 @@ if($_SESSION['install']['step'] == 5) {
         ->setLastname('admin')
         ->save();
 
-    $config = new \Thelia\Model\Config();
-    $config->setName('contact_email')
-        ->setValue($_POST['email_contact'])
-        ->save();
-    ;
+
+    \Thelia\Model\ConfigQuery::create()
+        ->filterByName('contact_email')
+        ->update(array('Value' => $_POST['email_contact']));
+
+    \Thelia\Model\ConfigQuery::create()
+        ->filterByName('company_name')
+        ->update(array('Value' => $_POST['company_name']));
 }
 
+//clean up cache directories
+$fs = new \Symfony\Component\Filesystem\Filesystem();
+
+$fs->remove(THELIA_ROOT . '/cache/prod');
+$fs->remove(THELIA_ROOT . '/cache/dev');
+
+
+$request = \Thelia\Core\HttpFoundation\Request::createFromGlobals();
 $_SESSION['install']['step'] = $step;
 ?>
 
     <div class="well">
         <p class="lead text-center">
-            Thank you have installed Thelia
+            Thanks, you have installed Thelia
         </p>
         <p class="lead text-center">
             Don't forget to delete the web/install directory.
         </p>
 
+        <p class="lead text-center">
+            <a href="<?php echo $request->getSchemeAndHttpHost(); ?>/admin">Go to back office</a>
+        </p>
+
     </div>
 <?php include "footer.php"; ?>

web/test_to_remove/admin-stats.json

@@ -1,6 +1,6 @@
-{	
-	"title" : "Stats on September 2013",
-	"series" : [
+{
+  "title" : "Stats on September 2013",
+  "series" : [
         {
             "datas" : [[0,10.00],[1,200.00],[2,5.00],[3,2.75],[4,20.30],[5,14.09],[6,5],[7,23],[8,5],[9,42],[10,0],[11,4],[12,78],[13,75],[14,70],[15,65],[16,102],[17,50],[18,27],[19,35],[20,37],[21,29],[22,56],[23,52],[24,12],[25,6],[26,82],[27,32],[28,15],[29,50],[30,42]],
             "color" : "#adadad"
@@ -22,4 +22,4 @@
             "color" : "#d9534f"
         }
     ]
-}
+}