Merge branch 'cleanmaster' into modules

Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php

Readme.md

@@ -30,8 +30,8 @@ Requirements
 
 If you use Mac OSX, it still doesn't use php 5.4 as default php version... There are many solutions for you :
 
-* use linux (the best one)
-* use last MAMP version and put the php bin directory in your path  :
+* use [phpbrew](https://github.com/c9s/phpbrew)
+* use last MAMP version and put the php bin directory in your path:
 
 ```bash
 export PATH=/Applications/MAMP/bin/php/php5.4.x/bin/:$PATH

core/lib/Thelia/Controller/Admin/SessionController.php

@@ -99,7 +99,7 @@ class SessionController extends BaseAdminController
             $this->getSecurityContext()->setAdminUser($user);
 
             // Log authentication success
-            AdminLog::append("admin", "LOGIN", "Authentication successful", $request, $user);
+            AdminLog::append("admin", "LOGIN", "Authentication successful", $request, $user, false);
 
             /**
              * FIXME: we have tou find a way to send cookie

core/lib/Thelia/Controller/BaseController.php

@@ -147,7 +147,7 @@ abstract class BaseController extends ContainerAware
     }
 
     /**
-     * @return \Symfony\Component\HttpFoundation\Request
+     * @return \Thelia\Core\HttpFoundation\Request
      */
     protected function getRequest()
     {

core/lib/Thelia/Core/HttpFoundation/Request.php

@@ -34,6 +34,11 @@ use Symfony\Component\HttpFoundation\Request as BaseRequest;
 class Request extends BaseRequest
 {
 
+    private $excludeContent = array(
+        'username',
+        'password'
+    );
+
     public function getProductId()
     {
         return $this->get("product_id");
@@ -66,4 +71,17 @@ class Request extends BaseRequest
     {
         return parent::getSession();
     }
+
+    public function toString($withContent = true)
+    {
+        $string =
+            sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
+            $this->headers."\r\n";
+
+        if (true === $withContent) {
+            $string .= $this->getContent();
+        }
+
+        return $string;
+    }
 }

core/lib/Thelia/Model/AdminLog.php

@@ -18,7 +18,7 @@ class AdminLog extends BaseAdminLog
      * @param Request    $request
      * @param Base\Admin $adminUser
      */
-    public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null) {
+    public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null, $withRequestContent = true) {
 
 		$log = new AdminLog();
 
@@ -29,7 +29,7 @@ class AdminLog extends BaseAdminLog
 	       	->setResource($resource)
 	       	->setAction($action)
             ->setMessage($message)
-	       	->setRequest($request->__toString())
+	       	->setRequest($request->toString($withRequestContent))
 	    ;
 
         try {

core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php

@@ -3,11 +3,10 @@ namespace Thelia\Tests\Action;
 
 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Exception\UrlRewritingException;
+use Thelia\Model\ProductQuery;
 use Thelia\Model\RewritingUrlQuery;
 use Thelia\Model\ConfigQuery;
-use Thelia\Model\ProductQuery;
 use Thelia\Rewriting\RewritingResolver;
-use Thelia\Tools\URL;
 
 /**
  * Class RewrittenUrlTestTrait

templates/backOffice/default/I18n/en_US.php

@@ -5,7 +5,7 @@ return array(
 	'Version %ver' => 'Version %ver',
 	'View site' => 'View site',
 	'View shop' => 'View shop',
-	'Profil' => 'Profil',
+	'Profil' => 'Profile',
 	'Close administation session' => 'Close administation session',
 	'Logout' => 'Logout',
 	'Home' => 'Home',

templates/backOffice/default/admin-layout.tpl

@@ -222,8 +222,8 @@
         <div class="container">
             <p>{intl l='&copy; Thelia 2013'}
             - <a href="http://www.openstudio.fr/" target="_blank">{intl l='Published by OpenStudio'}</a>
-            - <a href="http://forum.thelia.net/" target="_blank">{intl l='Thelia support forum'}</a>
-            - <a href="http://contrib.thelia.net/" target="_blank">{intl l='Thelia contributions'}</a>
+            - <a href="http://thelia.net/forum" target="_blank">{intl l='Thelia support forum'}</a>
+            - <a href="#" target="_blank">{intl l='Thelia contributions'}</a>
             </p>
 
             {module_include location='in_footer'}
@@ -269,4 +269,4 @@
 	{module_include location='footer_js'}
 
 </body>
-</html>
+</html>

templates/backOffice/default/category-edit.html

@@ -308,8 +308,9 @@
     {javascripts file='assets/js/document-upload.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
-
-
+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 
 <script src="{url file='/tinymce/tinymce.min.js'}"></script>
 <script>

templates/backOffice/default/content-edit.html

@@ -200,6 +200,9 @@ form_content    = {$smarty.capture.delete_folder_dialog nofilter}
     {javascripts file='assets/js/document-upload.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 
     <script>
         $(function() {

templates/backOffice/default/folder-edit.html

@@ -299,6 +299,9 @@
     {javascripts file='assets/js/document-upload.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 
     <script>
         $(function() {

templates/backOffice/default/product-edit.html

@@ -135,15 +135,12 @@
     {javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
-
 	{javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
 	    <script src="{$asset_url}"></script>
 	{/javascripts}
-
     {javascripts file='assets/js/jquery.typewatch.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
-
     {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}

templates/frontOffice/default/product.html

@@ -27,7 +27,7 @@
                 {/loop}
             {/loop}
             {loop name="brand.feature" type="feature" product="{$ID}" title="isbn"}
-                {loop name="brand.value" type="feature_value" feature="{$ID}" product=$product_id}
+                {loop name="brand.value" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
                     <meta itemprop="productID" content="isbn:{$TITLE}">
                 {/loop}
             {/loop}