@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | /** |
| 133 | 133 | * Cleans the AuditEntry data |
| 134 | 134 | * |
| 135 | - * @param $maxAge |
|
| 135 | + * @param integer|null $maxAge |
|
| 136 | 136 | * @return bool |
| 137 | 137 | */ |
| 138 | 138 | protected function cleanupEntry($maxAge) |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * Cleans the Panel data |
| 161 | 161 | * |
| 162 | 162 | * @param $id |
| 163 | - * @param $maxAge |
|
| 163 | + * @param integer|null $maxAge |
|
| 164 | 164 | * @return bool |
| 165 | 165 | */ |
| 166 | 166 | protected function cleanupPanel($id, $maxAge) |
@@ -113,9 +113,9 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | // heading |
| 115 | 115 | $n = count($panels); |
| 116 | - $this->stdout("Total $n " . ($n === 1 ? 'cleanup' : 'cleanups') . " to be applied:\n", Console::FG_YELLOW); |
|
| 117 | - $this->stdout("\t" . 'DATA CLEANUP TO DATETIME' . "\n"); |
|
| 118 | - $this->stdout("\t" . '---------------------------------------------' . "\n"); |
|
| 116 | + $this->stdout("Total $n ".($n === 1 ? 'cleanup' : 'cleanups')." to be applied:\n", Console::FG_YELLOW); |
|
| 117 | + $this->stdout("\t".'DATA CLEANUP TO DATETIME'."\n"); |
|
| 118 | + $this->stdout("\t".'---------------------------------------------'."\n"); |
|
| 119 | 119 | |
| 120 | 120 | // audit panels |
| 121 | 121 | foreach ($panels as $id) { |
@@ -125,9 +125,9 @@ discard block |
||
| 125 | 125 | $dots = str_repeat('.', 24 - strlen($id)); |
| 126 | 126 | if ($age !== null) { |
| 127 | 127 | $date = date('Y-m-d 23:59:59', strtotime("-$age days")); |
| 128 | - $this->stdout("\t" . $id . ' ' . $dots . ' ' . $date . "\n"); |
|
| 128 | + $this->stdout("\t".$id.' '.$dots.' '.$date."\n"); |
|
| 129 | 129 | } else { |
| 130 | - $this->stdout("\t" . $id . ' ' . $dots . ' no maxAge, skipping' . "\n"); |
|
| 130 | + $this->stdout("\t".$id.' '.$dots.' no maxAge, skipping'."\n"); |
|
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | 133 | |
@@ -135,12 +135,12 @@ discard block |
||
| 135 | 135 | if ($entry) { |
| 136 | 136 | $maxAge = $maxAge !== null ? $maxAge : $audit->maxAge; |
| 137 | 137 | $date = $maxAge !== null ? date('Y-m-d 23:59:59', strtotime("-$maxAge days")) : 'no maxAge, skipping'; |
| 138 | - $this->stdout("\t" . 'AuditEntry .............. ' . $date . "\n"); |
|
| 138 | + $this->stdout("\t".'AuditEntry .............. '.$date."\n"); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | // audit entry solo |
| 142 | 142 | if ($entrySolo) { |
| 143 | - $this->stdout("\t" . 'AuditEntry solo ......... ' . date('Y-m-d 23:59:59') . "\n"); |
|
| 143 | + $this->stdout("\t".'AuditEntry solo ......... '.date('Y-m-d 23:59:59')."\n"); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | $this->stdout("\n"); |
@@ -165,11 +165,11 @@ discard block |
||
| 165 | 165 | $count = AuditEntry::deleteAll(['<=', 'created', $date]); |
| 166 | 166 | if ($count !== false) { |
| 167 | 167 | $time = microtime(true) - $start; |
| 168 | - $this->stdout("\n*** cleaned AuditEntry (records: " . $count . ",time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_GREEN); |
|
| 168 | + $this->stdout("\n*** cleaned AuditEntry (records: ".$count.",time: ".sprintf("%.3f", $time)."s)\n", Console::FG_GREEN); |
|
| 169 | 169 | return true; |
| 170 | 170 | } |
| 171 | 171 | $time = microtime(true) - $start; |
| 172 | - $this->stdout("\n*** failed to clean AuditEntry (time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_RED); |
|
| 172 | + $this->stdout("\n*** failed to clean AuditEntry (time: ".sprintf("%.3f", $time)."s)\n", Console::FG_RED); |
|
| 173 | 173 | return false; |
| 174 | 174 | } |
| 175 | 175 | |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | $time = microtime(true) - $start; |
| 207 | - $this->stdout("\n*** cleaned AuditEntry (records: " . $count . ",time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_GREEN); |
|
| 207 | + $this->stdout("\n*** cleaned AuditEntry (records: ".$count.",time: ".sprintf("%.3f", $time)."s)\n", Console::FG_GREEN); |
|
| 208 | 208 | return true; |
| 209 | 209 | } |
| 210 | 210 | |
@@ -229,11 +229,11 @@ discard block |
||
| 229 | 229 | $count = $panel->cleanup($maxAge); |
| 230 | 230 | if ($count !== false) { |
| 231 | 231 | $time = microtime(true) - $start; |
| 232 | - $this->stdout("\n*** cleaned $id (records: " . $count . ", time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_GREEN); |
|
| 232 | + $this->stdout("\n*** cleaned $id (records: ".$count.", time: ".sprintf("%.3f", $time)."s)\n", Console::FG_GREEN); |
|
| 233 | 233 | return true; |
| 234 | 234 | } |
| 235 | 235 | $time = microtime(true) - $start; |
| 236 | - $this->stdout("\n*** failed to clean $id (time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_RED); |
|
| 236 | + $this->stdout("\n*** failed to clean $id (time: ".sprintf("%.3f", $time)."s)\n", Console::FG_RED); |
|
| 237 | 237 | return false; |
| 238 | 238 | } |
| 239 | 239 | |
@@ -265,13 +265,13 @@ discard block |
||
| 265 | 265 | ]; |
| 266 | 266 | $message = [ |
| 267 | 267 | 'subject' => Yii::t('audit', 'Audit Error in Audit Entry #{entry_id}', $params), |
| 268 | - 'text' => Yii::t('audit', '{message}' . "\n" . 'in {file} on line {line}.' . "\n" . '-- {url}', $params), |
|
| 268 | + 'text' => Yii::t('audit', '{message}'."\n".'in {file} on line {line}.'."\n".'-- {url}', $params), |
|
| 269 | 269 | 'html' => Yii::t('audit', '<b>{message}</b><br />in <i>{file}</i> on line <i>{line}</i>.<br/>-- {link}', $params), |
| 270 | 270 | ]; |
| 271 | 271 | |
| 272 | 272 | // send email |
| 273 | 273 | Yii::$app->mailer->compose() |
| 274 | - ->setFrom([$email => 'Audit :: ' . Yii::$app->name]) |
|
| 274 | + ->setFrom([$email => 'Audit :: '.Yii::$app->name]) |
|
| 275 | 275 | ->setTo($email) |
| 276 | 276 | ->setSubject($message['subject']) |
| 277 | 277 | ->setTextBody($message['text']) |
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace bedezign\yii2\audit\commands; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use bedezign\yii2\audit\Audit; |
| 6 | 7 | use bedezign\yii2\audit\components\panels\Panel; |
| 7 | 8 | use bedezign\yii2\audit\models\AuditEntry; |
| 8 | 9 | use bedezign\yii2\audit\models\AuditError; |
| 9 | -use Yii; |
|
| 10 | 10 | use yii\base\Exception; |
| 11 | 11 | use yii\console\Controller; |
| 12 | 12 | use yii\console\ExitCode; |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | [ |
| 32 | 32 | 'attribute' => 'entry_id', |
| 33 | 33 | 'class' => 'yii\grid\DataColumn', |
| 34 | - 'value' => function ($data) { |
|
| 34 | + 'value' => function($data) { |
|
| 35 | 35 | return $data->entry_id ? Html::a($data->entry_id, ['entry/view', 'id' => $data->entry_id]) : ''; |
| 36 | 36 | }, |
| 37 | 37 | 'format' => 'raw', |
@@ -6,5 +6,6 @@ |
||
| 6 | 6 | |
| 7 | 7 | echo Html::tag('h1', $panel->name); |
| 8 | 8 | |
| 9 | -foreach ($dataProvider->allModels as $index => $request) |
|
| 9 | +foreach ($dataProvider->allModels as $index => $request) { |
|
| 10 | 10 | echo $this->render('detail', ['panel' => $panel, 'request' => $request, 'index' => $index + 1]); |
| 11 | +} |
|
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | [ |
| 32 | 32 | 'attribute' => 'entry_id', |
| 33 | 33 | 'class' => 'yii\grid\DataColumn', |
| 34 | - 'value' => function ($data) { |
|
| 34 | + 'value' => function($data) { |
|
| 35 | 35 | return $data->entry_id ? Html::a($data->entry_id, ['entry/view', 'id' => $data->entry_id]) : ''; |
| 36 | 36 | }, |
| 37 | 37 | 'format' => 'raw', |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | $defaults = []; |
| 10 | 10 | $startDate = strtotime('-6 days'); |
| 11 | 11 | foreach (range(-6, 0) as $day) { |
| 12 | - $defaults[date('D: Y-m-d', strtotime($day . 'days'))] = 0; |
|
| 12 | + $defaults[date('D: Y-m-d', strtotime($day.'days'))] = 0; |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | $results = AuditTrail::find() |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | $defaults = []; |
| 38 | 38 | $startDate = strtotime('-6 days'); |
| 39 | 39 | foreach (range(-6, 0) as $day) { |
| 40 | - $defaults[date('D: Y-m-d', strtotime($day . 'days'))] = 0; |
|
| 40 | + $defaults[date('D: Y-m-d', strtotime($day.'days'))] = 0; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | $panelModel = $this->getChartModel(); |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | $this->title = Yii::t('audit', 'Mail #{id}', ['id' => $model->id]); |
| 11 | 11 | $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Audit'), 'url' => ['default/index']]; |
| 12 | 12 | $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Mails'), 'url' => ['index']]; |
| 13 | -$this->params['breadcrumbs'][] = '#' . $model->id; |
|
| 13 | +$this->params['breadcrumbs'][] = '#'.$model->id; |
|
| 14 | 14 | |
| 15 | 15 | |
| 16 | 16 | //echo Yii::$app->formatter->asHtml($model->html); |
@@ -20,5 +20,5 @@ discard block |
||
| 20 | 20 | $parser->setText($model->data); |
| 21 | 21 | echo $parser->getMessageBody('htmlEmbedded'); |
| 22 | 22 | } else { |
| 23 | - echo Html::tag('pre', $model->data) . Html::tag('br') . 'Please install php-mime-mail-parser for better functionality'; |
|
| 23 | + echo Html::tag('pre', $model->data).Html::tag('br').'Please install php-mime-mail-parser for better functionality'; |
|
| 24 | 24 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | $this->title = Yii::t('audit', 'Error #{id}', ['id' => $model->id]); |
| 12 | 12 | $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Audit'), 'url' => ['default/index']]; |
| 13 | 13 | $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Errors'), 'url' => ['index']]; |
| 14 | -$this->params['breadcrumbs'][] = '#' . $model->id; |
|
| 14 | +$this->params['breadcrumbs'][] = '#'.$model->id; |
|
| 15 | 15 | |
| 16 | 16 | echo Html::tag('h1', $this->title); |
| 17 | 17 | |
@@ -44,16 +44,15 @@ discard block |
||
| 44 | 44 | 'line', |
| 45 | 45 | [ |
| 46 | 46 | 'header' => Yii::t('audit', 'Called'), |
| 47 | - 'value' => function ($data) { |
|
| 47 | + 'value' => function($data) { |
|
| 48 | 48 | return |
| 49 | 49 | isset($data['type']) ? |
| 50 | - (( isset($data['class']) ? $data['class'] : '[unknown]') . $data['type'] . $data['function']) : |
|
| 51 | - $data['function']; |
|
| 50 | + ((isset($data['class']) ? $data['class'] : '[unknown]').$data['type'].$data['function']) : $data['function']; |
|
| 52 | 51 | } |
| 53 | 52 | ], |
| 54 | 53 | [ |
| 55 | 54 | 'header' => Yii::t('audit', 'Args'), |
| 56 | - 'value' => function ($data) { |
|
| 55 | + 'value' => function($data) { |
|
| 57 | 56 | $out = '<a class="args-toggle glyphicon glyphicon-plus" href="javascript:void(0);"></a>'; |
| 58 | 57 | $out .= '<pre style="display:none;">'; |
| 59 | 58 | $out .= !empty($data['args']) ? VarDumper::dumpAsString($data['args']) : ''; |