@@ -942,7 +942,9 @@ discard block |
||
| 942 | 942 | |
| 943 | 943 | if ($this->logToInsightConsole !== null && (get_class($this) == 'FirePHP_Insight' || is_subclass_of($this, 'FirePHP_Insight'))) { |
| 944 | 944 | $trace = debug_backtrace(); |
| 945 | - if (!$trace) return false; |
|
| 945 | + if (!$trace) { |
|
| 946 | + return false; |
|
| 947 | + } |
|
| 946 | 948 | for ($i = 0; $i < sizeof($trace); $i++) { |
| 947 | 949 | if (isset($trace[$i]['class'])) { |
| 948 | 950 | if ($trace[$i]['class'] == 'FirePHP' || $trace[$i]['class'] == 'FB') { |
@@ -1317,7 +1319,9 @@ discard block |
||
| 1317 | 1319 | */ |
| 1318 | 1320 | protected function _escapeTrace($trace, $options = array()) |
| 1319 | 1321 | { |
| 1320 | - if (!$trace) return $trace; |
|
| 1322 | + if (!$trace) { |
|
| 1323 | + return $trace; |
|
| 1324 | + } |
|
| 1321 | 1325 | for ($i = 0; $i < sizeof($trace); $i++) { |
| 1322 | 1326 | if (isset($trace[$i]['file'])) { |
| 1323 | 1327 | $trace[$i]['file'] = $this->_escapeTraceFile($trace[$i]['file']); |
@@ -1377,7 +1381,9 @@ discard block |
||
| 1377 | 1381 | */ |
| 1378 | 1382 | protected function getUserAgent() |
| 1379 | 1383 | { |
| 1380 | - if (!isset($_SERVER['HTTP_USER_AGENT'])) return false; |
|
| 1384 | + if (!isset($_SERVER['HTTP_USER_AGENT'])) { |
|
| 1385 | + return false; |
|
| 1386 | + } |
|
| 1381 | 1387 | return $_SERVER['HTTP_USER_AGENT']; |
| 1382 | 1388 | } |
| 1383 | 1389 | |
@@ -1464,7 +1470,9 @@ discard block |
||
| 1464 | 1470 | */ |
| 1465 | 1471 | protected function encodeTable($table, $options = array()) |
| 1466 | 1472 | { |
| 1467 | - if (!$table) return $table; |
|
| 1473 | + if (!$table) { |
|
| 1474 | + return $table; |
|
| 1475 | + } |
|
| 1468 | 1476 | |
| 1469 | 1477 | $newTable = array(); |
| 1470 | 1478 | foreach ($table as $row) { |
@@ -1716,18 +1724,30 @@ discard block |
||
| 1716 | 1724 | for ($i = 0; $i < $len; $i++) { |
| 1717 | 1725 | $c = ord($str[$i]); |
| 1718 | 1726 | if ($c > 128) { |
| 1719 | - if (($c >= 254)) return false; |
|
| 1720 | - elseif ($c >= 252) $bits = 6; |
|
| 1721 | - elseif ($c >= 248) $bits = 5; |
|
| 1722 | - elseif ($c >= 240) $bits = 4; |
|
| 1723 | - elseif ($c >= 224) $bits = 3; |
|
| 1724 | - elseif ($c >= 192) $bits = 2; |
|
| 1725 | - else return false; |
|
| 1726 | - if (($i + $bits) > $len) return false; |
|
| 1727 | + if (($c >= 254)) { |
|
| 1728 | + return false; |
|
| 1729 | + } elseif ($c >= 252) { |
|
| 1730 | + $bits = 6; |
|
| 1731 | + } elseif ($c >= 248) { |
|
| 1732 | + $bits = 5; |
|
| 1733 | + } elseif ($c >= 240) { |
|
| 1734 | + $bits = 4; |
|
| 1735 | + } elseif ($c >= 224) { |
|
| 1736 | + $bits = 3; |
|
| 1737 | + } elseif ($c >= 192) { |
|
| 1738 | + $bits = 2; |
|
| 1739 | + } else { |
|
| 1740 | + return false; |
|
| 1741 | + } |
|
| 1742 | + if (($i + $bits) > $len) { |
|
| 1743 | + return false; |
|
| 1744 | + } |
|
| 1727 | 1745 | while($bits > 1) { |
| 1728 | 1746 | $i++; |
| 1729 | 1747 | $b = ord($str[$i]); |
| 1730 | - if ($b < 128 || $b > 191) return false; |
|
| 1748 | + if ($b < 128 || $b > 191) { |
|
| 1749 | + return false; |
|
| 1750 | + } |
|
| 1731 | 1751 | $bits--; |
| 1732 | 1752 | } |
| 1733 | 1753 | } |