@@ -90,7 +90,7 @@ |
||
90 | 90 | |
91 | 91 | if($output == false) { |
92 | 92 | sleep(1); |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | return json_decode($output, true); |
95 | 95 | } |
96 | 96 |
@@ -86,11 +86,15 @@ discard block |
||
86 | 86 | $arrays = func_get_args(); |
87 | 87 | $base = array_shift($arrays); |
88 | 88 | |
89 | - if (!is_array($base)) $base = empty($base) ? array() : array($base); |
|
89 | + if (!is_array($base)) { |
|
90 | + $base = empty($base) ? array() : array($base); |
|
91 | + } |
|
90 | 92 | |
91 | 93 | foreach ($arrays as $append) { |
92 | 94 | |
93 | - if (!is_array($append)) $append = array($append); |
|
95 | + if (!is_array($append)) { |
|
96 | + $append = array($append); |
|
97 | + } |
|
94 | 98 | |
95 | 99 | foreach ($append as $key => $value) { |
96 | 100 | |
@@ -102,7 +106,9 @@ discard block |
||
102 | 106 | if (is_array($value) or is_array($base[$key])) { |
103 | 107 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
104 | 108 | } else if (is_numeric($key)) { |
105 | - if (!in_array($value, $base)) $base[] = $value; |
|
109 | + if (!in_array($value, $base)) { |
|
110 | + $base[] = $value; |
|
111 | + } |
|
106 | 112 | } else { |
107 | 113 | $base[$key] = $value; |
108 | 114 | } |
@@ -248,8 +248,9 @@ |
||
248 | 248 | } else { |
249 | 249 | $myisp = $isp[1].'.'.$isp[0]; |
250 | 250 | } |
251 | - if (preg_match("/[0-9]{1,3}\.[0-9]{1,3}/", $myisp)) |
|
252 | - return null; |
|
251 | + if (preg_match("/[0-9]{1,3}\.[0-9]{1,3}/", $myisp)) { |
|
252 | + return null; |
|
253 | + } |
|
253 | 254 | |
254 | 255 | $isp = explode('.', $myisp); |
255 | 256 | return $isp[0]; |