@@ -33,7 +33,7 @@ |
||
| 33 | 33 | /** |
| 34 | 34 | * Get the user that the activity belongs to. |
| 35 | 35 | * |
| 36 | - * @return object |
|
| 36 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 37 | 37 | */ |
| 38 | 38 | public function user() |
| 39 | 39 | { |
@@ -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'; |
|
| 8 | + /** |
|
| 9 | + * The database table used by the model. |
|
| 10 | + * |
|
| 11 | + * @var string |
|
| 12 | + */ |
|
| 13 | + protected $table = 'activity_log'; |
|
| 14 | 14 | |
| 15 | - /** |
|
| 16 | - * The fillable fields for the model. |
|
| 17 | - * |
|
| 18 | - * @var array |
|
| 19 | - */ |
|
| 20 | - protected $fillable = [ |
|
| 15 | + /** |
|
| 16 | + * The fillable fields for the model. |
|
| 17 | + * |
|
| 18 | + * @var array |
|
| 19 | + */ |
|
| 20 | + protected $fillable = [ |
|
| 21 | 21 | 'user_id', |
| 22 | 22 | 'content_type', |
| 23 | 23 | 'content_id', |
@@ -28,61 +28,61 @@ discard block |
||
| 28 | 28 | 'version', |
| 29 | 29 | 'ip_address', |
| 30 | 30 | 'user_agent', |
| 31 | - ]; |
|
| 31 | + ]; |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * Get the user that the activity belongs to. |
|
| 35 | - * |
|
| 36 | - * @return object |
|
| 37 | - */ |
|
| 38 | - public function user() |
|
| 39 | - { |
|
| 33 | + /** |
|
| 34 | + * Get the user that the activity belongs to. |
|
| 35 | + * |
|
| 36 | + * @return object |
|
| 37 | + */ |
|
| 38 | + public function user() |
|
| 39 | + { |
|
| 40 | 40 | return $this->belongsTo(config('auth.providers.users.model'), 'user_id'); |
| 41 | - } |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Create an activity log entry. |
|
| 45 | - * |
|
| 46 | - * @param mixed $data |
|
| 47 | - * @return boolean |
|
| 48 | - */ |
|
| 49 | - public static function log($data = []) |
|
| 50 | - { |
|
| 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 | // set the user ID |
| 62 | 62 | if (config('activity-log.auto_set_user_id') && !isset($data['userId'])) { |
| 63 | - $user = call_user_func(config('activity-log.auth_method')); |
|
| 64 | - $data['userId'] = isset($user->id) ? $user->id : null; |
|
| 63 | + $user = call_user_func(config('activity-log.auth_method')); |
|
| 64 | + $data['userId'] = isset($user->id) ? $user->id : null; |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | // set IP address |
| 68 | 68 | if (!isset($data['ipAddress'])) { |
| 69 | - $data['ipAddress'] = Request::getClientIp(); |
|
| 69 | + $data['ipAddress'] = Request::getClientIp(); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // set user agent |
| 73 | 73 | if (!isset($data['userAgent'])) { |
| 74 | - $data['userAgent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'No User Agent'; |
|
| 74 | + $data['userAgent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'No User Agent'; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | // set additional data and encode it as JSON if it is an array or an object |
| 78 | 78 | if (isset($data['data']) && (is_array($data['data']) || is_object($data['data']))) { |
| 79 | - $data['data'] = json_encode($data['data']); |
|
| 79 | + $data['data'] = json_encode($data['data']); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // format array keys to snake case for insertion into database |
| 83 | 83 | $dataFormatted = []; |
| 84 | 84 | foreach ($data as $key => $value) { |
| 85 | - $dataFormatted[snake_case($key)] = $value; |
|
| 85 | + $dataFormatted[snake_case($key)] = $value; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | // merge defaults array with formatted data array |
@@ -92,5 +92,5 @@ discard block |
||
| 92 | 92 | $self = static::create($data); |
| 93 | 93 | |
| 94 | 94 | return $self; |
| 95 | - } |
|
| 95 | + } |
|
| 96 | 96 | } |
@@ -3,48 +3,48 @@ |
||
| 3 | 3 | use Illuminate\Support\ServiceProvider; |
| 4 | 4 | |
| 5 | 5 | class ActivityLogServiceProvider extends ServiceProvider {
|
| 6 | - /** |
|
| 7 | - * Indicates if loading of the provider is deferred. |
|
| 8 | - * |
|
| 9 | - * @var bool |
|
| 10 | - */ |
|
| 11 | - protected $defer = false; |
|
| 6 | + /** |
|
| 7 | + * Indicates if loading of the provider is deferred. |
|
| 8 | + * |
|
| 9 | + * @var bool |
|
| 10 | + */ |
|
| 11 | + protected $defer = false; |
|
| 12 | 12 | |
| 13 | - /** |
|
| 14 | - * Bootstrap the application events. |
|
| 15 | - * |
|
| 16 | - * @return void |
|
| 17 | - */ |
|
| 18 | - public function boot() |
|
| 19 | - {
|
|
| 13 | + /** |
|
| 14 | + * Bootstrap the application events. |
|
| 15 | + * |
|
| 16 | + * @return void |
|
| 17 | + */ |
|
| 18 | + public function boot() |
|
| 19 | + {
|
|
| 20 | 20 | $this->publishes([ |
| 21 | - __DIR__ . '/config/activity-log.php' => config_path('activity-log.php'),
|
|
| 21 | + __DIR__ . '/config/activity-log.php' => config_path('activity-log.php'),
|
|
| 22 | 22 | ]); |
| 23 | 23 | |
| 24 | 24 | $this->publishes([ |
| 25 | - __DIR__ . '/migrations' => database_path('migrations'),
|
|
| 25 | + __DIR__ . '/migrations' => database_path('migrations'),
|
|
| 26 | 26 | ], 'migrations'); |
| 27 | 27 | |
| 28 | 28 | $this->mergeConfigFrom(__DIR__ . '/config/activity-log.php', 'activity-log'); |
| 29 | - } |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Register the service provider. |
|
| 33 | - * |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 36 | - public function register() |
|
| 37 | - {
|
|
| 31 | + /** |
|
| 32 | + * Register the service provider. |
|
| 33 | + * |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | + public function register() |
|
| 37 | + {
|
|
| 38 | 38 | // |
| 39 | - } |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Get the services provided by the provider. |
|
| 43 | - * |
|
| 44 | - * @return array |
|
| 45 | - */ |
|
| 46 | - public function provides() |
|
| 47 | - {
|
|
| 41 | + /** |
|
| 42 | + * Get the services provided by the provider. |
|
| 43 | + * |
|
| 44 | + * @return array |
|
| 45 | + */ |
|
| 46 | + public function provides() |
|
| 47 | + {
|
|
| 48 | 48 | return []; |
| 49 | - } |
|
| 49 | + } |
|
| 50 | 50 | } |
@@ -1,29 +1,29 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - /** |
|
| 5 | - * Auto Set User ID |
|
| 6 | - * |
|
| 7 | - * If false, user ID will not be automatically set. |
|
| 8 | - */ |
|
| 9 | - 'auto_set_user_id' => true, |
|
| 4 | + /** |
|
| 5 | + * Auto Set User ID |
|
| 6 | + * |
|
| 7 | + * If false, user ID will not be automatically set. |
|
| 8 | + */ |
|
| 9 | + 'auto_set_user_id' => true, |
|
| 10 | 10 | |
| 11 | - /** |
|
| 12 | - * Auth driver |
|
| 13 | - * |
|
| 14 | - * If you are using any alternative packages for Authentication |
|
| 15 | - * and User management then you can put in the appropriate |
|
| 16 | - * function to get the currently logged in user. |
|
| 17 | - * For example, if you are using Sentry, |
|
| 18 | - * you would put Sentry::getUser() |
|
| 19 | - * instead of Laravel's default which is Auth::user(). |
|
| 20 | - */ |
|
| 21 | - 'auth_method' => '\Auth::user', |
|
| 11 | + /** |
|
| 12 | + * Auth driver |
|
| 13 | + * |
|
| 14 | + * If you are using any alternative packages for Authentication |
|
| 15 | + * and User management then you can put in the appropriate |
|
| 16 | + * function to get the currently logged in user. |
|
| 17 | + * For example, if you are using Sentry, |
|
| 18 | + * you would put Sentry::getUser() |
|
| 19 | + * instead of Laravel's default which is Auth::user(). |
|
| 20 | + */ |
|
| 21 | + 'auth_method' => '\Auth::user', |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Default Values |
|
| 25 | - */ |
|
| 26 | - 'defaults' => [ |
|
| 27 | - ], |
|
| 23 | + /** |
|
| 24 | + * Default Values |
|
| 25 | + */ |
|
| 26 | + 'defaults' => [ |
|
| 27 | + ], |
|
| 28 | 28 | |
| 29 | 29 | ]; |
@@ -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_type', 72)->nullable(); |
|
| 22 | - $table->string('action', 32)->nullable(); |
|
| 23 | - $table->string('description')->nullable(); |
|
| 21 | + $table->string('content_type', 72)->nullable(); |
|
| 22 | + $table->string('action', 32)->nullable(); |
|
| 23 | + $table->string('description')->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'); |
|
| 28 | + $table->string('version', 10)->nullable(); |
|
| 29 | + $table->string('ip_address', 64); |
|
| 30 | + $table->string('user_agent'); |
|
| 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 | } |