@@ -307,14 +307,12 @@ discard block |
||
307 | 307 | { |
308 | 308 | return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']); |
309 | 309 | } |
310 | - } |
|
311 | - else |
|
310 | + } else |
|
312 | 311 | { |
313 | 312 | if ($objectCall && ! is_callable(array($method_parts['0'], $method_parts['1']))) |
314 | 313 | { |
315 | 314 | return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']); |
316 | - } |
|
317 | - elseif ( ! $objectCall && ! is_callable($this->methods[$methName]['function'])) |
|
315 | + } elseif ( ! $objectCall && ! is_callable($this->methods[$methName]['function'])) |
|
318 | 316 | { |
319 | 317 | return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']); |
320 | 318 | } |
@@ -362,22 +360,19 @@ discard block |
||
362 | 360 | if ($method_parts[0] == "this" && $system_call == TRUE) |
363 | 361 | { |
364 | 362 | return call_user_func(array($this, $method_parts[1]), $m); |
365 | - } |
|
366 | - else |
|
363 | + } else |
|
367 | 364 | { |
368 | 365 | if ($this->object === FALSE) |
369 | 366 | { |
370 | 367 | $CI = & get_instance(); |
371 | 368 | return $CI->$method_parts['1']($m); |
372 | - } |
|
373 | - else |
|
369 | + } else |
|
374 | 370 | { |
375 | 371 | return $this->object->$method_parts['1']($m); |
376 | 372 | //return call_user_func(array(&$method_parts['0'],$method_parts['1']), $m); |
377 | 373 | } |
378 | 374 | } |
379 | - } |
|
380 | - else |
|
375 | + } else |
|
381 | 376 | { |
382 | 377 | return call_user_func($this->methods[$methName]['function'], $m); |
383 | 378 | } |
@@ -3,6 +3,7 @@ |
||
3 | 3 | $name = 'Courier'; |
4 | 4 | $up = -100; |
5 | 5 | $ut = 50; |
6 | -for ($i = 0; $i <= 255; $i++) |
|
7 | - $cw[chr($i)] = 600; |
|
6 | +for ($i = 0; $i <= 255; $i++) { |
|
7 | + $cw[chr($i)] = 600; |
|
8 | +} |
|
8 | 9 | ?> |
@@ -3,6 +3,7 @@ |
||
3 | 3 | $name = 'Courier-BoldOblique'; |
4 | 4 | $up = -100; |
5 | 5 | $ut = 50; |
6 | -for ($i = 0; $i <= 255; $i++) |
|
7 | - $cw[chr($i)] = 600; |
|
6 | +for ($i = 0; $i <= 255; $i++) { |
|
7 | + $cw[chr($i)] = 600; |
|
8 | +} |
|
8 | 9 | ?> |
@@ -3,6 +3,7 @@ |
||
3 | 3 | $name = 'Courier-Bold'; |
4 | 4 | $up = -100; |
5 | 5 | $ut = 50; |
6 | -for ($i = 0; $i <= 255; $i++) |
|
7 | - $cw[chr($i)] = 600; |
|
6 | +for ($i = 0; $i <= 255; $i++) { |
|
7 | + $cw[chr($i)] = 600; |
|
8 | +} |
|
8 | 9 | ?> |
@@ -3,6 +3,7 @@ |
||
3 | 3 | $name = 'Courier-Oblique'; |
4 | 4 | $up = -100; |
5 | 5 | $ut = 50; |
6 | -for ($i = 0; $i <= 255; $i++) |
|
7 | - $cw[chr($i)] = 600; |
|
6 | +for ($i = 0; $i <= 255; $i++) { |
|
7 | + $cw[chr($i)] = 600; |
|
8 | +} |
|
8 | 9 | ?> |
@@ -407,8 +407,7 @@ discard block |
||
407 | 407 | { |
408 | 408 | $this->width = $this->orig_height; |
409 | 409 | $this->height = $this->orig_width; |
410 | - } |
|
411 | - else |
|
410 | + } else |
|
412 | 411 | { |
413 | 412 | $this->width = $this->orig_width; |
414 | 413 | $this->height = $this->orig_height; |
@@ -502,8 +501,7 @@ discard block |
||
502 | 501 | { |
503 | 502 | $create = 'imagecreatetruecolor'; |
504 | 503 | $copy = 'imagecopyresampled'; |
505 | - } |
|
506 | - else |
|
504 | + } else |
|
507 | 505 | { |
508 | 506 | $create = 'imagecreate'; |
509 | 507 | $copy = 'imagecopyresized'; |
@@ -1010,25 +1008,27 @@ discard block |
||
1010 | 1008 | // invert the offset. Note: The horizontal |
1011 | 1009 | // offset flips itself automatically |
1012 | 1010 | |
1013 | - if ($this->wm_vrt_alignment == 'B') |
|
1014 | - $this->wm_vrt_offset = $this->wm_vrt_offset * -1; |
|
1011 | + if ($this->wm_vrt_alignment == 'B') { |
|
1012 | + $this->wm_vrt_offset = $this->wm_vrt_offset * -1; |
|
1013 | + } |
|
1015 | 1014 | |
1016 | - if ($this->wm_hor_alignment == 'R') |
|
1017 | - $this->wm_hor_offset = $this->wm_hor_offset * -1; |
|
1015 | + if ($this->wm_hor_alignment == 'R') { |
|
1016 | + $this->wm_hor_offset = $this->wm_hor_offset * -1; |
|
1017 | + } |
|
1018 | 1018 | |
1019 | 1019 | // Set font width and height |
1020 | 1020 | // These are calculated differently depending on |
1021 | 1021 | // whether we are using the true type font or not |
1022 | 1022 | if ($this->wm_use_truetype == TRUE) |
1023 | 1023 | { |
1024 | - if ($this->wm_font_size == '') |
|
1025 | - $this->wm_font_size = '17'; |
|
1024 | + if ($this->wm_font_size == '') { |
|
1025 | + $this->wm_font_size = '17'; |
|
1026 | + } |
|
1026 | 1027 | |
1027 | 1028 | $fontwidth = $this->wm_font_size - ($this->wm_font_size / 4); |
1028 | 1029 | $fontheight = $this->wm_font_size; |
1029 | 1030 | $this->wm_vrt_offset += $this->wm_font_size; |
1030 | - } |
|
1031 | - else |
|
1031 | + } else |
|
1032 | 1032 | { |
1033 | 1033 | $fontwidth = imagefontwidth($this->wm_font_size); |
1034 | 1034 | $fontheight = imagefontheight($this->wm_font_size); |
@@ -1065,13 +1065,15 @@ discard block |
||
1065 | 1065 | case "L": |
1066 | 1066 | break; |
1067 | 1067 | case "R": |
1068 | - if ($this->wm_use_drop_shadow) |
|
1069 | - $x_shad += ($this->orig_width - $fontwidth * strlen($this->wm_text)); |
|
1068 | + if ($this->wm_use_drop_shadow) { |
|
1069 | + $x_shad += ($this->orig_width - $fontwidth * strlen($this->wm_text)); |
|
1070 | + } |
|
1070 | 1071 | $x_axis += ($this->orig_width - $fontwidth * strlen($this->wm_text)); |
1071 | 1072 | break; |
1072 | 1073 | case "C": |
1073 | - if ($this->wm_use_drop_shadow) |
|
1074 | - $x_shad += floor(($this->orig_width - $fontwidth * strlen($this->wm_text)) / 2); |
|
1074 | + if ($this->wm_use_drop_shadow) { |
|
1075 | + $x_shad += floor(($this->orig_width - $fontwidth * strlen($this->wm_text)) / 2); |
|
1076 | + } |
|
1075 | 1077 | $x_axis += floor(($this->orig_width - $fontwidth * strlen($this->wm_text)) / 2); |
1076 | 1078 | break; |
1077 | 1079 | } |
@@ -1400,8 +1402,7 @@ discard block |
||
1400 | 1402 | if ($vals['new_width'] == 0) |
1401 | 1403 | { |
1402 | 1404 | $vals['new_width'] = ceil($vals['width'] * $vals['new_height'] / $vals['height']); |
1403 | - } |
|
1404 | - elseif ($vals['new_height'] == 0) |
|
1405 | + } elseif ($vals['new_height'] == 0) |
|
1405 | 1406 | { |
1406 | 1407 | $vals['new_height'] = ceil($vals['new_width'] * $vals['height'] / $vals['width']); |
1407 | 1408 | } |
@@ -369,8 +369,7 @@ |
||
369 | 369 | |
370 | 370 | $tb_array = explode('=', $tb_end); |
371 | 371 | $tb_id = $tb_array[count($tb_array) - 1]; |
372 | - } |
|
373 | - else |
|
372 | + } else |
|
374 | 373 | { |
375 | 374 | $url = rtrim($url, '/'); |
376 | 375 |
@@ -1062,9 +1062,11 @@ |
||
1062 | 1062 | { |
1063 | 1063 | $output = array(); |
1064 | 1064 | @exec('file --brief --mime-type '.escapeshellarg($file['tmp_path']), $output, $return_code); |
1065 | - if ($return_code === 0 && strlen($output[0]) > 0) // A return status code != 0 would mean failed execution |
|
1065 | + if ($return_code === 0 && strlen($output[0]) > 0) { |
|
1066 | + // A return status code != 0 would mean failed execution |
|
1066 | 1067 | { |
1067 | 1068 | $this->file_type = rtrim($output[0]); |
1069 | + } |
|
1068 | 1070 | return; |
1069 | 1071 | } |
1070 | 1072 | } |
@@ -274,8 +274,7 @@ discard block |
||
274 | 274 | if (is_array($val)) |
275 | 275 | { |
276 | 276 | $output .= "<pre>".htmlspecialchars(stripslashes(print_r($val, true)))."</pre>"; |
277 | - } |
|
278 | - else |
|
277 | + } else |
|
279 | 278 | { |
280 | 279 | $output .= htmlspecialchars(stripslashes($val)); |
281 | 280 | } |
@@ -322,8 +321,7 @@ discard block |
||
322 | 321 | if (is_array($val)) |
323 | 322 | { |
324 | 323 | $output .= "<pre>".htmlspecialchars(stripslashes(print_r($val, TRUE)))."</pre>"; |
325 | - } |
|
326 | - else |
|
324 | + } else |
|
327 | 325 | { |
328 | 326 | $output .= htmlspecialchars(stripslashes($val)); |
329 | 327 | } |