@@ -6,67 +6,67 @@ |
||
| 6 | 6 | class SettingsObserver |
| 7 | 7 | { |
| 8 | 8 | |
| 9 | - public function saving($model) |
|
| 10 | - { |
|
| 11 | - // |
|
| 12 | - } |
|
| 9 | + public function saving($model) |
|
| 10 | + { |
|
| 11 | + // |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - public function saved($model) |
|
| 15 | - { |
|
| 16 | - // |
|
| 17 | - } |
|
| 14 | + public function saved($model) |
|
| 15 | + { |
|
| 16 | + // |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Prevent the creating of the settings. |
|
| 21 | - * |
|
| 22 | - * @param object $model the model beign created. |
|
| 23 | - * @return void |
|
| 24 | - */ |
|
| 25 | - public function creating($model) |
|
| 26 | - { |
|
| 27 | - \Errors::cannotCreateSetting(); |
|
| 28 | - } |
|
| 19 | + /** |
|
| 20 | + * Prevent the creating of the settings. |
|
| 21 | + * |
|
| 22 | + * @param object $model the model beign created. |
|
| 23 | + * @return void |
|
| 24 | + */ |
|
| 25 | + public function creating($model) |
|
| 26 | + { |
|
| 27 | + \Errors::cannotCreateSetting(); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - public function created($model) |
|
| 31 | - { |
|
| 32 | - // |
|
| 33 | - } |
|
| 30 | + public function created($model) |
|
| 31 | + { |
|
| 32 | + // |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Prevent updating of the setting key. |
|
| 37 | - * |
|
| 38 | - * @param object $model the model beign updated. |
|
| 39 | - * @return void |
|
| 40 | - */ |
|
| 41 | - public function updating($model) |
|
| 42 | - { |
|
| 43 | - if ($model->getOriginal('key') !== $model->key) { |
|
| 44 | - \Errors::cannotUpdateSettingKey(); |
|
| 45 | - } |
|
| 46 | - } |
|
| 35 | + /** |
|
| 36 | + * Prevent updating of the setting key. |
|
| 37 | + * |
|
| 38 | + * @param object $model the model beign updated. |
|
| 39 | + * @return void |
|
| 40 | + */ |
|
| 41 | + public function updating($model) |
|
| 42 | + { |
|
| 43 | + if ($model->getOriginal('key') !== $model->key) { |
|
| 44 | + \Errors::cannotUpdateSettingKey(); |
|
| 45 | + } |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - public function updated($model) |
|
| 49 | - { |
|
| 50 | - // |
|
| 51 | - } |
|
| 48 | + public function updated($model) |
|
| 49 | + { |
|
| 50 | + // |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - public function deleting($model) |
|
| 54 | - { |
|
| 55 | - // |
|
| 56 | - } |
|
| 53 | + public function deleting($model) |
|
| 54 | + { |
|
| 55 | + // |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - public function deleted($model) |
|
| 59 | - { |
|
| 60 | - // |
|
| 61 | - } |
|
| 58 | + public function deleted($model) |
|
| 59 | + { |
|
| 60 | + // |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - public function restoring($model) |
|
| 64 | - { |
|
| 65 | - // |
|
| 66 | - } |
|
| 63 | + public function restoring($model) |
|
| 64 | + { |
|
| 65 | + // |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - public function restored($model) |
|
| 69 | - { |
|
| 70 | - // |
|
| 71 | - } |
|
| 68 | + public function restored($model) |
|
| 69 | + { |
|
| 70 | + // |
|
| 71 | + } |
|
| 72 | 72 | } |
@@ -5,102 +5,102 @@ |
||
| 5 | 5 | |
| 6 | 6 | class CachingDecorator |
| 7 | 7 | { |
| 8 | - /** |
|
| 9 | - * @var string |
|
| 10 | - */ |
|
| 11 | - public $repo; |
|
| 8 | + /** |
|
| 9 | + * @var string |
|
| 10 | + */ |
|
| 11 | + public $repo; |
|
| 12 | 12 | |
| 13 | - /** |
|
| 14 | - * @var Cache |
|
| 15 | - */ |
|
| 16 | - protected $cache; |
|
| 13 | + /** |
|
| 14 | + * @var Cache |
|
| 15 | + */ |
|
| 16 | + protected $cache; |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * @var string |
|
| 20 | - */ |
|
| 21 | - public $modelKey; |
|
| 18 | + /** |
|
| 19 | + * @var string |
|
| 20 | + */ |
|
| 21 | + public $modelKey; |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * @var string |
|
| 25 | - */ |
|
| 26 | - public $model; |
|
| 23 | + /** |
|
| 24 | + * @var string |
|
| 25 | + */ |
|
| 26 | + public $model; |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @var string |
|
| 30 | - */ |
|
| 31 | - public $modelClass; |
|
| 28 | + /** |
|
| 29 | + * @var string |
|
| 30 | + */ |
|
| 31 | + public $modelClass; |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @var mixed |
|
| 35 | - */ |
|
| 36 | - public $cacheConfig; |
|
| 33 | + /** |
|
| 34 | + * @var mixed |
|
| 35 | + */ |
|
| 36 | + public $cacheConfig; |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @var string |
|
| 40 | - */ |
|
| 41 | - public $cacheTag; |
|
| 38 | + /** |
|
| 39 | + * @var string |
|
| 40 | + */ |
|
| 41 | + public $cacheTag; |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Init new object. |
|
| 45 | - * |
|
| 46 | - * @param string $repo |
|
| 47 | - * @param Cache $cache |
|
| 48 | - * |
|
| 49 | - * @return void |
|
| 50 | - */ |
|
| 51 | - public function __construct($repo, Cache $cache) |
|
| 52 | - { |
|
| 53 | - $this->repo = $repo; |
|
| 54 | - $this->cache = $cache; |
|
| 55 | - $this->model = $this->repo->model; |
|
| 56 | - $this->modelClass = get_class($this->model); |
|
| 57 | - $repoClass = explode('\\', get_class($this->repo)); |
|
| 58 | - $repoName = end($repoClass); |
|
| 59 | - $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
| 60 | - } |
|
| 43 | + /** |
|
| 44 | + * Init new object. |
|
| 45 | + * |
|
| 46 | + * @param string $repo |
|
| 47 | + * @param Cache $cache |
|
| 48 | + * |
|
| 49 | + * @return void |
|
| 50 | + */ |
|
| 51 | + public function __construct($repo, Cache $cache) |
|
| 52 | + { |
|
| 53 | + $this->repo = $repo; |
|
| 54 | + $this->cache = $cache; |
|
| 55 | + $this->model = $this->repo->model; |
|
| 56 | + $this->modelClass = get_class($this->model); |
|
| 57 | + $repoClass = explode('\\', get_class($this->repo)); |
|
| 58 | + $repoName = end($repoClass); |
|
| 59 | + $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Handle the cache mechanism for the called method |
|
| 64 | - * based the configurations. |
|
| 65 | - * |
|
| 66 | - * @param string $name the called method name |
|
| 67 | - * @param array $arguments the method arguments |
|
| 68 | - * @return object |
|
| 69 | - */ |
|
| 70 | - public function __call($name, $arguments) |
|
| 71 | - { |
|
| 72 | - $this->setCacheConfig($name); |
|
| 62 | + /** |
|
| 63 | + * Handle the cache mechanism for the called method |
|
| 64 | + * based the configurations. |
|
| 65 | + * |
|
| 66 | + * @param string $name the called method name |
|
| 67 | + * @param array $arguments the method arguments |
|
| 68 | + * @return object |
|
| 69 | + */ |
|
| 70 | + public function __call($name, $arguments) |
|
| 71 | + { |
|
| 72 | + $this->setCacheConfig($name); |
|
| 73 | 73 | |
| 74 | - if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
| 75 | - $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
| 76 | - $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
| 77 | - return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
| 78 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
| 79 | - }); |
|
| 80 | - } elseif ($this->cacheConfig && $this->cacheConfig == 'clear') { |
|
| 81 | - $this->cache->tags($this->cacheConfig)->flush(); |
|
| 82 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
| 83 | - } |
|
| 74 | + if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
| 75 | + $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
| 76 | + $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
| 77 | + return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
| 78 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
| 79 | + }); |
|
| 80 | + } elseif ($this->cacheConfig && $this->cacheConfig == 'clear') { |
|
| 81 | + $this->cache->tags($this->cacheConfig)->flush(); |
|
| 82 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
| 86 | - } |
|
| 85 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - /** |
|
| 89 | - * Set cache config based on the called method. |
|
| 90 | - * |
|
| 91 | - * @param string $name |
|
| 92 | - * @return void |
|
| 93 | - */ |
|
| 94 | - private function setCacheConfig($name) |
|
| 95 | - { |
|
| 96 | - $config = \CoreConfig::getConfig(); |
|
| 97 | - $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
| 98 | - $this->cacheConfig = false; |
|
| 88 | + /** |
|
| 89 | + * Set cache config based on the called method. |
|
| 90 | + * |
|
| 91 | + * @param string $name |
|
| 92 | + * @return void |
|
| 93 | + */ |
|
| 94 | + private function setCacheConfig($name) |
|
| 95 | + { |
|
| 96 | + $config = \CoreConfig::getConfig(); |
|
| 97 | + $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
| 98 | + $this->cacheConfig = false; |
|
| 99 | 99 | |
| 100 | - if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
| 101 | - $this->cacheConfig = 'cache'; |
|
| 102 | - } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
| 103 | - $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
| 104 | - } |
|
| 105 | - } |
|
| 100 | + if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
| 101 | + $this->cacheConfig = 'cache'; |
|
| 102 | + } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
| 103 | + $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
| 104 | + } |
|
| 105 | + } |
|
| 106 | 106 | } |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
| 75 | 75 | $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
| 76 | 76 | $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
| 77 | - return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
| 77 | + return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) { |
|
| 78 | 78 | return call_user_func_array([$this->repo, $name], $arguments); |
| 79 | 79 | }); |
| 80 | 80 | } elseif ($this->cacheConfig && $this->cacheConfig == 'clear') { |
@@ -5,64 +5,64 @@ |
||
| 5 | 5 | |
| 6 | 6 | class LoginProxy |
| 7 | 7 | { |
| 8 | - /** |
|
| 9 | - * Attempt to create an access token using user credentials. |
|
| 10 | - * |
|
| 11 | - * @param string $email |
|
| 12 | - * @param string $password |
|
| 13 | - * @return array |
|
| 14 | - */ |
|
| 15 | - public function login($email, $password) |
|
| 16 | - { |
|
| 17 | - return $this->proxy('password', [ |
|
| 18 | - 'username' => $email, |
|
| 19 | - 'password' => $password |
|
| 20 | - ]); |
|
| 21 | - } |
|
| 8 | + /** |
|
| 9 | + * Attempt to create an access token using user credentials. |
|
| 10 | + * |
|
| 11 | + * @param string $email |
|
| 12 | + * @param string $password |
|
| 13 | + * @return array |
|
| 14 | + */ |
|
| 15 | + public function login($email, $password) |
|
| 16 | + { |
|
| 17 | + return $this->proxy('password', [ |
|
| 18 | + 'username' => $email, |
|
| 19 | + 'password' => $password |
|
| 20 | + ]); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Attempt to refresh the access token using the given refresh token. |
|
| 25 | - * |
|
| 26 | - * @param string $refreshToken |
|
| 27 | - * @return array |
|
| 28 | - */ |
|
| 29 | - public function refreshToken($refreshToken) |
|
| 30 | - { |
|
| 31 | - return $this->proxy('refresh_token', [ |
|
| 32 | - 'refresh_token' => $refreshToken |
|
| 33 | - ]); |
|
| 34 | - } |
|
| 23 | + /** |
|
| 24 | + * Attempt to refresh the access token using the given refresh token. |
|
| 25 | + * |
|
| 26 | + * @param string $refreshToken |
|
| 27 | + * @return array |
|
| 28 | + */ |
|
| 29 | + public function refreshToken($refreshToken) |
|
| 30 | + { |
|
| 31 | + return $this->proxy('refresh_token', [ |
|
| 32 | + 'refresh_token' => $refreshToken |
|
| 33 | + ]); |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * Proxy a request to the OAuth server. |
|
| 38 | - * |
|
| 39 | - * @param string $grantType what type of grant type should be proxied |
|
| 40 | - * @param array |
|
| 41 | - */ |
|
| 42 | - public function proxy($grantType, array $data = []) |
|
| 43 | - { |
|
| 44 | - $data = array_merge($data, [ |
|
| 45 | - 'client_id' => config('skeleton.passport_client_id'), |
|
| 46 | - 'client_secret' => config('skeleton.passport_client_secret'), |
|
| 47 | - 'grant_type' => $grantType |
|
| 48 | - ]); |
|
| 36 | + /** |
|
| 37 | + * Proxy a request to the OAuth server. |
|
| 38 | + * |
|
| 39 | + * @param string $grantType what type of grant type should be proxied |
|
| 40 | + * @param array |
|
| 41 | + */ |
|
| 42 | + public function proxy($grantType, array $data = []) |
|
| 43 | + { |
|
| 44 | + $data = array_merge($data, [ |
|
| 45 | + 'client_id' => config('skeleton.passport_client_id'), |
|
| 46 | + 'client_secret' => config('skeleton.passport_client_secret'), |
|
| 47 | + 'grant_type' => $grantType |
|
| 48 | + ]); |
|
| 49 | 49 | |
| 50 | - $response = \ApiConsumer::post('/oauth/token', $data); |
|
| 50 | + $response = \ApiConsumer::post('/oauth/token', $data); |
|
| 51 | 51 | |
| 52 | - if (! $response->isSuccessful()) { |
|
| 53 | - if ($grantType == 'refresh_token') { |
|
| 54 | - \Errors::invalidRefreshToken(); |
|
| 55 | - } |
|
| 52 | + if (! $response->isSuccessful()) { |
|
| 53 | + if ($grantType == 'refresh_token') { |
|
| 54 | + \Errors::invalidRefreshToken(); |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - \Errors::loginFailed(); |
|
| 58 | - } |
|
| 57 | + \Errors::loginFailed(); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - $data = json_decode($response->getContent()); |
|
| 60 | + $data = json_decode($response->getContent()); |
|
| 61 | 61 | |
| 62 | - return [ |
|
| 63 | - 'access_token' => $data->access_token, |
|
| 64 | - 'refresh_token' => $data->refresh_token, |
|
| 65 | - 'expires_in' => $data->expires_in |
|
| 66 | - ]; |
|
| 67 | - } |
|
| 62 | + return [ |
|
| 63 | + 'access_token' => $data->access_token, |
|
| 64 | + 'refresh_token' => $data->refresh_token, |
|
| 65 | + 'expires_in' => $data->expires_in |
|
| 66 | + ]; |
|
| 67 | + } |
|
| 68 | 68 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $response = \ApiConsumer::post('/oauth/token', $data); |
| 51 | 51 | |
| 52 | - if (! $response->isSuccessful()) { |
|
| 52 | + if ( ! $response->isSuccessful()) { |
|
| 53 | 53 | if ($grantType == 'refresh_token') { |
| 54 | 54 | \Errors::invalidRefreshToken(); |
| 55 | 55 | } |
@@ -6,61 +6,61 @@ |
||
| 6 | 6 | class AclUserObserver |
| 7 | 7 | { |
| 8 | 8 | |
| 9 | - public function saving($model) |
|
| 10 | - { |
|
| 11 | - if ($model->isDirty('profile_picture')) { |
|
| 12 | - \Media::deleteImage($model->getOriginal('profile_picture')); |
|
| 13 | - } |
|
| 14 | - } |
|
| 9 | + public function saving($model) |
|
| 10 | + { |
|
| 11 | + if ($model->isDirty('profile_picture')) { |
|
| 12 | + \Media::deleteImage($model->getOriginal('profile_picture')); |
|
| 13 | + } |
|
| 14 | + } |
|
| 15 | 15 | |
| 16 | - public function saved($model) |
|
| 17 | - { |
|
| 18 | - // |
|
| 19 | - } |
|
| 16 | + public function saved($model) |
|
| 17 | + { |
|
| 18 | + // |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - public function creating($model) |
|
| 22 | - { |
|
| 23 | - // |
|
| 24 | - } |
|
| 21 | + public function creating($model) |
|
| 22 | + { |
|
| 23 | + // |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - public function created($model) |
|
| 27 | - { |
|
| 28 | - // |
|
| 29 | - } |
|
| 26 | + public function created($model) |
|
| 27 | + { |
|
| 28 | + // |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - public function updating($model) |
|
| 32 | - { |
|
| 33 | - // |
|
| 34 | - } |
|
| 31 | + public function updating($model) |
|
| 32 | + { |
|
| 33 | + // |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - public function updated($model) |
|
| 37 | - { |
|
| 38 | - if ($model->isDirty('blocked') && $model->blocked) { |
|
| 39 | - $model->tokens()->each(function ($token) { |
|
| 40 | - \Core::oauthClients()->revokeAccessToken($token); |
|
| 41 | - }); |
|
| 42 | - } |
|
| 43 | - } |
|
| 36 | + public function updated($model) |
|
| 37 | + { |
|
| 38 | + if ($model->isDirty('blocked') && $model->blocked) { |
|
| 39 | + $model->tokens()->each(function ($token) { |
|
| 40 | + \Core::oauthClients()->revokeAccessToken($token); |
|
| 41 | + }); |
|
| 42 | + } |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - public function deleting($model) |
|
| 46 | - { |
|
| 47 | - if ($model->getOriginal('id') == \Auth::id()) { |
|
| 48 | - \Errors::noPermissions(); |
|
| 49 | - } |
|
| 50 | - } |
|
| 45 | + public function deleting($model) |
|
| 46 | + { |
|
| 47 | + if ($model->getOriginal('id') == \Auth::id()) { |
|
| 48 | + \Errors::noPermissions(); |
|
| 49 | + } |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - public function deleted($model) |
|
| 53 | - { |
|
| 54 | - // |
|
| 55 | - } |
|
| 52 | + public function deleted($model) |
|
| 53 | + { |
|
| 54 | + // |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - public function restoring($model) |
|
| 58 | - { |
|
| 59 | - // |
|
| 60 | - } |
|
| 57 | + public function restoring($model) |
|
| 58 | + { |
|
| 59 | + // |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - public function restored($model) |
|
| 63 | - { |
|
| 64 | - // |
|
| 65 | - } |
|
| 62 | + public function restored($model) |
|
| 63 | + { |
|
| 64 | + // |
|
| 65 | + } |
|
| 66 | 66 | } |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | public function updated($model) |
| 37 | 37 | { |
| 38 | 38 | if ($model->isDirty('blocked') && $model->blocked) { |
| 39 | - $model->tokens()->each(function ($token) { |
|
| 39 | + $model->tokens()->each(function($token) { |
|
| 40 | 40 | \Core::oauthClients()->revokeAccessToken($token); |
| 41 | 41 | }); |
| 42 | 42 | } |
@@ -6,53 +6,53 @@ |
||
| 6 | 6 | class ReportObserver |
| 7 | 7 | { |
| 8 | 8 | |
| 9 | - public function saving($model) |
|
| 10 | - { |
|
| 11 | - // |
|
| 12 | - } |
|
| 13 | - |
|
| 14 | - public function saved($model) |
|
| 15 | - { |
|
| 16 | - // |
|
| 17 | - } |
|
| 18 | - |
|
| 19 | - public function creating($model) |
|
| 20 | - { |
|
| 21 | - // |
|
| 22 | - } |
|
| 23 | - |
|
| 24 | - public function created($model) |
|
| 25 | - { |
|
| 26 | - // |
|
| 27 | - } |
|
| 28 | - |
|
| 29 | - public function updating($model) |
|
| 30 | - { |
|
| 31 | - // |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - public function updated($model) |
|
| 35 | - { |
|
| 36 | - // |
|
| 37 | - } |
|
| 38 | - |
|
| 39 | - public function deleting($model) |
|
| 40 | - { |
|
| 41 | - // |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - public function deleted($model) |
|
| 45 | - { |
|
| 46 | - // |
|
| 47 | - } |
|
| 48 | - |
|
| 49 | - public function restoring($model) |
|
| 50 | - { |
|
| 51 | - // |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - public function restored($model) |
|
| 55 | - { |
|
| 56 | - // |
|
| 57 | - } |
|
| 9 | + public function saving($model) |
|
| 10 | + { |
|
| 11 | + // |
|
| 12 | + } |
|
| 13 | + |
|
| 14 | + public function saved($model) |
|
| 15 | + { |
|
| 16 | + // |
|
| 17 | + } |
|
| 18 | + |
|
| 19 | + public function creating($model) |
|
| 20 | + { |
|
| 21 | + // |
|
| 22 | + } |
|
| 23 | + |
|
| 24 | + public function created($model) |
|
| 25 | + { |
|
| 26 | + // |
|
| 27 | + } |
|
| 28 | + |
|
| 29 | + public function updating($model) |
|
| 30 | + { |
|
| 31 | + // |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + public function updated($model) |
|
| 35 | + { |
|
| 36 | + // |
|
| 37 | + } |
|
| 38 | + |
|
| 39 | + public function deleting($model) |
|
| 40 | + { |
|
| 41 | + // |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + public function deleted($model) |
|
| 45 | + { |
|
| 46 | + // |
|
| 47 | + } |
|
| 48 | + |
|
| 49 | + public function restoring($model) |
|
| 50 | + { |
|
| 51 | + // |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + public function restored($model) |
|
| 55 | + { |
|
| 56 | + // |
|
| 57 | + } |
|
| 58 | 58 | } |
@@ -43,9 +43,9 @@ |
||
| 43 | 43 | /** |
| 44 | 44 | * Check report existance and permission. |
| 45 | 45 | */ |
| 46 | - if (! $report) { |
|
| 46 | + if ( ! $report) { |
|
| 47 | 47 | \Errors::notFound('report'); |
| 48 | - } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
| 48 | + } elseif ( ! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
| 49 | 49 | \Errors::noPermissions(); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -8,49 +8,49 @@ |
||
| 8 | 8 | |
| 9 | 9 | class ReportService extends BaseService |
| 10 | 10 | { |
| 11 | - /** |
|
| 12 | - * @var UserService |
|
| 13 | - */ |
|
| 14 | - protected $userService; |
|
| 11 | + /** |
|
| 12 | + * @var UserService |
|
| 13 | + */ |
|
| 14 | + protected $userService; |
|
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * Init new object. |
|
| 18 | - * |
|
| 19 | - * @param ReportRepository $repo |
|
| 20 | - * @return void |
|
| 21 | - */ |
|
| 22 | - public function __construct(ReportRepository $repo, UserService $userService) |
|
| 23 | - { |
|
| 24 | - $this->userService = $userService; |
|
| 25 | - parent::__construct($repo); |
|
| 26 | - } |
|
| 16 | + /** |
|
| 17 | + * Init new object. |
|
| 18 | + * |
|
| 19 | + * @param ReportRepository $repo |
|
| 20 | + * @return void |
|
| 21 | + */ |
|
| 22 | + public function __construct(ReportRepository $repo, UserService $userService) |
|
| 23 | + { |
|
| 24 | + $this->userService = $userService; |
|
| 25 | + parent::__construct($repo); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Render the given report db view based on the given |
|
| 30 | - * condition. |
|
| 31 | - * |
|
| 32 | - * @param string $reportName |
|
| 33 | - * @param array $conditions |
|
| 34 | - * @param integer $perPage |
|
| 35 | - * @param boolean $skipPermission |
|
| 36 | - * @return object |
|
| 37 | - */ |
|
| 38 | - public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false) |
|
| 39 | - { |
|
| 40 | - /** |
|
| 41 | - * Fetch the report from db. |
|
| 42 | - */ |
|
| 43 | - $report = $this->repo->first(['report_name' => $reportName]); |
|
| 28 | + /** |
|
| 29 | + * Render the given report db view based on the given |
|
| 30 | + * condition. |
|
| 31 | + * |
|
| 32 | + * @param string $reportName |
|
| 33 | + * @param array $conditions |
|
| 34 | + * @param integer $perPage |
|
| 35 | + * @param boolean $skipPermission |
|
| 36 | + * @return object |
|
| 37 | + */ |
|
| 38 | + public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false) |
|
| 39 | + { |
|
| 40 | + /** |
|
| 41 | + * Fetch the report from db. |
|
| 42 | + */ |
|
| 43 | + $report = $this->repo->first(['report_name' => $reportName]); |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Check report existance and permission. |
|
| 47 | - */ |
|
| 48 | - if (! $report) { |
|
| 49 | - \Errors::notFound('report'); |
|
| 50 | - } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
| 51 | - \Errors::noPermissions(); |
|
| 52 | - } |
|
| 45 | + /** |
|
| 46 | + * Check report existance and permission. |
|
| 47 | + */ |
|
| 48 | + if (! $report) { |
|
| 49 | + \Errors::notFound('report'); |
|
| 50 | + } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
| 51 | + \Errors::noPermissions(); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - return $this->repo->renderReport($report, $conditions, $perPage); |
|
| 55 | - } |
|
| 54 | + return $this->repo->renderReport($report, $conditions, $perPage); |
|
| 55 | + } |
|
| 56 | 56 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Password Reset Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
| 17 | - 'reset' => 'Your password has been reset!', |
|
| 18 | - 'sent' => 'We have e-mailed your password reset link!', |
|
| 19 | - 'token' => 'This password reset token is invalid.', |
|
| 20 | - 'user' => "We can't find a user with that e-mail address.", |
|
| 16 | + 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
| 17 | + 'reset' => 'Your password has been reset!', |
|
| 18 | + 'sent' => 'We have e-mailed your password reset link!', |
|
| 19 | + 'token' => 'This password reset token is invalid.', |
|
| 20 | + 'user' => "We can't find a user with that e-mail address.", |
|
| 21 | 21 | |
| 22 | 22 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Pagination Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'previous' => '« Previous', |
|
| 17 | - 'next' => 'Next »', |
|
| 16 | + 'previous' => '« Previous', |
|
| 17 | + 'next' => 'Next »', |
|
| 18 | 18 | |
| 19 | 19 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Authentication Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'failed' => 'These credentials do not match our records.', |
|
| 17 | - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', |
|
| 16 | + 'failed' => 'These credentials do not match our records.', |
|
| 17 | + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', |
|
| 18 | 18 | |
| 19 | 19 | ]; |