bedezign / yii2-audit

src/components/Helper.php

Braces +53 added lines, -35 removed lines

@@ -23,8 +23,9 @@ 
      */
     public static function serialize($data, $compact = true)
     {
-        if ($compact)
-            $data = self::compact($data);
+        if ($compact) {
+                    $data = self::compact($data);
+        }
 
         $data = serialize($data);
         $data = self::compress($data);
@@ -39,19 +40,22 @@ 
      */
     public static function unserialize($data)
     {
-        if (is_resource($data))
-            // For some databases (like Postgres) binary columns return as a resource, fetch the content first
+        if (is_resource($data)) {
+                    // For some databases (like Postgres) binary columns return as a resource, fetch the content first
             $data = stream_get_contents($data, -1, 0);
+        }
 
         $originalData = $data;
         $data = self::uncompress($data);
 
-        if ($data === false)
-            $data = $originalData;
+        if ($data === false) {
+                    $data = $originalData;
+        }
 
         $data = @unserialize($data);
-        if ($data === false)
-            $data = $originalData;
+        if ($data === false) {
+                    $data = $originalData;
+        }
 
         return $data;
     }
@@ -63,8 +67,9 @@ 
      */
     public static function compress($data)
     {
-        if (Audit::getInstance()->compressData)
-            $data = gzcompress($data);
+        if (Audit::getInstance()->compressData) {
+                    $data = gzcompress($data);
+        }
         return $data;
     }
 
@@ -90,15 +95,17 @@ 
     public static function compact($data, $simplify = false, $threshold = 512)
     {
         $data = ArrayHelper::toArray($data);
-        if ($simplify)
-            array_walk($data, function (&$value) {
+        if ($simplify) {
+                    array_walk($data, function (&$value) {
                 if (is_array($value) && count($value) == 1) $value = reset($value);
+        }
             });
 
         $tooBig = [];
-        foreach ($data as $index => $value)
-            if (strlen(serialize($value)) > $threshold)
+        foreach ($data as $index => $value) {
+                    if (strlen(serialize($value)) > $threshold)
                 $tooBig[] = $index;
+        }
 
         if (count($tooBig)) {
             $data = array_diff_key($data, array_flip($tooBig));
@@ -117,8 +124,9 @@ 
     {
         $trace = debug_backtrace();
         array_pop($trace); // remove the last trace since it would be the entry script, not very useful
-        if ($skip > 0)
-            $trace = array_slice($trace, $skip);
+        if ($skip > 0) {
+                    $trace = array_slice($trace, $skip);
+        }
         return self::cleanupTrace($trace);
     }
 
@@ -130,8 +138,9 @@ 
      */
     public static function cleanupTrace($trace)
     {
-        if (!is_array($trace))
-            return [];
+        if (!is_array($trace)) {
+                    return [];
+        }
 
         foreach ($trace as $n => $call) {
             $call['file'] = isset($call['file']) ? $call['file'] : 'unknown';
@@ -140,14 +149,18 @@ 
             $call['file'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $call['file']);
 
             // XDebug
-            if (isset($call['params'])) unset($call['params']);
+            if (isset($call['params'])) {
+                unset($call['params']);
+            }
 
             // Trace entry contains the class instance, also compact and include this
-            if (isset($call['object']))
-                $call['object'] = current(self::cleanupTraceArguments([$call['object']]));
+            if (isset($call['object'])) {
+                            $call['object'] = current(self::cleanupTraceArguments([$call['object']]));
+            }
 
-            if (isset($call['args']))
-                $call['args'] = self::cleanupTraceArguments($call['args']);
+            if (isset($call['args'])) {
+                            $call['args'] = self::cleanupTraceArguments($call['args']);
+            }
 
             $trace[$n] = $call;
         }
@@ -176,10 +189,11 @@ 
                     $args[$name] = $object;
                 }
             } else if (is_array($value)) {
-                if ($recurseDepth > 0)
-                    $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1);
-                else
-                    $args[$name] = 'Array';
+                if ($recurseDepth > 0) {
+                                    $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1);
+                } else {
+                                    $args[$name] = 'Array';
+                }
             }
         }
         return $args;
@@ -212,8 +226,9 @@ 
     public static function formatAsQuery($data)
     {
         $data = rawurldecode($data);
-        if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data))
-            return null;
+        if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data)) {
+                    return null;
+        }
 
         $result = [];
         parse_str($data, $result);
@@ -241,8 +256,9 @@ 
         $doc = new \DOMDocument('1.0');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
-        if (@$doc->loadXML($data))
-            return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8');
+        if (@$doc->loadXML($data)) {
+                    return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8');
+        }
         return null;
     }
 
@@ -253,14 +269,16 @@ 
      */
     public static function formatAsHTML($data)
     {
-        if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml')
-            return null;
+        if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml') {
+                    return null;
+        }
 
         $doc = new \DOMDocument('1.0');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
-        if (@$doc->loadHTML($data))
-            return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8');
+        if (@$doc->loadHTML($data)) {
+                    return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8');
+        }
         return null;
     }
 }
\ No newline at end of file

src/components/SoapClient.php

