diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index 9292f8c387..1c01a16727 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -64,6 +64,8 @@ class ConfigurationController extends Controller $subTitle = (string)trans('firefly.instance_configuration'); $subTitleIcon = 'fa-wrench'; + Log::channel('audit')->info('User visits admin config index.'); + // all available configuration and their default value in case // they don't exist yet. $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; @@ -88,6 +90,8 @@ class ConfigurationController extends Controller // get config values: $data = $request->getConfigurationData(); + Log::channel('audit')->info('User updates global configuration.', $data); + // store config values FireflyConfig::set('single_user_mode', $data['single_user_mode']); FireflyConfig::set('is_demo_site', $data['is_demo_site']); diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 2373143b9a..16733d64f5 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -52,6 +52,7 @@ class HomeController extends Controller */ public function index() { + Log::channel('audit')->info('User visits admin index.'); $title = (string)trans('firefly.administration'); $mainTitleIcon = 'fa-hand-spock-o'; $sandstorm = 1 === (int)getenv('SANDSTORM'); @@ -68,6 +69,7 @@ class HomeController extends Controller */ public function testMessage(Request $request) { + Log::channel('audit')->info('User sends test message.'); /** @var User $user */ $user = auth()->user(); $ipAddress = $request->ip(); diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index 01b1814138..4a3a3afcea 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -28,6 +28,7 @@ use FireflyIII\Http\Requests\LinkTypeFormRequest; use FireflyIII\Models\LinkType; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; use Illuminate\Http\Request; +use Log; use View; /** @@ -63,6 +64,8 @@ class LinkController extends Controller $subTitle = (string)trans('firefly.create_new_link_type'); $subTitleIcon = 'fa-link'; + Log::channel('audit')->info('User visits link index.'); + // put previous url in session if not redirect from store (not "create another"). if (true !== session('link-types.create.fromStore')) { $this->rememberPreviousUri('link-types.create.uri'); @@ -88,6 +91,8 @@ class LinkController extends Controller return redirect(route('admin.links.index')); } + Log::channel('audit')->info(sprintf('User wants to delete link type #%d', $linkType->id)); + $subTitle = (string)trans('firefly.delete_link_type', ['name' => $linkType->name]); $otherTypes = $repository->get(); $count = $repository->countJournals($linkType); @@ -116,6 +121,7 @@ class LinkController extends Controller */ public function destroy(Request $request, LinkTypeRepositoryInterface $repository, LinkType $linkType) { + Log::channel('audit')->info(sprintf('User destroyed link type #%d', $linkType->id)); $name = $linkType->name; $moveTo = $repository->findNull((int)$request->get('move_link_type_before_delete')); $repository->destroy($linkType, $moveTo); @@ -144,6 +150,8 @@ class LinkController extends Controller $subTitle = (string)trans('firefly.edit_link_type', ['name' => $linkType->name]); $subTitleIcon = 'fa-link'; + Log::channel('audit')->info(sprintf('User wants to edit link type #%d', $linkType->id)); + // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('link-types.edit.fromUpdate')) { $this->rememberPreviousUri('link-types.edit.uri'); // @codeCoverageIgnore @@ -165,6 +173,8 @@ class LinkController extends Controller $subTitle = (string)trans('firefly.journal_link_configuration'); $subTitleIcon = 'fa-link'; $linkTypes = $repository->get(); + + Log::channel('audit')->info('User on index of link types in admin.'); $linkTypes->each( function (LinkType $linkType) use ($repository) { $linkType->journalCount = $repository->countJournals($linkType); @@ -187,6 +197,8 @@ class LinkController extends Controller $subTitleIcon = 'fa-link'; $links = $linkType->transactionJournalLinks()->get(); + Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id)); + return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links')); } @@ -206,6 +218,9 @@ class LinkController extends Controller 'outward' => $request->string('outward'), ]; $linkType = $repository->store($data); + + Log::channel('audit')->info('User stored new link type.', $linkType->toArray()); + $request->session()->flash('success', (string)trans('firefly.stored_new_link_type', ['name' => $linkType->name])); $redirect = redirect($this->getPreviousUri('link-types.create.uri')); if (1 === (int)$request->get('create_another')) { @@ -243,6 +258,8 @@ class LinkController extends Controller ]; $repository->update($linkType, $data); + Log::channel('audit')->info(sprintf('User update link type #%d.', $linkType->id), $data); + $request->session()->flash('success', (string)trans('firefly.updated_link_type', ['name' => $linkType->name])); app('preferences')->mark(); $redirect = redirect($this->getPreviousUri('link-types.edit.uri')); diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index dda6f02d1f..622ca191e6 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -268,7 +268,7 @@ class CurrencyController extends Controller ]; $request->session()->flash('preFilled', $preFilled); - + Log::channel('audit')->info('Edit currency.', $currency->toArray()); // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('currencies.edit.fromUpdate')) { diff --git a/app/Services/Github/Request/UpdateRequest.php b/app/Services/Github/Request/UpdateRequest.php index 1616db8701..d49a982874 100644 --- a/app/Services/Github/Request/UpdateRequest.php +++ b/app/Services/Github/Request/UpdateRequest.php @@ -62,7 +62,7 @@ class UpdateRequest implements GithubRequest $releaseXml = new SimpleXMLElement($res->getBody()->getContents(), LIBXML_NOCDATA); } catch (RuntimeException $e) { Log::error(sprintf('Could not get body from github updat result: %s', $e->getMessage())); - $releaseXml = new SimpleXMLElement(''); + throw new FireflyException(sprintf('Could not get body from github updat result: %s', $e->getMessage())); } //fetch the products for each category