TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into frontend

Browse Source
This commit is contained in:
Manuel Raynaud
2013-12-16 15:45:04 +01:00
parent 681ac83334 315ed1fb09
commit d6ba2b3d65
42 changed files with 541 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Core/Event/TheliaEvents.php
View File

@@ -408,6 +408,7 @@ final class TheliaEvents
* Save given documents
*/
const DOCUMENT_UPDATE = "action.updateDocument";
const DOCUMENT_UPDATE_POSITION = "action.updateDocumentPosition";
/**
* Delete given document
@@ -428,6 +429,7 @@ final class TheliaEvents
* Save given images
*/
const IMAGE_UPDATE = "action.updateImages";
const IMAGE_UPDATE_POSITION = "action.updateImagePosition";
/**
* Delete given image

60
core/lib/Thelia/Core/Event/UpdateFilePositionEvent.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Core\Event;
use Propel\Runtime\ActiveQuery\ModelCriteria;
class UpdateFilePositionEvent extends UpdatePositionEvent
{
protected $query;
/**
* @param ModelCriteria $query
* @param $object_id
* @param null $mode
* @param null $position
*/
public function __construct(ModelCriteria $query, $object_id, $mode, $position = null)
{
parent::__construct($object_id, $mode, $position);
$this->setQuery($query);
}
/**
* @param ModelCriteria $query
*/
public function setQuery(ModelCriteria $query)
{
$this->query = $query;
}
/**
* @return ModelCriteria|null
*/
public function getQuery()
{
return $this->query;
}
}

18
core/lib/Thelia/Core/HttpFoundation/Request.php
View File

@@ -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;
}
}

2
core/lib/Thelia/Core/Security/Exception/RessourceException.php → core/lib/Thelia/Core/Security/Exception/ResourceException.php
View File

@@ -23,7 +23,7 @@
namespace Thelia\Core\Security\Exception;
class RessourceException extends \RuntimeException
class ResourceException extends \RuntimeException
{
const UNKNOWN_EXCEPTION = 0;