@@ -8,8 +8,8 @@ |
||
| 8 | 8 | |
| 9 | 9 | use Yii; |
| 10 | 10 | use bedezign\yii2\audit\components\panels\DataStoragePanel; |
| 11 | -use yii\grid\GridViewAsset; |
|
| 12 | 11 | use yii\data\ArrayDataProvider; |
| 12 | +use yii\grid\GridViewAsset; |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * Class CurlPanel |
@@ -96,19 +96,22 @@ discard block |
||
| 96 | 96 | curl_setopt($handle, CURLOPT_URL, $url); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - if ($postData) |
|
| 100 | - $this->data[$id]['post'] = $postData; |
|
| 99 | + if ($postData) { |
|
| 100 | + $this->data[$id]['post'] = $postData; |
|
| 101 | + } |
|
| 101 | 102 | |
| 102 | - if ($this->headers) |
|
| 103 | - curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']); |
|
| 103 | + if ($this->headers) { |
|
| 104 | + curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']); |
|
| 105 | + } |
|
| 104 | 106 | |
| 105 | 107 | if ($this->log) { |
| 106 | 108 | curl_setopt($handle, CURLOPT_VERBOSE, true); |
| 107 | 109 | curl_setopt($handle, CURLOPT_STDERR, $this->_logHandles[$id] = fopen('php://temp', 'rw+')); |
| 108 | 110 | } |
| 109 | 111 | |
| 110 | - if ($this->content) |
|
| 111 | - curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1); |
|
| 112 | + if ($this->content) { |
|
| 113 | + curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1); |
|
| 114 | + } |
|
| 112 | 115 | |
| 113 | 116 | return true; |
| 114 | 117 | } |
@@ -136,8 +139,9 @@ discard block |
||
| 136 | 139 | unset($this->_logHandles[$id]); |
| 137 | 140 | } |
| 138 | 141 | |
| 139 | - if ($this->content) |
|
| 140 | - $this->data[$id]['content']= curl_multi_getcontent($handle); |
|
| 142 | + if ($this->content) { |
|
| 143 | + $this->data[$id]['content']= curl_multi_getcontent($handle); |
|
| 144 | + } |
|
| 141 | 145 | |
| 142 | 146 | // Cleanup empty things |
| 143 | 147 | $this->data[$id] = array_filter($this->data[$id]); |
@@ -192,8 +196,9 @@ discard block |
||
| 192 | 196 | public function captureHeader($handle, $header) |
| 193 | 197 | { |
| 194 | 198 | $id = $this->id($handle); |
| 195 | - if (!isset($this->data[$id]['headers'])) |
|
| 196 | - $this->data[$id]['headers'] = []; |
|
| 199 | + if (!isset($this->data[$id]['headers'])) { |
|
| 200 | + $this->data[$id]['headers'] = []; |
|
| 201 | + } |
|
| 197 | 202 | |
| 198 | 203 | $this->data[$id]['headers'][] = $header; |
| 199 | 204 | return strlen($header); |
@@ -205,8 +210,9 @@ discard block |
||
| 205 | 210 | */ |
| 206 | 211 | protected function id($resource) |
| 207 | 212 | { |
| 208 | - if (!is_resource($resource)) |
|
| 209 | - return false; |
|
| 213 | + if (!is_resource($resource)) { |
|
| 214 | + return false; |
|
| 215 | + } |
|
| 210 | 216 | |
| 211 | 217 | $parts = explode('#', (string)$resource); |
| 212 | 218 | return array_pop($parts); |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace bedezign\yii2\audit\panels; |
| 4 | 4 | |
| 5 | -use bedezign\yii2\audit\components\panels\DataStoragePanelTrait; |
|
| 6 | 5 | use Yii; |
| 6 | +use bedezign\yii2\audit\components\panels\DataStoragePanelTrait; |
|
| 7 | 7 | use yii\debug\models\search\Db; |
| 8 | 8 | use yii\grid\GridViewAsset; |
| 9 | 9 | |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace bedezign\yii2\audit\panels; |
| 4 | 4 | |
| 5 | -use bedezign\yii2\audit\components\panels\DataStoragePanelTrait; |
|
| 6 | 5 | use Yii; |
| 6 | +use bedezign\yii2\audit\components\panels\DataStoragePanelTrait; |
|
| 7 | 7 | use yii\debug\models\search\Log; |
| 8 | 8 | use yii\grid\GridViewAsset; |
| 9 | 9 | |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace bedezign\yii2\audit\panels; |
| 4 | 4 | |
| 5 | -use bedezign\yii2\audit\components\panels\DataStoragePanelTrait; |
|
| 6 | 5 | use Yii; |
| 6 | +use bedezign\yii2\audit\components\panels\DataStoragePanelTrait; |
|
| 7 | 7 | use yii\debug\models\search\Profile; |
| 8 | 8 | use yii\grid\GridViewAsset; |
| 9 | 9 | |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | namespace bedezign\yii2\audit\panels; |
| 3 | 3 | |
| 4 | 4 | use Yii; |
| 5 | -use bedezign\yii2\audit\models\AuditError; |
|
| 6 | 5 | use bedezign\yii2\audit\components\panels\DataStoragePanel; |
| 7 | 6 | use yii\data\ArrayDataProvider; |
| 8 | 7 | |
@@ -35,8 +35,9 @@ |
||
| 35 | 35 | { |
| 36 | 36 | $this->module->registerPanel($this); |
| 37 | 37 | |
| 38 | - if (!is_array($this->data)) |
|
| 39 | - $this->data = []; |
|
| 38 | + if (!is_array($this->data)) { |
|
| 39 | + $this->data = []; |
|
| 40 | + } |
|
| 40 | 41 | |
| 41 | 42 | if (isset($data['error'])) { |
| 42 | 43 | $error = $this->module->exception($data['error']); |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /* @var $panel bedezign\yii2\audit\panels\SoapPanel */ |
| 3 | 3 | |
| 4 | -use yii\bootstrap\Tabs; |
|
| 5 | -use yii\helpers\Html; |
|
| 6 | 4 | use bedezign\yii2\audit\components\Helper; |
| 5 | +use yii\bootstrap\Tabs; |
|
| 7 | 6 | use yii\helpers\ArrayHelper; |
| 7 | +use yii\helpers\Html; |
|
| 8 | 8 | use yii\helpers\VarDumper; |
| 9 | 9 | |
| 10 | 10 | $preformatted = ['class' => 'well', 'style' => 'overflow: auto; white-space: pre']; |
@@ -24,11 +24,12 @@ |
||
| 24 | 24 | |
| 25 | 25 | if (isset($request['result'])) { |
| 26 | 26 | $xml = Helper::formatAsXML($request['result']); |
| 27 | - if ($xml) |
|
| 28 | - $tabs[] = [ |
|
| 27 | + if ($xml) { |
|
| 28 | + $tabs[] = [ |
|
| 29 | 29 | 'label' => \Yii::t('audit', 'Result - XML'), |
| 30 | 30 | 'content' => Html::tag('div', $xml, $preformatted) |
| 31 | 31 | ]; |
| 32 | + } |
|
| 32 | 33 | |
| 33 | 34 | $tabs[] = [ |
| 34 | 35 | 'label' => \Yii::t('audit', 'Result'), |
@@ -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 = []; |
@@ -23,8 +23,9 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public static function serialize($data, $compact = true) |
| 25 | 25 | { |
| 26 | - if ($compact) |
|
| 27 | - $data = self::compact($data); |
|
| 26 | + if ($compact) { |
|
| 27 | + $data = self::compact($data); |
|
| 28 | + } |
|
| 28 | 29 | |
| 29 | 30 | $data = serialize($data); |
| 30 | 31 | $data = self::compress($data); |
@@ -39,19 +40,22 @@ discard block |
||
| 39 | 40 | */ |
| 40 | 41 | public static function unserialize($data) |
| 41 | 42 | { |
| 42 | - if (is_resource($data)) |
|
| 43 | - // For some databases (like Postgres) binary columns return as a resource, fetch the content first |
|
| 43 | + if (is_resource($data)) { |
|
| 44 | + // For some databases (like Postgres) binary columns return as a resource, fetch the content first |
|
| 44 | 45 | $data = stream_get_contents($data, -1, 0); |
| 46 | + } |
|
| 45 | 47 | |
| 46 | 48 | $originalData = $data; |
| 47 | 49 | $data = self::uncompress($data); |
| 48 | 50 | |
| 49 | - if ($data === false) |
|
| 50 | - $data = $originalData; |
|
| 51 | + if ($data === false) { |
|
| 52 | + $data = $originalData; |
|
| 53 | + } |
|
| 51 | 54 | |
| 52 | 55 | $data = @unserialize($data); |
| 53 | - if ($data === false) |
|
| 54 | - $data = $originalData; |
|
| 56 | + if ($data === false) { |
|
| 57 | + $data = $originalData; |
|
| 58 | + } |
|
| 55 | 59 | |
| 56 | 60 | return $data; |
| 57 | 61 | } |
@@ -63,8 +67,9 @@ discard block |
||
| 63 | 67 | */ |
| 64 | 68 | public static function compress($data) |
| 65 | 69 | { |
| 66 | - if (Audit::getInstance()->compressData) |
|
| 67 | - $data = gzcompress($data); |
|
| 70 | + if (Audit::getInstance()->compressData) { |
|
| 71 | + $data = gzcompress($data); |
|
| 72 | + } |
|
| 68 | 73 | return $data; |
| 69 | 74 | } |
| 70 | 75 | |
@@ -90,15 +95,17 @@ discard block |
||
| 90 | 95 | public static function compact($data, $simplify = false, $threshold = 512) |
| 91 | 96 | { |
| 92 | 97 | $data = ArrayHelper::toArray($data); |
| 93 | - if ($simplify) |
|
| 94 | - array_walk($data, function (&$value) { |
|
| 98 | + if ($simplify) { |
|
| 99 | + array_walk($data, function (&$value) { |
|
| 95 | 100 | if (is_array($value) && count($value) == 1) $value = reset($value); |
| 101 | + } |
|
| 96 | 102 | }); |
| 97 | 103 | |
| 98 | 104 | $tooBig = []; |
| 99 | - foreach ($data as $index => $value) |
|
| 100 | - if (strlen(serialize($value)) > $threshold) |
|
| 105 | + foreach ($data as $index => $value) { |
|
| 106 | + if (strlen(serialize($value)) > $threshold) |
|
| 101 | 107 | $tooBig[] = $index; |
| 108 | + } |
|
| 102 | 109 | |
| 103 | 110 | if (count($tooBig)) { |
| 104 | 111 | $data = array_diff_key($data, array_flip($tooBig)); |
@@ -117,8 +124,9 @@ discard block |
||
| 117 | 124 | { |
| 118 | 125 | $trace = debug_backtrace(); |
| 119 | 126 | array_pop($trace); // remove the last trace since it would be the entry script, not very useful |
| 120 | - if ($skip > 0) |
|
| 121 | - $trace = array_slice($trace, $skip); |
|
| 127 | + if ($skip > 0) { |
|
| 128 | + $trace = array_slice($trace, $skip); |
|
| 129 | + } |
|
| 122 | 130 | return self::cleanupTrace($trace); |
| 123 | 131 | } |
| 124 | 132 | |
@@ -130,8 +138,9 @@ discard block |
||
| 130 | 138 | */ |
| 131 | 139 | public static function cleanupTrace($trace) |
| 132 | 140 | { |
| 133 | - if (!is_array($trace)) |
|
| 134 | - return []; |
|
| 141 | + if (!is_array($trace)) { |
|
| 142 | + return []; |
|
| 143 | + } |
|
| 135 | 144 | |
| 136 | 145 | foreach ($trace as $n => $call) { |
| 137 | 146 | $call['file'] = isset($call['file']) ? $call['file'] : 'unknown'; |
@@ -140,14 +149,18 @@ discard block |
||
| 140 | 149 | $call['file'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $call['file']); |
| 141 | 150 | |
| 142 | 151 | // XDebug |
| 143 | - if (isset($call['params'])) unset($call['params']); |
|
| 152 | + if (isset($call['params'])) { |
|
| 153 | + unset($call['params']); |
|
| 154 | + } |
|
| 144 | 155 | |
| 145 | 156 | // Trace entry contains the class instance, also compact and include this |
| 146 | - if (isset($call['object'])) |
|
| 147 | - $call['object'] = current(self::cleanupTraceArguments([$call['object']])); |
|
| 157 | + if (isset($call['object'])) { |
|
| 158 | + $call['object'] = current(self::cleanupTraceArguments([$call['object']])); |
|
| 159 | + } |
|
| 148 | 160 | |
| 149 | - if (isset($call['args'])) |
|
| 150 | - $call['args'] = self::cleanupTraceArguments($call['args']); |
|
| 161 | + if (isset($call['args'])) { |
|
| 162 | + $call['args'] = self::cleanupTraceArguments($call['args']); |
|
| 163 | + } |
|
| 151 | 164 | |
| 152 | 165 | $trace[$n] = $call; |
| 153 | 166 | } |
@@ -176,10 +189,11 @@ discard block |
||
| 176 | 189 | $args[$name] = $object; |
| 177 | 190 | } |
| 178 | 191 | } else if (is_array($value)) { |
| 179 | - if ($recurseDepth > 0) |
|
| 180 | - $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1); |
|
| 181 | - else |
|
| 182 | - $args[$name] = 'Array'; |
|
| 192 | + if ($recurseDepth > 0) { |
|
| 193 | + $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1); |
|
| 194 | + } else { |
|
| 195 | + $args[$name] = 'Array'; |
|
| 196 | + } |
|
| 183 | 197 | } |
| 184 | 198 | } |
| 185 | 199 | return $args; |
@@ -212,8 +226,9 @@ discard block |
||
| 212 | 226 | public static function formatAsQuery($data) |
| 213 | 227 | { |
| 214 | 228 | $data = rawurldecode($data); |
| 215 | - if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data)) |
|
| 216 | - return null; |
|
| 229 | + if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data)) { |
|
| 230 | + return null; |
|
| 231 | + } |
|
| 217 | 232 | |
| 218 | 233 | $result = []; |
| 219 | 234 | parse_str($data, $result); |
@@ -241,8 +256,9 @@ discard block |
||
| 241 | 256 | $doc = new \DOMDocument('1.0'); |
| 242 | 257 | $doc->preserveWhiteSpace = false; |
| 243 | 258 | $doc->formatOutput = true; |
| 244 | - if (@$doc->loadXML($data)) |
|
| 245 | - return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8'); |
|
| 259 | + if (@$doc->loadXML($data)) { |
|
| 260 | + return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8'); |
|
| 261 | + } |
|
| 246 | 262 | return null; |
| 247 | 263 | } |
| 248 | 264 | |
@@ -253,14 +269,16 @@ discard block |
||
| 253 | 269 | */ |
| 254 | 270 | public static function formatAsHTML($data) |
| 255 | 271 | { |
| 256 | - if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml') |
|
| 257 | - return null; |
|
| 272 | + if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml') { |
|
| 273 | + return null; |
|
| 274 | + } |
|
| 258 | 275 | |
| 259 | 276 | $doc = new \DOMDocument('1.0'); |
| 260 | 277 | $doc->preserveWhiteSpace = false; |
| 261 | 278 | $doc->formatOutput = true; |
| 262 | - if (@$doc->loadHTML($data)) |
|
| 263 | - return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8'); |
|
| 279 | + if (@$doc->loadHTML($data)) { |
|
| 280 | + return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8'); |
|
| 281 | + } |
|
| 264 | 282 | return null; |
| 265 | 283 | } |
| 266 | 284 | } |
| 267 | 285 | \ No newline at end of file |
@@ -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 |