@@ -82,7 +82,7 @@ |
||
| 82 | 82 | * @param $id |
| 83 | 83 | * @param $attribute |
| 84 | 84 | * @param $version |
| 85 | - * @return null|integer|float|string |
|
| 85 | + * @return string|null |
|
| 86 | 86 | */ |
| 87 | 87 | public static function findAttribute($class, $id, $attribute, $version) |
| 88 | 88 | { |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @param Event $event |
| 39 | - * @return null|static |
|
| 39 | + * @return AuditMail|null |
|
| 40 | 40 | */ |
| 41 | 41 | public function record($event) |
| 42 | 42 | { |
@@ -167,8 +167,9 @@ |
||
| 167 | 167 | public function cleanup($maxAge = null) |
| 168 | 168 | { |
| 169 | 169 | $maxAge = $maxAge !== null ? $maxAge : $this->maxAge; |
| 170 | - if ($maxAge === null) |
|
| 171 | - return false; |
|
| 170 | + if ($maxAge === null) { |
|
| 171 | + return false; |
|
| 172 | + } |
|
| 172 | 173 | return AuditMail::deleteAll([ |
| 173 | 174 | '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days")) |
| 174 | 175 | ]); |
@@ -36,13 +36,15 @@ discard block |
||
| 36 | 36 | */ |
| 37 | 37 | public function export() |
| 38 | 38 | { |
| 39 | - if (!\Yii::$app) |
|
| 40 | - // Things like this can happen in tests etc, but it is too late for us to do anything about that. |
|
| 39 | + if (!\Yii::$app) { |
|
| 40 | + // Things like this can happen in tests etc, but it is too late for us to do anything about that. |
|
| 41 | 41 | return; |
| 42 | + } |
|
| 42 | 43 | |
| 43 | 44 | $module = $this->module; |
| 44 | - if (!$module->entry || empty($module->panels)) |
|
| 45 | - return; |
|
| 45 | + if (!$module->entry || empty($module->panels)) { |
|
| 46 | + return; |
|
| 47 | + } |
|
| 46 | 48 | |
| 47 | 49 | $entry = $module->entry; |
| 48 | 50 | |
@@ -53,11 +55,12 @@ discard block |
||
| 53 | 55 | $records = array_filter($records); |
| 54 | 56 | |
| 55 | 57 | if (!empty($records)) { |
| 56 | - if ($module->batchSave) |
|
| 57 | - $entry->addBatchData($records, false); |
|
| 58 | - else { |
|
| 59 | - foreach ($records as $type => $record) |
|
| 60 | - $entry->addData($type, $record, false); |
|
| 58 | + if ($module->batchSave) { |
|
| 59 | + $entry->addBatchData($records, false); |
|
| 60 | + } else { |
|
| 61 | + foreach ($records as $type => $record) { |
|
| 62 | + $entry->addData($type, $record, false); |
|
| 63 | + } |
|
| 61 | 64 | } |
| 62 | 65 | } |
| 63 | 66 | $this->messages = []; |
@@ -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 |
@@ -101,8 +101,9 @@ |
||
| 101 | 101 | public function cleanup($maxAge = null) |
| 102 | 102 | { |
| 103 | 103 | $maxAge = $maxAge !== null ? $maxAge : $this->maxAge; |
| 104 | - if ($maxAge === null) |
|
| 105 | - return false; |
|
| 104 | + if ($maxAge === null) { |
|
| 105 | + return false; |
|
| 106 | + } |
|
| 106 | 107 | return AuditData::deleteAll('type = :type AND created <= :created', [ |
| 107 | 108 | ':type' => $this->id, |
| 108 | 109 | ':created' => date('Y-m-d 23:59:59', strtotime("-$maxAge days")), |
@@ -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; |
@@ -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 | } |
@@ -50,8 +50,9 @@ |
||
| 50 | 50 | public static function create($initialise = true) |
| 51 | 51 | { |
| 52 | 52 | $entry = new static; |
| 53 | - if ($initialise) |
|
| 54 | - $entry->record(); |
|
| 53 | + if ($initialise) { |
|
| 54 | + $entry->record(); |
|
| 55 | + } |
|
| 55 | 56 | |
| 56 | 57 | return $entry; |
| 57 | 58 | } |