Braces +17 added lines, -14 removed lines

@@ -14,8 +14,7 @@ 
 
         try {
             parent::__construct($wsdl, $options);
-        }
-        catch (\SoapFault $e) {
+        } catch (\SoapFault $e) {
             // Catches errors like being unable to read the WSDL and so on
             $this->logSoapFault($e);
             throw $e;
@@ -46,22 +45,24 @@ 
         try {
             $result = parent::__soapCall($function_name, $arguments, $options, $input_headers, $output_headers);
             $this->_data['duration'] = microtime(true) - $started;
-            if ($output_headers)
-                $this->_data['output_headers'] = (array) $output_headers;
+            if ($output_headers) {
+                            $this->_data['output_headers'] = (array) $output_headers;
+            }
 
-            if (is_soap_fault($result))
-                // Cover non-exception variant
+            if (is_soap_fault($result)) {
+                            // Cover non-exception variant
                 return $this->logSoapFault($result);
+            }
 
             $this->_data['result_object'] = $result;
             $this->finalize();
 
             return $result;
-        }
-        catch (\Exception $error) {
+        } catch (\Exception $error) {
             $this->_data['duration'] = microtime(true) - $started;
-            if ($output_headers)
-                $this->_data['output_headers'] = (array) $output_headers;
+            if ($output_headers) {
+                            $this->_data['output_headers'] = (array) $output_headers;
+            }
 
             $this->logSoapFault($error);
             throw $error;
@@ -82,8 +83,9 @@ 
 
     public function __setCookie ($name, $value = null)
     {
-        if (!isset($this->_data['cookies']))
-            $this->_data['cookies'] = [];
+        if (!isset($this->_data['cookies'])) {
+                    $this->_data['cookies'] = [];
+        }
         $this->_data['cookies'][$name] = $value;
 
         parent::__setCookie($name, $value);
@@ -99,7 +101,8 @@ 
     protected function finalize()
     {
         $_panel = Audit::getInstance()->getPanel('audit/soap');
-        if ($_panel)
-            $_panel->logSoapRequest($this->_data);
+        if ($_panel) {
+                    $_panel->logSoapRequest($this->_data);
+        }
     }
 }
\ No newline at end of file

src/components/db/ActiveRecord.php

Braces +12 added lines, -8 removed lines

@@ -37,13 +37,15 @@ 
      */
     public function beforeSave($insert)
     {
-        if ($insert && $this->hasAttribute('created'))
-            $this->created = date('Y-m-d H:i:s');
+        if ($insert && $this->hasAttribute('created')) {
+                    $this->created = date('Y-m-d H:i:s');
+        }
 
-        if ($this->autoSerialize)
-            foreach ($this->serializeAttributes as $attribute)
+        if ($this->autoSerialize) {
+                    foreach ($this->serializeAttributes as $attribute)
                 if ($this->hasAttribute($attribute))
                     $this->$attribute = [Helper::serialize($this->$attribute, false), \PDO::PARAM_LOB];
+        }
 
         return parent::beforeSave($insert);
     }
@@ -56,12 +58,13 @@ 
     {
         parent::afterSave($insert, $changedAttributes);
 
-        if ($this->autoSerialize)
-            foreach ($this->serializeAttributes as $attribute)
+        if ($this->autoSerialize) {
+                    foreach ($this->serializeAttributes as $attribute)
                 if ($this->hasAttribute($attribute)) {
                     if (is_array($this->$attribute)) {
                         // Get rid of the extra PDO parameter type if needed
                         $array = $this->$attribute;
+        }
                         $this->$attribute = $array[0];
                     }
                     $this->$attribute = Helper::unserialize($this->$attribute);
@@ -75,9 +78,10 @@ 
     {
         parent::afterFind();
 
-        if ($this->autoSerialize)
-            foreach ($this->serializeAttributes as $attribute)
+        if ($this->autoSerialize) {
+                    foreach ($this->serializeAttributes as $attribute)
                 if ($this->hasAttribute($attribute))
                     $this->$attribute = Helper::unserialize($this->$attribute);
+        }
     }
 }
\ No newline at end of file

src/components/panels/PanelTrait.php

Braces +3 added lines, -2 removed lines

@@ -101,8 +101,9 @@
     public function cleanup($maxAge = null)
     {
         $maxAge = $maxAge !== null ? $maxAge : $this->maxAge;
-        if ($maxAge === null)
-            return false;
+        if ($maxAge === null) {
+                    return false;
+        }
         return AuditData::deleteAll('type = :type AND created <= :created', [
             ':type' => $this->id,
             ':created' => date('Y-m-d 23:59:59', strtotime("-$maxAge days")),

src/controllers/EntryController.php

Braces +6 added lines, -5 removed lines

@@ -46,9 +46,9 @@ 
     public function actionView($id, $panel = '')
     {
         list($model, $panels) = $this->loadData($id);
-        if (isset($panels[$panel]))
-            $activePanel = $panel;
-        else {
+        if (isset($panels[$panel])) {
+                    $activePanel = $panel;
+        } else {
             reset($panels);
             $activePanel = key($panels);
         }
@@ -97,9 +97,10 @@ 
         $panels = $this->module->loadPanels($this->module->getPanelIdentifiers());
         $activePanels = [];
         $data = ArrayHelper::getColumn($model->data, 'data');
-        foreach ($panels as $panelId => $panel)
-            if ($panel->hasEntryData($model)) {
+        foreach ($panels as $panelId => $panel) {
+                    if ($panel->hasEntryData($model)) {
                 $panel->tag = $id;
+        }
                 $panel->model = $model;
                 $panel->load(isset($data[$panelId]) ? $data[$panelId] : null);
                 $activePanels[$panelId] = $panel;

src/controllers/JsLogController.php

Braces +15 added lines, -8 removed lines

@@ -51,21 +51,28 @@
                 $javascript->origin .= ':' . $value;
             },
             'data'       => function ($value) use ($javascript) {
-                if (count($value)) $javascript->data = $value;
+                if (count($value)) {
+                    $javascript->data = $value;
+                }
             },
         ];
 
-        foreach ($map as $key => $target)
-            if (isset($data[$key])) {
+        foreach ($map as $key => $target) {
+                    if (isset($data[$key])) {
                 if (is_callable($target)) $target($data[$key]);
-                else $javascript->$target = $data[$key];
+        }
+                else {
+                    $javascript->$target = $data[$key];
+                }
             }
 
-        if (!$javascript->type)
-            $javascript->type = 'unknown';
+        if (!$javascript->type) {
+                    $javascript->type = 'unknown';
+        }
 
-        if ($javascript->save())
-            return ['result' => 'ok', 'entry' => $data['auditEntry']];
+        if ($javascript->save()) {
+                    return ['result' => 'ok', 'entry' => $data['auditEntry']];
+        }
 
         return ['result' => 'error', 'errors' => $javascript->getErrors()];
     }

src/models/AuditEntry.php

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
     public static function create($initialise = true)
     {
         $entry = new static;
-        if ($initialise)
-            $entry->record();
+        if ($initialise) {
+                    $entry->record();
+        }
 
         return $entry;
     }

src/panels/CurlPanel.php

Braces +18 added lines, -12 removed lines

@@ -96,19 +96,22 @@ 
             curl_setopt($handle, CURLOPT_URL, $url);
         }
 
-        if ($postData)
-            $this->data[$id]['post'] = $postData;
+        if ($postData) {
+                    $this->data[$id]['post'] = $postData;
+        }
 
-        if ($this->headers)
-            curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']);
+        if ($this->headers) {
+                    curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']);
+        }
 
         if ($this->log) {
             curl_setopt($handle, CURLOPT_VERBOSE, true);
             curl_setopt($handle, CURLOPT_STDERR, $this->_logHandles[$id] = fopen('php://temp', 'rw+'));
         }
 
-        if ($this->content)
-            curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+        if ($this->content) {
+                    curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+        }
 
         return true;
     }
@@ -136,8 +139,9 @@ 
             unset($this->_logHandles[$id]);
         }
 
-        if ($this->content)
-            $this->data[$id]['content']= curl_multi_getcontent($handle);
+        if ($this->content) {
+                    $this->data[$id]['content']= curl_multi_getcontent($handle);
+        }
 
         // Cleanup empty things
         $this->data[$id] = array_filter($this->data[$id]);
@@ -192,8 +196,9 @@ 
     public function captureHeader($handle, $header)
     {
         $id = $this->id($handle);
-        if (!isset($this->data[$id]['headers']))
-            $this->data[$id]['headers'] = [];
+        if (!isset($this->data[$id]['headers'])) {
+                    $this->data[$id]['headers'] = [];
+        }
 
         $this->data[$id]['headers'][] = $header;
         return strlen($header);
@@ -205,8 +210,9 @@ 
      */
     protected function id($resource)
     {
-        if (!is_resource($resource))
-            return false;
+        if (!is_resource($resource)) {
+                    return false;
+        }
 
         $parts = explode('#', (string)$resource);
         return array_pop($parts);

src/panels/ErrorPanel.php

Braces +9 added lines, -6 removed lines

@@ -47,12 +47,14 @@ 
     {
         // Only log each exception once
         $exceptionId = spl_object_hash($exception);
-        if (in_array($exceptionId, $this->_exceptions))
-            return true;
+        if (in_array($exceptionId, $this->_exceptions)) {
+                    return true;
+        }
 
         // If this is a follow up exception, make sure to log the base exception first
-        if ($exception->getPrevious())
-            $this->log($entry_id, $exception->getPrevious());
+        if ($exception->getPrevious()) {
+                    $this->log($entry_id, $exception->getPrevious());
+        }
 
         $error = new AuditError();
         $error->entry_id    = $entry_id;
@@ -165,8 +167,9 @@ 
     public function cleanup($maxAge = null)
     {
         $maxAge = $maxAge !== null ? $maxAge : $this->maxAge;
-        if ($maxAge === null)
-            return false;
+        if ($maxAge === null) {
+                    return false;
+        }
         return AuditError::deleteAll([
             '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days"))
         ]);