@@ -80,7 +80,7 @@ |
||
| 80 | 80 | return $this->_data['result'] = parent::__doRequest($request, $location, $action, $version, $one_way); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - public function __setCookie ($name, $value = null) |
|
| 83 | + public function __setCookie($name, $value = null) |
|
| 84 | 84 | { |
| 85 | 85 | if (!isset($this->_data['cookies'])) |
| 86 | 86 | $this->_data['cookies'] = []; |
@@ -14,8 +14,7 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | try { |
| 16 | 16 | parent::__construct($wsdl, $options); |
| 17 | - } |
|
| 18 | - catch (\SoapFault $e) { |
|
| 17 | + } catch (\SoapFault $e) { |
|
| 19 | 18 | // Catches errors like being unable to read the WSDL and so on |
| 20 | 19 | $this->logSoapFault($e); |
| 21 | 20 | throw $e; |
@@ -46,22 +45,24 @@ discard block |
||
| 46 | 45 | try { |
| 47 | 46 | $result = parent::__soapCall($function_name, $arguments, $options, $input_headers, $output_headers); |
| 48 | 47 | $this->_data['duration'] = microtime(true) - $started; |
| 49 | - if ($output_headers) |
|
| 50 | - $this->_data['output_headers'] = (array) $output_headers; |
|
| 48 | + if ($output_headers) { |
|
| 49 | + $this->_data['output_headers'] = (array) $output_headers; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - if (is_soap_fault($result)) |
|
| 53 | - // Cover non-exception variant |
|
| 52 | + if (is_soap_fault($result)) { |
|
| 53 | + // Cover non-exception variant |
|
| 54 | 54 | return $this->logSoapFault($result); |
| 55 | + } |
|
| 55 | 56 | |
| 56 | 57 | $this->_data['result_object'] = $result; |
| 57 | 58 | $this->finalize(); |
| 58 | 59 | |
| 59 | 60 | return $result; |
| 60 | - } |
|
| 61 | - catch (\Exception $error) { |
|
| 61 | + } catch (\Exception $error) { |
|
| 62 | 62 | $this->_data['duration'] = microtime(true) - $started; |
| 63 | - if ($output_headers) |
|
| 64 | - $this->_data['output_headers'] = (array) $output_headers; |
|
| 63 | + if ($output_headers) { |
|
| 64 | + $this->_data['output_headers'] = (array) $output_headers; |
|
| 65 | + } |
|
| 65 | 66 | |
| 66 | 67 | $this->logSoapFault($error); |
| 67 | 68 | throw $error; |
@@ -82,8 +83,9 @@ discard block |
||
| 82 | 83 | |
| 83 | 84 | public function __setCookie ($name, $value = null) |
| 84 | 85 | { |
| 85 | - if (!isset($this->_data['cookies'])) |
|
| 86 | - $this->_data['cookies'] = []; |
|
| 86 | + if (!isset($this->_data['cookies'])) { |
|
| 87 | + $this->_data['cookies'] = []; |
|
| 88 | + } |
|
| 87 | 89 | $this->_data['cookies'][$name] = $value; |
| 88 | 90 | |
| 89 | 91 | parent::__setCookie($name, $value); |
@@ -99,7 +101,8 @@ discard block |
||
| 99 | 101 | protected function finalize() |
| 100 | 102 | { |
| 101 | 103 | $_panel = Audit::getInstance()->getPanel('audit/soap'); |
| 102 | - if ($_panel) |
|
| 103 | - $_panel->logSoapRequest($this->_data); |
|
| 104 | + if ($_panel) { |
|
| 105 | + $_panel->logSoapRequest($this->_data); |
|
| 106 | + } |
|
| 104 | 107 | } |
| 105 | 108 | } |
| 106 | 109 | \ No newline at end of file |
@@ -37,13 +37,15 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public function beforeSave($insert) |
| 39 | 39 | { |
| 40 | - if ($insert && $this->hasAttribute('created')) |
|
| 41 | - $this->created = date('Y-m-d H:i:s'); |
|
| 40 | + if ($insert && $this->hasAttribute('created')) { |
|
| 41 | + $this->created = date('Y-m-d H:i:s'); |
|
| 42 | + } |
|
| 42 | 43 | |
| 43 | - if ($this->autoSerialize) |
|
| 44 | - foreach ($this->serializeAttributes as $attribute) |
|
| 44 | + if ($this->autoSerialize) { |
|
| 45 | + foreach ($this->serializeAttributes as $attribute) |
|
| 45 | 46 | if ($this->hasAttribute($attribute)) |
| 46 | 47 | $this->$attribute = [Helper::serialize($this->$attribute, false), \PDO::PARAM_LOB]; |
| 48 | + } |
|
| 47 | 49 | |
| 48 | 50 | return parent::beforeSave($insert); |
| 49 | 51 | } |
@@ -56,12 +58,13 @@ discard block |
||
| 56 | 58 | { |
| 57 | 59 | parent::afterSave($insert, $changedAttributes); |
| 58 | 60 | |
| 59 | - if ($this->autoSerialize) |
|
| 60 | - foreach ($this->serializeAttributes as $attribute) |
|
| 61 | + if ($this->autoSerialize) { |
|
| 62 | + foreach ($this->serializeAttributes as $attribute) |
|
| 61 | 63 | if ($this->hasAttribute($attribute)) { |
| 62 | 64 | if (is_array($this->$attribute)) { |
| 63 | 65 | // Get rid of the extra PDO parameter type if needed |
| 64 | 66 | $array = $this->$attribute; |
| 67 | + } |
|
| 65 | 68 | $this->$attribute = $array[0]; |
| 66 | 69 | } |
| 67 | 70 | $this->$attribute = Helper::unserialize($this->$attribute); |
@@ -75,9 +78,10 @@ discard block |
||
| 75 | 78 | { |
| 76 | 79 | parent::afterFind(); |
| 77 | 80 | |
| 78 | - if ($this->autoSerialize) |
|
| 79 | - foreach ($this->serializeAttributes as $attribute) |
|
| 81 | + if ($this->autoSerialize) { |
|
| 82 | + foreach ($this->serializeAttributes as $attribute) |
|
| 80 | 83 | if ($this->hasAttribute($attribute)) |
| 81 | 84 | $this->$attribute = Helper::unserialize($this->$attribute); |
| 85 | + } |
|
| 82 | 86 | } |
| 83 | 87 | } |
| 84 | 88 | \ No newline at end of file |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | */ |
| 37 | 37 | public function getLabel() |
| 38 | 38 | { |
| 39 | - return $this->getName() . ' <small>(' . count($this->data) . ')</small>'; |
|
| 39 | + return $this->getName().' <small>('.count($this->data).')</small>'; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | public function getUrl() |
| 82 | 82 | { |
| 83 | - return Url::toRoute(['/' . $this->module->id . '/entry/view', |
|
| 83 | + return Url::toRoute(['/'.$this->module->id.'/entry/view', |
|
| 84 | 84 | 'panel' => $this->id, |
| 85 | 85 | 'id' => $this->tag, |
| 86 | 86 | ]); |
@@ -87,8 +87,9 @@ |
||
| 87 | 87 | public function cleanup($maxAge = null) |
| 88 | 88 | { |
| 89 | 89 | $maxAge = $maxAge !== null ? $maxAge : $this->maxAge; |
| 90 | - if ($maxAge === null) |
|
| 91 | - return false; |
|
| 90 | + if ($maxAge === null) { |
|
| 91 | + return false; |
|
| 92 | + } |
|
| 92 | 93 | return AuditTrail::deleteAll([ |
| 93 | 94 | '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days")) |
| 94 | 95 | ]); |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | public function actionView($id, $panel = '') |
| 47 | 47 | { |
| 48 | 48 | list($model, $panels) = $this->loadData($id); |
| 49 | - if (isset($panels[$panel])) |
|
| 50 | - $activePanel = $panel; |
|
| 51 | - else { |
|
| 49 | + if (isset($panels[$panel])) { |
|
| 50 | + $activePanel = $panel; |
|
| 51 | + } else { |
|
| 52 | 52 | reset($panels); |
| 53 | 53 | $activePanel = key($panels); |
| 54 | 54 | } |
@@ -97,9 +97,10 @@ discard block |
||
| 97 | 97 | $panels = $this->module->loadPanels($this->module->getPanelIdentifiers()); |
| 98 | 98 | $activePanels = []; |
| 99 | 99 | $data = ArrayHelper::getColumn($model->data, 'data'); |
| 100 | - foreach ($panels as $panelId => $panel) |
|
| 101 | - if ($panel->hasEntryData($model)) { |
|
| 100 | + foreach ($panels as $panelId => $panel) { |
|
| 101 | + if ($panel->hasEntryData($model)) { |
|
| 102 | 102 | $panel->tag = $id; |
| 103 | + } |
|
| 103 | 104 | $panel->model = $model; |
| 104 | 105 | $panel->load(isset($data[$panelId]) ? $data[$panelId] : null); |
| 105 | 106 | $activePanels[$panelId] = $panel; |
@@ -44,13 +44,13 @@ |
||
| 44 | 44 | 'message' => 'message', |
| 45 | 45 | 'type' => 'type', |
| 46 | 46 | 'file' => 'origin', |
| 47 | - 'line' => function ($value) use ($javascript) { |
|
| 48 | - $javascript->origin .= ':' . $value; |
|
| 47 | + 'line' => function($value) use ($javascript) { |
|
| 48 | + $javascript->origin .= ':'.$value; |
|
| 49 | 49 | }, |
| 50 | - 'col' => function ($value) use ($javascript) { |
|
| 51 | - $javascript->origin .= ':' . $value; |
|
| 50 | + 'col' => function($value) use ($javascript) { |
|
| 51 | + $javascript->origin .= ':'.$value; |
|
| 52 | 52 | }, |
| 53 | - 'data' => function ($value) use ($javascript) { |
|
| 53 | + 'data' => function($value) use ($javascript) { |
|
| 54 | 54 | if (count($value)) $javascript->data = $value; |
| 55 | 55 | }, |
| 56 | 56 | ]; |
@@ -51,21 +51,28 @@ |
||
| 51 | 51 | $javascript->origin .= ':' . $value; |
| 52 | 52 | }, |
| 53 | 53 | 'data' => function ($value) use ($javascript) { |
| 54 | - if (count($value)) $javascript->data = $value; |
|
| 54 | + if (count($value)) { |
|
| 55 | + $javascript->data = $value; |
|
| 56 | + } |
|
| 55 | 57 | }, |
| 56 | 58 | ]; |
| 57 | 59 | |
| 58 | - foreach ($map as $key => $target) |
|
| 59 | - if (isset($data[$key])) { |
|
| 60 | + foreach ($map as $key => $target) { |
|
| 61 | + if (isset($data[$key])) { |
|
| 60 | 62 | if (is_callable($target)) $target($data[$key]); |
| 61 | - else $javascript->$target = $data[$key]; |
|
| 63 | + } |
|
| 64 | + else { |
|
| 65 | + $javascript->$target = $data[$key]; |
|
| 66 | + } |
|
| 62 | 67 | } |
| 63 | 68 | |
| 64 | - if (!$javascript->type) |
|
| 65 | - $javascript->type = 'unknown'; |
|
| 69 | + if (!$javascript->type) { |
|
| 70 | + $javascript->type = 'unknown'; |
|
| 71 | + } |
|
| 66 | 72 | |
| 67 | - if ($javascript->save()) |
|
| 68 | - return ['result' => 'ok', 'entry' => $data['auditEntry']]; |
|
| 73 | + if ($javascript->save()) { |
|
| 74 | + return ['result' => 'ok', 'entry' => $data['auditEntry']]; |
|
| 75 | + } |
|
| 69 | 76 | |
| 70 | 77 | return ['result' => 'error', 'errors' => $javascript->getErrors()]; |
| 71 | 78 | } |
@@ -58,6 +58,6 @@ |
||
| 58 | 58 | if (!$model) { |
| 59 | 59 | throw new NotFoundHttpException('The requested mail does not exist.'); |
| 60 | 60 | } |
| 61 | - Yii::$app->response->sendContentAsFile(Helper::uncompress($model->data), $model->id . '.eml'); |
|
| 61 | + Yii::$app->response->sendContentAsFile(Helper::uncompress($model->data), $model->id.'.eml'); |
|
| 62 | 62 | } |
| 63 | 63 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | // and the '.svn' will match all files and directories named exactly '.svn'. |
| 27 | 27 | // Note, the '/' characters in a pattern matches both '/' and '\'. |
| 28 | 28 | // See helpers/FileHelper::findFiles() description for more details on pattern matching rules. |
| 29 | - 'only' => ['*.php', '*.js'], |
|
| 29 | + 'only' => ['*.php', '*.js'], |
|
| 30 | 30 | // array, list of patterns that specify which files (not directories) should be processed. |
| 31 | 31 | // If empty or not set, all files will be processed. |
| 32 | 32 | // Please refer to "except" for details about the patterns. |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | // string, required, root directory of all source files |
| 5 | - 'sourcePath' => __DIR__ . '/..', |
|
| 5 | + 'sourcePath' => __DIR__.'/..', |
|
| 6 | 6 | // array, required, list of language codes that the extracted messages |
| 7 | 7 | // should be translated to. For example, ['zh-CN', 'de']. |
| 8 | 8 | 'languages' => ['en', 'nl'], |
@@ -15,19 +15,19 @@ |
||
| 15 | 15 | |
| 16 | 16 | $this->createTable(self::TABLE, [ |
| 17 | 17 | 'id' => Schema::TYPE_PK, |
| 18 | - 'created' => Schema::TYPE_DATETIME . ' NOT NULL', |
|
| 19 | - 'start_time' => Schema::TYPE_FLOAT . ' NULL', |
|
| 20 | - 'end_time' => Schema::TYPE_FLOAT . ' NULL', |
|
| 21 | - 'duration' => Schema::TYPE_FLOAT . ' NULL', |
|
| 22 | - 'user_id' => Schema::TYPE_INTEGER . " DEFAULT '0'", |
|
| 23 | - 'ip' => Schema::TYPE_STRING . '(45) NULL', |
|
| 24 | - 'referrer' => Schema::TYPE_STRING . '(512) NULL', |
|
| 25 | - 'origin' => Schema::TYPE_STRING . '(512) NULL', |
|
| 26 | - 'url' => Schema::TYPE_STRING . '(512) NULL', |
|
| 27 | - 'route' => Schema::TYPE_STRING . '(255) NULL', |
|
| 18 | + 'created' => Schema::TYPE_DATETIME.' NOT NULL', |
|
| 19 | + 'start_time' => Schema::TYPE_FLOAT.' NULL', |
|
| 20 | + 'end_time' => Schema::TYPE_FLOAT.' NULL', |
|
| 21 | + 'duration' => Schema::TYPE_FLOAT.' NULL', |
|
| 22 | + 'user_id' => Schema::TYPE_INTEGER." DEFAULT '0'", |
|
| 23 | + 'ip' => Schema::TYPE_STRING.'(45) NULL', |
|
| 24 | + 'referrer' => Schema::TYPE_STRING.'(512) NULL', |
|
| 25 | + 'origin' => Schema::TYPE_STRING.'(512) NULL', |
|
| 26 | + 'url' => Schema::TYPE_STRING.'(512) NULL', |
|
| 27 | + 'route' => Schema::TYPE_STRING.'(255) NULL', |
|
| 28 | 28 | 'data' => 'BLOB NULL', |
| 29 | - 'memory' => Schema::TYPE_INTEGER . " NULL", |
|
| 30 | - 'memory_max' => Schema::TYPE_INTEGER . " NULL", |
|
| 29 | + 'memory' => Schema::TYPE_INTEGER." NULL", |
|
| 30 | + 'memory_max' => Schema::TYPE_INTEGER." NULL", |
|
| 31 | 31 | |
| 32 | 32 | ], $tableOptions); |
| 33 | 33 | |
@@ -15,9 +15,9 @@ |
||
| 15 | 15 | |
| 16 | 16 | $this->createTable(self::TABLE, [ |
| 17 | 17 | 'id' => Schema::TYPE_PK, |
| 18 | - 'audit_id' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 19 | - 'name' => Schema::TYPE_STRING . '(255) NOT NULL', |
|
| 20 | - 'type' => Schema::TYPE_STRING . '(255) NULL', |
|
| 18 | + 'audit_id' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 19 | + 'name' => Schema::TYPE_STRING.'(255) NOT NULL', |
|
| 20 | + 'type' => Schema::TYPE_STRING.'(255) NULL', |
|
| 21 | 21 | 'packed' => "TINYINT(1) UNSIGNED NOT NULL DEFAULT '0'", |
| 22 | 22 | 'data' => 'BLOB NOT NULL', |
| 23 | 23 | ], $tableOptions); |