@@ -4,43 +4,43 @@ |
||
4 | 4 | use Illuminate\Database\Migrations\Migration; |
5 | 5 | |
6 | 6 | class CreateActivityLogTable extends Migration { |
7 | - /** |
|
8 | - * Run the migrations. |
|
9 | - * |
|
10 | - * @return void |
|
11 | - */ |
|
12 | - public function up() |
|
13 | - { |
|
7 | + /** |
|
8 | + * Run the migrations. |
|
9 | + * |
|
10 | + * @return void |
|
11 | + */ |
|
12 | + public function up() |
|
13 | + { |
|
14 | 14 | Schema::create('activity_log', function(Blueprint $table) |
15 | 15 | { |
16 | - $table->increments('id'); |
|
16 | + $table->increments('id'); |
|
17 | 17 | |
18 | - $table->integer('user_id')->nullable(); |
|
19 | - $table->integer('content_id')->nullable(); |
|
18 | + $table->integer('user_id')->nullable(); |
|
19 | + $table->integer('content_id')->nullable(); |
|
20 | 20 | |
21 | - $table->string('content', 72)->nullable(); |
|
22 | - $table->string('action', 32)->nullable(); |
|
23 | - $table->string('state', 32)->nullable(); |
|
21 | + $table->string('content', 72)->nullable(); |
|
22 | + $table->string('action', 32)->nullable(); |
|
23 | + $table->string('state', 32)->nullable(); |
|
24 | 24 | |
25 | - $table->longText('details')->nullable(); |
|
26 | - $table->longText('data')->nullable(); |
|
25 | + $table->longText('details')->nullable(); |
|
26 | + $table->longText('data')->nullable(); |
|
27 | 27 | |
28 | - $table->string('version', 10)->nullable(); |
|
29 | - $table->string('ip_address', 64); |
|
30 | - $table->string('user_agent', 255); |
|
28 | + $table->string('version', 10)->nullable(); |
|
29 | + $table->string('ip_address', 64); |
|
30 | + $table->string('user_agent', 255); |
|
31 | 31 | |
32 | - $table->timestamp('created_at')->useCurrent(); |
|
33 | - $table->timestamp('updated_at')->useCurrent(); |
|
32 | + $table->timestamp('created_at')->useCurrent(); |
|
33 | + $table->timestamp('updated_at')->useCurrent(); |
|
34 | 34 | }); |
35 | - } |
|
36 | - |
|
37 | - /** |
|
38 | - * Reverse the migrations. |
|
39 | - * |
|
40 | - * @return void |
|
41 | - */ |
|
42 | - public function down() |
|
43 | - { |
|
35 | + } |
|
36 | + |
|
37 | + /** |
|
38 | + * Reverse the migrations. |
|
39 | + * |
|
40 | + * @return void |
|
41 | + */ |
|
42 | + public function down() |
|
43 | + { |
|
44 | 44 | Schema::drop('activity_log'); |
45 | - } |
|
45 | + } |
|
46 | 46 | } |
@@ -5,19 +5,19 @@ discard block |
||
5 | 5 | use Illuminate\Support\Facades\Request; |
6 | 6 | |
7 | 7 | class Activity extends Eloquent { |
8 | - /** |
|
9 | - * The database table used by the model. |
|
10 | - * |
|
11 | - * @var string |
|
12 | - */ |
|
13 | - protected $table = 'activity_log'; |
|
14 | - |
|
15 | - /** |
|
16 | - * The fillable fields for the model. |
|
17 | - * |
|
18 | - * @var array |
|
19 | - */ |
|
20 | - protected $fillable = [ |
|
8 | + /** |
|
9 | + * The database table used by the model. |
|
10 | + * |
|
11 | + * @var string |
|
12 | + */ |
|
13 | + protected $table = 'activity_log'; |
|
14 | + |
|
15 | + /** |
|
16 | + * The fillable fields for the model. |
|
17 | + * |
|
18 | + * @var array |
|
19 | + */ |
|
20 | + protected $fillable = [ |
|
21 | 21 | 'user_id', |
22 | 22 | 'content', |
23 | 23 | 'content_id', |
@@ -28,71 +28,71 @@ discard block |
||
28 | 28 | 'version', |
29 | 29 | 'ip_address', |
30 | 30 | 'user_agent', |
31 | - ]; |
|
32 | - |
|
33 | - /** |
|
34 | - * Get the user that the activity belongs to. |
|
35 | - * |
|
36 | - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
37 | - */ |
|
38 | - public function user() |
|
39 | - { |
|
31 | + ]; |
|
32 | + |
|
33 | + /** |
|
34 | + * Get the user that the activity belongs to. |
|
35 | + * |
|
36 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
37 | + */ |
|
38 | + public function user() |
|
39 | + { |
|
40 | 40 | return $this->belongsTo(config('auth.providers.users.model'), 'user_id'); |
41 | - } |
|
42 | - |
|
43 | - /** |
|
44 | - * Create an activity log entry. |
|
45 | - * |
|
46 | - * @param mixed $data |
|
47 | - * @return boolean |
|
48 | - */ |
|
49 | - public static function log($data = []) |
|
50 | - { |
|
41 | + } |
|
42 | + |
|
43 | + /** |
|
44 | + * Create an activity log entry. |
|
45 | + * |
|
46 | + * @param mixed $data |
|
47 | + * @return boolean |
|
48 | + */ |
|
49 | + public static function log($data = []) |
|
50 | + { |
|
51 | 51 | // set the defaults from config |
52 | 52 | $defaults = config('activity-log.defaults'); |
53 | 53 | if (!is_array($defaults)) { |
54 | - $defaults = []; |
|
54 | + $defaults = []; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | if (is_object($data)) { |
58 | - $data = (array) $data; |
|
58 | + $data = (array) $data; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | // conversion path to content |
62 | 62 | if (isset($data['contentType']) && !isset($data['content'])) { |
63 | - $data['content'] = $data['contentType']; |
|
63 | + $data['content'] = $data['contentType']; |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | // conversion path to state |
67 | 67 | if (isset($data['description']) && !isset($data['state'])) { |
68 | - $data['state'] = $data['description']; |
|
68 | + $data['state'] = $data['description']; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | // set the user ID |
72 | 72 | if (config('activity-log.auto_set_user_id') && !isset($data['userId'])) { |
73 | - $user = call_user_func(config('activity-log.auth_method')); |
|
74 | - $data['userId'] = isset($user->id) ? $user->id : null; |
|
73 | + $user = call_user_func(config('activity-log.auth_method')); |
|
74 | + $data['userId'] = isset($user->id) ? $user->id : null; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | // set IP address |
78 | 78 | if (!isset($data['ipAddress'])) { |
79 | - $data['ipAddress'] = Request::getClientIp(); |
|
79 | + $data['ipAddress'] = Request::getClientIp(); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | // set user agent |
83 | 83 | if (!isset($data['userAgent'])) { |
84 | - $data['userAgent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'No User Agent'; |
|
84 | + $data['userAgent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'No User Agent'; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | // set additional data and encode it as JSON if it is an array or an object |
88 | 88 | if (isset($data['data']) && (is_array($data['data']) || is_object($data['data']))) { |
89 | - $data['data'] = json_encode($data['data']); |
|
89 | + $data['data'] = json_encode($data['data']); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | // format array keys to snake case for insertion into database |
93 | 93 | $dataFormatted = []; |
94 | 94 | foreach ($data as $key => $value) { |
95 | - $dataFormatted[snake_case($key)] = $value; |
|
95 | + $dataFormatted[snake_case($key)] = $value; |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | // merge defaults array with formatted data array |
@@ -102,5 +102,5 @@ discard block |
||
102 | 102 | $self = static::create($data); |
103 | 103 | |
104 | 104 | return $self; |
105 | - } |
|
105 | + } |
|
106 | 106 | } |