Inital commit

core/lib/Thelia/Model/AdminLog.php

@@ -2,32 +2,41 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base\AdminLog as BaseAdminLog;
 use Thelia\Core\HttpFoundation\Request;
+use Thelia\Core\Security\User\UserInterface;
 use Thelia\Log\Tlog;
-use Thelia\Model\Base\Admin as BaseAdminUser;
+use Thelia\Model\Base\AdminLog as BaseAdminLog;
 
 class AdminLog extends BaseAdminLog
 {
     /**
      * A simple helper to insert an entry in the admin log
      *
-     * @param $resource
-     * @param $action
-     * @param $message
-     * @param Request    $request
-     * @param Base\Admin $adminUser
-     * @param bool       $withRequestContent
+     * @param string $resource
+     * @param string $action
+     * @param string $message
+     * @param Request       $request
+     * @param UserInterface $adminUser
+     * @param bool          $withRequestContent
+     * @param int           $resourceId
      */
-    public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null, $withRequestContent = true)
-    {
+    public static function append(
+        $resource,
+        $action,
+        $message,
+        Request $request,
+        UserInterface $adminUser = null,
+        $withRequestContent = true,
+        $resourceId = null
+    ) {
         $log = new AdminLog();
 
         $log
-            ->setAdminLogin($adminUser !== null ? $adminUser->getLogin() : '<no login>')
-            ->setAdminFirstname($adminUser !== null ? $adminUser->getFirstname() : '<no first name>')
-            ->setAdminLastname($adminUser !== null ? $adminUser->getLastname() : '<no last name>')
+            ->setAdminLogin($adminUser !== null ? $adminUser->getUsername() : '<no login>')
+            ->setAdminFirstname($adminUser !== null && $adminUser instanceof Admin ? $adminUser->getFirstname() : '<no first name>')
+            ->setAdminLastname($adminUser !== null && $adminUser instanceof Admin ? $adminUser->getLastname() : '<no last name>')
             ->setResource($resource)
+            ->setResourceId($resourceId)
             ->setAction($action)
             ->setMessage($message)
             ->setRequest($request->toString($withRequestContent));
@@ -37,6 +46,5 @@ class AdminLog extends BaseAdminLog
         } catch (\Exception $ex) {
             Tlog::getInstance()->err("Failed to insert new entry in AdminLog: {ex}", array('ex' => $ex));
         }
-
     }
 }