@@ -87,8 +87,9 @@ |
||
87 | 87 | public function process(Vtiger_Request $request) |
88 | 88 | { |
89 | 89 | $default_charset = AppConfig::main('default_charset'); |
90 | - if (empty($default_charset)) |
|
91 | - $default_charset = 'UTF-8'; |
|
90 | + if (empty($default_charset)) { |
|
91 | + $default_charset = 'UTF-8'; |
|
92 | + } |
|
92 | 93 | $mode = $request->getMode(); |
93 | 94 | if (!empty($mode) && $this->isMethodExposed($mode)) { |
94 | 95 | return $this->$mode($request); |
@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | function _recaptcha_qsencode($data) |
48 | 48 | { |
49 | 49 | $req = ""; |
50 | - foreach ($data as $key => $value) |
|
51 | - $req .= $key . '=' . urlencode(stripslashes($value)) . '&'; |
|
50 | + foreach ($data as $key => $value) { |
|
51 | + $req .= $key . '=' . urlencode(stripslashes($value)) . '&'; |
|
52 | + } |
|
52 | 53 | |
53 | 54 | // Cut the last '&' |
54 | 55 | $req = substr($req, 0, strlen($req) - 1); |
@@ -83,8 +84,10 @@ discard block |
||
83 | 84 | |
84 | 85 | fwrite($fs, $http_request); |
85 | 86 | |
86 | - while (!feof($fs)) |
|
87 | - $response .= fgets($fs, 1160); // One TCP-IP packet |
|
87 | + while (!feof($fs)) { |
|
88 | + $response .= fgets($fs, 1160); |
|
89 | + } |
|
90 | + // One TCP-IP packet |
|
88 | 91 | fclose($fs); |
89 | 92 | $response = explode("\r\n\r\n", $response, 2); |
90 | 93 |
@@ -80,8 +80,9 @@ |
||
80 | 80 | $fieldlists = explode(',', $fieldsname); |
81 | 81 | $fl = []; |
82 | 82 | foreach ($fieldlists as $w => $c) { |
83 | - if (count($fl)) |
|
84 | - $fl[] = "' '"; |
|
83 | + if (count($fl)) { |
|
84 | + $fl[] = "' '"; |
|
85 | + } |
|
85 | 86 | $fl[] = $c; |
86 | 87 | } |
87 | 88 | $fieldsname = $adb->concat($fl); |
@@ -124,8 +124,9 @@ |
||
124 | 124 | $secondFallBackModuleDir = $secondFallBackModuleClassPath = $actualModule; |
125 | 125 | if ($actualModule != 'Users') { |
126 | 126 | $baseModule = $moduleHierarchyParts[0]; |
127 | - if ($baseModule == 'Settings') |
|
128 | - $baseModule = 'Settings:Vtiger'; |
|
127 | + if ($baseModule == 'Settings') { |
|
128 | + $baseModule = 'Settings:Vtiger'; |
|
129 | + } |
|
129 | 130 | $firstFallBackDir = str_replace(':', '.', $baseModule); |
130 | 131 | $firstFallBackClassPath = str_replace(':', '_', $baseModule); |
131 | 132 | } |
@@ -153,8 +153,9 @@ discard block |
||
153 | 153 | echo $lead . $this->tag; |
154 | 154 | if ($show_attr && count($this->attr) > 0) { |
155 | 155 | echo '('; |
156 | - foreach ($this->attr as $k => $v) |
|
157 | - echo "[$k]=>\"" . $this->$k . '", '; |
|
156 | + foreach ($this->attr as $k => $v) { |
|
157 | + echo "[$k]=>\"" . $this->$k . '", '; |
|
158 | + } |
|
158 | 159 | echo ')'; |
159 | 160 | } |
160 | 161 | echo "\n"; |
@@ -246,8 +247,9 @@ discard block |
||
246 | 247 | if ($idx === -1) { |
247 | 248 | return $this->children; |
248 | 249 | } |
249 | -if (isset($this->children[$idx])) |
|
250 | +if (isset($this->children[$idx])) { |
|
250 | 251 | return $this->children[$idx]; |
252 | +} |
|
251 | 253 | return null; |
252 | 254 | } |
253 | 255 | |
@@ -290,14 +292,17 @@ discard block |
||
290 | 292 | // returns the previous sibling of node |
291 | 293 | function prev_sibling() |
292 | 294 | { |
293 | -if ($this->parent === null) |
|
295 | +if ($this->parent === null) { |
|
294 | 296 | return null; |
297 | +} |
|
295 | 298 | $idx = 0; |
296 | 299 | $count = count($this->parent->children); |
297 | -while ($idx < $count && $this !== $this->parent->children[$idx]) |
|
300 | +while ($idx < $count && $this !== $this->parent->children[$idx]) { |
|
298 | 301 | ++$idx; |
299 | -if (--$idx < 0) |
|
302 | +} |
|
303 | +if (--$idx < 0) { |
|
300 | 304 | return null; |
305 | +} |
|
301 | 306 | return $this->parent->children[$idx]; |
302 | 307 | } |
303 | 308 | |
@@ -328,14 +333,17 @@ discard block |
||
328 | 333 | // get dom node's inner html |
329 | 334 | function innertext() |
330 | 335 | { |
331 | -if (isset($this->_[HDOM_INFO_INNER])) |
|
336 | +if (isset($this->_[HDOM_INFO_INNER])) { |
|
332 | 337 | return $this->_[HDOM_INFO_INNER]; |
333 | -if (isset($this->_[HDOM_INFO_TEXT])) |
|
338 | +} |
|
339 | +if (isset($this->_[HDOM_INFO_TEXT])) { |
|
334 | 340 | return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
341 | +} |
|
335 | 342 | |
336 | 343 | $ret = ''; |
337 | -foreach ($this->nodes as $n) |
|
344 | +foreach ($this->nodes as $n) { |
|
338 | 345 | $ret .= $n->outertext(); |
346 | +} |
|
339 | 347 | return $ret; |
340 | 348 | } |
341 | 349 | |
@@ -353,18 +361,21 @@ discard block |
||
353 | 361 | $debugObject->debugLog(1, 'Innertext of tag: ' . $this->tag . $text); |
354 | 362 | } |
355 | 363 | |
356 | -if ($this->tag === 'root') |
|
364 | +if ($this->tag === 'root') { |
|
357 | 365 | return $this->innertext(); |
366 | +} |
|
358 | 367 | |
359 | 368 | // trigger callback |
360 | 369 | if ($this->dom && $this->dom->callback !== null) { |
361 | 370 | call_user_func_array($this->dom->callback, array($this)); |
362 | 371 | } |
363 | 372 | |
364 | -if (isset($this->_[HDOM_INFO_OUTER])) |
|
373 | +if (isset($this->_[HDOM_INFO_OUTER])) { |
|
365 | 374 | return $this->_[HDOM_INFO_OUTER]; |
366 | -if (isset($this->_[HDOM_INFO_TEXT])) |
|
375 | +} |
|
376 | +if (isset($this->_[HDOM_INFO_TEXT])) { |
|
367 | 377 | return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
378 | +} |
|
368 | 379 | |
369 | 380 | // render begin tag |
370 | 381 | if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) { |
@@ -388,25 +399,29 @@ discard block |
||
388 | 399 | } |
389 | 400 | |
390 | 401 | // render end tag |
391 | -if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) |
|
402 | +if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) { |
|
392 | 403 | $ret .= '</' . $this->tag . '>'; |
404 | +} |
|
393 | 405 | return $ret; |
394 | 406 | } |
395 | 407 | |
396 | 408 | // get dom node's plain text |
397 | 409 | function text() |
398 | 410 | { |
399 | -if (isset($this->_[HDOM_INFO_INNER])) |
|
411 | +if (isset($this->_[HDOM_INFO_INNER])) { |
|
400 | 412 | return $this->_[HDOM_INFO_INNER]; |
413 | +} |
|
401 | 414 | switch ($this->nodetype) { |
402 | 415 | case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
403 | 416 | case HDOM_TYPE_COMMENT: return ''; |
404 | 417 | case HDOM_TYPE_UNKNOWN: return ''; |
405 | 418 | } |
406 | -if (strcasecmp($this->tag, 'script') === 0) |
|
419 | +if (strcasecmp($this->tag, 'script') === 0) { |
|
407 | 420 | return ''; |
408 | -if (strcasecmp($this->tag, 'style') === 0) |
|
421 | +} |
|
422 | +if (strcasecmp($this->tag, 'style') === 0) { |
|
409 | 423 | return ''; |
424 | +} |
|
410 | 425 | |
411 | 426 | $ret = ''; |
412 | 427 | // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL. |
@@ -437,8 +452,9 @@ discard block |
||
437 | 452 | function makeup() |
438 | 453 | { |
439 | 454 | // text, comment, unknown |
440 | -if (isset($this->_[HDOM_INFO_TEXT])) |
|
455 | +if (isset($this->_[HDOM_INFO_TEXT])) { |
|
441 | 456 | return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
457 | +} |
|
442 | 458 | |
443 | 459 | $ret = '<' . $this->tag; |
444 | 460 | $i = -1; |
@@ -447,14 +463,15 @@ discard block |
||
447 | 463 | ++$i; |
448 | 464 | |
449 | 465 | // skip removed attribute |
450 | - if ($val === null || $val === false) |
|
451 | - continue; |
|
466 | + if ($val === null || $val === false) { |
|
467 | + continue; |
|
468 | + } |
|
452 | 469 | |
453 | 470 | $ret .= $this->_[HDOM_INFO_SPACE][$i][0]; |
454 | 471 | //no value attr: nowrap, checked selected... |
455 | - if ($val === true) |
|
456 | - $ret .= $key; |
|
457 | - else { |
|
472 | + if ($val === true) { |
|
473 | + $ret .= $key; |
|
474 | + } else { |
|
458 | 475 | switch ($this->_[HDOM_INFO_QUOTE][$i]) { |
459 | 476 | case HDOM_QUOTE_DOUBLE: $quote = '"'; |
460 | 477 | break; |
@@ -474,18 +491,21 @@ discard block |
||
474 | 491 | function find($selector, $idx = null, $lowercase = false) |
475 | 492 | { |
476 | 493 | $selectors = $this->parse_selector($selector); |
477 | -if (($count = count($selectors)) === 0) |
|
494 | +if (($count = count($selectors)) === 0) { |
|
478 | 495 | return []; |
496 | +} |
|
479 | 497 | $found_keys = []; |
480 | 498 | |
481 | 499 | // find each selector |
482 | 500 | for ($c = 0; $c < $count; ++$c) { |
483 | 501 | // The change on the below line was documented on the sourceforge code tracker id 2788009 |
484 | 502 | // used to be: if (($levle=count($selectors[0]))===0) return []; |
485 | - if (($levle = count($selectors[$c])) === 0) |
|
486 | - return []; |
|
487 | - if (!isset($this->_[HDOM_INFO_BEGIN])) |
|
488 | - return []; |
|
503 | + if (($levle = count($selectors[$c])) === 0) { |
|
504 | + return []; |
|
505 | + } |
|
506 | + if (!isset($this->_[HDOM_INFO_BEGIN])) { |
|
507 | + return []; |
|
508 | + } |
|
489 | 509 | |
490 | 510 | $head = array($this->_[HDOM_INFO_BEGIN] => 1); |
491 | 511 | |
@@ -501,8 +521,9 @@ discard block |
||
501 | 521 | } |
502 | 522 | |
503 | 523 | foreach ($head as $k => $v) { |
504 | - if (!isset($found_keys[$k])) |
|
505 | - $found_keys[$k] = 1; |
|
524 | + if (!isset($found_keys[$k])) { |
|
525 | + $found_keys[$k] = 1; |
|
526 | + } |
|
506 | 527 | } |
507 | 528 | } |
508 | 529 | |
@@ -510,14 +531,16 @@ discard block |
||
510 | 531 | ksort($found_keys); |
511 | 532 | |
512 | 533 | $found = []; |
513 | -foreach ($found_keys as $k => $v) |
|
534 | +foreach ($found_keys as $k => $v) { |
|
514 | 535 | $found[] = $this->dom->nodes[$k]; |
536 | +} |
|
515 | 537 | |
516 | 538 | // return nth-element or array |
517 | -if (is_null($idx)) |
|
539 | +if (is_null($idx)) { |
|
518 | 540 | return $found; |
519 | -else if ($idx < 0) |
|
541 | +} else if ($idx < 0) { |
|
520 | 542 | $idx = count($found) + $idx; |
543 | +} |
|
521 | 544 | return (isset($found[$idx])) ? $found[$idx] : null; |
522 | 545 | } |
523 | 546 | |
@@ -562,8 +585,9 @@ discard block |
||
562 | 585 | $pass = true; |
563 | 586 | |
564 | 587 | if ($tag === '*' && !$key) { |
565 | - if (in_array($node, $this->children, true)) |
|
566 | - $ret[$i] = 1; |
|
588 | + if (in_array($node, $this->children, true)) { |
|
589 | + $ret[$i] = 1; |
|
590 | + } |
|
567 | 591 | continue; |
568 | 592 | } |
569 | 593 | |
@@ -574,11 +598,13 @@ discard block |
||
574 | 598 | // compare key |
575 | 599 | if ($pass && $key) { |
576 | 600 | if ($no_key) { |
577 | - if (isset($node->attr[$key])) |
|
578 | - $pass = false; |
|
601 | + if (isset($node->attr[$key])) { |
|
602 | + $pass = false; |
|
603 | + } |
|
579 | 604 | } else { |
580 | - if (($key != "plaintext") && !isset($node->attr[$key])) |
|
581 | - $pass = false; |
|
605 | + if (($key != "plaintext") && !isset($node->attr[$key])) { |
|
606 | + $pass = false; |
|
607 | + } |
|
582 | 608 | } |
583 | 609 | } |
584 | 610 | // compare value |
@@ -614,16 +640,19 @@ discard block |
||
614 | 640 | } else { |
615 | 641 | $check = $this->match($exp, $val, $k); |
616 | 642 | } |
617 | - if ($check) |
|
618 | - break; |
|
643 | + if ($check) { |
|
644 | + break; |
|
645 | + } |
|
619 | 646 | } |
620 | 647 | } |
621 | 648 | } |
622 | - if (!$check) |
|
623 | - $pass = false; |
|
649 | + if (!$check) { |
|
650 | + $pass = false; |
|
651 | + } |
|
652 | + } |
|
653 | + if ($pass) { |
|
654 | + $ret[$i] = 1; |
|
624 | 655 | } |
625 | - if ($pass) |
|
626 | - $ret[$i] = 1; |
|
627 | 656 | unset($node); |
628 | 657 | } |
629 | 658 | // It's passed by reference so this is actually what this function returns. |
@@ -683,11 +712,13 @@ discard block |
||
683 | 712 | |
684 | 713 | foreach ($matches as $m) { |
685 | 714 | $m[0] = trim($m[0]); |
686 | - if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') |
|
687 | - continue; |
|
715 | + if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') { |
|
716 | + continue; |
|
717 | + } |
|
688 | 718 | // for browser generated xpath |
689 | - if ($m[1] === 'tbody') |
|
690 | - continue; |
|
719 | + if ($m[1] === 'tbody') { |
|
720 | + continue; |
|
721 | + } |
|
691 | 722 | |
692 | 723 | list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false); |
693 | 724 | if (!empty($m[2])) { |
@@ -725,8 +756,9 @@ discard block |
||
725 | 756 | $result = []; |
726 | 757 | } |
727 | 758 | } |
728 | -if (count($result) > 0) |
|
759 | +if (count($result) > 0) { |
|
729 | 760 | $selectors[] = $result; |
761 | +} |
|
730 | 762 | return $selectors; |
731 | 763 | } |
732 | 764 | |
@@ -749,8 +781,9 @@ discard block |
||
749 | 781 | switch ($name) { |
750 | 782 | case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value; |
751 | 783 | case 'innertext': |
752 | - if (isset($this->_[HDOM_INFO_TEXT])) |
|
753 | - return $this->_[HDOM_INFO_TEXT] = $value; |
|
784 | + if (isset($this->_[HDOM_INFO_TEXT])) { |
|
785 | + return $this->_[HDOM_INFO_TEXT] = $value; |
|
786 | + } |
|
754 | 787 | return $this->_[HDOM_INFO_INNER] = $value; |
755 | 788 | } |
756 | 789 | if (!isset($this->attr[$name])) { |
@@ -773,9 +806,10 @@ discard block |
||
773 | 806 | |
774 | 807 | function __unset($name) |
775 | 808 | { |
776 | -if (isset($this->attr[$name])) |
|
809 | +if (isset($this->attr[$name])) { |
|
777 | 810 | unset($this->attr[$name]); |
778 | 811 | } |
812 | +} |
|
779 | 813 | |
780 | 814 | // PaperG - Function to convert the text from one character set to another if the two sets are not the same. |
781 | 815 | function convert_text($text) |
@@ -835,27 +869,30 @@ discard block |
||
835 | 869 | for ($i = 0; $i < $len; $i++) { |
836 | 870 | $c = ord($str[$i]); |
837 | 871 | if ($c > 128) { |
838 | - if (($c >= 254)) |
|
839 | - return false; |
|
840 | - elseif ($c >= 252) |
|
841 | - $bits = 6; |
|
842 | - elseif ($c >= 248) |
|
843 | - $bits = 5; |
|
844 | - elseif ($c >= 240) |
|
845 | - $bits = 4; |
|
846 | - elseif ($c >= 224) |
|
847 | - $bits = 3; |
|
848 | - elseif ($c >= 192) |
|
849 | - $bits = 2; |
|
850 | - else |
|
851 | - return false; |
|
852 | - if (($i + $bits) > $len) |
|
853 | - return false; |
|
872 | + if (($c >= 254)) { |
|
873 | + return false; |
|
874 | + } elseif ($c >= 252) { |
|
875 | + $bits = 6; |
|
876 | + } elseif ($c >= 248) { |
|
877 | + $bits = 5; |
|
878 | + } elseif ($c >= 240) { |
|
879 | + $bits = 4; |
|
880 | + } elseif ($c >= 224) { |
|
881 | + $bits = 3; |
|
882 | + } elseif ($c >= 192) { |
|
883 | + $bits = 2; |
|
884 | + } else { |
|
885 | + return false; |
|
886 | + } |
|
887 | + if (($i + $bits) > $len) { |
|
888 | + return false; |
|
889 | + } |
|
854 | 890 | while ($bits > 1) { |
855 | 891 | $i++; |
856 | 892 | $b = ord($str[$i]); |
857 | - if ($b < 128 || $b > 191) |
|
858 | - return false; |
|
893 | + if ($b < 128 || $b > 191) { |
|
894 | + return false; |
|
895 | + } |
|
859 | 896 | $bits--; |
860 | 897 | } |
861 | 898 | } |
@@ -1175,8 +1212,9 @@ discard block |
||
1175 | 1212 | function save($filepath = '') |
1176 | 1213 | { |
1177 | 1214 | $ret = $this->root->innertext(); |
1178 | -if ($filepath !== '') |
|
1215 | +if ($filepath !== '') { |
|
1179 | 1216 | file_put_contents($filepath, $ret, LOCK_EX); |
1217 | +} |
|
1180 | 1218 | return $ret; |
1181 | 1219 | } |
1182 | 1220 | |
@@ -1195,9 +1233,10 @@ discard block |
||
1195 | 1233 | $n = null; |
1196 | 1234 | } |
1197 | 1235 | // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear. |
1198 | -if (isset($this->children)) |
|
1236 | +if (isset($this->children)) { |
|
1199 | 1237 | foreach ($this->children as $n) { |
1200 | 1238 | $n->clear(); |
1239 | +} |
|
1201 | 1240 | $n = null; |
1202 | 1241 | } |
1203 | 1242 | if (isset($this->parent)) { |
@@ -1249,9 +1288,10 @@ discard block |
||
1249 | 1288 | $this->root->_[HDOM_INFO_BEGIN] = -1; |
1250 | 1289 | $this->root->nodetype = HDOM_TYPE_ROOT; |
1251 | 1290 | $this->parent = $this->root; |
1252 | -if ($this->size > 0) |
|
1291 | +if ($this->size > 0) { |
|
1253 | 1292 | $this->char = $this->doc[0]; |
1254 | 1293 | } |
1294 | +} |
|
1255 | 1295 | |
1256 | 1296 | // parse html content |
1257 | 1297 | protected function parse() |
@@ -1360,8 +1400,9 @@ discard block |
||
1360 | 1400 | $tag = $this->copy_until_char('>'); |
1361 | 1401 | |
1362 | 1402 | // skip attributes in end tag |
1363 | - if (($pos = strpos($tag, ' ')) !== false) |
|
1364 | - $tag = substr($tag, 0, $pos); |
|
1403 | + if (($pos = strpos($tag, ' ')) !== false) { |
|
1404 | + $tag = substr($tag, 0, $pos); |
|
1405 | + } |
|
1365 | 1406 | |
1366 | 1407 | $parent_lower = strtolower($this->parent->tag); |
1367 | 1408 | $tag_lower = strtolower($tag); |
@@ -1371,23 +1412,25 @@ discard block |
||
1371 | 1412 | $this->parent->_[HDOM_INFO_END] = 0; |
1372 | 1413 | $org_parent = $this->parent; |
1373 | 1414 | |
1374 | - while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) |
|
1375 | - $this->parent = $this->parent->parent; |
|
1415 | + while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) { |
|
1416 | + $this->parent = $this->parent->parent; |
|
1417 | + } |
|
1376 | 1418 | |
1377 | 1419 | if (strtolower($this->parent->tag) !== $tag_lower) { |
1378 | 1420 | $this->parent = $org_parent; // restore origonal parent |
1379 | - if ($this->parent->parent) |
|
1380 | - $this->parent = $this->parent->parent; |
|
1421 | + if ($this->parent->parent) { |
|
1422 | + $this->parent = $this->parent->parent; |
|
1423 | + } |
|
1381 | 1424 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
1382 | 1425 | return $this->as_text_node($tag); |
1383 | 1426 | } |
1384 | - } |
|
1385 | - else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) { |
|
1427 | + } else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) { |
|
1386 | 1428 | $this->parent->_[HDOM_INFO_END] = 0; |
1387 | 1429 | $org_parent = $this->parent; |
1388 | 1430 | |
1389 | - while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) |
|
1390 | - $this->parent = $this->parent->parent; |
|
1431 | + while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) { |
|
1432 | + $this->parent = $this->parent->parent; |
|
1433 | + } |
|
1391 | 1434 | |
1392 | 1435 | if (strtolower($this->parent->tag) !== $tag_lower) { |
1393 | 1436 | $this->parent = $org_parent; // restore origonal parent |
@@ -1397,13 +1440,15 @@ discard block |
||
1397 | 1440 | } else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower) { |
1398 | 1441 | $this->parent->_[HDOM_INFO_END] = 0; |
1399 | 1442 | $this->parent = $this->parent->parent; |
1400 | - } else |
|
1401 | - return $this->as_text_node($tag); |
|
1443 | + } else { |
|
1444 | + return $this->as_text_node($tag); |
|
1445 | + } |
|
1402 | 1446 | } |
1403 | 1447 | |
1404 | 1448 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
1405 | - if ($this->parent->parent) |
|
1406 | - $this->parent = $this->parent->parent; |
|
1449 | + if ($this->parent->parent) { |
|
1450 | + $this->parent = $this->parent->parent; |
|
1451 | + } |
|
1407 | 1452 | |
1408 | 1453 | $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
1409 | 1454 | return true; |
@@ -1426,8 +1471,9 @@ discard block |
||
1426 | 1471 | $node->nodetype = HDOM_TYPE_UNKNOWN; |
1427 | 1472 | $node->tag = 'unknown'; |
1428 | 1473 | } |
1429 | - if ($this->char === '>') |
|
1430 | - $node->_[HDOM_INFO_TEXT].='>'; |
|
1474 | + if ($this->char === '>') { |
|
1475 | + $node->_[HDOM_INFO_TEXT].='>'; |
|
1476 | + } |
|
1431 | 1477 | $this->link_nodes($node, true); |
1432 | 1478 | $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
1433 | 1479 | return true; |
@@ -1449,8 +1495,9 @@ discard block |
||
1449 | 1495 | return true; |
1450 | 1496 | } |
1451 | 1497 | |
1452 | - if ($this->char === '>') |
|
1453 | - $node->_[HDOM_INFO_TEXT].='>'; |
|
1498 | + if ($this->char === '>') { |
|
1499 | + $node->_[HDOM_INFO_TEXT].='>'; |
|
1500 | + } |
|
1454 | 1501 | $this->link_nodes($node, false); |
1455 | 1502 | $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
1456 | 1503 | return true; |
@@ -1511,8 +1558,9 @@ discard block |
||
1511 | 1558 | if ($name !== '/' && $name !== '') { |
1512 | 1559 | $space[1] = $this->copy_skip($this->token_blank); |
1513 | 1560 | $name = $this->restore_noise($name); |
1514 | - if ($this->lowercase) |
|
1515 | - $name = strtolower($name); |
|
1561 | + if ($this->lowercase) { |
|
1562 | + $name = strtolower($name); |
|
1563 | + } |
|
1516 | 1564 | if ($this->char === '=') { |
1517 | 1565 | $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
1518 | 1566 | $this->parse_attr($node, $name, $space); |
@@ -1520,14 +1568,17 @@ discard block |
||
1520 | 1568 | //no value attr: nowrap, checked selected... |
1521 | 1569 | $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO; |
1522 | 1570 | $node->attr[$name] = true; |
1523 | - if ($this->char != '>') |
|
1524 | - $this->char = $this->doc[--$this->pos]; // prev |
|
1571 | + if ($this->char != '>') { |
|
1572 | + $this->char = $this->doc[--$this->pos]; |
|
1573 | + } |
|
1574 | + // prev |
|
1525 | 1575 | } |
1526 | 1576 | $node->_[HDOM_INFO_SPACE][] = $space; |
1527 | 1577 | $space = array($this->copy_skip($this->token_blank), '', ''); |
1528 | - } else |
|
1529 | - break; |
|
1530 | -} while ($this->char !== '>' && $this->char !== '/'); |
|
1578 | + } else { |
|
1579 | + break; |
|
1580 | + } |
|
1581 | + } while ($this->char !== '>' && $this->char !== '/'); |
|
1531 | 1582 | |
1532 | 1583 | $this->link_nodes($node, true); |
1533 | 1584 | $node->_[HDOM_INFO_ENDSPACE] = $space[0]; |
@@ -1538,9 +1589,10 @@ discard block |
||
1538 | 1589 | $node->_[HDOM_INFO_END] = 0; |
1539 | 1590 | } else { |
1540 | 1591 | // reset parent |
1541 | - if (!isset($this->self_closing_tags[strtolower($node->tag)])) |
|
1542 | - $this->parent = $node; |
|
1543 | -} |
|
1592 | + if (!isset($this->self_closing_tags[strtolower($node->tag)])) { |
|
1593 | + $this->parent = $node; |
|
1594 | + } |
|
1595 | + } |
|
1544 | 1596 | $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
1545 | 1597 | // If it's a BR tag, we need to set it's text to the default text. |
1546 | 1598 | // This way when we see it in plaintext, we can generate formatting that the user wants. |
@@ -1621,8 +1673,9 @@ discard block |
||
1621 | 1673 | $len = strspn($this->doc, $chars, $pos); |
1622 | 1674 | $this->pos += $len; |
1623 | 1675 | $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
1624 | -if ($len === 0) |
|
1676 | +if ($len === 0) { |
|
1625 | 1677 | return ''; |
1678 | +} |
|
1626 | 1679 | return substr($this->doc, $pos, $len); |
1627 | 1680 | } |
1628 | 1681 | |
@@ -1637,8 +1690,9 @@ discard block |
||
1637 | 1690 | |
1638 | 1691 | protected function copy_until_char($char) |
1639 | 1692 | { |
1640 | -if ($this->char === null) |
|
1693 | +if ($this->char === null) { |
|
1641 | 1694 | return ''; |
1695 | +} |
|
1642 | 1696 | |
1643 | 1697 | if (($pos = strpos($this->doc, $char, $this->pos)) === false) { |
1644 | 1698 | $ret = substr($this->doc, $this->pos, $this->size - $this->pos); |
@@ -1647,8 +1701,9 @@ discard block |
||
1647 | 1701 | return $ret; |
1648 | 1702 | } |
1649 | 1703 | |
1650 | -if ($pos === $this->pos) |
|
1704 | +if ($pos === $this->pos) { |
|
1651 | 1705 | return ''; |
1706 | +} |
|
1652 | 1707 | $pos_old = $this->pos; |
1653 | 1708 | $this->char = $this->doc[$pos]; |
1654 | 1709 | $this->pos = $pos; |
@@ -1657,8 +1712,9 @@ discard block |
||
1657 | 1712 | |
1658 | 1713 | protected function copy_until_char_escape($char) |
1659 | 1714 | { |
1660 | -if ($this->char === null) |
|
1715 | +if ($this->char === null) { |
|
1661 | 1716 | return ''; |
1717 | +} |
|
1662 | 1718 | |
1663 | 1719 | $start = $this->pos; |
1664 | 1720 | while (1) { |
@@ -1669,8 +1725,9 @@ discard block |
||
1669 | 1725 | return $ret; |
1670 | 1726 | } |
1671 | 1727 | |
1672 | - if ($pos === $this->pos) |
|
1673 | - return ''; |
|
1728 | + if ($pos === $this->pos) { |
|
1729 | + return ''; |
|
1730 | + } |
|
1674 | 1731 | |
1675 | 1732 | if ($this->doc[$pos - 1] === '\\') { |
1676 | 1733 | $start = $pos + 1; |
@@ -209,8 +209,9 @@ discard block |
||
209 | 209 | $needle = '$' . strtolower($this->module) . '-' . $parentFieldColumnMapping[$params['field']] . ':' . $column . '$'; |
210 | 210 | $this->processedDescription = str_replace($needle, $values[array_search($column, $fieldColumnMapping)], $this->processedDescription); |
211 | 211 | } |
212 | - if (!$params['owner']) |
|
213 | - $this->processedmodules[$module] = true; |
|
212 | + if (!$params['owner']) { |
|
213 | + $this->processedmodules[$module] = true; |
|
214 | + } |
|
214 | 215 | } |
215 | 216 | } |
216 | 217 | } |
@@ -253,7 +254,8 @@ discard block |
||
253 | 254 | $rows = $adb->num_rows($res); |
254 | 255 | if ($rows > 0) { |
255 | 256 | return true; |
256 | - } else |
|
257 | - return false; |
|
257 | + } else { |
|
258 | + return false; |
|
259 | + } |
|
258 | 260 | } |
259 | 261 | } |
@@ -37,8 +37,9 @@ discard block |
||
37 | 37 | |
38 | 38 | public function setConfig($key, $value) |
39 | 39 | { |
40 | - if (empty($key)) |
|
41 | - return; |
|
40 | + if (empty($key)) { |
|
41 | + return; |
|
42 | + } |
|
42 | 43 | $this->properties[$key] = $value; |
43 | 44 | //not neccessary for php5.x versions |
44 | 45 | self::$propertiesCache[$this->name] = $this->properties; |
@@ -46,8 +47,9 @@ discard block |
||
46 | 47 | |
47 | 48 | public function getConfig($key) |
48 | 49 | { |
49 | - if (empty($key)) |
|
50 | - return ''; |
|
50 | + if (empty($key)) { |
|
51 | + return ''; |
|
52 | + } |
|
51 | 53 | return $this->properties[$key]; |
52 | 54 | } |
53 | 55 | } |
@@ -28,8 +28,9 @@ |
||
28 | 28 | $blockid_list = '('; |
29 | 29 | for ($i = 0; $i < $noofrows; $i++) { |
30 | 30 | $blockid = $adb->query_result($result, $i, "blockid"); |
31 | - if ($i != 0) |
|
32 | - $blockid_list .= ', '; |
|
31 | + if ($i != 0) { |
|
32 | + $blockid_list .= ', '; |
|
33 | + } |
|
33 | 34 | $blockid_list .= $blockid; |
34 | 35 | $block_label[$blockid] = $adb->query_result($result, $i, "blocklabel"); |
35 | 36 | } |
@@ -69,8 +69,9 @@ discard block |
||
69 | 69 | } |
70 | 70 | $this->dayofweek_to_rpt = $repeat_arr['dayofweek_to_repeat']; |
71 | 71 | $this->repeat_monthby = $repeat_arr['repeatmonth_type']; |
72 | - if (isset($repeat_arr['repeatmonth_date'])) |
|
73 | - $this->rptmonth_datevalue = $repeat_arr['repeatmonth_date']; |
|
72 | + if (isset($repeat_arr['repeatmonth_date'])) { |
|
73 | + $this->rptmonth_datevalue = $repeat_arr['repeatmonth_date']; |
|
74 | + } |
|
74 | 75 | $this->rptmonth_daytype = $repeat_arr['repeatmonth_daytype']; |
75 | 76 | |
76 | 77 | $this->recurringdates = $this->_getRecurringDates(); |
@@ -409,13 +410,13 @@ discard block |
||
409 | 410 | if ($this->rptmonth_datevalue <= $date) { |
410 | 411 | $index = $this->rptmonth_datevalue - 1; |
411 | 412 | $day = $this->rptmonth_datevalue; |
412 | - if (isset($this->recur_freq)) |
|
413 | - $month = $month + $this->recur_freq; |
|
414 | - else |
|
415 | - $month = $month + 1; |
|
413 | + if (isset($this->recur_freq)) { |
|
414 | + $month = $month + $this->recur_freq; |
|
415 | + } else { |
|
416 | + $month = $month + 1; |
|
417 | + } |
|
416 | 418 | $tempdateObj = $tempdateObj->getThismonthDaysbyIndex($index, $day, $month, $year); |
417 | - } |
|
418 | - else { |
|
419 | + } else { |
|
419 | 420 | $index = $this->rptmonth_datevalue - 1; |
420 | 421 | $day = $this->rptmonth_datevalue; |
421 | 422 | $tempdateObj = $tempdateObj->getThismonthDaysbyIndex($index, $day, $month, $year); |
@@ -430,10 +431,11 @@ discard block |
||
430 | 431 | $tempdateObj = new vt_DateTime($date_arr, true); |
431 | 432 | $firstdayofmonthObj = $this->getFistdayofmonth($this->dayofweek_to_rpt[0], $tempdateObj); |
432 | 433 | if ($firstdayofmonthObj->get_DB_formatted_date() <= $tempdate) { |
433 | - if (isset($this->recur_freq)) |
|
434 | - $month = $firstdayofmonthObj->getMonth() + $this->recur_freq; |
|
435 | - else |
|
436 | - $month = $firstdayofmonthObj->getMonth() + 1; |
|
434 | + if (isset($this->recur_freq)) { |
|
435 | + $month = $firstdayofmonthObj->getMonth() + $this->recur_freq; |
|
436 | + } else { |
|
437 | + $month = $firstdayofmonthObj->getMonth() + 1; |
|
438 | + } |
|
437 | 439 | $dateObj = $firstdayofmonthObj->getThismonthDaysbyIndex(0, 1, $month, $firstdayofmonthObj->getYear()); |
438 | 440 | $nextmonthObj = $this->getFistdayofmonth($this->dayofweek_to_rpt[0], $dateObj); |
439 | 441 | $tempdateObj = $nextmonthObj; |
@@ -449,16 +451,16 @@ discard block |
||
449 | 451 | $tempdateObj = new vt_DateTime($date_arr, true); |
450 | 452 | $lastdayofmonthObj = $this->getLastdayofmonth($this->dayofweek_to_rpt[0], $tempdateObj); |
451 | 453 | if ($lastdayofmonthObj->get_DB_formatted_date() <= $tempdate) { |
452 | - if (isset($this->recur_freq)) |
|
453 | - $month = $lastdayofmonthObj->getMonth() + $this->recur_freq; |
|
454 | - else |
|
455 | - $month = $lastdayofmonthObj->getMonth() + 1; |
|
454 | + if (isset($this->recur_freq)) { |
|
455 | + $month = $lastdayofmonthObj->getMonth() + $this->recur_freq; |
|
456 | + } else { |
|
457 | + $month = $lastdayofmonthObj->getMonth() + 1; |
|
458 | + } |
|
456 | 459 | $dateObj = $lastdayofmonthObj->getThismonthDaysbyIndex(0, 1, $month, $lastdayofmonthObj->getYear()); |
457 | 460 | $dateObj = $dateObj->getThismonthDaysbyIndex($dateObj->getDaysInMonth() - 1, $dateObj->getDaysInMonth(), $month, $lastdayofmonthObj->getYear()); |
458 | 461 | $nextmonthObj = $this->getLastdayofmonth($this->dayofweek_to_rpt[0], $dateObj); |
459 | 462 | $tempdateObj = $nextmonthObj; |
460 | - } |
|
461 | - else { |
|
463 | + } else { |
|
462 | 464 | $tempdateObj = $lastdayofmonthObj; |
463 | 465 | } |
464 | 466 | } |
@@ -476,10 +478,11 @@ discard block |
||
476 | 478 | } |
477 | 479 | } elseif ($this->recur_type == 'Yearly') { |
478 | 480 | |
479 | - if (isset($this->recur_freq)) |
|
480 | - $index = $year + $this->recur_freq; |
|
481 | - else |
|
482 | - $index = $year + 1; |
|
481 | + if (isset($this->recur_freq)) { |
|
482 | + $index = $year + $this->recur_freq; |
|
483 | + } else { |
|
484 | + $index = $year + 1; |
|
485 | + } |
|
483 | 486 | if ($index > 2037 || $index < 1970) { |
484 | 487 | print("<font color='red'>" . \includes\Language::translate('LBL_CAL_LIMIT_MSG') . "</font>"); |
485 | 488 | exit; |
@@ -534,10 +537,11 @@ discard block |
||
534 | 537 | if ($dayofweek == $dateObj->dayofweek) { |
535 | 538 | return $dateObj; |
536 | 539 | } else { |
537 | - if ($dayofweek > $dateObj->dayofweek) |
|
538 | - $day = $dateObj->day - 7 + ($dayofweek - $dateObj->dayofweek); |
|
539 | - else |
|
540 | - $day = $dateObj->day - ($dateObj->dayofweek - $dayofweek); |
|
540 | + if ($dayofweek > $dateObj->dayofweek) { |
|
541 | + $day = $dateObj->day - 7 + ($dayofweek - $dateObj->dayofweek); |
|
542 | + } else { |
|
543 | + $day = $dateObj->day - ($dateObj->dayofweek - $dayofweek); |
|
544 | + } |
|
541 | 545 | $index = $day - 1; |
542 | 546 | $month = $dateObj->month; |
543 | 547 | $year = $dateObj->year; |