+ * $query->filterByResource('fooValue'); // WHERE resource = 'fooValue'
+ * $query->filterByResource('%fooValue%'); // WHERE resource LIKE '%fooValue%'
+ *
+ *
+ * @param string $resource The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildAdminLogQuery The current query, for fluid interface
+ */
+ public function filterByResource($resource = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($resource)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $resource)) {
+ $resource = str_replace('*', '%', $resource);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(AdminLogTableMap::RESOURCE, $resource, $comparison);
+ }
+
/**
* Filter the query on the action column
*
@@ -394,6 +431,35 @@ abstract class AdminLogQuery extends ModelCriteria
return $this->addUsingAlias(AdminLogTableMap::ACTION, $action, $comparison);
}
+ /**
+ * Filter the query on the message column
+ *
+ * Example usage:
+ *
+ * $query->filterByMessage('fooValue'); // WHERE message = 'fooValue'
+ * $query->filterByMessage('%fooValue%'); // WHERE message LIKE '%fooValue%'
+ *
+ *
+ * @param string $message The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildAdminLogQuery The current query, for fluid interface
+ */
+ public function filterByMessage($message = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($message)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $message)) {
+ $message = str_replace('*', '%', $message);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(AdminLogTableMap::MESSAGE, $message, $comparison);
+ }
+
/**
* Filter the query on the request column
*
diff --git a/core/lib/Thelia/Model/Map/AdminLogTableMap.php b/core/lib/Thelia/Model/Map/AdminLogTableMap.php
index 633d6b4e9..fabd848dc 100644
--- a/core/lib/Thelia/Model/Map/AdminLogTableMap.php
+++ b/core/lib/Thelia/Model/Map/AdminLogTableMap.php
@@ -57,7 +57,7 @@ class AdminLogTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 8;
+ const NUM_COLUMNS = 10;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class AdminLogTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 8;
+ const NUM_HYDRATE_COLUMNS = 10;
/**
* the column name for the ID field
@@ -89,11 +89,21 @@ class AdminLogTableMap extends TableMap
*/
const ADMIN_LASTNAME = 'admin_log.ADMIN_LASTNAME';
+ /**
+ * the column name for the RESOURCE field
+ */
+ const RESOURCE = 'admin_log.RESOURCE';
+
/**
* the column name for the ACTION field
*/
const ACTION = 'admin_log.ACTION';
+ /**
+ * the column name for the MESSAGE field
+ */
+ const MESSAGE = 'admin_log.MESSAGE';
+
/**
* the column name for the REQUEST field
*/
@@ -121,12 +131,12 @@ class AdminLogTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'AdminLogin', 'AdminFirstname', 'AdminLastname', 'Action', 'Request', 'CreatedAt', 'UpdatedAt', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'adminLogin', 'adminFirstname', 'adminLastname', 'action', 'request', 'createdAt', 'updatedAt', ),
- self::TYPE_COLNAME => array(AdminLogTableMap::ID, AdminLogTableMap::ADMIN_LOGIN, AdminLogTableMap::ADMIN_FIRSTNAME, AdminLogTableMap::ADMIN_LASTNAME, AdminLogTableMap::ACTION, AdminLogTableMap::REQUEST, AdminLogTableMap::CREATED_AT, AdminLogTableMap::UPDATED_AT, ),
- self::TYPE_RAW_COLNAME => array('ID', 'ADMIN_LOGIN', 'ADMIN_FIRSTNAME', 'ADMIN_LASTNAME', 'ACTION', 'REQUEST', 'CREATED_AT', 'UPDATED_AT', ),
- self::TYPE_FIELDNAME => array('id', 'admin_login', 'admin_firstname', 'admin_lastname', 'action', 'request', 'created_at', 'updated_at', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
+ self::TYPE_PHPNAME => array('Id', 'AdminLogin', 'AdminFirstname', 'AdminLastname', 'Resource', 'Action', 'Message', 'Request', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'adminLogin', 'adminFirstname', 'adminLastname', 'resource', 'action', 'message', 'request', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(AdminLogTableMap::ID, AdminLogTableMap::ADMIN_LOGIN, AdminLogTableMap::ADMIN_FIRSTNAME, AdminLogTableMap::ADMIN_LASTNAME, AdminLogTableMap::RESOURCE, AdminLogTableMap::ACTION, AdminLogTableMap::MESSAGE, AdminLogTableMap::REQUEST, AdminLogTableMap::CREATED_AT, AdminLogTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'ADMIN_LOGIN', 'ADMIN_FIRSTNAME', 'ADMIN_LASTNAME', 'RESOURCE', 'ACTION', 'MESSAGE', 'REQUEST', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('id', 'admin_login', 'admin_firstname', 'admin_lastname', 'resource', 'action', 'message', 'request', 'created_at', 'updated_at', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -136,12 +146,12 @@ class AdminLogTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'AdminLogin' => 1, 'AdminFirstname' => 2, 'AdminLastname' => 3, 'Action' => 4, 'Request' => 5, 'CreatedAt' => 6, 'UpdatedAt' => 7, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'adminLogin' => 1, 'adminFirstname' => 2, 'adminLastname' => 3, 'action' => 4, 'request' => 5, 'createdAt' => 6, 'updatedAt' => 7, ),
- self::TYPE_COLNAME => array(AdminLogTableMap::ID => 0, AdminLogTableMap::ADMIN_LOGIN => 1, AdminLogTableMap::ADMIN_FIRSTNAME => 2, AdminLogTableMap::ADMIN_LASTNAME => 3, AdminLogTableMap::ACTION => 4, AdminLogTableMap::REQUEST => 5, AdminLogTableMap::CREATED_AT => 6, AdminLogTableMap::UPDATED_AT => 7, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'ADMIN_LOGIN' => 1, 'ADMIN_FIRSTNAME' => 2, 'ADMIN_LASTNAME' => 3, 'ACTION' => 4, 'REQUEST' => 5, 'CREATED_AT' => 6, 'UPDATED_AT' => 7, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'admin_login' => 1, 'admin_firstname' => 2, 'admin_lastname' => 3, 'action' => 4, 'request' => 5, 'created_at' => 6, 'updated_at' => 7, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'AdminLogin' => 1, 'AdminFirstname' => 2, 'AdminLastname' => 3, 'Resource' => 4, 'Action' => 5, 'Message' => 6, 'Request' => 7, 'CreatedAt' => 8, 'UpdatedAt' => 9, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'adminLogin' => 1, 'adminFirstname' => 2, 'adminLastname' => 3, 'resource' => 4, 'action' => 5, 'message' => 6, 'request' => 7, 'createdAt' => 8, 'updatedAt' => 9, ),
+ self::TYPE_COLNAME => array(AdminLogTableMap::ID => 0, AdminLogTableMap::ADMIN_LOGIN => 1, AdminLogTableMap::ADMIN_FIRSTNAME => 2, AdminLogTableMap::ADMIN_LASTNAME => 3, AdminLogTableMap::RESOURCE => 4, AdminLogTableMap::ACTION => 5, AdminLogTableMap::MESSAGE => 6, AdminLogTableMap::REQUEST => 7, AdminLogTableMap::CREATED_AT => 8, AdminLogTableMap::UPDATED_AT => 9, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'ADMIN_LOGIN' => 1, 'ADMIN_FIRSTNAME' => 2, 'ADMIN_LASTNAME' => 3, 'RESOURCE' => 4, 'ACTION' => 5, 'MESSAGE' => 6, 'REQUEST' => 7, 'CREATED_AT' => 8, 'UPDATED_AT' => 9, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'admin_login' => 1, 'admin_firstname' => 2, 'admin_lastname' => 3, 'resource' => 4, 'action' => 5, 'message' => 6, 'request' => 7, 'created_at' => 8, 'updated_at' => 9, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -164,8 +174,10 @@ class AdminLogTableMap extends TableMap
$this->addColumn('ADMIN_LOGIN', 'AdminLogin', 'VARCHAR', false, 255, null);
$this->addColumn('ADMIN_FIRSTNAME', 'AdminFirstname', 'VARCHAR', false, 255, null);
$this->addColumn('ADMIN_LASTNAME', 'AdminLastname', 'VARCHAR', false, 255, null);
+ $this->addColumn('RESOURCE', 'Resource', 'VARCHAR', false, 255, null);
$this->addColumn('ACTION', 'Action', 'VARCHAR', false, 255, null);
- $this->addColumn('REQUEST', 'Request', 'LONGVARCHAR', false, null, null);
+ $this->addColumn('MESSAGE', 'Message', 'LONGVARCHAR', false, null, null);
+ $this->addColumn('REQUEST', 'Request', 'CLOB', false, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
} // initialize()
@@ -332,7 +344,9 @@ class AdminLogTableMap extends TableMap
$criteria->addSelectColumn(AdminLogTableMap::ADMIN_LOGIN);
$criteria->addSelectColumn(AdminLogTableMap::ADMIN_FIRSTNAME);
$criteria->addSelectColumn(AdminLogTableMap::ADMIN_LASTNAME);
+ $criteria->addSelectColumn(AdminLogTableMap::RESOURCE);
$criteria->addSelectColumn(AdminLogTableMap::ACTION);
+ $criteria->addSelectColumn(AdminLogTableMap::MESSAGE);
$criteria->addSelectColumn(AdminLogTableMap::REQUEST);
$criteria->addSelectColumn(AdminLogTableMap::CREATED_AT);
$criteria->addSelectColumn(AdminLogTableMap::UPDATED_AT);
@@ -341,7 +355,9 @@ class AdminLogTableMap extends TableMap
$criteria->addSelectColumn($alias . '.ADMIN_LOGIN');
$criteria->addSelectColumn($alias . '.ADMIN_FIRSTNAME');
$criteria->addSelectColumn($alias . '.ADMIN_LASTNAME');
+ $criteria->addSelectColumn($alias . '.RESOURCE');
$criteria->addSelectColumn($alias . '.ACTION');
+ $criteria->addSelectColumn($alias . '.MESSAGE');
$criteria->addSelectColumn($alias . '.REQUEST');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
diff --git a/core/lib/Thelia/Tools/FileManager.php b/core/lib/Thelia/Tools/FileManager.php
index a795bcd5e..b4173645e 100644
--- a/core/lib/Thelia/Tools/FileManager.php
+++ b/core/lib/Thelia/Tools/FileManager.php
@@ -118,20 +118,6 @@ class FileManager
$directory = $this->getUploadDir($parentType, $fileType);
$fileName = $this->renameFile($model->getId(), $uploadedFile);
- $this->adminLogAppend(
- $this->translator->trans(
- 'Uploading %type% %fileName% to %directory% for parent_id %parentId% (%parentType%)',
- array(
- '%type%' => $fileType,
- '%fileName%' => $uploadedFile->getClientOriginalName(),
- '%directory%' => $directory . '/' . $fileName,
- '%parentId%' => $parentId,
- '%parentType%' => $parentType
- ),
- 'image'
- )
- );
-
$newUploadedFile = $uploadedFile->move($directory, $fileName);
$model->setFile($fileName);
@@ -282,20 +268,6 @@ class FileManager
return strtolower(preg_replace('/[^a-zA-Z0-9-_\.]/', '', $string));
}
- /**
- * Helper to append a message to the admin log.
- *
- * @param string $message
- */
- public function adminLogAppend($message)
- {
- AdminLog::append(
- $message,
- $this->container->get('request'),
- $this->container->get('thelia.securityContext')->getAdminUser()
- );
- }
-
/**
* Delete image from file storage and database
*
diff --git a/install/thelia.sql b/install/thelia.sql
index 79163345b..c20bbc8e2 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -1138,8 +1138,10 @@ CREATE TABLE `admin_log`
`admin_login` VARCHAR(255),
`admin_firstname` VARCHAR(255),
`admin_lastname` VARCHAR(255),
+ `resource` VARCHAR(255),
`action` VARCHAR(255),
- `request` TEXT,
+ `message` TEXT,
+ `request` LONGTEXT,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`)
diff --git a/local/config/schema.xml b/local/config/schema.xml
index ba19efee0..6e547bd19 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,1259 +1,1261 @@
-
-