chamilo /
chamilo-lms
@@ -264,6 +264,7 @@ discard block |
||
| 264 | 264 | * Set the encoding method |
| 265 | 265 | * |
| 266 | 266 | * @param string Encoding to use |
| 267 | + * @param string $encoding |
|
| 267 | 268 | * @access public |
| 268 | 269 | */ |
| 269 | 270 | function setOutputEncoding($encoding) |
@@ -924,6 +925,7 @@ discard block |
||
| 924 | 925 | * Check whether the current record read is a date |
| 925 | 926 | * |
| 926 | 927 | * @param todo |
| 928 | + * @param integer $spos |
|
| 927 | 929 | * @return boolean True if date, false otherwise |
| 928 | 930 | */ |
| 929 | 931 | function isDate($spos) |
@@ -982,6 +984,9 @@ discard block |
||
| 982 | 984 | return array($string, $raw); |
| 983 | 985 | } |
| 984 | 986 | |
| 987 | + /** |
|
| 988 | + * @param integer $spos |
|
| 989 | + */ |
|
| 985 | 990 | function createNumber($spos) |
| 986 | 991 | { |
| 987 | 992 | $rknumhigh = $this->_GetInt4d($this->data, $spos + 10); |
@@ -1000,6 +1005,10 @@ discard block |
||
| 1000 | 1005 | return $value; |
| 1001 | 1006 | } |
| 1002 | 1007 | |
| 1008 | + /** |
|
| 1009 | + * @param integer $row |
|
| 1010 | + * @param integer $col |
|
| 1011 | + */ |
|
| 1003 | 1012 | function addcell($row, $col, $string, $raw = '') |
| 1004 | 1013 | { |
| 1005 | 1014 | //echo "ADD cel $row-$col $string\n"; |
@@ -1014,6 +1023,9 @@ discard block |
||
| 1014 | 1023 | } |
| 1015 | 1024 | |
| 1016 | 1025 | |
| 1026 | + /** |
|
| 1027 | + * @param integer $rknum |
|
| 1028 | + */ |
|
| 1017 | 1029 | function _GetIEEE754($rknum) |
| 1018 | 1030 | { |
| 1019 | 1031 | if (($rknum & 0x02) != 0) { |
@@ -1051,6 +1063,10 @@ discard block |
||
| 1051 | 1063 | /* |
| 1052 | 1064 | * Function modified by jmontoya in order to fix a problem with encoding in excels |
| 1053 | 1065 | * */ |
| 1066 | + |
|
| 1067 | + /** |
|
| 1068 | + * @param string $string |
|
| 1069 | + */ |
|
| 1054 | 1070 | function _encodeUTF16($string, $check = false) { |
| 1055 | 1071 | //var_dump($this->_defaultEncoding.' '.$this->_encoderFunction.' '.$from); |
| 1056 | 1072 | if ($check) { |
@@ -1074,6 +1090,10 @@ discard block |
||
| 1074 | 1090 | */ |
| 1075 | 1091 | } |
| 1076 | 1092 | |
| 1093 | + /** |
|
| 1094 | + * @param string $data |
|
| 1095 | + * @param integer $pos |
|
| 1096 | + */ |
|
| 1077 | 1097 | function _GetInt4d($data, $pos) |
| 1078 | 1098 | { |
| 1079 | 1099 | $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); |
@@ -464,10 +464,10 @@ discard block |
||
| 464 | 464 | case SPREADSHEET_EXCEL_READER_TYPE_SST: |
| 465 | 465 | //echo "Type_SST\n"; |
| 466 | 466 | $spos = $pos + 4; |
| 467 | - $limitpos = $spos + $length; |
|
| 468 | - $uniqueStrings = $this->_GetInt4d($this->data, $spos+4); |
|
| 467 | + $limitpos = $spos + $length; |
|
| 468 | + $uniqueStrings = $this->_GetInt4d($this->data, $spos+4); |
|
| 469 | 469 | $spos += 8; |
| 470 | - for ($i = 0; $i < $uniqueStrings; $i++) { |
|
| 470 | + for ($i = 0; $i < $uniqueStrings; $i++) { |
|
| 471 | 471 | // Read in the number of characters |
| 472 | 472 | if ($spos == $limitpos) { |
| 473 | 473 | $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
@@ -496,9 +496,9 @@ discard block |
||
| 496 | 496 | } |
| 497 | 497 | |
| 498 | 498 | if ($extendedString) { |
| 499 | - // Read in cchExtRst |
|
| 500 | - $extendedRunLength = $this->_GetInt4d($this->data, $spos); |
|
| 501 | - $spos += 4; |
|
| 499 | + // Read in cchExtRst |
|
| 500 | + $extendedRunLength = $this->_GetInt4d($this->data, $spos); |
|
| 501 | + $spos += 4; |
|
| 502 | 502 | } |
| 503 | 503 | |
| 504 | 504 | $len = ($asciiEncoding)? $numChars : $numChars*2; |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | $charsLeft = $numChars - (($asciiEncoding) ? $bytesRead : ($bytesRead / 2)); |
| 513 | 513 | $spos = $limitpos; |
| 514 | 514 | |
| 515 | - while ($charsLeft > 0){ |
|
| 515 | + while ($charsLeft > 0){ |
|
| 516 | 516 | $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
| 517 | 517 | $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
| 518 | 518 | if ($opcode != 0x3c) { |
@@ -522,29 +522,29 @@ discard block |
||
| 522 | 522 | $limitpos = $spos + $conlength; |
| 523 | 523 | $option = ord($this->data[$spos]); |
| 524 | 524 | $spos += 1; |
| 525 | - if ($asciiEncoding && ($option == 0)) { |
|
| 525 | + if ($asciiEncoding && ($option == 0)) { |
|
| 526 | 526 | $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength); |
| 527 | 527 | $retstr .= substr($this->data, $spos, $len); |
| 528 | 528 | $charsLeft -= $len; |
| 529 | 529 | $asciiEncoding = true; |
| 530 | - }elseif (!$asciiEncoding && ($option != 0)){ |
|
| 530 | + }elseif (!$asciiEncoding && ($option != 0)){ |
|
| 531 | 531 | $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength); |
| 532 | 532 | $retstr .= substr($this->data, $spos, $len); |
| 533 | 533 | $charsLeft -= $len/2; |
| 534 | 534 | $asciiEncoding = false; |
| 535 | - }elseif (!$asciiEncoding && ($option == 0)) { |
|
| 535 | + }elseif (!$asciiEncoding && ($option == 0)) { |
|
| 536 | 536 | // Bummer - the string starts off as Unicode, but after the |
| 537 | 537 | // continuation it is in straightforward ASCII encoding |
| 538 | 538 | $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength); |
| 539 | 539 | for ($j = 0; $j < $len; $j++) { |
| 540 | - $retstr .= $this->data[$spos + $j].chr(0); |
|
| 540 | + $retstr .= $this->data[$spos + $j].chr(0); |
|
| 541 | 541 | } |
| 542 | 542 | $charsLeft -= $len; |
| 543 | 543 | $asciiEncoding = false; |
| 544 | - }else{ |
|
| 544 | + }else{ |
|
| 545 | 545 | $newstr = ''; |
| 546 | 546 | for ($j = 0; $j < strlen($retstr); $j++) { |
| 547 | - $newstr = $retstr[$j].chr(0); |
|
| 547 | + $newstr = $retstr[$j].chr(0); |
|
| 548 | 548 | } |
| 549 | 549 | $retstr = $newstr; |
| 550 | 550 | $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength); |
@@ -552,28 +552,28 @@ discard block |
||
| 552 | 552 | $charsLeft -= $len/2; |
| 553 | 553 | $asciiEncoding = false; |
| 554 | 554 | //echo "Izavrat\n"; |
| 555 | - } |
|
| 556 | - $spos += $len; |
|
| 555 | + } |
|
| 556 | + $spos += $len; |
|
| 557 | 557 | |
| 558 | - } |
|
| 558 | + } |
|
| 559 | 559 | } |
| 560 | 560 | //We check the string before send it check the _encodeUTF16 |
| 561 | 561 | //$retstr = ($asciiEncoding) ? $retstr : $this->_encodeUTF16($retstr); |
| 562 | 562 | $retstr = ($asciiEncoding) ? $this->_encodeUTF16($retstr, true) : $this->_encodeUTF16($retstr); |
| 563 | 563 | // echo "Str $i = $retstr\n"; |
| 564 | 564 | if ($richString){ |
| 565 | - $spos += 4 * $formattingRuns; |
|
| 565 | + $spos += 4 * $formattingRuns; |
|
| 566 | 566 | } |
| 567 | 567 | |
| 568 | 568 | // For extended strings, skip over the extended string data |
| 569 | 569 | if ($extendedString) { |
| 570 | - $spos += $extendedRunLength; |
|
| 570 | + $spos += $extendedRunLength; |
|
| 571 | 571 | } |
| 572 | 572 | //if ($retstr == 'Derby'){ |
| 573 | 573 | // echo "bb\n"; |
| 574 | 574 | //} |
| 575 | 575 | $this->sst[]=$retstr; |
| 576 | - } |
|
| 576 | + } |
|
| 577 | 577 | /*$continueRecords = array(); |
| 578 | 578 | while ($this->getNextCode() == Type_CONTINUE) { |
| 579 | 579 | $continueRecords[] = &$this->nextRecord(); |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | $this->shareStrings = new SSTRecord($r, $continueRecords); |
| 583 | 583 | //print_r($this->shareStrings->strings); |
| 584 | 584 | */ |
| 585 | - // echo 'SST read: '.($time_end-$time_start)."\n"; |
|
| 585 | + // echo 'SST read: '.($time_end-$time_start)."\n"; |
|
| 586 | 586 | break; |
| 587 | 587 | |
| 588 | 588 | case SPREADSHEET_EXCEL_READER_TYPE_FILEPASS: |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | } |
| 608 | 608 | |
| 609 | 609 | $this->formatRecords[$indexCode] = $formatString; |
| 610 | - // echo "Type.FORMAT\n"; |
|
| 610 | + // echo "Type.FORMAT\n"; |
|
| 611 | 611 | break; |
| 612 | 612 | case SPREADSHEET_EXCEL_READER_TYPE_XF: |
| 613 | 613 | //global $dateFormats, $numberFormats; |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | $rec_name = substr($this->data, $pos+11, $rec_length); |
| 679 | 679 | } |
| 680 | 680 | $this->boundsheets[] = array('name'=>$rec_name, |
| 681 | - 'offset'=>$rec_offset); |
|
| 681 | + 'offset'=>$rec_offset); |
|
| 682 | 682 | |
| 683 | 683 | break; |
| 684 | 684 | |
@@ -820,14 +820,14 @@ discard block |
||
| 820 | 820 | } |
| 821 | 821 | $string = sprintf($this->curformat, $numValue * $this->multiplier); |
| 822 | 822 | } |
| 823 | - //$rec['rknumbers'][$i]['xfindex'] = ord($rec['data'][$pos]) | ord($rec['data'][$pos+1]) << 8; |
|
| 824 | - $tmppos += 6; |
|
| 825 | - $this->addcell($row, $colFirst + $i, $string, $raw); |
|
| 826 | - //echo "MULRK $row ".($colFirst + $i)." $string\n"; |
|
| 823 | + //$rec['rknumbers'][$i]['xfindex'] = ord($rec['data'][$pos]) | ord($rec['data'][$pos+1]) << 8; |
|
| 824 | + $tmppos += 6; |
|
| 825 | + $this->addcell($row, $colFirst + $i, $string, $raw); |
|
| 826 | + //echo "MULRK $row ".($colFirst + $i)." $string\n"; |
|
| 827 | 827 | } |
| 828 | - //MulRKRecord($r); |
|
| 828 | + //MulRKRecord($r); |
|
| 829 | 829 | // Get the individual cell records from the multiple record |
| 830 | - //$num = ; |
|
| 830 | + //$num = ; |
|
| 831 | 831 | |
| 832 | 832 | break; |
| 833 | 833 | case SPREADSHEET_EXCEL_READER_TYPE_NUMBER: |
@@ -836,7 +836,7 @@ discard block |
||
| 836 | 836 | $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent |
| 837 | 837 | if ($this->isDate($spos)) { |
| 838 | 838 | list($string, $raw) = $this->createDate($tmp['double']); |
| 839 | - // $this->addcell(DateRecord($r, 1)); |
|
| 839 | + // $this->addcell(DateRecord($r, 1)); |
|
| 840 | 840 | }else{ |
| 841 | 841 | //$raw = $tmp['']; |
| 842 | 842 | if (isset($this->_columnsFormat[$column + 1])){ |
@@ -845,7 +845,7 @@ discard block |
||
| 845 | 845 | $raw = $this->createNumber($spos); |
| 846 | 846 | $string = sprintf($this->curformat, $raw * $this->multiplier); |
| 847 | 847 | |
| 848 | - // $this->addcell(NumberRecord($r)); |
|
| 848 | + // $this->addcell(NumberRecord($r)); |
|
| 849 | 849 | } |
| 850 | 850 | $this->addcell($row, $column, $string, $raw); |
| 851 | 851 | //echo "Number $row $column $string\n"; |
@@ -868,7 +868,7 @@ discard block |
||
| 868 | 868 | $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent |
| 869 | 869 | if ($this->isDate($spos)) { |
| 870 | 870 | list($string, $raw) = $this->createDate($tmp['double']); |
| 871 | - // $this->addcell(DateRecord($r, 1)); |
|
| 871 | + // $this->addcell(DateRecord($r, 1)); |
|
| 872 | 872 | }else{ |
| 873 | 873 | //$raw = $tmp['']; |
| 874 | 874 | if (isset($this->_columnsFormat[$column + 1])){ |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | $raw = $this->createNumber($spos); |
| 878 | 878 | $string = sprintf($this->curformat, $raw * $this->multiplier); |
| 879 | 879 | |
| 880 | - // $this->addcell(NumberRecord($r)); |
|
| 880 | + // $this->addcell(NumberRecord($r)); |
|
| 881 | 881 | } |
| 882 | 882 | $this->addcell($row, $column, $string, $raw); |
| 883 | 883 | //echo "Number $row $column $string\n"; |
@@ -899,7 +899,7 @@ discard block |
||
| 899 | 899 | $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
| 900 | 900 | $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8)); |
| 901 | 901 | |
| 902 | - // $this->addcell(LabelRecord($r)); |
|
| 902 | + // $this->addcell(LabelRecord($r)); |
|
| 903 | 903 | break; |
| 904 | 904 | |
| 905 | 905 | case SPREADSHEET_EXCEL_READER_TYPE_EOF: |
@@ -914,9 +914,9 @@ discard block |
||
| 914 | 914 | } |
| 915 | 915 | |
| 916 | 916 | if (!isset($this->sheets[$this->sn]['numRows'])) |
| 917 | - $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow']; |
|
| 917 | + $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow']; |
|
| 918 | 918 | if (!isset($this->sheets[$this->sn]['numCols'])) |
| 919 | - $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol']; |
|
| 919 | + $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol']; |
|
| 920 | 920 | |
| 921 | 921 | } |
| 922 | 922 | |
@@ -1033,7 +1033,7 @@ discard block |
||
| 1033 | 1033 | // The RK format calls for using only the most significant 30 bits of the |
| 1034 | 1034 | // 64 bit floating point value. The other 34 bits are assumed to be 0 |
| 1035 | 1035 | // So, we use the upper 30 bits of $rknum as follows... |
| 1036 | - $sign = ($rknum & 0x80000000) >> 31; |
|
| 1036 | + $sign = ($rknum & 0x80000000) >> 31; |
|
| 1037 | 1037 | $exp = ($rknum & 0x7ff00000) >> 20; |
| 1038 | 1038 | $mantissa = (0x100000 | ($rknum & 0x000ffffc)); |
| 1039 | 1039 | $value = $mantissa / pow( 2 , (20- ($exp - 1023))); |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | if ($spos + $len < $limitpos) { |
| 506 | 506 | $retstr = substr($this->data, $spos, $len); |
| 507 | 507 | $spos += $len; |
| 508 | - }else{ |
|
| 508 | + } else{ |
|
| 509 | 509 | // found countinue |
| 510 | 510 | $retstr = substr($this->data, $spos, $limitpos - $spos); |
| 511 | 511 | $bytesRead = $limitpos - $spos; |
@@ -527,12 +527,12 @@ discard block |
||
| 527 | 527 | $retstr .= substr($this->data, $spos, $len); |
| 528 | 528 | $charsLeft -= $len; |
| 529 | 529 | $asciiEncoding = true; |
| 530 | - }elseif (!$asciiEncoding && ($option != 0)){ |
|
| 530 | + } elseif (!$asciiEncoding && ($option != 0)){ |
|
| 531 | 531 | $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength); |
| 532 | 532 | $retstr .= substr($this->data, $spos, $len); |
| 533 | 533 | $charsLeft -= $len/2; |
| 534 | 534 | $asciiEncoding = false; |
| 535 | - }elseif (!$asciiEncoding && ($option == 0)) { |
|
| 535 | + } elseif (!$asciiEncoding && ($option == 0)) { |
|
| 536 | 536 | // Bummer - the string starts off as Unicode, but after the |
| 537 | 537 | // continuation it is in straightforward ASCII encoding |
| 538 | 538 | $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength); |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | } |
| 542 | 542 | $charsLeft -= $len; |
| 543 | 543 | $asciiEncoding = false; |
| 544 | - }else{ |
|
| 544 | + } else{ |
|
| 545 | 545 | $newstr = ''; |
| 546 | 546 | for ($j = 0; $j < strlen($retstr); $j++) { |
| 547 | 547 | $newstr = $retstr[$j].chr(0); |
@@ -619,22 +619,24 @@ discard block |
||
| 619 | 619 | 'type' => 'date', |
| 620 | 620 | 'format' => $this->dateFormats[$indexCode] |
| 621 | 621 | ); |
| 622 | - }elseif (array_key_exists($indexCode, $this->numberFormats)) { |
|
| 622 | + } elseif (array_key_exists($indexCode, $this->numberFormats)) { |
|
| 623 | 623 | //echo "isnumber ".$this->numberFormats[$indexCode]; |
| 624 | 624 | $this->formatRecords['xfrecords'][] = array( |
| 625 | 625 | 'type' => 'number', |
| 626 | 626 | 'format' => $this->numberFormats[$indexCode] |
| 627 | 627 | ); |
| 628 | - }else{ |
|
| 628 | + } else{ |
|
| 629 | 629 | $isdate = FALSE; |
| 630 | 630 | if ($indexCode > 0){ |
| 631 | - if (isset($this->formatRecords[$indexCode])) |
|
| 632 | - $formatstr = $this->formatRecords[$indexCode]; |
|
| 631 | + if (isset($this->formatRecords[$indexCode])) { |
|
| 632 | + $formatstr = $this->formatRecords[$indexCode]; |
|
| 633 | + } |
|
| 633 | 634 | //echo '.other.'; |
| 634 | 635 | //echo "\ndate-time=$formatstr=\n"; |
| 635 | - if ($formatstr) |
|
| 636 | - if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format |
|
| 636 | + if ($formatstr) { |
|
| 637 | + if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format |
|
| 637 | 638 | $isdate = TRUE; |
| 639 | + } |
|
| 638 | 640 | $formatstr = str_replace('mm', 'i', $formatstr); |
| 639 | 641 | $formatstr = str_replace('h', 'H', $formatstr); |
| 640 | 642 | //echo "\ndate-time $formatstr \n"; |
@@ -646,7 +648,7 @@ discard block |
||
| 646 | 648 | 'type' => 'date', |
| 647 | 649 | 'format' => $formatstr, |
| 648 | 650 | ); |
| 649 | - }else{ |
|
| 651 | + } else{ |
|
| 650 | 652 | $this->formatRecords['xfrecords'][] = array( |
| 651 | 653 | 'type' => 'other', |
| 652 | 654 | 'format' => '', |
@@ -674,7 +676,7 @@ discard block |
||
| 674 | 676 | } else { |
| 675 | 677 | $rec_name = $this->_encodeUTF16(substr($this->data, $pos+12, $rec_length*2)); |
| 676 | 678 | } |
| 677 | - }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){ |
|
| 679 | + } elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){ |
|
| 678 | 680 | $rec_name = substr($this->data, $pos+11, $rec_length); |
| 679 | 681 | } |
| 680 | 682 | $this->boundsheets[] = array('name'=>$rec_name, |
@@ -733,7 +735,9 @@ discard block |
||
| 733 | 735 | //echo "mem= ".memory_get_usage()."\n"; |
| 734 | 736 | // $r = &$this->file->nextRecord(); |
| 735 | 737 | $lowcode = ord($this->data[$spos]); |
| 736 | - if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) break; |
|
| 738 | + if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) { |
|
| 739 | + break; |
|
| 740 | + } |
|
| 737 | 741 | $code = $lowcode | ord($this->data[$spos+1])<<8; |
| 738 | 742 | $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
| 739 | 743 | $spos += 4; |
@@ -783,7 +787,7 @@ discard block |
||
| 783 | 787 | //echo $numValue." "; |
| 784 | 788 | if ($this->isDate($spos)) { |
| 785 | 789 | list($string, $raw) = $this->createDate($numValue); |
| 786 | - }else{ |
|
| 790 | + } else{ |
|
| 787 | 791 | $raw = $numValue; |
| 788 | 792 | if (isset($this->_columnsFormat[$column + 1])){ |
| 789 | 793 | $this->curformat = $this->_columnsFormat[$column + 1]; |
@@ -813,7 +817,7 @@ discard block |
||
| 813 | 817 | $numValue = $this->_GetIEEE754($this->_GetInt4d($this->data, $tmppos + 2)); |
| 814 | 818 | if ($this->isDate($tmppos-4)) { |
| 815 | 819 | list($string, $raw) = $this->createDate($numValue); |
| 816 | - }else{ |
|
| 820 | + } else{ |
|
| 817 | 821 | $raw = $numValue; |
| 818 | 822 | if (isset($this->_columnsFormat[$colFirst + $i + 1])){ |
| 819 | 823 | $this->curformat = $this->_columnsFormat[$colFirst + $i + 1]; |
@@ -837,7 +841,7 @@ discard block |
||
| 837 | 841 | if ($this->isDate($spos)) { |
| 838 | 842 | list($string, $raw) = $this->createDate($tmp['double']); |
| 839 | 843 | // $this->addcell(DateRecord($r, 1)); |
| 840 | - }else{ |
|
| 844 | + } else{ |
|
| 841 | 845 | //$raw = $tmp['']; |
| 842 | 846 | if (isset($this->_columnsFormat[$column + 1])){ |
| 843 | 847 | $this->curformat = $this->_columnsFormat[$column + 1]; |
@@ -869,7 +873,7 @@ discard block |
||
| 869 | 873 | if ($this->isDate($spos)) { |
| 870 | 874 | list($string, $raw) = $this->createDate($tmp['double']); |
| 871 | 875 | // $this->addcell(DateRecord($r, 1)); |
| 872 | - }else{ |
|
| 876 | + } else{ |
|
| 873 | 877 | //$raw = $tmp['']; |
| 874 | 878 | if (isset($this->_columnsFormat[$column + 1])){ |
| 875 | 879 | $this->curformat = $this->_columnsFormat[$column + 1]; |
@@ -913,10 +917,12 @@ discard block |
||
| 913 | 917 | $spos += $length; |
| 914 | 918 | } |
| 915 | 919 | |
| 916 | - if (!isset($this->sheets[$this->sn]['numRows'])) |
|
| 917 | - $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow']; |
|
| 918 | - if (!isset($this->sheets[$this->sn]['numCols'])) |
|
| 919 | - $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol']; |
|
| 920 | + if (!isset($this->sheets[$this->sn]['numRows'])) { |
|
| 921 | + $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow']; |
|
| 922 | + } |
|
| 923 | + if (!isset($this->sheets[$this->sn]['numCols'])) { |
|
| 924 | + $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol']; |
|
| 925 | + } |
|
| 920 | 926 | |
| 921 | 927 | } |
| 922 | 928 | |
@@ -943,7 +949,7 @@ discard block |
||
| 943 | 949 | if (($xfindex == 0x9) || ($xfindex == 0xa)){ |
| 944 | 950 | $this->multiplier = 100; |
| 945 | 951 | } |
| 946 | - }else{ |
|
| 952 | + } else{ |
|
| 947 | 953 | $this->curformat = $this->_defaultFormat; |
| 948 | 954 | $this->rectype = 'unknown'; |
| 949 | 955 | } |
@@ -993,7 +999,9 @@ discard block |
||
| 993 | 999 | $mantissalow1 = ($rknumlow & 0x80000000) >> 31; |
| 994 | 1000 | $mantissalow2 = ($rknumlow & 0x7fffffff); |
| 995 | 1001 | $value = $mantissa / pow( 2 , (20- ($exp - 1023))); |
| 996 | - if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023))); |
|
| 1002 | + if ($mantissalow1 != 0) { |
|
| 1003 | + $value += 1 / pow (2 , (21 - ($exp - 1023))); |
|
| 1004 | + } |
|
| 997 | 1005 | $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023))); |
| 998 | 1006 | //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2<br>\n"; |
| 999 | 1007 | if ($sign) {$value = -1 * $value;} |
@@ -1006,10 +1014,12 @@ discard block |
||
| 1006 | 1014 | $this->sheets[$this->sn]['maxrow'] = max($this->sheets[$this->sn]['maxrow'], $row + $this->_rowoffset); |
| 1007 | 1015 | $this->sheets[$this->sn]['maxcol'] = max($this->sheets[$this->sn]['maxcol'], $col + $this->_coloffset); |
| 1008 | 1016 | $this->sheets[$this->sn]['cells'][$row + $this->_rowoffset][$col + $this->_coloffset] = $string; |
| 1009 | - if ($raw) |
|
| 1010 | - $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw; |
|
| 1011 | - if (isset($this->rectype)) |
|
| 1012 | - $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype; |
|
| 1017 | + if ($raw) { |
|
| 1018 | + $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw; |
|
| 1019 | + } |
|
| 1020 | + if (isset($this->rectype)) { |
|
| 1021 | + $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype; |
|
| 1022 | + } |
|
| 1013 | 1023 | |
| 1014 | 1024 | } |
| 1015 | 1025 | |
@@ -25,50 +25,50 @@ discard block |
||
| 25 | 25 | * @see OLE, Spreadsheet_Excel_Writer |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | -define('SPREADSHEET_EXCEL_READER_BIFF8', 0x600); |
|
| 29 | -define('SPREADSHEET_EXCEL_READER_BIFF7', 0x500); |
|
| 30 | -define('SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS', 0x5); |
|
| 31 | -define('SPREADSHEET_EXCEL_READER_WORKSHEET', 0x10); |
|
| 32 | - |
|
| 33 | -define('SPREADSHEET_EXCEL_READER_TYPE_BOF', 0x809); |
|
| 34 | -define('SPREADSHEET_EXCEL_READER_TYPE_EOF', 0x0a); |
|
| 35 | -define('SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET', 0x85); |
|
| 36 | -define('SPREADSHEET_EXCEL_READER_TYPE_DIMENSION', 0x200); |
|
| 37 | -define('SPREADSHEET_EXCEL_READER_TYPE_ROW', 0x208); |
|
| 38 | -define('SPREADSHEET_EXCEL_READER_TYPE_DBCELL', 0xd7); |
|
| 39 | -define('SPREADSHEET_EXCEL_READER_TYPE_FILEPASS', 0x2f); |
|
| 40 | -define('SPREADSHEET_EXCEL_READER_TYPE_NOTE', 0x1c); |
|
| 41 | -define('SPREADSHEET_EXCEL_READER_TYPE_TXO', 0x1b6); |
|
| 42 | -define('SPREADSHEET_EXCEL_READER_TYPE_RK', 0x7e); |
|
| 43 | -define('SPREADSHEET_EXCEL_READER_TYPE_RK2', 0x27e); |
|
| 44 | -define('SPREADSHEET_EXCEL_READER_TYPE_MULRK', 0xbd); |
|
| 45 | -define('SPREADSHEET_EXCEL_READER_TYPE_MULBLANK', 0xbe); |
|
| 46 | -define('SPREADSHEET_EXCEL_READER_TYPE_INDEX', 0x20b); |
|
| 47 | -define('SPREADSHEET_EXCEL_READER_TYPE_SST', 0xfc); |
|
| 48 | -define('SPREADSHEET_EXCEL_READER_TYPE_EXTSST', 0xff); |
|
| 49 | -define('SPREADSHEET_EXCEL_READER_TYPE_CONTINUE', 0x3c); |
|
| 50 | -define('SPREADSHEET_EXCEL_READER_TYPE_LABEL', 0x204); |
|
| 51 | -define('SPREADSHEET_EXCEL_READER_TYPE_LABELSST', 0xfd); |
|
| 52 | -define('SPREADSHEET_EXCEL_READER_TYPE_NUMBER', 0x203); |
|
| 53 | -define('SPREADSHEET_EXCEL_READER_TYPE_NAME', 0x18); |
|
| 54 | -define('SPREADSHEET_EXCEL_READER_TYPE_ARRAY', 0x221); |
|
| 55 | -define('SPREADSHEET_EXCEL_READER_TYPE_STRING', 0x207); |
|
| 56 | -define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA', 0x406); |
|
| 57 | -define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA2', 0x6); |
|
| 58 | -define('SPREADSHEET_EXCEL_READER_TYPE_FORMAT', 0x41e); |
|
| 59 | -define('SPREADSHEET_EXCEL_READER_TYPE_XF', 0xe0); |
|
| 60 | -define('SPREADSHEET_EXCEL_READER_TYPE_BOOLERR', 0x205); |
|
| 61 | -define('SPREADSHEET_EXCEL_READER_TYPE_UNKNOWN', 0xffff); |
|
| 28 | +define('SPREADSHEET_EXCEL_READER_BIFF8', 0x600); |
|
| 29 | +define('SPREADSHEET_EXCEL_READER_BIFF7', 0x500); |
|
| 30 | +define('SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS', 0x5); |
|
| 31 | +define('SPREADSHEET_EXCEL_READER_WORKSHEET', 0x10); |
|
| 32 | + |
|
| 33 | +define('SPREADSHEET_EXCEL_READER_TYPE_BOF', 0x809); |
|
| 34 | +define('SPREADSHEET_EXCEL_READER_TYPE_EOF', 0x0a); |
|
| 35 | +define('SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET', 0x85); |
|
| 36 | +define('SPREADSHEET_EXCEL_READER_TYPE_DIMENSION', 0x200); |
|
| 37 | +define('SPREADSHEET_EXCEL_READER_TYPE_ROW', 0x208); |
|
| 38 | +define('SPREADSHEET_EXCEL_READER_TYPE_DBCELL', 0xd7); |
|
| 39 | +define('SPREADSHEET_EXCEL_READER_TYPE_FILEPASS', 0x2f); |
|
| 40 | +define('SPREADSHEET_EXCEL_READER_TYPE_NOTE', 0x1c); |
|
| 41 | +define('SPREADSHEET_EXCEL_READER_TYPE_TXO', 0x1b6); |
|
| 42 | +define('SPREADSHEET_EXCEL_READER_TYPE_RK', 0x7e); |
|
| 43 | +define('SPREADSHEET_EXCEL_READER_TYPE_RK2', 0x27e); |
|
| 44 | +define('SPREADSHEET_EXCEL_READER_TYPE_MULRK', 0xbd); |
|
| 45 | +define('SPREADSHEET_EXCEL_READER_TYPE_MULBLANK', 0xbe); |
|
| 46 | +define('SPREADSHEET_EXCEL_READER_TYPE_INDEX', 0x20b); |
|
| 47 | +define('SPREADSHEET_EXCEL_READER_TYPE_SST', 0xfc); |
|
| 48 | +define('SPREADSHEET_EXCEL_READER_TYPE_EXTSST', 0xff); |
|
| 49 | +define('SPREADSHEET_EXCEL_READER_TYPE_CONTINUE', 0x3c); |
|
| 50 | +define('SPREADSHEET_EXCEL_READER_TYPE_LABEL', 0x204); |
|
| 51 | +define('SPREADSHEET_EXCEL_READER_TYPE_LABELSST', 0xfd); |
|
| 52 | +define('SPREADSHEET_EXCEL_READER_TYPE_NUMBER', 0x203); |
|
| 53 | +define('SPREADSHEET_EXCEL_READER_TYPE_NAME', 0x18); |
|
| 54 | +define('SPREADSHEET_EXCEL_READER_TYPE_ARRAY', 0x221); |
|
| 55 | +define('SPREADSHEET_EXCEL_READER_TYPE_STRING', 0x207); |
|
| 56 | +define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA', 0x406); |
|
| 57 | +define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA2', 0x6); |
|
| 58 | +define('SPREADSHEET_EXCEL_READER_TYPE_FORMAT', 0x41e); |
|
| 59 | +define('SPREADSHEET_EXCEL_READER_TYPE_XF', 0xe0); |
|
| 60 | +define('SPREADSHEET_EXCEL_READER_TYPE_BOOLERR', 0x205); |
|
| 61 | +define('SPREADSHEET_EXCEL_READER_TYPE_UNKNOWN', 0xffff); |
|
| 62 | 62 | define('SPREADSHEET_EXCEL_READER_TYPE_NINETEENFOUR', 0x22); |
| 63 | -define('SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS', 0xE5); |
|
| 63 | +define('SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS', 0xE5); |
|
| 64 | 64 | |
| 65 | -define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS' , 25569); |
|
| 65 | +define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS', 25569); |
|
| 66 | 66 | define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904', 24107); |
| 67 | -define('SPREADSHEET_EXCEL_READER_MSINADAY', 86400); |
|
| 67 | +define('SPREADSHEET_EXCEL_READER_MSINADAY', 86400); |
|
| 68 | 68 | //define('SPREADSHEET_EXCEL_READER_MSINADAY', 24 * 60 * 60); |
| 69 | 69 | |
| 70 | 70 | //define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%.2f"); |
| 71 | -define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%s"); |
|
| 71 | +define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%s"); |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | /* |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | * @var array |
| 202 | 202 | * @access public |
| 203 | 203 | */ |
| 204 | - var $dateFormats = array ( |
|
| 204 | + var $dateFormats = array( |
|
| 205 | 205 | 0xe => "d/m/Y", |
| 206 | 206 | 0xf => "d-M-Y", |
| 207 | 207 | 0x10 => "d-M", |
@@ -222,26 +222,26 @@ discard block |
||
| 222 | 222 | * @access public |
| 223 | 223 | */ |
| 224 | 224 | var $numberFormats = array( |
| 225 | - 0x1 => "%1.0f", // "0" |
|
| 226 | - 0x2 => "%1.2f", // "0.00", |
|
| 227 | - 0x3 => "%1.0f", //"#,##0", |
|
| 228 | - 0x4 => "%1.2f", //"#,##0.00", |
|
| 229 | - 0x5 => "%1.0f", /*"$#,##0;($#,##0)",*/ |
|
| 230 | - 0x6 => '$%1.0f', /*"$#,##0;($#,##0)",*/ |
|
| 231 | - 0x7 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 232 | - 0x8 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 233 | - 0x9 => '%1.0f%%', // "0%" |
|
| 234 | - 0xa => '%1.2f%%', // "0.00%" |
|
| 235 | - 0xb => '%1.2f', // 0.00E00", |
|
| 236 | - 0x25 => '%1.0f', // "#,##0;(#,##0)", |
|
| 237 | - 0x26 => '%1.0f', //"#,##0;(#,##0)", |
|
| 238 | - 0x27 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 239 | - 0x28 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 240 | - 0x29 => '%1.0f', //"#,##0;(#,##0)", |
|
| 241 | - 0x2a => '$%1.0f', //"$#,##0;($#,##0)", |
|
| 242 | - 0x2b => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 243 | - 0x2c => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 244 | - 0x30 => '%1.0f'); //"##0.0E0"; |
|
| 225 | + 0x1 => "%1.0f", // "0" |
|
| 226 | + 0x2 => "%1.2f", // "0.00", |
|
| 227 | + 0x3 => "%1.0f", //"#,##0", |
|
| 228 | + 0x4 => "%1.2f", //"#,##0.00", |
|
| 229 | + 0x5 => "%1.0f", /*"$#,##0;($#,##0)",*/ |
|
| 230 | + 0x6 => '$%1.0f', /*"$#,##0;($#,##0)",*/ |
|
| 231 | + 0x7 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 232 | + 0x8 => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 233 | + 0x9 => '%1.0f%%', // "0%" |
|
| 234 | + 0xa => '%1.2f%%', // "0.00%" |
|
| 235 | + 0xb => '%1.2f', // 0.00E00", |
|
| 236 | + 0x25 => '%1.0f', // "#,##0;(#,##0)", |
|
| 237 | + 0x26 => '%1.0f', //"#,##0;(#,##0)", |
|
| 238 | + 0x27 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 239 | + 0x28 => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 240 | + 0x29 => '%1.0f', //"#,##0;(#,##0)", |
|
| 241 | + 0x2a => '$%1.0f', //"$#,##0;($#,##0)", |
|
| 242 | + 0x2b => '%1.2f', //"#,##0.00;(#,##0.00)", |
|
| 243 | + 0x2c => '$%1.2f', //"$#,##0.00;($#,##0.00)", |
|
| 244 | + 0x30 => '%1.0f'); //"##0.0E0"; |
|
| 245 | 245 | |
| 246 | 246 | // }}} |
| 247 | 247 | // {{{ Spreadsheet_Excel_Reader() |
@@ -290,8 +290,7 @@ discard block |
||
| 290 | 290 | $this->_encoderFunction = function_exists('iconv') ? 'iconv' : ''; |
| 291 | 291 | } elseif ($encoder == 'mb') { |
| 292 | 292 | $this->_encoderFunction = function_exists('mb_convert_encoding') ? |
| 293 | - 'mb_convert_encoding' : |
|
| 294 | - ''; |
|
| 293 | + 'mb_convert_encoding' : ''; |
|
| 295 | 294 | } |
| 296 | 295 | } |
| 297 | 296 | |
@@ -376,9 +375,9 @@ discard block |
||
| 376 | 375 | $res = $this->_ole->read($sFileName); |
| 377 | 376 | |
| 378 | 377 | // oops, something goes wrong (Darko Miljanovic) |
| 379 | - if($res === false) { |
|
| 378 | + if ($res === false) { |
|
| 380 | 379 | // check error code |
| 381 | - if($this->_ole->error == 1) { |
|
| 380 | + if ($this->_ole->error == 1) { |
|
| 382 | 381 | // bad file |
| 383 | 382 | //die('The filename ' . $sFileName . ' is not readable'); |
| 384 | 383 | Display::display_header(''); |
@@ -437,11 +436,11 @@ discard block |
||
| 437 | 436 | { |
| 438 | 437 | $pos = 0; |
| 439 | 438 | |
| 440 | - $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8; |
|
| 441 | - $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8; |
|
| 439 | + $code = ord($this->data[$pos]) | ord($this->data[$pos + 1]) << 8; |
|
| 440 | + $length = ord($this->data[$pos + 2]) | ord($this->data[$pos + 3]) << 8; |
|
| 442 | 441 | |
| 443 | - $version = ord($this->data[$pos + 4]) | ord($this->data[$pos + 5])<<8; |
|
| 444 | - $substreamType = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7])<<8; |
|
| 442 | + $version = ord($this->data[$pos + 4]) | ord($this->data[$pos + 5]) << 8; |
|
| 443 | + $substreamType = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7]) << 8; |
|
| 445 | 444 | //echo "Start parse code=".base_convert($code,10,16)." version=".base_convert($version,10,16)." substreamType=".base_convert($substreamType,10,16).""."\n"; |
| 446 | 445 | |
| 447 | 446 | if (($version != SPREADSHEET_EXCEL_READER_BIFF8) && |
@@ -449,15 +448,15 @@ discard block |
||
| 449 | 448 | return false; |
| 450 | 449 | } |
| 451 | 450 | |
| 452 | - if ($substreamType != SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS){ |
|
| 451 | + if ($substreamType != SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS) { |
|
| 453 | 452 | return false; |
| 454 | 453 | } |
| 455 | 454 | |
| 456 | 455 | //print_r($rec); |
| 457 | 456 | $pos += $length + 4; |
| 458 | 457 | |
| 459 | - $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8; |
|
| 460 | - $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8; |
|
| 458 | + $code = ord($this->data[$pos]) | ord($this->data[$pos + 1]) << 8; |
|
| 459 | + $length = ord($this->data[$pos + 2]) | ord($this->data[$pos + 3]) << 8; |
|
| 461 | 460 | |
| 462 | 461 | while ($code != SPREADSHEET_EXCEL_READER_TYPE_EOF) { |
| 463 | 462 | switch ($code) { |
@@ -465,33 +464,33 @@ discard block |
||
| 465 | 464 | //echo "Type_SST\n"; |
| 466 | 465 | $spos = $pos + 4; |
| 467 | 466 | $limitpos = $spos + $length; |
| 468 | - $uniqueStrings = $this->_GetInt4d($this->data, $spos+4); |
|
| 467 | + $uniqueStrings = $this->_GetInt4d($this->data, $spos + 4); |
|
| 469 | 468 | $spos += 8; |
| 470 | 469 | for ($i = 0; $i < $uniqueStrings; $i++) { |
| 471 | 470 | // Read in the number of characters |
| 472 | 471 | if ($spos == $limitpos) { |
| 473 | - $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 474 | - $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 472 | + $opcode = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 473 | + $conlength = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 475 | 474 | if ($opcode != 0x3c) { |
| 476 | 475 | return -1; |
| 477 | 476 | } |
| 478 | 477 | $spos += 4; |
| 479 | 478 | $limitpos = $spos + $conlength; |
| 480 | 479 | } |
| 481 | - $numChars = ord($this->data[$spos]) | (ord($this->data[$spos+1]) << 8); |
|
| 480 | + $numChars = ord($this->data[$spos]) | (ord($this->data[$spos + 1]) << 8); |
|
| 482 | 481 | //echo "i = $i pos = $pos numChars = $numChars "; |
| 483 | 482 | $spos += 2; |
| 484 | 483 | $optionFlags = ord($this->data[$spos]); |
| 485 | 484 | $spos++; |
| 486 | - $asciiEncoding = (($optionFlags & 0x01) == 0) ; |
|
| 487 | - $extendedString = ( ($optionFlags & 0x04) != 0); |
|
| 485 | + $asciiEncoding = (($optionFlags & 0x01) == 0); |
|
| 486 | + $extendedString = (($optionFlags & 0x04) != 0); |
|
| 488 | 487 | |
| 489 | 488 | // See if string contains formatting information |
| 490 | - $richString = ( ($optionFlags & 0x08) != 0); |
|
| 489 | + $richString = (($optionFlags & 0x08) != 0); |
|
| 491 | 490 | |
| 492 | 491 | if ($richString) { |
| 493 | 492 | // Read in the crun |
| 494 | - $formattingRuns = ord($this->data[$spos]) | (ord($this->data[$spos+1]) << 8); |
|
| 493 | + $formattingRuns = ord($this->data[$spos]) | (ord($this->data[$spos + 1]) << 8); |
|
| 495 | 494 | $spos += 2; |
| 496 | 495 | } |
| 497 | 496 | |
@@ -501,20 +500,20 @@ discard block |
||
| 501 | 500 | $spos += 4; |
| 502 | 501 | } |
| 503 | 502 | |
| 504 | - $len = ($asciiEncoding)? $numChars : $numChars*2; |
|
| 503 | + $len = ($asciiEncoding) ? $numChars : $numChars * 2; |
|
| 505 | 504 | if ($spos + $len < $limitpos) { |
| 506 | 505 | $retstr = substr($this->data, $spos, $len); |
| 507 | 506 | $spos += $len; |
| 508 | - }else{ |
|
| 507 | + } else { |
|
| 509 | 508 | // found countinue |
| 510 | 509 | $retstr = substr($this->data, $spos, $limitpos - $spos); |
| 511 | 510 | $bytesRead = $limitpos - $spos; |
| 512 | 511 | $charsLeft = $numChars - (($asciiEncoding) ? $bytesRead : ($bytesRead / 2)); |
| 513 | 512 | $spos = $limitpos; |
| 514 | 513 | |
| 515 | - while ($charsLeft > 0){ |
|
| 516 | - $opcode = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 517 | - $conlength = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 514 | + while ($charsLeft > 0) { |
|
| 515 | + $opcode = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 516 | + $conlength = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 518 | 517 | if ($opcode != 0x3c) { |
| 519 | 518 | return -1; |
| 520 | 519 | } |
@@ -527,10 +526,10 @@ discard block |
||
| 527 | 526 | $retstr .= substr($this->data, $spos, $len); |
| 528 | 527 | $charsLeft -= $len; |
| 529 | 528 | $asciiEncoding = true; |
| 530 | - }elseif (!$asciiEncoding && ($option != 0)){ |
|
| 529 | + }elseif (!$asciiEncoding && ($option != 0)) { |
|
| 531 | 530 | $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength); |
| 532 | 531 | $retstr .= substr($this->data, $spos, $len); |
| 533 | - $charsLeft -= $len/2; |
|
| 532 | + $charsLeft -= $len / 2; |
|
| 534 | 533 | $asciiEncoding = false; |
| 535 | 534 | }elseif (!$asciiEncoding && ($option == 0)) { |
| 536 | 535 | // Bummer - the string starts off as Unicode, but after the |
@@ -541,7 +540,7 @@ discard block |
||
| 541 | 540 | } |
| 542 | 541 | $charsLeft -= $len; |
| 543 | 542 | $asciiEncoding = false; |
| 544 | - }else{ |
|
| 543 | + } else { |
|
| 545 | 544 | $newstr = ''; |
| 546 | 545 | for ($j = 0; $j < strlen($retstr); $j++) { |
| 547 | 546 | $newstr = $retstr[$j].chr(0); |
@@ -549,7 +548,7 @@ discard block |
||
| 549 | 548 | $retstr = $newstr; |
| 550 | 549 | $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength); |
| 551 | 550 | $retstr .= substr($this->data, $spos, $len); |
| 552 | - $charsLeft -= $len/2; |
|
| 551 | + $charsLeft -= $len / 2; |
|
| 553 | 552 | $asciiEncoding = false; |
| 554 | 553 | //echo "Izavrat\n"; |
| 555 | 554 | } |
@@ -561,7 +560,7 @@ discard block |
||
| 561 | 560 | //$retstr = ($asciiEncoding) ? $retstr : $this->_encodeUTF16($retstr); |
| 562 | 561 | $retstr = ($asciiEncoding) ? $this->_encodeUTF16($retstr, true) : $this->_encodeUTF16($retstr); |
| 563 | 562 | // echo "Str $i = $retstr\n"; |
| 564 | - if ($richString){ |
|
| 563 | + if ($richString) { |
|
| 565 | 564 | $spos += 4 * $formattingRuns; |
| 566 | 565 | } |
| 567 | 566 | |
@@ -572,7 +571,7 @@ discard block |
||
| 572 | 571 | //if ($retstr == 'Derby'){ |
| 573 | 572 | // echo "bb\n"; |
| 574 | 573 | //} |
| 575 | - $this->sst[]=$retstr; |
|
| 574 | + $this->sst[] = $retstr; |
|
| 576 | 575 | } |
| 577 | 576 | /*$continueRecords = array(); |
| 578 | 577 | while ($this->getNextCode() == Type_CONTINUE) { |
@@ -592,18 +591,18 @@ discard block |
||
| 592 | 591 | //echo "Type_NAME\n"; |
| 593 | 592 | break; |
| 594 | 593 | case SPREADSHEET_EXCEL_READER_TYPE_FORMAT: |
| 595 | - $indexCode = ord($this->data[$pos+4]) | ord($this->data[$pos+5]) << 8; |
|
| 594 | + $indexCode = ord($this->data[$pos + 4]) | ord($this->data[$pos + 5]) << 8; |
|
| 596 | 595 | |
| 597 | 596 | if ($version == SPREADSHEET_EXCEL_READER_BIFF8) { |
| 598 | - $numchars = ord($this->data[$pos+6]) | ord($this->data[$pos+7]) << 8; |
|
| 599 | - if (ord($this->data[$pos+8]) == 0){ |
|
| 600 | - $formatString = substr($this->data, $pos+9, $numchars); |
|
| 597 | + $numchars = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7]) << 8; |
|
| 598 | + if (ord($this->data[$pos + 8]) == 0) { |
|
| 599 | + $formatString = substr($this->data, $pos + 9, $numchars); |
|
| 601 | 600 | } else { |
| 602 | - $formatString = substr($this->data, $pos+9, $numchars*2); |
|
| 601 | + $formatString = substr($this->data, $pos + 9, $numchars * 2); |
|
| 603 | 602 | } |
| 604 | 603 | } else { |
| 605 | - $numchars = ord($this->data[$pos+6]); |
|
| 606 | - $formatString = substr($this->data, $pos+7, $numchars*2); |
|
| 604 | + $numchars = ord($this->data[$pos + 6]); |
|
| 605 | + $formatString = substr($this->data, $pos + 7, $numchars * 2); |
|
| 607 | 606 | } |
| 608 | 607 | |
| 609 | 608 | $this->formatRecords[$indexCode] = $formatString; |
@@ -611,7 +610,7 @@ discard block |
||
| 611 | 610 | break; |
| 612 | 611 | case SPREADSHEET_EXCEL_READER_TYPE_XF: |
| 613 | 612 | //global $dateFormats, $numberFormats; |
| 614 | - $indexCode = ord($this->data[$pos+6]) | ord($this->data[$pos+7]) << 8; |
|
| 613 | + $indexCode = ord($this->data[$pos + 6]) | ord($this->data[$pos + 7]) << 8; |
|
| 615 | 614 | //echo "\nType.XF ".count($this->formatRecords['xfrecords'])." $indexCode "; |
| 616 | 615 | if (array_key_exists($indexCode, $this->dateFormats)) { |
| 617 | 616 | //echo "isdate ".$dateFormats[$indexCode]; |
@@ -625,9 +624,9 @@ discard block |
||
| 625 | 624 | 'type' => 'number', |
| 626 | 625 | 'format' => $this->numberFormats[$indexCode] |
| 627 | 626 | ); |
| 628 | - }else{ |
|
| 627 | + } else { |
|
| 629 | 628 | $isdate = FALSE; |
| 630 | - if ($indexCode > 0){ |
|
| 629 | + if ($indexCode > 0) { |
|
| 631 | 630 | if (isset($this->formatRecords[$indexCode])) |
| 632 | 631 | $formatstr = $this->formatRecords[$indexCode]; |
| 633 | 632 | //echo '.other.'; |
@@ -641,12 +640,12 @@ discard block |
||
| 641 | 640 | } |
| 642 | 641 | } |
| 643 | 642 | |
| 644 | - if ($isdate){ |
|
| 643 | + if ($isdate) { |
|
| 645 | 644 | $this->formatRecords['xfrecords'][] = array( |
| 646 | 645 | 'type' => 'date', |
| 647 | 646 | 'format' => $formatstr, |
| 648 | 647 | ); |
| 649 | - }else{ |
|
| 648 | + } else { |
|
| 650 | 649 | $this->formatRecords['xfrecords'][] = array( |
| 651 | 650 | 'type' => 'other', |
| 652 | 651 | 'format' => '', |
@@ -658,24 +657,24 @@ discard block |
||
| 658 | 657 | break; |
| 659 | 658 | case SPREADSHEET_EXCEL_READER_TYPE_NINETEENFOUR: |
| 660 | 659 | //echo "Type.NINETEENFOUR\n"; |
| 661 | - $this->nineteenFour = (ord($this->data[$pos+4]) == 1); |
|
| 660 | + $this->nineteenFour = (ord($this->data[$pos + 4]) == 1); |
|
| 662 | 661 | break; |
| 663 | 662 | case SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET: |
| 664 | 663 | //echo "Type.BOUNDSHEET\n"; |
| 665 | - $rec_offset = $this->_GetInt4d($this->data, $pos+4); |
|
| 666 | - $rec_typeFlag = ord($this->data[$pos+8]); |
|
| 667 | - $rec_visibilityFlag = ord($this->data[$pos+9]); |
|
| 668 | - $rec_length = ord($this->data[$pos+10]); |
|
| 669 | - |
|
| 670 | - if ($version == SPREADSHEET_EXCEL_READER_BIFF8){ |
|
| 671 | - $chartype = ord($this->data[$pos+11]); |
|
| 672 | - if ($chartype == 0){ |
|
| 673 | - $rec_name = substr($this->data, $pos+12, $rec_length); |
|
| 664 | + $rec_offset = $this->_GetInt4d($this->data, $pos + 4); |
|
| 665 | + $rec_typeFlag = ord($this->data[$pos + 8]); |
|
| 666 | + $rec_visibilityFlag = ord($this->data[$pos + 9]); |
|
| 667 | + $rec_length = ord($this->data[$pos + 10]); |
|
| 668 | + |
|
| 669 | + if ($version == SPREADSHEET_EXCEL_READER_BIFF8) { |
|
| 670 | + $chartype = ord($this->data[$pos + 11]); |
|
| 671 | + if ($chartype == 0) { |
|
| 672 | + $rec_name = substr($this->data, $pos + 12, $rec_length); |
|
| 674 | 673 | } else { |
| 675 | - $rec_name = $this->_encodeUTF16(substr($this->data, $pos+12, $rec_length*2)); |
|
| 674 | + $rec_name = $this->_encodeUTF16(substr($this->data, $pos + 12, $rec_length * 2)); |
|
| 676 | 675 | } |
| 677 | - }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){ |
|
| 678 | - $rec_name = substr($this->data, $pos+11, $rec_length); |
|
| 676 | + }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7) { |
|
| 677 | + $rec_name = substr($this->data, $pos + 11, $rec_length); |
|
| 679 | 678 | } |
| 680 | 679 | $this->boundsheets[] = array('name'=>$rec_name, |
| 681 | 680 | 'offset'=>$rec_offset); |
@@ -686,14 +685,14 @@ discard block |
||
| 686 | 685 | |
| 687 | 686 | //echo "Code = ".base_convert($r['code'],10,16)."\n"; |
| 688 | 687 | $pos += $length + 4; |
| 689 | - $code = ord($this->data[$pos]) | ord($this->data[$pos+1])<<8; |
|
| 690 | - $length = ord($this->data[$pos+2]) | ord($this->data[$pos+3])<<8; |
|
| 688 | + $code = ord($this->data[$pos]) | ord($this->data[$pos + 1]) << 8; |
|
| 689 | + $length = ord($this->data[$pos + 2]) | ord($this->data[$pos + 3]) << 8; |
|
| 691 | 690 | |
| 692 | 691 | //$r = &$this->nextRecord(); |
| 693 | 692 | //echo "1 Code = ".base_convert($r['code'],10,16)."\n"; |
| 694 | 693 | } |
| 695 | 694 | |
| 696 | - foreach ($this->boundsheets as $key=>$val){ |
|
| 695 | + foreach ($this->boundsheets as $key=>$val) { |
|
| 697 | 696 | $this->sn = $key; |
| 698 | 697 | $this->_parsesheet($val['offset']); |
| 699 | 698 | } |
@@ -712,30 +711,30 @@ discard block |
||
| 712 | 711 | { |
| 713 | 712 | $cont = true; |
| 714 | 713 | // read BOF |
| 715 | - $code = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 716 | - $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 714 | + $code = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 715 | + $length = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 717 | 716 | |
| 718 | - $version = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5])<<8; |
|
| 719 | - $substreamType = ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8; |
|
| 717 | + $version = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 718 | + $substreamType = ord($this->data[$spos + 6]) | ord($this->data[$spos + 7]) << 8; |
|
| 720 | 719 | |
| 721 | 720 | if (($version != SPREADSHEET_EXCEL_READER_BIFF8) && ($version != SPREADSHEET_EXCEL_READER_BIFF7)) { |
| 722 | 721 | return -1; |
| 723 | 722 | } |
| 724 | 723 | |
| 725 | - if ($substreamType != SPREADSHEET_EXCEL_READER_WORKSHEET){ |
|
| 724 | + if ($substreamType != SPREADSHEET_EXCEL_READER_WORKSHEET) { |
|
| 726 | 725 | return -2; |
| 727 | 726 | } |
| 728 | 727 | //echo "Start parse code=".base_convert($code,10,16)." version=".base_convert($version,10,16)." substreamType=".base_convert($substreamType,10,16).""."\n"; |
| 729 | 728 | $spos += $length + 4; |
| 730 | 729 | //var_dump($this->formatRecords); |
| 731 | 730 | //echo "code $code $length"; |
| 732 | - while($cont) { |
|
| 731 | + while ($cont) { |
|
| 733 | 732 | //echo "mem= ".memory_get_usage()."\n"; |
| 734 | 733 | // $r = &$this->file->nextRecord(); |
| 735 | 734 | $lowcode = ord($this->data[$spos]); |
| 736 | 735 | if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) break; |
| 737 | - $code = $lowcode | ord($this->data[$spos+1])<<8; |
|
| 738 | - $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 736 | + $code = $lowcode | ord($this->data[$spos + 1]) << 8; |
|
| 737 | + $length = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 739 | 738 | $spos += 4; |
| 740 | 739 | $this->sheets[$this->sn]['maxrow'] = $this->_rowoffset - 1; |
| 741 | 740 | $this->sheets[$this->sn]['maxcol'] = $this->_coloffset - 1; |
@@ -746,29 +745,29 @@ discard block |
||
| 746 | 745 | case SPREADSHEET_EXCEL_READER_TYPE_DIMENSION: |
| 747 | 746 | //echo 'Type_DIMENSION '; |
| 748 | 747 | if (!isset($this->numRows)) { |
| 749 | - if (($length == 10) || ($version == SPREADSHEET_EXCEL_READER_BIFF7)){ |
|
| 750 | - $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos+2]) | ord($this->data[$spos+3]) << 8; |
|
| 751 | - $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos+6]) | ord($this->data[$spos+7]) << 8; |
|
| 748 | + if (($length == 10) || ($version == SPREADSHEET_EXCEL_READER_BIFF7)) { |
|
| 749 | + $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 750 | + $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos + 6]) | ord($this->data[$spos + 7]) << 8; |
|
| 752 | 751 | } else { |
| 753 | - $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8; |
|
| 754 | - $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos+10]) | ord($this->data[$spos+11]) << 8; |
|
| 752 | + $this->sheets[$this->sn]['numRows'] = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 753 | + $this->sheets[$this->sn]['numCols'] = ord($this->data[$spos + 10]) | ord($this->data[$spos + 11]) << 8; |
|
| 755 | 754 | } |
| 756 | 755 | } |
| 757 | 756 | //echo 'numRows '.$this->numRows.' '.$this->numCols."\n"; |
| 758 | 757 | break; |
| 759 | 758 | case SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS: |
| 760 | - $cellRanges = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 759 | + $cellRanges = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 761 | 760 | for ($i = 0; $i < $cellRanges; $i++) { |
| 762 | - $fr = ord($this->data[$spos + 8*$i + 2]) | ord($this->data[$spos + 8*$i + 3])<<8; |
|
| 763 | - $lr = ord($this->data[$spos + 8*$i + 4]) | ord($this->data[$spos + 8*$i + 5])<<8; |
|
| 764 | - $fc = ord($this->data[$spos + 8*$i + 6]) | ord($this->data[$spos + 8*$i + 7])<<8; |
|
| 765 | - $lc = ord($this->data[$spos + 8*$i + 8]) | ord($this->data[$spos + 8*$i + 9])<<8; |
|
| 761 | + $fr = ord($this->data[$spos + 8 * $i + 2]) | ord($this->data[$spos + 8 * $i + 3]) << 8; |
|
| 762 | + $lr = ord($this->data[$spos + 8 * $i + 4]) | ord($this->data[$spos + 8 * $i + 5]) << 8; |
|
| 763 | + $fc = ord($this->data[$spos + 8 * $i + 6]) | ord($this->data[$spos + 8 * $i + 7]) << 8; |
|
| 764 | + $lc = ord($this->data[$spos + 8 * $i + 8]) | ord($this->data[$spos + 8 * $i + 9]) << 8; |
|
| 766 | 765 | //$this->sheets[$this->sn]['mergedCells'][] = array($fr + 1, $fc + 1, $lr + 1, $lc + 1); |
| 767 | 766 | if ($lr - $fr > 0) { |
| 768 | - $this->sheets[$this->sn]['cellsInfo'][$fr+1][$fc+1]['rowspan'] = $lr - $fr + 1; |
|
| 767 | + $this->sheets[$this->sn]['cellsInfo'][$fr + 1][$fc + 1]['rowspan'] = $lr - $fr + 1; |
|
| 769 | 768 | } |
| 770 | 769 | if ($lc - $fc > 0) { |
| 771 | - $this->sheets[$this->sn]['cellsInfo'][$fr+1][$fc+1]['colspan'] = $lc - $fc + 1; |
|
| 770 | + $this->sheets[$this->sn]['cellsInfo'][$fr + 1][$fc + 1]['colspan'] = $lc - $fc + 1; |
|
| 772 | 771 | } |
| 773 | 772 | } |
| 774 | 773 | //echo "Merged Cells $cellRanges $lr $fr $lc $fc\n"; |
@@ -776,16 +775,16 @@ discard block |
||
| 776 | 775 | case SPREADSHEET_EXCEL_READER_TYPE_RK: |
| 777 | 776 | case SPREADSHEET_EXCEL_READER_TYPE_RK2: |
| 778 | 777 | //echo 'SPREADSHEET_EXCEL_READER_TYPE_RK'."\n"; |
| 779 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 780 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 778 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 779 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 781 | 780 | $rknum = $this->_GetInt4d($this->data, $spos + 6); |
| 782 | 781 | $numValue = $this->_GetIEEE754($rknum); |
| 783 | 782 | //echo $numValue." "; |
| 784 | 783 | if ($this->isDate($spos)) { |
| 785 | 784 | list($string, $raw) = $this->createDate($numValue); |
| 786 | - }else{ |
|
| 785 | + } else { |
|
| 787 | 786 | $raw = $numValue; |
| 788 | - if (isset($this->_columnsFormat[$column + 1])){ |
|
| 787 | + if (isset($this->_columnsFormat[$column + 1])) { |
|
| 789 | 788 | $this->curformat = $this->_columnsFormat[$column + 1]; |
| 790 | 789 | } |
| 791 | 790 | $string = sprintf($this->curformat, $numValue * $this->multiplier); |
@@ -795,27 +794,27 @@ discard block |
||
| 795 | 794 | //echo "Type_RK $row $column $string $raw {$this->curformat}\n"; |
| 796 | 795 | break; |
| 797 | 796 | case SPREADSHEET_EXCEL_READER_TYPE_LABELSST: |
| 798 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 799 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 800 | - $xfindex = ord($this->data[$spos+4]) | ord($this->data[$spos+5])<<8; |
|
| 801 | - $index = $this->_GetInt4d($this->data, $spos + 6); |
|
| 797 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 798 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 799 | + $xfindex = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 800 | + $index = $this->_GetInt4d($this->data, $spos + 6); |
|
| 802 | 801 | //var_dump($this->sst); |
| 803 | 802 | $this->addcell($row, $column, $this->sst[$index]); |
| 804 | 803 | //echo "LabelSST $row $column $string\n"; |
| 805 | 804 | break; |
| 806 | 805 | case SPREADSHEET_EXCEL_READER_TYPE_MULRK: |
| 807 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 808 | - $colFirst = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 809 | - $colLast = ord($this->data[$spos + $length - 2]) | ord($this->data[$spos + $length - 1])<<8; |
|
| 806 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 807 | + $colFirst = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 808 | + $colLast = ord($this->data[$spos + $length - 2]) | ord($this->data[$spos + $length - 1]) << 8; |
|
| 810 | 809 | $columns = $colLast - $colFirst + 1; |
| 811 | - $tmppos = $spos+4; |
|
| 810 | + $tmppos = $spos + 4; |
|
| 812 | 811 | for ($i = 0; $i < $columns; $i++) { |
| 813 | 812 | $numValue = $this->_GetIEEE754($this->_GetInt4d($this->data, $tmppos + 2)); |
| 814 | - if ($this->isDate($tmppos-4)) { |
|
| 813 | + if ($this->isDate($tmppos - 4)) { |
|
| 815 | 814 | list($string, $raw) = $this->createDate($numValue); |
| 816 | - }else{ |
|
| 815 | + } else { |
|
| 817 | 816 | $raw = $numValue; |
| 818 | - if (isset($this->_columnsFormat[$colFirst + $i + 1])){ |
|
| 817 | + if (isset($this->_columnsFormat[$colFirst + $i + 1])) { |
|
| 819 | 818 | $this->curformat = $this->_columnsFormat[$colFirst + $i + 1]; |
| 820 | 819 | } |
| 821 | 820 | $string = sprintf($this->curformat, $numValue * $this->multiplier); |
@@ -831,15 +830,15 @@ discard block |
||
| 831 | 830 | |
| 832 | 831 | break; |
| 833 | 832 | case SPREADSHEET_EXCEL_READER_TYPE_NUMBER: |
| 834 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 835 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 833 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 834 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 836 | 835 | $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent |
| 837 | 836 | if ($this->isDate($spos)) { |
| 838 | 837 | list($string, $raw) = $this->createDate($tmp['double']); |
| 839 | 838 | // $this->addcell(DateRecord($r, 1)); |
| 840 | - }else{ |
|
| 839 | + } else { |
|
| 841 | 840 | //$raw = $tmp['']; |
| 842 | - if (isset($this->_columnsFormat[$column + 1])){ |
|
| 841 | + if (isset($this->_columnsFormat[$column + 1])) { |
|
| 843 | 842 | $this->curformat = $this->_columnsFormat[$column + 1]; |
| 844 | 843 | } |
| 845 | 844 | $raw = $this->createNumber($spos); |
@@ -852,16 +851,16 @@ discard block |
||
| 852 | 851 | break; |
| 853 | 852 | case SPREADSHEET_EXCEL_READER_TYPE_FORMULA: |
| 854 | 853 | case SPREADSHEET_EXCEL_READER_TYPE_FORMULA2: |
| 855 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 856 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 857 | - if ((ord($this->data[$spos+6])==0) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 854 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 855 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 856 | + if ((ord($this->data[$spos + 6]) == 0) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 858 | 857 | //String formula. Result follows in a STRING record |
| 859 | 858 | //echo "FORMULA $row $column Formula with a string<br>\n"; |
| 860 | - } elseif ((ord($this->data[$spos+6])==1) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 859 | + } elseif ((ord($this->data[$spos + 6]) == 1) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 861 | 860 | //Boolean formula. Result is in +2; 0=false,1=true |
| 862 | - } elseif ((ord($this->data[$spos+6])==2) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 861 | + } elseif ((ord($this->data[$spos + 6]) == 2) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 863 | 862 | //Error formula. Error code is in +2; |
| 864 | - } elseif ((ord($this->data[$spos+6])==3) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { |
|
| 863 | + } elseif ((ord($this->data[$spos + 6]) == 3) && (ord($this->data[$spos + 12]) == 255) && (ord($this->data[$spos + 13]) == 255)) { |
|
| 865 | 864 | //Formula result is a null string. |
| 866 | 865 | } else { |
| 867 | 866 | // result is a number, so first 14 bytes are just like a _NUMBER record |
@@ -869,9 +868,9 @@ discard block |
||
| 869 | 868 | if ($this->isDate($spos)) { |
| 870 | 869 | list($string, $raw) = $this->createDate($tmp['double']); |
| 871 | 870 | // $this->addcell(DateRecord($r, 1)); |
| 872 | - }else{ |
|
| 871 | + } else { |
|
| 873 | 872 | //$raw = $tmp['']; |
| 874 | - if (isset($this->_columnsFormat[$column + 1])){ |
|
| 873 | + if (isset($this->_columnsFormat[$column + 1])) { |
|
| 875 | 874 | $this->curformat = $this->_columnsFormat[$column + 1]; |
| 876 | 875 | } |
| 877 | 876 | $raw = $this->createNumber($spos); |
@@ -884,9 +883,9 @@ discard block |
||
| 884 | 883 | } |
| 885 | 884 | break; |
| 886 | 885 | case SPREADSHEET_EXCEL_READER_TYPE_BOOLERR: |
| 887 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 888 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 889 | - $string = ord($this->data[$spos+6]); |
|
| 886 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 887 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 888 | + $string = ord($this->data[$spos + 6]); |
|
| 890 | 889 | $this->addcell($row, $column, $string); |
| 891 | 890 | //echo 'Type_BOOLERR '."\n"; |
| 892 | 891 | break; |
@@ -895,9 +894,9 @@ discard block |
||
| 895 | 894 | case SPREADSHEET_EXCEL_READER_TYPE_MULBLANK: |
| 896 | 895 | break; |
| 897 | 896 | case SPREADSHEET_EXCEL_READER_TYPE_LABEL: |
| 898 | - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; |
|
| 899 | - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; |
|
| 900 | - $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8)); |
|
| 897 | + $row = ord($this->data[$spos]) | ord($this->data[$spos + 1]) << 8; |
|
| 898 | + $column = ord($this->data[$spos + 2]) | ord($this->data[$spos + 3]) << 8; |
|
| 899 | + $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7]) << 8)); |
|
| 901 | 900 | |
| 902 | 901 | // $this->addcell(LabelRecord($r)); |
| 903 | 902 | break; |
@@ -929,7 +928,7 @@ discard block |
||
| 929 | 928 | function isDate($spos) |
| 930 | 929 | { |
| 931 | 930 | //$xfindex = GetInt2d(, 4); |
| 932 | - $xfindex = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8; |
|
| 931 | + $xfindex = ord($this->data[$spos + 4]) | ord($this->data[$spos + 5]) << 8; |
|
| 933 | 932 | //echo 'check is date '.$xfindex.' '.$this->formatRecords['xfrecords'][$xfindex]['type']."\n"; |
| 934 | 933 | //var_dump($this->formatRecords['xfrecords'][$xfindex]); |
| 935 | 934 | if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'date') { |
@@ -940,10 +939,10 @@ discard block |
||
| 940 | 939 | if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'number') { |
| 941 | 940 | $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format']; |
| 942 | 941 | $this->rectype = 'number'; |
| 943 | - if (($xfindex == 0x9) || ($xfindex == 0xa)){ |
|
| 942 | + if (($xfindex == 0x9) || ($xfindex == 0xa)) { |
|
| 944 | 943 | $this->multiplier = 100; |
| 945 | 944 | } |
| 946 | - }else{ |
|
| 945 | + } else { |
|
| 947 | 946 | $this->curformat = $this->_defaultFormat; |
| 948 | 947 | $this->rectype = 'unknown'; |
| 949 | 948 | } |
@@ -968,15 +967,15 @@ discard block |
||
| 968 | 967 | { |
| 969 | 968 | if ($numValue > 1) { |
| 970 | 969 | $utcDays = $numValue - ($this->nineteenFour ? SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904 : SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS); |
| 971 | - $utcValue = round(($utcDays+1) * SPREADSHEET_EXCEL_READER_MSINADAY); |
|
| 972 | - $string = date ($this->curformat, $utcValue); |
|
| 970 | + $utcValue = round(($utcDays + 1) * SPREADSHEET_EXCEL_READER_MSINADAY); |
|
| 971 | + $string = date($this->curformat, $utcValue); |
|
| 973 | 972 | $raw = $utcValue; |
| 974 | 973 | } else { |
| 975 | 974 | $raw = $numValue; |
| 976 | 975 | $hours = floor($numValue * 24); |
| 977 | 976 | $mins = floor($numValue * 24 * 60) - $hours * 60; |
| 978 | 977 | $secs = floor($numValue * SPREADSHEET_EXCEL_READER_MSINADAY) - $hours * 60 * 60 - $mins * 60; |
| 979 | - $string = date ($this->curformat, mktime($hours, $mins, $secs)); |
|
| 978 | + $string = date($this->curformat, mktime($hours, $mins, $secs)); |
|
| 980 | 979 | } |
| 981 | 980 | |
| 982 | 981 | return array($string, $raw); |
@@ -988,15 +987,15 @@ discard block |
||
| 988 | 987 | $rknumlow = $this->_GetInt4d($this->data, $spos + 6); |
| 989 | 988 | //for ($i=0; $i<8; $i++) { echo ord($this->data[$i+$spos+6]) . " "; } echo "<br>"; |
| 990 | 989 | $sign = ($rknumhigh & 0x80000000) >> 31; |
| 991 | - $exp = ($rknumhigh & 0x7ff00000) >> 20; |
|
| 990 | + $exp = ($rknumhigh & 0x7ff00000) >> 20; |
|
| 992 | 991 | $mantissa = (0x100000 | ($rknumhigh & 0x000fffff)); |
| 993 | 992 | $mantissalow1 = ($rknumlow & 0x80000000) >> 31; |
| 994 | 993 | $mantissalow2 = ($rknumlow & 0x7fffffff); |
| 995 | - $value = $mantissa / pow( 2 , (20- ($exp - 1023))); |
|
| 996 | - if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023))); |
|
| 997 | - $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023))); |
|
| 994 | + $value = $mantissa / pow(2, (20 - ($exp - 1023))); |
|
| 995 | + if ($mantissalow1 != 0) $value += 1 / pow(2, (21 - ($exp - 1023))); |
|
| 996 | + $value += $mantissalow2 / pow(2, (52 - ($exp - 1023))); |
|
| 998 | 997 | //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2<br>\n"; |
| 999 | - if ($sign) {$value = -1 * $value;} |
|
| 998 | + if ($sign) {$value = -1 * $value; } |
|
| 1000 | 999 | return $value; |
| 1001 | 1000 | } |
| 1002 | 1001 | |
@@ -1036,8 +1035,8 @@ discard block |
||
| 1036 | 1035 | $sign = ($rknum & 0x80000000) >> 31; |
| 1037 | 1036 | $exp = ($rknum & 0x7ff00000) >> 20; |
| 1038 | 1037 | $mantissa = (0x100000 | ($rknum & 0x000ffffc)); |
| 1039 | - $value = $mantissa / pow( 2 , (20- ($exp - 1023))); |
|
| 1040 | - if ($sign) {$value = -1 * $value;} |
|
| 1038 | + $value = $mantissa / pow(2, (20 - ($exp - 1023))); |
|
| 1039 | + if ($sign) {$value = -1 * $value; } |
|
| 1041 | 1040 | //end of changes by mmp |
| 1042 | 1041 | |
| 1043 | 1042 | } |
@@ -1058,7 +1057,7 @@ discard block |
||
| 1058 | 1057 | $string = api_convert_encoding($string, $this->_defaultEncoding, $from); |
| 1059 | 1058 | return $string; |
| 1060 | 1059 | } |
| 1061 | - $string = api_convert_encoding($string, $this->_defaultEncoding, 'UTF-16LE'); |
|
| 1060 | + $string = api_convert_encoding($string, $this->_defaultEncoding, 'UTF-16LE'); |
|
| 1062 | 1061 | return $string; |
| 1063 | 1062 | /* |
| 1064 | 1063 | * Default behaviour |
@@ -1076,10 +1075,10 @@ discard block |
||
| 1076 | 1075 | |
| 1077 | 1076 | function _GetInt4d($data, $pos) |
| 1078 | 1077 | { |
| 1079 | - $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); |
|
| 1080 | - if ($value>=4294967294) |
|
| 1078 | + $value = ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | (ord($data[$pos + 3]) << 24); |
|
| 1079 | + if ($value >= 4294967294) |
|
| 1081 | 1080 | { |
| 1082 | - $value=-2; |
|
| 1081 | + $value = -2; |
|
| 1083 | 1082 | } |
| 1084 | 1083 | return $value; |
| 1085 | 1084 | } |
@@ -116,6 +116,7 @@ |
||
| 116 | 116 | * @param string exception message |
| 117 | 117 | * @param int|Exception|PEAR_Error|array|null exception cause |
| 118 | 118 | * @param int|null exception code or null |
| 119 | + * @param string $message |
|
| 119 | 120 | */ |
| 120 | 121 | public function __construct($message, $p2 = null, $p3 = null) |
| 121 | 122 | { |
@@ -234,9 +234,9 @@ discard block |
||
| 234 | 234 | { |
| 235 | 235 | $trace = $this->getTraceSafe(); |
| 236 | 236 | $cause = array('class' => get_class($this), |
| 237 | - 'message' => $this->message, |
|
| 238 | - 'file' => 'unknown', |
|
| 239 | - 'line' => 'unknown'); |
|
| 237 | + 'message' => $this->message, |
|
| 238 | + 'file' => 'unknown', |
|
| 239 | + 'line' => 'unknown'); |
|
| 240 | 240 | if (isset($trace[0])) { |
| 241 | 241 | if (isset($trace[0]['file'])) { |
| 242 | 242 | $cause['file'] = $trace[0]['file']; |
@@ -248,28 +248,28 @@ discard block |
||
| 248 | 248 | $this->cause->getCauseMessage($causes); |
| 249 | 249 | } elseif ($this->cause instanceof Exception) { |
| 250 | 250 | $causes[] = array('class' => get_class($this->cause), |
| 251 | - 'message' => $this->cause->getMessage(), |
|
| 252 | - 'file' => $this->cause->getFile(), |
|
| 253 | - 'line' => $this->cause->getLine()); |
|
| 251 | + 'message' => $this->cause->getMessage(), |
|
| 252 | + 'file' => $this->cause->getFile(), |
|
| 253 | + 'line' => $this->cause->getLine()); |
|
| 254 | 254 | } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) { |
| 255 | 255 | $causes[] = array('class' => get_class($this->cause), |
| 256 | - 'message' => $this->cause->getMessage(), |
|
| 257 | - 'file' => 'unknown', |
|
| 258 | - 'line' => 'unknown'); |
|
| 256 | + 'message' => $this->cause->getMessage(), |
|
| 257 | + 'file' => 'unknown', |
|
| 258 | + 'line' => 'unknown'); |
|
| 259 | 259 | } elseif (is_array($this->cause)) { |
| 260 | 260 | foreach ($this->cause as $cause) { |
| 261 | 261 | if ($cause instanceof PEAR_Exception) { |
| 262 | 262 | $cause->getCauseMessage($causes); |
| 263 | 263 | } elseif ($cause instanceof Exception) { |
| 264 | 264 | $causes[] = array('class' => get_class($cause), |
| 265 | - 'message' => $cause->getMessage(), |
|
| 266 | - 'file' => $cause->getFile(), |
|
| 267 | - 'line' => $cause->getLine()); |
|
| 265 | + 'message' => $cause->getMessage(), |
|
| 266 | + 'file' => $cause->getFile(), |
|
| 267 | + 'line' => $cause->getLine()); |
|
| 268 | 268 | } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) { |
| 269 | 269 | $causes[] = array('class' => get_class($cause), |
| 270 | - 'message' => $cause->getMessage(), |
|
| 271 | - 'file' => 'unknown', |
|
| 272 | - 'line' => 'unknown'); |
|
| 270 | + 'message' => $cause->getMessage(), |
|
| 271 | + 'file' => 'unknown', |
|
| 272 | + 'line' => 'unknown'); |
|
| 273 | 273 | } elseif (is_array($cause) && isset($cause['message'])) { |
| 274 | 274 | // PEAR_ErrorStack warning |
| 275 | 275 | $causes[] = array( |
@@ -327,19 +327,19 @@ discard block |
||
| 327 | 327 | $html = '<table style="border: 1px" cellspacing="0">' . "\n"; |
| 328 | 328 | foreach ($causes as $i => $cause) { |
| 329 | 329 | $html .= '<tr><td colspan="3" style="background: #ff9999">' |
| 330 | - . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: ' |
|
| 331 | - . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> ' |
|
| 332 | - . 'on line <b>' . $cause['line'] . '</b>' |
|
| 333 | - . "</td></tr>\n"; |
|
| 330 | + . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: ' |
|
| 331 | + . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> ' |
|
| 332 | + . 'on line <b>' . $cause['line'] . '</b>' |
|
| 333 | + . "</td></tr>\n"; |
|
| 334 | 334 | } |
| 335 | 335 | $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n" |
| 336 | - . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>' |
|
| 337 | - . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>' |
|
| 338 | - . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n"; |
|
| 336 | + . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>' |
|
| 337 | + . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>' |
|
| 338 | + . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n"; |
|
| 339 | 339 | |
| 340 | 340 | foreach ($trace as $k => $v) { |
| 341 | 341 | $html .= '<tr><td style="text-align: center;">' . $k . '</td>' |
| 342 | - . '<td>'; |
|
| 342 | + . '<td>'; |
|
| 343 | 343 | if (!empty($v['class'])) { |
| 344 | 344 | $html .= $v['class'] . $v['type']; |
| 345 | 345 | } |
@@ -361,15 +361,15 @@ discard block |
||
| 361 | 361 | } |
| 362 | 362 | } |
| 363 | 363 | $html .= '(' . implode(', ',$args) . ')' |
| 364 | - . '</td>' |
|
| 365 | - . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown') |
|
| 366 | - . ':' . (isset($v['line']) ? $v['line'] : 'unknown') |
|
| 367 | - . '</td></tr>' . "\n"; |
|
| 364 | + . '</td>' |
|
| 365 | + . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown') |
|
| 366 | + . ':' . (isset($v['line']) ? $v['line'] : 'unknown') |
|
| 367 | + . '</td></tr>' . "\n"; |
|
| 368 | 368 | } |
| 369 | 369 | $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>' |
| 370 | - . '<td>{main}</td>' |
|
| 371 | - . '<td> </td></tr>' . "\n" |
|
| 372 | - . '</table>'; |
|
| 370 | + . '<td>{main}</td>' |
|
| 371 | + . '<td> </td></tr>' . "\n" |
|
| 372 | + . '</table>'; |
|
| 373 | 373 | return $html; |
| 374 | 374 | } |
| 375 | 375 | |
@@ -380,8 +380,8 @@ discard block |
||
| 380 | 380 | $causeMsg = ''; |
| 381 | 381 | foreach ($causes as $i => $cause) { |
| 382 | 382 | $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': ' |
| 383 | - . $cause['message'] . ' in ' . $cause['file'] |
|
| 384 | - . ' on line ' . $cause['line'] . "\n"; |
|
| 383 | + . $cause['message'] . ' in ' . $cause['file'] |
|
| 384 | + . ' on line ' . $cause['line'] . "\n"; |
|
| 385 | 385 | } |
| 386 | 386 | return $causeMsg . $this->getTraceAsString(); |
| 387 | 387 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // using is_object allows both Exception and PEAR_Error |
| 127 | 127 | if (is_object($p2) && !($p2 instanceof Exception)) { |
| 128 | 128 | if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) { |
| 129 | - throw new PEAR_Exception('exception cause must be Exception, ' . |
|
| 129 | + throw new PEAR_Exception('exception cause must be Exception, '. |
|
| 130 | 130 | 'array, or PEAR_Error'); |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -276,11 +276,9 @@ discard block |
||
| 276 | 276 | 'class' => $cause['package'], |
| 277 | 277 | 'message' => $cause['message'], |
| 278 | 278 | 'file' => isset($cause['context']['file']) ? |
| 279 | - $cause['context']['file'] : |
|
| 280 | - 'unknown', |
|
| 279 | + $cause['context']['file'] : 'unknown', |
|
| 281 | 280 | 'line' => isset($cause['context']['line']) ? |
| 282 | - $cause['context']['line'] : |
|
| 283 | - 'unknown', |
|
| 281 | + $cause['context']['line'] : 'unknown', |
|
| 284 | 282 | ); |
| 285 | 283 | } |
| 286 | 284 | } |
@@ -293,7 +291,7 @@ discard block |
||
| 293 | 291 | $this->_trace = $this->getTrace(); |
| 294 | 292 | if (empty($this->_trace)) { |
| 295 | 293 | $backtrace = debug_backtrace(); |
| 296 | - $this->_trace = array($backtrace[count($backtrace)-1]); |
|
| 294 | + $this->_trace = array($backtrace[count($backtrace) - 1]); |
|
| 297 | 295 | } |
| 298 | 296 | } |
| 299 | 297 | return $this->_trace; |
@@ -324,24 +322,24 @@ discard block |
||
| 324 | 322 | $trace = $this->getTraceSafe(); |
| 325 | 323 | $causes = array(); |
| 326 | 324 | $this->getCauseMessage($causes); |
| 327 | - $html = '<table style="border: 1px" cellspacing="0">' . "\n"; |
|
| 325 | + $html = '<table style="border: 1px" cellspacing="0">'."\n"; |
|
| 328 | 326 | foreach ($causes as $i => $cause) { |
| 329 | 327 | $html .= '<tr><td colspan="3" style="background: #ff9999">' |
| 330 | - . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: ' |
|
| 331 | - . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> ' |
|
| 332 | - . 'on line <b>' . $cause['line'] . '</b>' |
|
| 328 | + . str_repeat('-', $i).' <b>'.$cause['class'].'</b>: ' |
|
| 329 | + . htmlspecialchars($cause['message']).' in <b>'.$cause['file'].'</b> ' |
|
| 330 | + . 'on line <b>'.$cause['line'].'</b>' |
|
| 333 | 331 | . "</td></tr>\n"; |
| 334 | 332 | } |
| 335 | - $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n" |
|
| 333 | + $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>'."\n" |
|
| 336 | 334 | . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>' |
| 337 | 335 | . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>' |
| 338 | - . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n"; |
|
| 336 | + . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>'."\n"; |
|
| 339 | 337 | |
| 340 | 338 | foreach ($trace as $k => $v) { |
| 341 | - $html .= '<tr><td style="text-align: center;">' . $k . '</td>' |
|
| 339 | + $html .= '<tr><td style="text-align: center;">'.$k.'</td>' |
|
| 342 | 340 | . '<td>'; |
| 343 | 341 | if (!empty($v['class'])) { |
| 344 | - $html .= $v['class'] . $v['type']; |
|
| 342 | + $html .= $v['class'].$v['type']; |
|
| 345 | 343 | } |
| 346 | 344 | $html .= $v['function']; |
| 347 | 345 | $args = array(); |
@@ -353,22 +351,22 @@ discard block |
||
| 353 | 351 | elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false'; |
| 354 | 352 | elseif (is_int($arg) || is_double($arg)) $args[] = $arg; |
| 355 | 353 | else { |
| 356 | - $arg = (string)$arg; |
|
| 354 | + $arg = (string) $arg; |
|
| 357 | 355 | $str = htmlspecialchars(substr($arg, 0, 16)); |
| 358 | 356 | if (strlen($arg) > 16) $str .= '…'; |
| 359 | - $args[] = "'" . $str . "'"; |
|
| 357 | + $args[] = "'".$str."'"; |
|
| 360 | 358 | } |
| 361 | 359 | } |
| 362 | 360 | } |
| 363 | - $html .= '(' . implode(', ',$args) . ')' |
|
| 361 | + $html .= '('.implode(', ', $args).')' |
|
| 364 | 362 | . '</td>' |
| 365 | - . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown') |
|
| 366 | - . ':' . (isset($v['line']) ? $v['line'] : 'unknown') |
|
| 367 | - . '</td></tr>' . "\n"; |
|
| 363 | + . '<td>'.(isset($v['file']) ? $v['file'] : 'unknown') |
|
| 364 | + . ':'.(isset($v['line']) ? $v['line'] : 'unknown') |
|
| 365 | + . '</td></tr>'."\n"; |
|
| 368 | 366 | } |
| 369 | - $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>' |
|
| 367 | + $html .= '<tr><td style="text-align: center;">'.($k + 1).'</td>' |
|
| 370 | 368 | . '<td>{main}</td>' |
| 371 | - . '<td> </td></tr>' . "\n" |
|
| 369 | + . '<td> </td></tr>'."\n" |
|
| 372 | 370 | . '</table>'; |
| 373 | 371 | return $html; |
| 374 | 372 | } |
@@ -379,10 +377,10 @@ discard block |
||
| 379 | 377 | $this->getCauseMessage($causes); |
| 380 | 378 | $causeMsg = ''; |
| 381 | 379 | foreach ($causes as $i => $cause) { |
| 382 | - $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': ' |
|
| 383 | - . $cause['message'] . ' in ' . $cause['file'] |
|
| 384 | - . ' on line ' . $cause['line'] . "\n"; |
|
| 380 | + $causeMsg .= str_repeat(' ', $i).$cause['class'].': ' |
|
| 381 | + . $cause['message'].' in '.$cause['file'] |
|
| 382 | + . ' on line '.$cause['line']."\n"; |
|
| 385 | 383 | } |
| 386 | - return $causeMsg . $this->getTraceAsString(); |
|
| 384 | + return $causeMsg.$this->getTraceAsString(); |
|
| 387 | 385 | } |
| 388 | 386 | } |
@@ -347,15 +347,22 @@ |
||
| 347 | 347 | $args = array(); |
| 348 | 348 | if (!empty($v['args'])) { |
| 349 | 349 | foreach ($v['args'] as $arg) { |
| 350 | - if (is_null($arg)) $args[] = 'null'; |
|
| 351 | - elseif (is_array($arg)) $args[] = 'Array'; |
|
| 352 | - elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')'; |
|
| 353 | - elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false'; |
|
| 354 | - elseif (is_int($arg) || is_double($arg)) $args[] = $arg; |
|
| 355 | - else { |
|
| 350 | + if (is_null($arg)) { |
|
| 351 | + $args[] = 'null'; |
|
| 352 | + } elseif (is_array($arg)) { |
|
| 353 | + $args[] = 'Array'; |
|
| 354 | + } elseif (is_object($arg)) { |
|
| 355 | + $args[] = 'Object('.get_class($arg).')'; |
|
| 356 | + } elseif (is_bool($arg)) { |
|
| 357 | + $args[] = $arg ? 'true' : 'false'; |
|
| 358 | + } elseif (is_int($arg) || is_double($arg)) { |
|
| 359 | + $args[] = $arg; |
|
| 360 | + } else { |
|
| 356 | 361 | $arg = (string)$arg; |
| 357 | 362 | $str = htmlspecialchars(substr($arg, 0, 16)); |
| 358 | - if (strlen($arg) > 16) $str .= '…'; |
|
| 363 | + if (strlen($arg) > 16) { |
|
| 364 | + $str .= '…'; |
|
| 365 | + } |
|
| 359 | 366 | $args[] = "'" . $str . "'"; |
| 360 | 367 | } |
| 361 | 368 | } |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | * @param array $attributes Array of attribute |
| 200 | 200 | * @since 1.0 |
| 201 | 201 | * @access private |
| 202 | - * @return bool |
|
| 202 | + * @return boolean|null |
|
| 203 | 203 | */ |
| 204 | 204 | function _getAttrKey($attr, $attributes) |
| 205 | 205 | { |
@@ -265,6 +265,7 @@ discard block |
||
| 265 | 265 | * |
| 266 | 266 | * @param string Attribute name |
| 267 | 267 | * @param string Attribute value (will be set to $name if omitted) |
| 268 | + * @param string $name |
|
| 268 | 269 | * @access public |
| 269 | 270 | */ |
| 270 | 271 | function setAttribute($name, $value = null) |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | if (is_array($attributes)) { |
| 142 | 142 | $charset = HTML_Common::charset(); |
| 143 | 143 | foreach ($attributes as $key => $value) { |
| 144 | - // Modified by Ivan Tcholakov, 16-MAR-2010 |
|
| 144 | + // Modified by Ivan Tcholakov, 16-MAR-2010 |
|
| 145 | 145 | $value = @htmlspecialchars($value, ENT_COMPAT, $charset); |
| 146 | 146 | $strAttr .= ' ' . $key . '= "' . $value. '"'; |
| 147 | 147 | } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | foreach ($attributes as $key => $value) { |
| 144 | 144 | // Modified by Ivan Tcholakov, 16-MAR-2010 |
| 145 | 145 | $value = @htmlspecialchars($value, ENT_COMPAT, $charset); |
| 146 | - $strAttr .= ' ' . $key . '= "' . $value. '"'; |
|
| 146 | + $strAttr .= ' '.$key.'= "'.$value.'"'; |
|
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | return $strAttr; |
@@ -170,10 +170,10 @@ discard block |
||
| 170 | 170 | return $ret; |
| 171 | 171 | |
| 172 | 172 | } elseif (is_string($attributes)) { |
| 173 | - $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)" . |
|
| 173 | + $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)". |
|
| 174 | 174 | "([ \\n\\t\\r]+)?(=([ \\n\\t\\r]+)?(\"[^\"]*\"|'[^']*'|[^ \\n\\t\\r]*))?/"; |
| 175 | 175 | if (preg_match_all($preg, $attributes, $regs)) { |
| 176 | - for ($counter=0; $counter<count($regs[1]); $counter++) { |
|
| 176 | + for ($counter = 0; $counter < count($regs[1]); $counter++) { |
|
| 177 | 177 | $name = $regs[1][$counter]; |
| 178 | 178 | $check = $regs[0][$counter]; |
| 179 | 179 | $value = $regs[7][$counter]; |
@@ -689,6 +689,8 @@ discard block |
||
| 689 | 689 | * @param HTML_QuickForm_element Element to insert |
| 690 | 690 | * @param string Name of the element before which the new |
| 691 | 691 | * one is inserted |
| 692 | + * @param HTML_QuickForm_element $element |
|
| 693 | + * @param string $nameAfter |
|
| 692 | 694 | * @return HTML_QuickForm_element reference to inserted element |
| 693 | 695 | * @throws HTML_QuickForm_Error |
| 694 | 696 | */ |
@@ -1290,7 +1292,7 @@ discard block |
||
| 1290 | 1292 | * Applies a data filter for the given field(s) |
| 1291 | 1293 | * |
| 1292 | 1294 | * @param mixed $element Form element name or array of such names |
| 1293 | - * @param mixed $filter Callback, either function name or array(&$object, 'method') |
|
| 1295 | + * @param string $filter Callback, either function name or array(&$object, 'method') |
|
| 1294 | 1296 | * @since 2.0 |
| 1295 | 1297 | * @access public |
| 1296 | 1298 | * @throws HTML_QuickForm_Error |
@@ -2042,6 +2044,7 @@ discard block |
||
| 2042 | 2044 | * |
| 2043 | 2045 | * @access public |
| 2044 | 2046 | * @param int error code |
| 2047 | + * @param integer $value |
|
| 2045 | 2048 | * @return string error message |
| 2046 | 2049 | * @static |
| 2047 | 2050 | */ |
@@ -630,8 +630,8 @@ discard block |
||
| 630 | 630 | public function &addElement($element) |
| 631 | 631 | { |
| 632 | 632 | if (is_object($element) && is_subclass_of($element, 'html_quickform_element')) { |
| 633 | - $elementObject = &$element; |
|
| 634 | - $elementObject->onQuickFormEvent('updateValue', null, $this); |
|
| 633 | + $elementObject = &$element; |
|
| 634 | + $elementObject->onQuickFormEvent('updateValue', null, $this); |
|
| 635 | 635 | } else { |
| 636 | 636 | $args = func_get_args(); |
| 637 | 637 | $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1)); |
@@ -676,22 +676,22 @@ discard block |
||
| 676 | 676 | // }}} |
| 677 | 677 | // {{{ insertElementBefore() |
| 678 | 678 | |
| 679 | - /** |
|
| 680 | - * Inserts a new element right before the other element |
|
| 681 | - * |
|
| 682 | - * Warning: it is not possible to check whether the $element is already |
|
| 683 | - * added to the form, therefore if you want to move the existing form |
|
| 684 | - * element to a new position, you'll have to use removeElement(): |
|
| 685 | - * $form->insertElementBefore($form->removeElement('foo', false), 'bar'); |
|
| 686 | - * |
|
| 687 | - * @access public |
|
| 688 | - * @since 3.2.4 |
|
| 689 | - * @param HTML_QuickForm_element Element to insert |
|
| 690 | - * @param string Name of the element before which the new |
|
| 691 | - * one is inserted |
|
| 692 | - * @return HTML_QuickForm_element reference to inserted element |
|
| 693 | - * @throws HTML_QuickForm_Error |
|
| 694 | - */ |
|
| 679 | + /** |
|
| 680 | + * Inserts a new element right before the other element |
|
| 681 | + * |
|
| 682 | + * Warning: it is not possible to check whether the $element is already |
|
| 683 | + * added to the form, therefore if you want to move the existing form |
|
| 684 | + * element to a new position, you'll have to use removeElement(): |
|
| 685 | + * $form->insertElementBefore($form->removeElement('foo', false), 'bar'); |
|
| 686 | + * |
|
| 687 | + * @access public |
|
| 688 | + * @since 3.2.4 |
|
| 689 | + * @param HTML_QuickForm_element Element to insert |
|
| 690 | + * @param string Name of the element before which the new |
|
| 691 | + * one is inserted |
|
| 692 | + * @return HTML_QuickForm_element reference to inserted element |
|
| 693 | + * @throws HTML_QuickForm_Error |
|
| 694 | + */ |
|
| 695 | 695 | function &insertElementBefore(&$element, $nameAfter) |
| 696 | 696 | { |
| 697 | 697 | if (!empty($this->_duplicateIndex[$nameAfter])) { |
@@ -870,9 +870,9 @@ discard block |
||
| 870 | 870 | if ((is_array($value) || null === $value) && isset($this->_submitFiles[$base])) { |
| 871 | 871 | $props = array('name', 'type', 'size', 'tmp_name', 'error'); |
| 872 | 872 | $code = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n" . |
| 873 | - " return null;\n" . |
|
| 874 | - "} else {\n" . |
|
| 875 | - " \$v = array();\n"; |
|
| 873 | + " return null;\n" . |
|
| 874 | + "} else {\n" . |
|
| 875 | + " \$v = array();\n"; |
|
| 876 | 876 | foreach ($props as $prop) { |
| 877 | 877 | $code .= " \$v = HTML_QuickForm::arrayMerge(\$v, \$this->_reindexFiles(\$this->_submitFiles['{$base}']['{$prop}']{$idx}, '{$prop}'));\n"; |
| 878 | 878 | } |
@@ -917,13 +917,13 @@ discard block |
||
| 917 | 917 | return $value; |
| 918 | 918 | } |
| 919 | 919 | |
| 920 | - /** |
|
| 921 | - * A helper function to change the indexes in $_FILES array |
|
| 922 | - * |
|
| 923 | - * @param mixed Some value from the $_FILES array |
|
| 924 | - * @param string The key from the $_FILES array that should be appended |
|
| 925 | - * @return array |
|
| 926 | - */ |
|
| 920 | + /** |
|
| 921 | + * A helper function to change the indexes in $_FILES array |
|
| 922 | + * |
|
| 923 | + * @param mixed Some value from the $_FILES array |
|
| 924 | + * @param string The key from the $_FILES array that should be appended |
|
| 925 | + * @return array |
|
| 926 | + */ |
|
| 927 | 927 | function _reindexFiles($value, $key) |
| 928 | 928 | { |
| 929 | 929 | if (!is_array($value)) { |
@@ -976,27 +976,27 @@ discard block |
||
| 976 | 976 | } |
| 977 | 977 | } // end func setElementError |
| 978 | 978 | |
| 979 | - // }}} |
|
| 980 | - // {{{ getElementType() |
|
| 981 | - |
|
| 982 | - /** |
|
| 983 | - * Returns the type of the given element |
|
| 984 | - * |
|
| 985 | - * @param string $element Name of form element |
|
| 986 | - * @since 1.1 |
|
| 987 | - * @access public |
|
| 988 | - * @return string Type of the element, false if the element is not found |
|
| 989 | - */ |
|
| 990 | - function getElementType($element) |
|
| 991 | - { |
|
| 992 | - if (isset($this->_elementIndex[$element])) { |
|
| 993 | - return $this->_elements[$this->_elementIndex[$element]]->getType(); |
|
| 994 | - } |
|
| 995 | - return false; |
|
| 996 | - } // end func getElementType |
|
| 997 | - |
|
| 998 | - // }}} |
|
| 999 | - // {{{ updateElementAttr() |
|
| 979 | + // }}} |
|
| 980 | + // {{{ getElementType() |
|
| 981 | + |
|
| 982 | + /** |
|
| 983 | + * Returns the type of the given element |
|
| 984 | + * |
|
| 985 | + * @param string $element Name of form element |
|
| 986 | + * @since 1.1 |
|
| 987 | + * @access public |
|
| 988 | + * @return string Type of the element, false if the element is not found |
|
| 989 | + */ |
|
| 990 | + function getElementType($element) |
|
| 991 | + { |
|
| 992 | + if (isset($this->_elementIndex[$element])) { |
|
| 993 | + return $this->_elements[$this->_elementIndex[$element]]->getType(); |
|
| 994 | + } |
|
| 995 | + return false; |
|
| 996 | + } // end func getElementType |
|
| 997 | + |
|
| 998 | + // }}} |
|
| 999 | + // {{{ updateElementAttr() |
|
| 1000 | 1000 | |
| 1001 | 1001 | /** |
| 1002 | 1002 | * Updates Attributes for one or more elements |
@@ -1263,18 +1263,18 @@ discard block |
||
| 1263 | 1263 | // }}} |
| 1264 | 1264 | // {{{ addFormRule() |
| 1265 | 1265 | |
| 1266 | - /** |
|
| 1267 | - * Adds a global validation rule |
|
| 1268 | - * |
|
| 1269 | - * This should be used when for a rule involving several fields or if |
|
| 1270 | - * you want to use some completely custom validation for your form. |
|
| 1271 | - * The rule function/method should return true in case of successful |
|
| 1272 | - * validation and array('element name' => 'error') when there were errors. |
|
| 1273 | - * |
|
| 1274 | - * @access public |
|
| 1275 | - * @param mixed Callback, either function name or array(&$object, 'method') |
|
| 1276 | - * @throws HTML_QuickForm_Error |
|
| 1277 | - */ |
|
| 1266 | + /** |
|
| 1267 | + * Adds a global validation rule |
|
| 1268 | + * |
|
| 1269 | + * This should be used when for a rule involving several fields or if |
|
| 1270 | + * you want to use some completely custom validation for your form. |
|
| 1271 | + * The rule function/method should return true in case of successful |
|
| 1272 | + * validation and array('element name' => 'error') when there were errors. |
|
| 1273 | + * |
|
| 1274 | + * @access public |
|
| 1275 | + * @param mixed Callback, either function name or array(&$object, 'method') |
|
| 1276 | + * @throws HTML_QuickForm_Error |
|
| 1277 | + */ |
|
| 1278 | 1278 | function addFormRule($rule) |
| 1279 | 1279 | { |
| 1280 | 1280 | if (!is_callable($rule)) { |
@@ -1351,18 +1351,18 @@ discard block |
||
| 1351 | 1351 | // }}} |
| 1352 | 1352 | // {{{ arrayMerge() |
| 1353 | 1353 | |
| 1354 | - /** |
|
| 1355 | - * Merges two arrays |
|
| 1356 | - * |
|
| 1357 | - * Merges two array like the PHP function array_merge but recursively. |
|
| 1358 | - * The main difference is that existing keys will not be renumbered |
|
| 1359 | - * if they are integers. |
|
| 1360 | - * |
|
| 1361 | - * @access public |
|
| 1362 | - * @param array $a original array |
|
| 1363 | - * @param array $b array which will be merged into first one |
|
| 1364 | - * @return array merged array |
|
| 1365 | - */ |
|
| 1354 | + /** |
|
| 1355 | + * Merges two arrays |
|
| 1356 | + * |
|
| 1357 | + * Merges two array like the PHP function array_merge but recursively. |
|
| 1358 | + * The main difference is that existing keys will not be renumbered |
|
| 1359 | + * if they are integers. |
|
| 1360 | + * |
|
| 1361 | + * @access public |
|
| 1362 | + * @param array $a original array |
|
| 1363 | + * @param array $b array which will be merged into first one |
|
| 1364 | + * @return array merged array |
|
| 1365 | + */ |
|
| 1366 | 1366 | static function arrayMerge($a, $b) |
| 1367 | 1367 | { |
| 1368 | 1368 | foreach ($b as $k => $v) { |
@@ -1493,10 +1493,10 @@ discard block |
||
| 1493 | 1493 | */ |
| 1494 | 1494 | function isElementFrozen($element) |
| 1495 | 1495 | { |
| 1496 | - if (isset($this->_elementIndex[$element])) { |
|
| 1497 | - return $this->_elements[$this->_elementIndex[$element]]->isFrozen(); |
|
| 1498 | - } |
|
| 1499 | - return false; |
|
| 1496 | + if (isset($this->_elementIndex[$element])) { |
|
| 1497 | + return $this->_elements[$this->_elementIndex[$element]]->isFrozen(); |
|
| 1498 | + } |
|
| 1499 | + return false; |
|
| 1500 | 1500 | } // end func isElementFrozen |
| 1501 | 1501 | |
| 1502 | 1502 | // }}} |
@@ -1685,7 +1685,7 @@ discard block |
||
| 1685 | 1685 | */ |
| 1686 | 1686 | function isFrozen() |
| 1687 | 1687 | { |
| 1688 | - return $this->_freezeAll; |
|
| 1688 | + return $this->_freezeAll; |
|
| 1689 | 1689 | } |
| 1690 | 1690 | |
| 1691 | 1691 | /** |
@@ -1707,14 +1707,14 @@ discard block |
||
| 1707 | 1707 | return call_user_func($callback, $values); |
| 1708 | 1708 | } |
| 1709 | 1709 | |
| 1710 | - /** |
|
| 1711 | - * Accepts a renderer |
|
| 1712 | - * |
|
| 1713 | - * @param object An HTML_QuickForm_Renderer object |
|
| 1714 | - * @since 3.0 |
|
| 1715 | - * @access public |
|
| 1716 | - * @return void |
|
| 1717 | - */ |
|
| 1710 | + /** |
|
| 1711 | + * Accepts a renderer |
|
| 1712 | + * |
|
| 1713 | + * @param object An HTML_QuickForm_Renderer object |
|
| 1714 | + * @since 3.0 |
|
| 1715 | + * @access public |
|
| 1716 | + * @return void |
|
| 1717 | + */ |
|
| 1718 | 1718 | function accept(&$renderer) { |
| 1719 | 1719 | $renderer->startForm($this); |
| 1720 | 1720 | foreach (array_keys($this->_elements) as $key) { |
@@ -1727,13 +1727,13 @@ discard block |
||
| 1727 | 1727 | $renderer->finishForm($this); |
| 1728 | 1728 | } |
| 1729 | 1729 | |
| 1730 | - /** |
|
| 1731 | - * Returns a reference to default renderer object |
|
| 1732 | - * |
|
| 1733 | - * @access public |
|
| 1734 | - * @since 3.0 |
|
| 1735 | - * @return HTML_QuickForm_Renderer_Default |
|
| 1736 | - */ |
|
| 1730 | + /** |
|
| 1731 | + * Returns a reference to default renderer object |
|
| 1732 | + * |
|
| 1733 | + * @access public |
|
| 1734 | + * @since 3.0 |
|
| 1735 | + * @return HTML_QuickForm_Renderer_Default |
|
| 1736 | + */ |
|
| 1737 | 1737 | function &defaultRenderer() { |
| 1738 | 1738 | if (!isset($GLOBALS['_HTML_QuickForm_default_renderer'])) { |
| 1739 | 1739 | // Modified by Ivan Tcholakov, 16-MAR-2010. Suppressing a deprecation warning on PHP 5.3 |
@@ -1889,7 +1889,7 @@ discard block |
||
| 1889 | 1889 | // |
| 1890 | 1890 | $this->accept($renderer); |
| 1891 | 1891 | return $renderer->toArray(); |
| 1892 | - } |
|
| 1892 | + } |
|
| 1893 | 1893 | |
| 1894 | 1894 | /** |
| 1895 | 1895 | * Returns a 'safe' element's value |
@@ -1961,15 +1961,15 @@ discard block |
||
| 1961 | 1961 | return $values; |
| 1962 | 1962 | } |
| 1963 | 1963 | |
| 1964 | - /** |
|
| 1965 | - * Tells whether the form was already submitted |
|
| 1966 | - * |
|
| 1967 | - * This is useful since the _submitFiles and _submitValues arrays |
|
| 1968 | - * may be completely empty after the trackSubmit value is removed. |
|
| 1969 | - * |
|
| 1970 | - * @access public |
|
| 1971 | - * @return bool |
|
| 1972 | - */ |
|
| 1964 | + /** |
|
| 1965 | + * Tells whether the form was already submitted |
|
| 1966 | + * |
|
| 1967 | + * This is useful since the _submitFiles and _submitValues arrays |
|
| 1968 | + * may be completely empty after the trackSubmit value is removed. |
|
| 1969 | + * |
|
| 1970 | + * @access public |
|
| 1971 | + * @return bool |
|
| 1972 | + */ |
|
| 1973 | 1973 | function isSubmitted() |
| 1974 | 1974 | { |
| 1975 | 1975 | return $this->_flagSubmitted; |
@@ -2056,21 +2056,21 @@ discard block |
||
| 2056 | 2056 | { |
| 2057 | 2057 | |
| 2058 | 2058 | /** |
| 2059 | - * Prefix for all error messages |
|
| 2060 | - * @var string |
|
| 2061 | - */ |
|
| 2059 | + * Prefix for all error messages |
|
| 2060 | + * @var string |
|
| 2061 | + */ |
|
| 2062 | 2062 | public $error_message_prefix = 'QuickForm Error: '; |
| 2063 | 2063 | |
| 2064 | 2064 | /** |
| 2065 | - * Creates a quickform error object, extending the PEAR_Error class |
|
| 2066 | - * |
|
| 2067 | - * @param int $code the error code |
|
| 2068 | - * @param int $mode the reaction to the error, either return, die or trigger/callback |
|
| 2069 | - * @param int $level intensity of the error (PHP error code) |
|
| 2070 | - * @param mixed $debuginfo any information that can inform user as to nature of the error |
|
| 2071 | - */ |
|
| 2065 | + * Creates a quickform error object, extending the PEAR_Error class |
|
| 2066 | + * |
|
| 2067 | + * @param int $code the error code |
|
| 2068 | + * @param int $mode the reaction to the error, either return, die or trigger/callback |
|
| 2069 | + * @param int $level intensity of the error (PHP error code) |
|
| 2070 | + * @param mixed $debuginfo any information that can inform user as to nature of the error |
|
| 2071 | + */ |
|
| 2072 | 2072 | public function __construct($code = QUICKFORM_ERROR, $mode = PEAR_ERROR_RETURN, |
| 2073 | - $level = E_USER_NOTICE, $debuginfo = null) |
|
| 2073 | + $level = E_USER_NOTICE, $debuginfo = null) |
|
| 2074 | 2074 | { |
| 2075 | 2075 | if (is_int($code)) { |
| 2076 | 2076 | $this->PEAR_Error(HTML_QuickForm::errorMessage($code), $code, $mode, $level, $debuginfo); |
@@ -42,16 +42,16 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | * @see HTML_QuickForm::errorMessage() |
| 44 | 44 | */ |
| 45 | -define('QUICKFORM_OK', 1); |
|
| 46 | -define('QUICKFORM_ERROR', -1); |
|
| 47 | -define('QUICKFORM_INVALID_RULE', -2); |
|
| 48 | -define('QUICKFORM_NONEXIST_ELEMENT', -3); |
|
| 49 | -define('QUICKFORM_INVALID_FILTER', -4); |
|
| 50 | -define('QUICKFORM_UNREGISTERED_ELEMENT', -5); |
|
| 51 | -define('QUICKFORM_INVALID_ELEMENT_NAME', -6); |
|
| 52 | -define('QUICKFORM_INVALID_PROCESS', -7); |
|
| 53 | -define('QUICKFORM_DEPRECATED', -8); |
|
| 54 | -define('QUICKFORM_INVALID_DATASOURCE', -9); |
|
| 45 | +define('QUICKFORM_OK', 1); |
|
| 46 | +define('QUICKFORM_ERROR', -1); |
|
| 47 | +define('QUICKFORM_INVALID_RULE', -2); |
|
| 48 | +define('QUICKFORM_NONEXIST_ELEMENT', -3); |
|
| 49 | +define('QUICKFORM_INVALID_FILTER', -4); |
|
| 50 | +define('QUICKFORM_UNREGISTERED_ELEMENT', -5); |
|
| 51 | +define('QUICKFORM_INVALID_ELEMENT_NAME', -6); |
|
| 52 | +define('QUICKFORM_INVALID_PROCESS', -7); |
|
| 53 | +define('QUICKFORM_DEPRECATED', -8); |
|
| 54 | +define('QUICKFORM_INVALID_DATASOURCE', -9); |
|
| 55 | 55 | /**#@-*/ |
| 56 | 56 | |
| 57 | 57 | // }}} |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param bool $trackSubmit (optional)Whether to track if the form was submitted by adding a special hidden field |
| 230 | 230 | * @access public |
| 231 | 231 | */ |
| 232 | - public function __construct($formName='', $method='post', $action='', $target='', $attributes=null, $trackSubmit = false) |
|
| 232 | + public function __construct($formName = '', $method = 'post', $action = '', $target = '', $attributes = null, $trackSubmit = false) |
|
| 233 | 233 | { |
| 234 | 234 | parent::__construct($attributes); |
| 235 | 235 | $method = (strtoupper($method) == 'GET') ? 'get' : 'post'; |
@@ -246,9 +246,9 @@ discard block |
||
| 246 | 246 | 'id' => $form_id |
| 247 | 247 | ) + $target; |
| 248 | 248 | $this->updateAttributes($attributes); |
| 249 | - if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) { |
|
| 249 | + if (!$trackSubmit || isset($_REQUEST['_qf__'.$formName])) { |
|
| 250 | 250 | if (1 == get_magic_quotes_gpc()) { |
| 251 | - $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method? $_GET: $_POST); |
|
| 251 | + $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method ? $_GET : $_POST); |
|
| 252 | 252 | foreach ($_FILES as $keyFirst => $valFirst) { |
| 253 | 253 | foreach ($valFirst as $keySecond => $valSecond) { |
| 254 | 254 | if ('name' == $keySecond) { |
@@ -259,14 +259,14 @@ discard block |
||
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | } else { |
| 262 | - $this->_submitValues = 'get' == $method? $_GET: $_POST; |
|
| 262 | + $this->_submitValues = 'get' == $method ? $_GET : $_POST; |
|
| 263 | 263 | $this->_submitFiles = $_FILES; |
| 264 | 264 | } |
| 265 | 265 | $this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0; |
| 266 | 266 | } |
| 267 | 267 | if ($trackSubmit) { |
| 268 | - unset($this->_submitValues['_qf__' . $formName]); |
|
| 269 | - $this->addElement('hidden', '_qf__' . $formName, null); |
|
| 268 | + unset($this->_submitValues['_qf__'.$formName]); |
|
| 269 | + $this->addElement('hidden', '_qf__'.$formName, null); |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | if (preg_match('/^([0-9]+)([a-zA-Z]*)$/', ini_get('upload_max_filesize'), $matches)) { |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | */ |
| 346 | 346 | public static function registerRule($ruleName, $type, $data1, $data2 = null) |
| 347 | 347 | { |
| 348 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 348 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 349 | 349 | $registry->registerRule($ruleName, $type, $data1, $data2); |
| 350 | 350 | } // end func registerRule |
| 351 | 351 | |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | * @access public |
| 361 | 361 | * @return boolean |
| 362 | 362 | */ |
| 363 | - function elementExists($element=null) |
|
| 363 | + function elementExists($element = null) |
|
| 364 | 364 | { |
| 365 | 365 | return isset($this->_elementIndex[$element]); |
| 366 | 366 | } // end func elementExists |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | function setDatasource(&$datasource, $defaultsFilter = null, $constantsFilter = null) |
| 386 | 386 | { |
| 387 | 387 | if (is_object($datasource)) { |
| 388 | - $this->_datasource =& $datasource; |
|
| 388 | + $this->_datasource = & $datasource; |
|
| 389 | 389 | if (is_callable(array($datasource, 'defaultValues'))) { |
| 390 | 390 | $this->setDefaults($datasource->defaultValues($this), $defaultsFilter); |
| 391 | 391 | } |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | if (!$this->elementExists('MAX_FILE_SIZE')) { |
| 497 | 497 | $this->addElement('hidden', 'MAX_FILE_SIZE', $this->_maxFileSize); |
| 498 | 498 | } else { |
| 499 | - $el =& $this->getElement('MAX_FILE_SIZE'); |
|
| 499 | + $el = & $this->getElement('MAX_FILE_SIZE'); |
|
| 500 | 500 | $el->updateAttributes(array('value' => $this->_maxFileSize)); |
| 501 | 501 | } |
| 502 | 502 | } // end func setMaxFileSize |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | $elementObject->onQuickFormEvent('updateValue', null, $this); |
| 635 | 635 | } else { |
| 636 | 636 | $args = func_get_args(); |
| 637 | - $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1)); |
|
| 637 | + $elementObject = & $this->_loadElement('addElement', $element, array_slice($args, 1)); |
|
| 638 | 638 | if (PEAR::isError($elementObject)) { |
| 639 | 639 | return $elementObject; |
| 640 | 640 | } |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | isset($this->_elementIndex[$elementName]) |
| 647 | 647 | ) { |
| 648 | 648 | if ($this->_elements[$this->_elementIndex[$elementName]]->getType() == $elementObject->getType()) { |
| 649 | - $this->_elements[] =& $elementObject; |
|
| 649 | + $this->_elements[] = & $elementObject; |
|
| 650 | 650 | $elKeys = array_keys($this->_elements); |
| 651 | 651 | $this->_duplicateIndex[$elementName][] = end($elKeys); |
| 652 | 652 | } else { |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | return $error; |
| 662 | 662 | } |
| 663 | 663 | } else { |
| 664 | - $this->_elements[] =& $elementObject; |
|
| 664 | + $this->_elements[] = & $elementObject; |
|
| 665 | 665 | $elKeys = array_keys($this->_elements); |
| 666 | 666 | $this->_elementIndex[$elementName] = end($elKeys); |
| 667 | 667 | } |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | function &insertElementBefore(&$element, $nameAfter) |
| 696 | 696 | { |
| 697 | 697 | if (!empty($this->_duplicateIndex[$nameAfter])) { |
| 698 | - $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "' . $nameAfter . '" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true); |
|
| 698 | + $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "'.$nameAfter.'" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true); |
|
| 699 | 699 | return $error; |
| 700 | 700 | } elseif (!$this->elementExists($nameAfter)) { |
| 701 | 701 | $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$nameAfter' does not exist in HTML_QuickForm::insertElementBefore()", 'HTML_QuickForm_Error', true); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | for ($i = end($elKeys); $i >= $targetIdx; $i--) { |
| 718 | 718 | if (isset($this->_elements[$i])) { |
| 719 | 719 | $currentName = $this->_elements[$i]->getName(); |
| 720 | - $this->_elements[$i + 1] =& $this->_elements[$i]; |
|
| 720 | + $this->_elements[$i + 1] = & $this->_elements[$i]; |
|
| 721 | 721 | if ($this->_elementIndex[$currentName] == $i) { |
| 722 | 722 | $this->_elementIndex[$currentName] = $i + 1; |
| 723 | 723 | } else { |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | } |
| 729 | 729 | } |
| 730 | 730 | // Put the element in place finally |
| 731 | - $this->_elements[$targetIdx] =& $element; |
|
| 731 | + $this->_elements[$targetIdx] = & $element; |
|
| 732 | 732 | if (!$duplicate) { |
| 733 | 733 | $this->_elementIndex[$elementName] = $targetIdx; |
| 734 | 734 | } else { |
@@ -759,12 +759,12 @@ discard block |
||
| 759 | 759 | * @access public |
| 760 | 760 | * @throws HTML_QuickForm_Error |
| 761 | 761 | */ |
| 762 | - function &addGroup($elements, $name=null, $groupLabel='', $separator=null, $appendName = true) |
|
| 762 | + function &addGroup($elements, $name = null, $groupLabel = '', $separator = null, $appendName = true) |
|
| 763 | 763 | { |
| 764 | 764 | static $anonGroups = 1; |
| 765 | 765 | |
| 766 | 766 | if (0 == strlen($name)) { |
| 767 | - $name = 'qf_group_' . $anonGroups++; |
|
| 767 | + $name = 'qf_group_'.$anonGroups++; |
|
| 768 | 768 | $appendName = false; |
| 769 | 769 | } |
| 770 | 770 | $group = & $this->addElement('group', $name, $groupLabel, $elements, $separator, $appendName); |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | if (is_array($value)) { |
| 822 | 822 | $value[] = $v; |
| 823 | 823 | } else { |
| 824 | - $value = (null === $value)? $v: array($value, $v); |
|
| 824 | + $value = (null === $value) ? $v : array($value, $v); |
|
| 825 | 825 | } |
| 826 | 826 | } |
| 827 | 827 | } |
@@ -844,7 +844,7 @@ discard block |
||
| 844 | 844 | { |
| 845 | 845 | $value = null; |
| 846 | 846 | if (isset($this->_submitValues[$elementName]) || isset($this->_submitFiles[$elementName])) { |
| 847 | - $value = isset($this->_submitValues[$elementName])? $this->_submitValues[$elementName]: array(); |
|
| 847 | + $value = isset($this->_submitValues[$elementName]) ? $this->_submitValues[$elementName] : array(); |
|
| 848 | 848 | if (is_array($value) && isset($this->_submitFiles[$elementName])) { |
| 849 | 849 | foreach ($this->_submitFiles[$elementName] as $k => $v) { |
| 850 | 850 | $value = HTML_QuickForm::arrayMerge($value, $this->_reindexFiles($this->_submitFiles[$elementName][$k], $k)); |
@@ -859,34 +859,34 @@ discard block |
||
| 859 | 859 | array('\\', '\''), array('\\\\', '\\\''), |
| 860 | 860 | substr($elementName, 0, $pos) |
| 861 | 861 | ); |
| 862 | - $idx = "['" . str_replace( |
|
| 862 | + $idx = "['".str_replace( |
|
| 863 | 863 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 864 | 864 | substr($elementName, $pos + 1, -1) |
| 865 | - ) . "']"; |
|
| 865 | + )."']"; |
|
| 866 | 866 | if (isset($this->_submitValues[$base])) { |
| 867 | 867 | $value = eval("return (isset(\$this->_submitValues['{$base}']{$idx})) ? \$this->_submitValues['{$base}']{$idx} : null;"); |
| 868 | 868 | } |
| 869 | 869 | |
| 870 | 870 | if ((is_array($value) || null === $value) && isset($this->_submitFiles[$base])) { |
| 871 | 871 | $props = array('name', 'type', 'size', 'tmp_name', 'error'); |
| 872 | - $code = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n" . |
|
| 873 | - " return null;\n" . |
|
| 874 | - "} else {\n" . |
|
| 872 | + $code = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n". |
|
| 873 | + " return null;\n". |
|
| 874 | + "} else {\n". |
|
| 875 | 875 | " \$v = array();\n"; |
| 876 | 876 | foreach ($props as $prop) { |
| 877 | 877 | $code .= " \$v = HTML_QuickForm::arrayMerge(\$v, \$this->_reindexFiles(\$this->_submitFiles['{$base}']['{$prop}']{$idx}, '{$prop}'));\n"; |
| 878 | 878 | } |
| 879 | - $fileValue = eval($code . " return \$v;\n}\n"); |
|
| 879 | + $fileValue = eval($code." return \$v;\n}\n"); |
|
| 880 | 880 | if (null !== $fileValue) { |
| 881 | - $value = null === $value? $fileValue: HTML_QuickForm::arrayMerge($value, $fileValue); |
|
| 881 | + $value = null === $value ? $fileValue : HTML_QuickForm::arrayMerge($value, $fileValue); |
|
| 882 | 882 | } |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | // This is only supposed to work for groups with appendName = false |
| 887 | 887 | if (null === $value && 'group' == $this->getElementType($elementName)) { |
| 888 | - $group =& $this->getElement($elementName); |
|
| 889 | - $elements =& $group->getElements(); |
|
| 888 | + $group = & $this->getElement($elementName); |
|
| 889 | + $elements = & $group->getElements(); |
|
| 890 | 890 | foreach (array_keys($elements) as $key) { |
| 891 | 891 | $name = $group->getElementName($key); |
| 892 | 892 | // prevent endless recursion in case of radios and such |
@@ -1049,7 +1049,7 @@ discard block |
||
| 1049 | 1049 | $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$elementName' does not exist in HTML_QuickForm::removeElement()", 'HTML_QuickForm_Error', true); |
| 1050 | 1050 | return $error; |
| 1051 | 1051 | } |
| 1052 | - $el =& $this->_elements[$this->_elementIndex[$elementName]]; |
|
| 1052 | + $el = & $this->_elements[$this->_elementIndex[$elementName]]; |
|
| 1053 | 1053 | unset($this->_elements[$this->_elementIndex[$elementName]]); |
| 1054 | 1054 | if (empty($this->_duplicateIndex[$elementName])) { |
| 1055 | 1055 | unset($this->_elementIndex[$elementName]); |
@@ -1148,7 +1148,7 @@ discard block |
||
| 1148 | 1148 | $this->_rules[$element] = array(); |
| 1149 | 1149 | } |
| 1150 | 1150 | if ($validation == 'client') { |
| 1151 | - $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);')); |
|
| 1151 | + $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);')); |
|
| 1152 | 1152 | } |
| 1153 | 1153 | $this->_rules[$element][] = array( |
| 1154 | 1154 | 'type' => $type, |
@@ -1181,20 +1181,20 @@ discard block |
||
| 1181 | 1181 | * @access public |
| 1182 | 1182 | * @throws HTML_QuickForm_Error |
| 1183 | 1183 | */ |
| 1184 | - function addGroupRule($group, $arg1, $type='', $format=null, $howmany=0, $validation = 'server', $reset = false) |
|
| 1184 | + function addGroupRule($group, $arg1, $type = '', $format = null, $howmany = 0, $validation = 'server', $reset = false) |
|
| 1185 | 1185 | { |
| 1186 | 1186 | if (!$this->elementExists($group)) { |
| 1187 | 1187 | return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Group '$group' does not exist in HTML_QuickForm::addGroupRule()", 'HTML_QuickForm_Error', true); |
| 1188 | 1188 | } |
| 1189 | 1189 | |
| 1190 | - $groupObj =& $this->getElement($group); |
|
| 1190 | + $groupObj = & $this->getElement($group); |
|
| 1191 | 1191 | if (is_array($arg1)) { |
| 1192 | 1192 | $required = 0; |
| 1193 | 1193 | foreach ($arg1 as $elementIndex => $rules) { |
| 1194 | 1194 | $elementName = $groupObj->getElementName($elementIndex); |
| 1195 | 1195 | foreach ($rules as $rule) { |
| 1196 | 1196 | $format = (isset($rule[2])) ? $rule[2] : null; |
| 1197 | - $validation = (isset($rule[3]) && 'client' == $rule[3])? 'client': 'server'; |
|
| 1197 | + $validation = (isset($rule[3]) && 'client' == $rule[3]) ? 'client' : 'server'; |
|
| 1198 | 1198 | $reset = isset($rule[4]) && $rule[4]; |
| 1199 | 1199 | $type = $rule[1]; |
| 1200 | 1200 | if (false === ($newName = $this->isRuleRegistered($type, true))) { |
@@ -1218,7 +1218,7 @@ discard block |
||
| 1218 | 1218 | $required++; |
| 1219 | 1219 | } |
| 1220 | 1220 | if ('client' == $validation) { |
| 1221 | - $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);')); |
|
| 1221 | + $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);')); |
|
| 1222 | 1222 | } |
| 1223 | 1223 | } |
| 1224 | 1224 | } |
@@ -1255,7 +1255,7 @@ discard block |
||
| 1255 | 1255 | $this->_required[] = $group; |
| 1256 | 1256 | } |
| 1257 | 1257 | if ($validation == 'client') { |
| 1258 | - $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);')); |
|
| 1258 | + $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);')); |
|
| 1259 | 1259 | } |
| 1260 | 1260 | } |
| 1261 | 1261 | } // end func addGroupRule |
@@ -1312,10 +1312,10 @@ discard block |
||
| 1312 | 1312 | if (false === strpos($elName, '[')) { |
| 1313 | 1313 | $this->_submitValues[$elName] = $this->_recursiveFilter($filter, $value); |
| 1314 | 1314 | } else { |
| 1315 | - $idx = "['" . str_replace( |
|
| 1315 | + $idx = "['".str_replace( |
|
| 1316 | 1316 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 1317 | 1317 | $elName |
| 1318 | - ) . "']"; |
|
| 1318 | + )."']"; |
|
| 1319 | 1319 | eval("\$this->_submitValues{$idx} = \$this->_recursiveFilter(\$filter, \$value);"); |
| 1320 | 1320 | } |
| 1321 | 1321 | } |
@@ -1432,7 +1432,7 @@ discard block |
||
| 1432 | 1432 | } |
| 1433 | 1433 | $ruleName = false; |
| 1434 | 1434 | if (is_object($name) && is_a($name, 'html_quickform_rule')) { |
| 1435 | - $ruleName = !empty($name->name)? $name->name: strtolower(get_class($name)); |
|
| 1435 | + $ruleName = !empty($name->name) ? $name->name : strtolower(get_class($name)); |
|
| 1436 | 1436 | } elseif (is_string($name) && class_exists($name)) { |
| 1437 | 1437 | $parent = strtolower($name); |
| 1438 | 1438 | do { |
@@ -1443,7 +1443,7 @@ discard block |
||
| 1443 | 1443 | } while ($parent = get_parent_class($parent)); |
| 1444 | 1444 | } |
| 1445 | 1445 | if ($ruleName) { |
| 1446 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1446 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1447 | 1447 | $registry->registerRule($ruleName, null, $name); |
| 1448 | 1448 | } |
| 1449 | 1449 | return $ruleName; |
@@ -1564,7 +1564,7 @@ discard block |
||
| 1564 | 1564 | return false; |
| 1565 | 1565 | } |
| 1566 | 1566 | |
| 1567 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1567 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1568 | 1568 | |
| 1569 | 1569 | foreach ($this->_rules as $target => $rules) { |
| 1570 | 1570 | $submitValue = $this->getSubmitValue($target); |
@@ -1595,10 +1595,10 @@ discard block |
||
| 1595 | 1595 | array('\\', '\''), array('\\\\', '\\\''), |
| 1596 | 1596 | substr($target, 0, $pos) |
| 1597 | 1597 | ); |
| 1598 | - $idx = "['" . str_replace( |
|
| 1598 | + $idx = "['".str_replace( |
|
| 1599 | 1599 | array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), |
| 1600 | 1600 | substr($target, $pos + 1, -1) |
| 1601 | - ) . "']"; |
|
| 1601 | + )."']"; |
|
| 1602 | 1602 | eval("\$isUpload = isset(\$this->_submitFiles['{$base}']['name']{$idx});"); |
| 1603 | 1603 | } |
| 1604 | 1604 | if ($isUpload && (!isset($submitValue['error']) || UPLOAD_ERR_NO_FILE == $submitValue['error'])) { |
@@ -1618,7 +1618,7 @@ discard block |
||
| 1618 | 1618 | $result = $registry->validate($rule['type'], $submitValue, $rule['format'], false); |
| 1619 | 1619 | } |
| 1620 | 1620 | |
| 1621 | - if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int)$result)) { |
|
| 1621 | + if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int) $result)) { |
|
| 1622 | 1622 | if (isset($rule['group'])) { |
| 1623 | 1623 | $this->_errors[$rule['group']] = $rule['message']; |
| 1624 | 1624 | } else { |
@@ -1650,7 +1650,7 @@ discard block |
||
| 1650 | 1650 | * @access public |
| 1651 | 1651 | * @throws HTML_QuickForm_Error |
| 1652 | 1652 | */ |
| 1653 | - function freeze($elementList=null) |
|
| 1653 | + function freeze($elementList = null) |
|
| 1654 | 1654 | { |
| 1655 | 1655 | if (!isset($elementList)) { |
| 1656 | 1656 | $this->_freezeAll = true; |
@@ -1671,7 +1671,7 @@ discard block |
||
| 1671 | 1671 | } |
| 1672 | 1672 | |
| 1673 | 1673 | if (!empty($elementList)) { |
| 1674 | - return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '" . implode("', '", array_keys($elementList)) . "' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true); |
|
| 1674 | + return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '".implode("', '", array_keys($elementList))."' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true); |
|
| 1675 | 1675 | } |
| 1676 | 1676 | return true; |
| 1677 | 1677 | } |
@@ -1718,7 +1718,7 @@ discard block |
||
| 1718 | 1718 | function accept(&$renderer) { |
| 1719 | 1719 | $renderer->startForm($this); |
| 1720 | 1720 | foreach (array_keys($this->_elements) as $key) { |
| 1721 | - $element =& $this->_elements[$key]; |
|
| 1721 | + $element = & $this->_elements[$key]; |
|
| 1722 | 1722 | $elementName = $element->getName(); |
| 1723 | 1723 | $required = ($this->isElementRequired($elementName) && !$element->isFrozen()); |
| 1724 | 1724 | $error = $this->getElementError($elementName); |
@@ -1758,7 +1758,7 @@ discard block |
||
| 1758 | 1758 | if (!is_null($in_data)) { |
| 1759 | 1759 | $this->addElement('html', $in_data); |
| 1760 | 1760 | } |
| 1761 | - $renderer =& $this->defaultRenderer(); |
|
| 1761 | + $renderer = & $this->defaultRenderer(); |
|
| 1762 | 1762 | $this->accept($renderer); |
| 1763 | 1763 | |
| 1764 | 1764 | return $renderer->toHtml(); |
@@ -1777,7 +1777,7 @@ discard block |
||
| 1777 | 1777 | return ''; |
| 1778 | 1778 | } |
| 1779 | 1779 | |
| 1780 | - $registry =& HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1780 | + $registry = & HTML_QuickForm_RuleRegistry::singleton(); |
|
| 1781 | 1781 | $test = array(); |
| 1782 | 1782 | $js_escape = array( |
| 1783 | 1783 | "\r" => '\r', |
@@ -1793,30 +1793,30 @@ discard block |
||
| 1793 | 1793 | if ('client' == $rule['validation']) { |
| 1794 | 1794 | unset($element); |
| 1795 | 1795 | |
| 1796 | - $dependent = isset($rule['dependent']) && is_array($rule['dependent']); |
|
| 1796 | + $dependent = isset($rule['dependent']) && is_array($rule['dependent']); |
|
| 1797 | 1797 | $rule['message'] = strtr($rule['message'], $js_escape); |
| 1798 | 1798 | |
| 1799 | 1799 | if (isset($rule['group'])) { |
| 1800 | - $group =& $this->getElement($rule['group']); |
|
| 1800 | + $group = & $this->getElement($rule['group']); |
|
| 1801 | 1801 | // No JavaScript validation for frozen elements |
| 1802 | 1802 | if ($group->isFrozen()) { |
| 1803 | 1803 | continue 2; |
| 1804 | 1804 | } |
| 1805 | - $elements =& $group->getElements(); |
|
| 1805 | + $elements = & $group->getElements(); |
|
| 1806 | 1806 | foreach (array_keys($elements) as $key) { |
| 1807 | 1807 | if ($elementName == $group->getElementName($key)) { |
| 1808 | - $element =& $elements[$key]; |
|
| 1808 | + $element = & $elements[$key]; |
|
| 1809 | 1809 | break; |
| 1810 | 1810 | } |
| 1811 | 1811 | } |
| 1812 | 1812 | } elseif ($dependent) { |
| 1813 | - $element = array(); |
|
| 1814 | - $element[] =& $this->getElement($elementName); |
|
| 1813 | + $element = array(); |
|
| 1814 | + $element[] = & $this->getElement($elementName); |
|
| 1815 | 1815 | foreach ($rule['dependent'] as $elName) { |
| 1816 | - $element[] =& $this->getElement($elName); |
|
| 1816 | + $element[] = & $this->getElement($elName); |
|
| 1817 | 1817 | } |
| 1818 | 1818 | } else { |
| 1819 | - $element =& $this->getElement($elementName); |
|
| 1819 | + $element = & $this->getElement($elementName); |
|
| 1820 | 1820 | } |
| 1821 | 1821 | // No JavaScript validation for frozen elements |
| 1822 | 1822 | if (is_object($element) && $element->isFrozen()) { |
@@ -1835,23 +1835,23 @@ discard block |
||
| 1835 | 1835 | } |
| 1836 | 1836 | if (count($test) > 0) { |
| 1837 | 1837 | return |
| 1838 | - "\n<script type=\"text/javascript\">\n" . |
|
| 1839 | - "//<![CDATA[\n" . |
|
| 1840 | - "function validate_" . $this->_attributes['id'] . "(frm) {\n" . |
|
| 1841 | - " var value = '';\n" . |
|
| 1842 | - " var errFlag = new Array();\n" . |
|
| 1843 | - " var _qfGroups = {};\n" . |
|
| 1844 | - " _qfMsg = '';\n\n" . |
|
| 1845 | - join("\n", $test) . |
|
| 1846 | - "\n if (_qfMsg != '') {\n" . |
|
| 1847 | - " _qfMsg = '" . strtr($this->_jsPrefix, $js_escape) . "' + _qfMsg;\n" . |
|
| 1848 | - " _qfMsg = _qfMsg + '\\n" . strtr($this->_jsPostfix, $js_escape) . "';\n" . |
|
| 1849 | - " alert(_qfMsg);\n" . |
|
| 1850 | - " return false;\n" . |
|
| 1851 | - " }\n" . |
|
| 1852 | - " return true;\n" . |
|
| 1853 | - "}\n" . |
|
| 1854 | - "//]]>\n" . |
|
| 1838 | + "\n<script type=\"text/javascript\">\n". |
|
| 1839 | + "//<![CDATA[\n". |
|
| 1840 | + "function validate_".$this->_attributes['id']."(frm) {\n". |
|
| 1841 | + " var value = '';\n". |
|
| 1842 | + " var errFlag = new Array();\n". |
|
| 1843 | + " var _qfGroups = {};\n". |
|
| 1844 | + " _qfMsg = '';\n\n". |
|
| 1845 | + join("\n", $test). |
|
| 1846 | + "\n if (_qfMsg != '') {\n". |
|
| 1847 | + " _qfMsg = '".strtr($this->_jsPrefix, $js_escape)."' + _qfMsg;\n". |
|
| 1848 | + " _qfMsg = _qfMsg + '\\n".strtr($this->_jsPostfix, $js_escape)."';\n". |
|
| 1849 | + " alert(_qfMsg);\n". |
|
| 1850 | + " return false;\n". |
|
| 1851 | + " }\n". |
|
| 1852 | + " return true;\n". |
|
| 1853 | + "}\n". |
|
| 1854 | + "//]]>\n". |
|
| 1855 | 1855 | "</script>"; |
| 1856 | 1856 | } |
| 1857 | 1857 | return ''; |
@@ -1867,7 +1867,7 @@ discard block |
||
| 1867 | 1867 | */ |
| 1868 | 1868 | function getSubmitValues($mergeFiles = false) |
| 1869 | 1869 | { |
| 1870 | - return $mergeFiles? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles): $this->_submitValues; |
|
| 1870 | + return $mergeFiles ? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles) : $this->_submitValues; |
|
| 1871 | 1871 | } |
| 1872 | 1872 | |
| 1873 | 1873 | /** |
@@ -1915,7 +1915,7 @@ discard block |
||
| 1915 | 1915 | if (is_array($value)) { |
| 1916 | 1916 | $value[] = $v; |
| 1917 | 1917 | } else { |
| 1918 | - $value = (null === $value)? $v: array($value, $v); |
|
| 1918 | + $value = (null === $value) ? $v : array($value, $v); |
|
| 1919 | 1919 | } |
| 1920 | 1920 | } |
| 1921 | 1921 | } |
@@ -50,7 +50,8 @@ |
||
| 50 | 50 | /** |
| 51 | 51 | * Removes the '..' and '.' segments from the path component |
| 52 | 52 | * |
| 53 | - * @param string Path component of the URL, possibly with '.' and '..' segments |
|
| 53 | + * @param string Path component of the URL, possibly with '.' and '..' segments |
|
| 54 | + * @param string $path |
|
| 54 | 55 | * @return string Path component of the URL with '.' and '..' segments removed |
| 55 | 56 | * @access private |
| 56 | 57 | */ |
@@ -31,13 +31,13 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | class HTML_QuickForm_Action_Jump extends HTML_QuickForm_Action |
| 33 | 33 | {
|
| 34 | - /** |
|
| 35 | - * Splits (part of) the URI into path and query components |
|
| 36 | - * |
|
| 37 | - * @param string String of the form 'foo?bar' |
|
| 38 | - * @return array Array of the form array('foo', '?bar)
|
|
| 39 | - * @access private |
|
| 40 | - */ |
|
| 34 | + /** |
|
| 35 | + * Splits (part of) the URI into path and query components |
|
| 36 | + * |
|
| 37 | + * @param string String of the form 'foo?bar' |
|
| 38 | + * @return array Array of the form array('foo', '?bar)
|
|
| 39 | + * @access private |
|
| 40 | + */ |
|
| 41 | 41 | function _splitUri($uri) |
| 42 | 42 | {
|
| 43 | 43 | if (false === ($qm = strpos($uri, '?'))) {
|
@@ -47,13 +47,13 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * Removes the '..' and '.' segments from the path component |
|
| 52 | - * |
|
| 53 | - * @param string Path component of the URL, possibly with '.' and '..' segments |
|
| 54 | - * @return string Path component of the URL with '.' and '..' segments removed |
|
| 55 | - * @access private |
|
| 56 | - */ |
|
| 50 | + /** |
|
| 51 | + * Removes the '..' and '.' segments from the path component |
|
| 52 | + * |
|
| 53 | + * @param string Path component of the URL, possibly with '.' and '..' segments |
|
| 54 | + * @return string Path component of the URL with '.' and '..' segments removed |
|
| 55 | + * @access private |
|
| 56 | + */ |
|
| 57 | 57 | function _normalizePath($path) |
| 58 | 58 | {
|
| 59 | 59 | $pathAry = explode('/', $path);
|
@@ -84,17 +84,17 @@ discard block |
||
| 84 | 84 | return implode('/', $pathAry);
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - /** |
|
| 88 | - * Resolves relative URL using current page's URL as base |
|
| 89 | - * |
|
| 90 | - * The method follows procedure described in section 4 of RFC 1808 and |
|
| 91 | - * passes the examples provided in section 5 of said RFC. Values from |
|
| 92 | - * $_SERVER array are used for calculation of "current URL" |
|
| 93 | - * |
|
| 94 | - * @param string Relative URL, probably from form's action attribute |
|
| 95 | - * @return string Absolute URL |
|
| 96 | - * @access private |
|
| 97 | - */ |
|
| 87 | + /** |
|
| 88 | + * Resolves relative URL using current page's URL as base |
|
| 89 | + * |
|
| 90 | + * The method follows procedure described in section 4 of RFC 1808 and |
|
| 91 | + * passes the examples provided in section 5 of said RFC. Values from |
|
| 92 | + * $_SERVER array are used for calculation of "current URL" |
|
| 93 | + * |
|
| 94 | + * @param string Relative URL, probably from form's action attribute |
|
| 95 | + * @return string Absolute URL |
|
| 96 | + * @access private |
|
| 97 | + */ |
|
| 98 | 98 | function _resolveRelativeURL($url) |
| 99 | 99 | {
|
| 100 | 100 | $https = !empty($_SERVER['HTTPS']) && ('off' != strtolower($_SERVER['HTTPS']));
|
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | } else {
|
| 106 | 106 | $host = $scheme . '//' . $_SERVER['SERVER_NAME'] . |
| 107 | - (($https && 443 == $_SERVER['SERVER_PORT'] || |
|
| 107 | + (($https && 443 == $_SERVER['SERVER_PORT'] || |
|
| 108 | 108 | !$https && 80 == $_SERVER['SERVER_PORT'])? '': ':' . $_SERVER['SERVER_PORT']); |
| 109 | 109 | if ('' == $url) {
|
| 110 | 110 | return $host . $_SERVER['REQUEST_URI']; |
@@ -148,8 +148,8 @@ discard block |
||
| 148 | 148 | $action = $this->_resolveRelativeURL($action); |
| 149 | 149 | } |
| 150 | 150 | $url = $action . (false === strpos($action, '?')? '?': '&') . |
| 151 | - $current->getButtonName('display') . '=true' .
|
|
| 152 | - ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);
|
|
| 151 | + $current->getButtonName('display') . '=true' .
|
|
| 152 | + ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);
|
|
| 153 | 153 | header('Location: ' . $url);
|
| 154 | 154 | exit; |
| 155 | 155 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | } elseif ('..' == $pathAry[$i] && $i > 1 && '..' != $pathAry[$i - 1]) {
|
| 72 | - if ($i < count($pathAry) -1) {
|
|
| 72 | + if ($i < count($pathAry) - 1) {
|
|
| 73 | 73 | array_splice($pathAry, $i - 1, 2); |
| 74 | 74 | $i--; |
| 75 | 75 | } else {
|
@@ -98,28 +98,28 @@ discard block |
||
| 98 | 98 | function _resolveRelativeURL($url) |
| 99 | 99 | {
|
| 100 | 100 | $https = !empty($_SERVER['HTTPS']) && ('off' != strtolower($_SERVER['HTTPS']));
|
| 101 | - $scheme = ($https? 'https:': 'http:'); |
|
| 101 | + $scheme = ($https ? 'https:' : 'http:'); |
|
| 102 | 102 | if ('//' == substr($url, 0, 2)) {
|
| 103 | - return $scheme . $url; |
|
| 103 | + return $scheme.$url; |
|
| 104 | 104 | |
| 105 | 105 | } else {
|
| 106 | - $host = $scheme . '//' . $_SERVER['SERVER_NAME'] . |
|
| 106 | + $host = $scheme.'//'.$_SERVER['SERVER_NAME']. |
|
| 107 | 107 | (($https && 443 == $_SERVER['SERVER_PORT'] || |
| 108 | - !$https && 80 == $_SERVER['SERVER_PORT'])? '': ':' . $_SERVER['SERVER_PORT']); |
|
| 108 | + !$https && 80 == $_SERVER['SERVER_PORT']) ? '' : ':'.$_SERVER['SERVER_PORT']); |
|
| 109 | 109 | if ('' == $url) {
|
| 110 | - return $host . $_SERVER['REQUEST_URI']; |
|
| 110 | + return $host.$_SERVER['REQUEST_URI']; |
|
| 111 | 111 | |
| 112 | 112 | } elseif ('/' == $url[0]) {
|
| 113 | - return $host . $url; |
|
| 113 | + return $host.$url; |
|
| 114 | 114 | |
| 115 | 115 | } else {
|
| 116 | 116 | list($basePath, $baseQuery) = $this->_splitUri($_SERVER['REQUEST_URI']); |
| 117 | 117 | list($actPath, $actQuery) = $this->_splitUri($url); |
| 118 | 118 | if ('' == $actPath) {
|
| 119 | - return $host . $basePath . $actQuery; |
|
| 119 | + return $host.$basePath.$actQuery; |
|
| 120 | 120 | } else {
|
| 121 | - $path = substr($basePath, 0, strrpos($basePath, '/') + 1) . $actPath; |
|
| 122 | - return $host . $this->_normalizePath($path) . $actQuery; |
|
| 121 | + $path = substr($basePath, 0, strrpos($basePath, '/') + 1).$actPath; |
|
| 122 | + return $host.$this->_normalizePath($path).$actQuery; |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | if (!$page->controller->isValid($pageName)) {
|
| 137 | 137 | $pageName = $page->controller->findInvalid(); |
| 138 | 138 | } |
| 139 | - $current =& $page->controller->getPage($pageName); |
|
| 139 | + $current = & $page->controller->getPage($pageName); |
|
| 140 | 140 | |
| 141 | 141 | } else {
|
| 142 | - $current =& $page; |
|
| 142 | + $current = & $page; |
|
| 143 | 143 | } |
| 144 | 144 | // generate the URL for the page 'display' event and redirect to it |
| 145 | 145 | $action = $current->getAttribute('action');
|
@@ -147,10 +147,10 @@ discard block |
||
| 147 | 147 | if (!preg_match('!^https?://!i', $action)) {
|
| 148 | 148 | $action = $this->_resolveRelativeURL($action); |
| 149 | 149 | } |
| 150 | - $url = $action . (false === strpos($action, '?')? '?': '&') . |
|
| 151 | - $current->getButtonName('display') . '=true' .
|
|
| 152 | - ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);
|
|
| 153 | - header('Location: ' . $url);
|
|
| 150 | + $url = $action.(false === strpos($action, '?') ? '?' : '&'). |
|
| 151 | + $current->getButtonName('display').'=true'.
|
|
| 152 | + ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies')) ? '' : '&'.SID);
|
|
| 153 | + header('Location: '.$url);
|
|
| 154 | 154 | exit; |
| 155 | 155 | } |
| 156 | 156 | } |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | /** |
| 9 | 9 | * Class constructor |
| 10 | 10 | * |
| 11 | - * @param string $text raw HTML to add |
|
| 12 | 11 | * @access public |
| 13 | 12 | * @return void |
| 14 | 13 | */ |
@@ -6,12 +6,12 @@ discard block |
||
| 6 | 6 | class HTML_QuickForm_advanced_settings extends HTML_QuickForm_static |
| 7 | 7 | { |
| 8 | 8 | /** |
| 9 | - * Class constructor |
|
| 10 | - * |
|
| 11 | - * @param string $text raw HTML to add |
|
| 12 | - * @access public |
|
| 13 | - * @return void |
|
| 14 | - */ |
|
| 9 | + * Class constructor |
|
| 10 | + * |
|
| 11 | + * @param string $text raw HTML to add |
|
| 12 | + * @access public |
|
| 13 | + * @return void |
|
| 14 | + */ |
|
| 15 | 15 | public function __construct($name = '', $label = '') |
| 16 | 16 | { |
| 17 | 17 | if (empty($label)) { |
@@ -26,13 +26,13 @@ discard block |
||
| 26 | 26 | $this->_type = 'html'; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * Accepts a renderer |
|
| 31 | - * |
|
| 32 | - * @param HTML_QuickForm_Renderer renderer object (only works with Default renderer!) |
|
| 33 | - * @access public |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 29 | + /** |
|
| 30 | + * Accepts a renderer |
|
| 31 | + * |
|
| 32 | + * @param HTML_QuickForm_Renderer renderer object (only works with Default renderer!) |
|
| 33 | + * @access public |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | 36 | function accept(&$renderer, $required = false, $error = null) |
| 37 | 37 | { |
| 38 | 38 | $renderer->renderHtml($this); |
@@ -234,7 +234,7 @@ |
||
| 234 | 234 | * @param object &$caller calling object |
| 235 | 235 | * @since 1.0 |
| 236 | 236 | * @access public |
| 237 | - * @return void |
|
| 237 | + * @return boolean |
|
| 238 | 238 | */ |
| 239 | 239 | function onQuickFormEvent($event, $arg, &$caller) |
| 240 | 240 | { |
@@ -156,12 +156,12 @@ discard block |
||
| 156 | 156 | // }}} |
| 157 | 157 | // {{{ setValue() |
| 158 | 158 | |
| 159 | - /** |
|
| 160 | - * Sets the element's value |
|
| 161 | - * |
|
| 162 | - * @param mixed Element's value |
|
| 163 | - * @access public |
|
| 164 | - */ |
|
| 159 | + /** |
|
| 160 | + * Sets the element's value |
|
| 161 | + * |
|
| 162 | + * @param mixed Element's value |
|
| 163 | + * @access public |
|
| 164 | + */ |
|
| 165 | 165 | function setValue($value) |
| 166 | 166 | { |
| 167 | 167 | $this->setChecked(isset($this->_values[1]) && $value == $this->_values[1]); |
@@ -171,12 +171,12 @@ discard block |
||
| 171 | 171 | // }}} |
| 172 | 172 | // {{{ getValue() |
| 173 | 173 | |
| 174 | - /** |
|
| 175 | - * Returns the element's value |
|
| 176 | - * |
|
| 177 | - * @access public |
|
| 178 | - * @return mixed |
|
| 179 | - */ |
|
| 174 | + /** |
|
| 175 | + * Returns the element's value |
|
| 176 | + * |
|
| 177 | + * @access public |
|
| 178 | + * @return mixed |
|
| 179 | + */ |
|
| 180 | 180 | function getValue() |
| 181 | 181 | { |
| 182 | 182 | if (is_array($this->_values)) { |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | 'type' => 'hidden', |
| 206 | 206 | 'name' => $this->getName(), |
| 207 | 207 | 'value' => $this->_values[0] |
| 208 | - )) . ' />' . parent::toHtml(); |
|
| 208 | + )) . ' />' . parent::toHtml(); |
|
| 209 | 209 | |
| 210 | 210 | } |
| 211 | 211 | } //end func toHtml |
@@ -213,14 +213,14 @@ discard block |
||
| 213 | 213 | // }}} |
| 214 | 214 | // {{{ getFrozenHtml() |
| 215 | 215 | |
| 216 | - /** |
|
| 217 | - * Unlike checkbox, this has to append a hidden input in both |
|
| 218 | - * checked and non-checked states |
|
| 219 | - */ |
|
| 216 | + /** |
|
| 217 | + * Unlike checkbox, this has to append a hidden input in both |
|
| 218 | + * checked and non-checked states |
|
| 219 | + */ |
|
| 220 | 220 | function getFrozenHtml() |
| 221 | 221 | { |
| 222 | 222 | return ($this->getChecked()? '<tt>[x]</tt>': '<tt>[ ]</tt>') . |
| 223 | - $this->_getPersistantData(); |
|
| 223 | + $this->_getPersistantData(); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | // }}} |
@@ -262,10 +262,10 @@ discard block |
||
| 262 | 262 | // }}} |
| 263 | 263 | // {{{ exportValue() |
| 264 | 264 | |
| 265 | - /** |
|
| 266 | - * This element has a value even if it is not checked, thus we override |
|
| 267 | - * checkbox's behaviour here |
|
| 268 | - */ |
|
| 265 | + /** |
|
| 266 | + * This element has a value even if it is not checked, thus we override |
|
| 267 | + * checkbox's behaviour here |
|
| 268 | + */ |
|
| 269 | 269 | function exportValue(&$submitValues, $assoc) |
| 270 | 270 | { |
| 271 | 271 | $value = $this->_findValue($submitValues); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * @access public |
| 82 | 82 | * @return void |
| 83 | 83 | */ |
| 84 | - function HTML_QuickForm_advcheckbox($elementName=null, $elementLabel=null, $text=null, $attributes=null, $values=null) |
|
| 84 | + function HTML_QuickForm_advcheckbox($elementName = null, $elementLabel = null, $text = null, $attributes = null, $values = null) |
|
| 85 | 85 | { |
| 86 | 86 | $this->HTML_QuickForm_checkbox($elementName, $elementLabel, $text, $attributes); |
| 87 | 87 | $this->setValues($values); |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | function getValue() |
| 181 | 181 | { |
| 182 | 182 | if (is_array($this->_values)) { |
| 183 | - return $this->_values[$this->getChecked()? 1: 0]; |
|
| 183 | + return $this->_values[$this->getChecked() ? 1 : 0]; |
|
| 184 | 184 | } else { |
| 185 | 185 | return null; |
| 186 | 186 | } |
@@ -201,11 +201,11 @@ discard block |
||
| 201 | 201 | if ($this->_flagFrozen) { |
| 202 | 202 | return parent::toHtml(); |
| 203 | 203 | } else { |
| 204 | - return '<input' . $this->_getAttrString(array( |
|
| 204 | + return '<input'.$this->_getAttrString(array( |
|
| 205 | 205 | 'type' => 'hidden', |
| 206 | 206 | 'name' => $this->getName(), |
| 207 | 207 | 'value' => $this->_values[0] |
| 208 | - )) . ' />' . parent::toHtml(); |
|
| 208 | + )).' />'.parent::toHtml(); |
|
| 209 | 209 | |
| 210 | 210 | } |
| 211 | 211 | } //end func toHtml |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | */ |
| 220 | 220 | function getFrozenHtml() |
| 221 | 221 | { |
| 222 | - return ($this->getChecked()? '<tt>[x]</tt>': '<tt>[ ]</tt>') . |
|
| 222 | + return ($this->getChecked() ? '<tt>[x]</tt>' : '<tt>[ ]</tt>'). |
|
| 223 | 223 | $this->_getPersistantData(); |
| 224 | 224 | } |
| 225 | 225 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
| 120 | - * @param mixed $class |
|
| 120 | + * @param string|null $class |
|
| 121 | 121 | */ |
| 122 | 122 | public function setClass($class) |
| 123 | 123 | { |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | /** |
| 128 | - * @return mixed |
|
| 128 | + * @return string|null |
|
| 129 | 129 | */ |
| 130 | 130 | public function getIcon() |
| 131 | 131 | { |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
| 136 | - * @param mixed $icon |
|
| 136 | + * @param string $icon |
|
| 137 | 137 | */ |
| 138 | 138 | public function setIcon($icon) |
| 139 | 139 | { |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * @return mixed |
|
| 144 | + * @return string|null |
|
| 145 | 145 | */ |
| 146 | 146 | public function getStyle() |
| 147 | 147 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
| 152 | - * @param mixed $style |
|
| 152 | + * @param string $style |
|
| 153 | 153 | */ |
| 154 | 154 | public function setStyle($style) |
| 155 | 155 | { |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | $this->columnsSize = $columnsSize; |
| 181 | 181 | } |
| 182 | 182 | /** |
| 183 | - * @param mixed $size |
|
| 183 | + * @param string $size |
|
| 184 | 184 | */ |
| 185 | 185 | public function setSize($size) |
| 186 | 186 | { |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | * Freeze the element so that only its value is returned |
| 208 | 208 | * |
| 209 | 209 | * @access public |
| 210 | - * @return void |
|
| 210 | + * @return boolean |
|
| 211 | 211 | */ |
| 212 | 212 | public function freeze() |
| 213 | 213 | { |
@@ -94,14 +94,14 @@ |
||
| 94 | 94 | $icon = $this->getIcon(); |
| 95 | 95 | |
| 96 | 96 | if (!empty($icon)) { |
| 97 | - $icon = '<em class="' . $this->getIcon() . '"></em> '; |
|
| 97 | + $icon = '<em class="'.$this->getIcon().'"></em> '; |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | $class = $this->getClass().' '.$this->getStyle().' '.$this->getSize(); |
| 101 | 101 | |
| 102 | 102 | return |
| 103 | - $this->_getTabs() . ' |
|
| 104 | - <button class="'.$class.'" ' . $this->_getAttrString($this->_attributes) . '>'. |
|
| 103 | + $this->_getTabs().' |
|
| 104 | + <button class="'.$class.'" '.$this->_getAttrString($this->_attributes).'>'. |
|
| 105 | 105 | $icon. |
| 106 | 106 | $value. |
| 107 | 107 | '</button>'; |
@@ -191,6 +191,7 @@ |
||
| 191 | 191 | * @access public |
| 192 | 192 | * @param HTML_QuickForm_Page The page that failed to handle the action |
| 193 | 193 | * @param string Name of the action |
| 194 | + * @param HTML_QuickForm_Page $page |
|
| 194 | 195 | * @throws PEAR_Error |
| 195 | 196 | */ |
| 196 | 197 | function handle(&$page, $actionName) |
@@ -40,48 +40,48 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | class HTML_QuickForm_Controller |
| 42 | 42 | { |
| 43 | - /** |
|
| 44 | - * Contains the pages (HTML_QuickForm_Page objects) of the miultipage form |
|
| 45 | - * @var array |
|
| 46 | - */ |
|
| 43 | + /** |
|
| 44 | + * Contains the pages (HTML_QuickForm_Page objects) of the miultipage form |
|
| 45 | + * @var array |
|
| 46 | + */ |
|
| 47 | 47 | var $_pages = array(); |
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Contains the mapping of actions to corresponding HTML_QuickForm_Action objects |
|
| 51 | - * @var array |
|
| 52 | - */ |
|
| 49 | + /** |
|
| 50 | + * Contains the mapping of actions to corresponding HTML_QuickForm_Action objects |
|
| 51 | + * @var array |
|
| 52 | + */ |
|
| 53 | 53 | var $_actions = array(); |
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * Name of the form, used to store the values in session |
|
| 57 | - * @var string |
|
| 58 | - */ |
|
| 55 | + /** |
|
| 56 | + * Name of the form, used to store the values in session |
|
| 57 | + * @var string |
|
| 58 | + */ |
|
| 59 | 59 | var $_name; |
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * Whether the form is modal |
|
| 63 | - * @var bool |
|
| 64 | - */ |
|
| 61 | + /** |
|
| 62 | + * Whether the form is modal |
|
| 63 | + * @var bool |
|
| 64 | + */ |
|
| 65 | 65 | var $_modal = true; |
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * The action extracted from HTTP request: array('page', 'action') |
|
| 69 | - * @var array |
|
| 70 | - */ |
|
| 67 | + /** |
|
| 68 | + * The action extracted from HTTP request: array('page', 'action') |
|
| 69 | + * @var array |
|
| 70 | + */ |
|
| 71 | 71 | var $_actionName = null; |
| 72 | 72 | |
| 73 | - /** |
|
| 74 | - * Class constructor. |
|
| 75 | - * |
|
| 76 | - * Sets the form name and modal/non-modal behaviuor. Different multipage |
|
| 77 | - * forms should have different names, as they are used to store form |
|
| 78 | - * values in session. Modal forms allow passing to the next page only when |
|
| 79 | - * all of the previous pages are valid. |
|
| 80 | - * |
|
| 81 | - * @access public |
|
| 82 | - * @param string form name |
|
| 83 | - * @param bool whether the form is modal |
|
| 84 | - */ |
|
| 73 | + /** |
|
| 74 | + * Class constructor. |
|
| 75 | + * |
|
| 76 | + * Sets the form name and modal/non-modal behaviuor. Different multipage |
|
| 77 | + * forms should have different names, as they are used to store form |
|
| 78 | + * values in session. Modal forms allow passing to the next page only when |
|
| 79 | + * all of the previous pages are valid. |
|
| 80 | + * |
|
| 81 | + * @access public |
|
| 82 | + * @param string form name |
|
| 83 | + * @param bool whether the form is modal |
|
| 84 | + */ |
|
| 85 | 85 | function HTML_QuickForm_Controller($name, $modal = true) |
| 86 | 86 | { |
| 87 | 87 | $this->_name = $name; |
@@ -89,17 +89,17 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * Returns a reference to a session variable containing the form-page |
|
| 94 | - * values and pages' validation status. |
|
| 95 | - * |
|
| 96 | - * This is a "low-level" method, use exportValues() if you want just to |
|
| 97 | - * get the form's values. |
|
| 98 | - * |
|
| 99 | - * @access public |
|
| 100 | - * @param bool If true, then reset the container: clear all default, constant and submitted values |
|
| 101 | - * @return array |
|
| 102 | - */ |
|
| 92 | + /** |
|
| 93 | + * Returns a reference to a session variable containing the form-page |
|
| 94 | + * values and pages' validation status. |
|
| 95 | + * |
|
| 96 | + * This is a "low-level" method, use exportValues() if you want just to |
|
| 97 | + * get the form's values. |
|
| 98 | + * |
|
| 99 | + * @access public |
|
| 100 | + * @param bool If true, then reset the container: clear all default, constant and submitted values |
|
| 101 | + * @return array |
|
| 102 | + */ |
|
| 103 | 103 | function &container($reset = false) |
| 104 | 104 | { |
| 105 | 105 | $name = '_' . $this->_name . '_container'; |
@@ -121,15 +121,15 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | |
| 124 | - /** |
|
| 125 | - * Processes the request. |
|
| 126 | - * |
|
| 127 | - * This finds the current page, the current action and passes the action |
|
| 128 | - * to the page's handle() method. |
|
| 129 | - * |
|
| 130 | - * @access public |
|
| 131 | - * @throws PEAR_Error |
|
| 132 | - */ |
|
| 124 | + /** |
|
| 125 | + * Processes the request. |
|
| 126 | + * |
|
| 127 | + * This finds the current page, the current action and passes the action |
|
| 128 | + * to the page's handle() method. |
|
| 129 | + * |
|
| 130 | + * @access public |
|
| 131 | + * @throws PEAR_Error |
|
| 132 | + */ |
|
| 133 | 133 | function run() |
| 134 | 134 | { |
| 135 | 135 | // the names of the action and page should be saved |
@@ -138,25 +138,25 @@ discard block |
||
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | |
| 141 | - /** |
|
| 142 | - * Registers a handler for a specific action. |
|
| 143 | - * |
|
| 144 | - * @access public |
|
| 145 | - * @param string name of the action |
|
| 146 | - * @param HTML_QuickForm_Action the handler for the action |
|
| 147 | - */ |
|
| 141 | + /** |
|
| 142 | + * Registers a handler for a specific action. |
|
| 143 | + * |
|
| 144 | + * @access public |
|
| 145 | + * @param string name of the action |
|
| 146 | + * @param HTML_QuickForm_Action the handler for the action |
|
| 147 | + */ |
|
| 148 | 148 | function addAction($actionName, &$action) |
| 149 | 149 | { |
| 150 | 150 | $this->_actions[$actionName] =& $action; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Adds a new page to the form |
|
| 156 | - * |
|
| 157 | - * @access public |
|
| 158 | - * @param HTML_QuickForm_Page |
|
| 159 | - */ |
|
| 154 | + /** |
|
| 155 | + * Adds a new page to the form |
|
| 156 | + * |
|
| 157 | + * @access public |
|
| 158 | + * @param HTML_QuickForm_Page |
|
| 159 | + */ |
|
| 160 | 160 | function addPage(&$page) |
| 161 | 161 | { |
| 162 | 162 | $page->controller =& $this; |
@@ -164,14 +164,14 @@ discard block |
||
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | |
| 167 | - /** |
|
| 168 | - * Returns a page |
|
| 169 | - * |
|
| 170 | - * @access public |
|
| 171 | - * @param string Name of a page |
|
| 172 | - * @return HTML_QuickForm_Page A reference to the page |
|
| 173 | - * @throws PEAR_Error |
|
| 174 | - */ |
|
| 167 | + /** |
|
| 168 | + * Returns a page |
|
| 169 | + * |
|
| 170 | + * @access public |
|
| 171 | + * @param string Name of a page |
|
| 172 | + * @return HTML_QuickForm_Page A reference to the page |
|
| 173 | + * @throws PEAR_Error |
|
| 174 | + */ |
|
| 175 | 175 | function &getPage($pageName) |
| 176 | 176 | { |
| 177 | 177 | if (!isset($this->_pages[$pageName])) { |
@@ -181,18 +181,18 @@ discard block |
||
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | |
| 184 | - /** |
|
| 185 | - * Handles an action. |
|
| 186 | - * |
|
| 187 | - * This will be called if the page itself does not have a handler |
|
| 188 | - * to a specific action. The method also loads and uses default handlers |
|
| 189 | - * for common actions, if specific ones were not added. |
|
| 190 | - * |
|
| 191 | - * @access public |
|
| 192 | - * @param HTML_QuickForm_Page The page that failed to handle the action |
|
| 193 | - * @param string Name of the action |
|
| 194 | - * @throws PEAR_Error |
|
| 195 | - */ |
|
| 184 | + /** |
|
| 185 | + * Handles an action. |
|
| 186 | + * |
|
| 187 | + * This will be called if the page itself does not have a handler |
|
| 188 | + * to a specific action. The method also loads and uses default handlers |
|
| 189 | + * for common actions, if specific ones were not added. |
|
| 190 | + * |
|
| 191 | + * @access public |
|
| 192 | + * @param HTML_QuickForm_Page The page that failed to handle the action |
|
| 193 | + * @param string Name of the action |
|
| 194 | + * @throws PEAR_Error |
|
| 195 | + */ |
|
| 196 | 196 | function handle(&$page, $actionName) |
| 197 | 197 | { |
| 198 | 198 | if (isset($this->_actions[$actionName])) { |
@@ -215,26 +215,26 @@ discard block |
||
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | |
| 218 | - /** |
|
| 219 | - * Checks whether the form is modal. |
|
| 220 | - * |
|
| 221 | - * @access public |
|
| 222 | - * @return bool |
|
| 223 | - */ |
|
| 218 | + /** |
|
| 219 | + * Checks whether the form is modal. |
|
| 220 | + * |
|
| 221 | + * @access public |
|
| 222 | + * @return bool |
|
| 223 | + */ |
|
| 224 | 224 | function isModal() |
| 225 | 225 | { |
| 226 | 226 | return $this->_modal; |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | |
| 230 | - /** |
|
| 231 | - * Checks whether the pages of the controller are valid |
|
| 232 | - * |
|
| 233 | - * @access public |
|
| 234 | - * @param string If set, check only the pages before (not including) that page |
|
| 235 | - * @return bool |
|
| 236 | - * @throws PEAR_Error |
|
| 237 | - */ |
|
| 230 | + /** |
|
| 231 | + * Checks whether the pages of the controller are valid |
|
| 232 | + * |
|
| 233 | + * @access public |
|
| 234 | + * @param string If set, check only the pages before (not including) that page |
|
| 235 | + * @return bool |
|
| 236 | + * @throws PEAR_Error |
|
| 237 | + */ |
|
| 238 | 238 | function isValid($pageName = null) |
| 239 | 239 | { |
| 240 | 240 | $data =& $this->container(); |
@@ -273,13 +273,13 @@ discard block |
||
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | |
| 276 | - /** |
|
| 277 | - * Returns the name of the page before the given. |
|
| 278 | - * |
|
| 279 | - * @access public |
|
| 280 | - * @param string |
|
| 281 | - * @return string |
|
| 282 | - */ |
|
| 276 | + /** |
|
| 277 | + * Returns the name of the page before the given. |
|
| 278 | + * |
|
| 279 | + * @access public |
|
| 280 | + * @param string |
|
| 281 | + * @return string |
|
| 282 | + */ |
|
| 283 | 283 | function getPrevName($pageName) |
| 284 | 284 | { |
| 285 | 285 | $prev = null; |
@@ -292,13 +292,13 @@ discard block |
||
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | |
| 295 | - /** |
|
| 296 | - * Returns the name of the page after the given. |
|
| 297 | - * |
|
| 298 | - * @access public |
|
| 299 | - * @param string |
|
| 300 | - * @return string |
|
| 301 | - */ |
|
| 295 | + /** |
|
| 296 | + * Returns the name of the page after the given. |
|
| 297 | + * |
|
| 298 | + * @access public |
|
| 299 | + * @param string |
|
| 300 | + * @return string |
|
| 301 | + */ |
|
| 302 | 302 | function getNextName($pageName) |
| 303 | 303 | { |
| 304 | 304 | $prev = null; |
@@ -312,12 +312,12 @@ discard block |
||
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | |
| 315 | - /** |
|
| 316 | - * Finds the (first) invalid page |
|
| 317 | - * |
|
| 318 | - * @access public |
|
| 319 | - * @return string Name of an invalid page |
|
| 320 | - */ |
|
| 315 | + /** |
|
| 316 | + * Finds the (first) invalid page |
|
| 317 | + * |
|
| 318 | + * @access public |
|
| 319 | + * @return string Name of an invalid page |
|
| 320 | + */ |
|
| 321 | 321 | function findInvalid() |
| 322 | 322 | { |
| 323 | 323 | $data =& $this->container(); |
@@ -330,13 +330,13 @@ discard block |
||
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | |
| 333 | - /** |
|
| 334 | - * Extracts the names of the current page and the current action from |
|
| 335 | - * HTTP request data. |
|
| 336 | - * |
|
| 337 | - * @access public |
|
| 338 | - * @return array first element is page name, second is action name |
|
| 339 | - */ |
|
| 333 | + /** |
|
| 334 | + * Extracts the names of the current page and the current action from |
|
| 335 | + * HTTP request data. |
|
| 336 | + * |
|
| 337 | + * @access public |
|
| 338 | + * @return array first element is page name, second is action name |
|
| 339 | + */ |
|
| 340 | 340 | function getActionName() |
| 341 | 341 | { |
| 342 | 342 | if (is_array($this->_actionName)) { |
@@ -360,14 +360,14 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | |
| 363 | - /** |
|
| 364 | - * Initializes default form values. |
|
| 365 | - * |
|
| 366 | - * @access public |
|
| 367 | - * @param array default values |
|
| 368 | - * @param mixed filter(s) to apply to default values |
|
| 369 | - * @throws PEAR_Error |
|
| 370 | - */ |
|
| 363 | + /** |
|
| 364 | + * Initializes default form values. |
|
| 365 | + * |
|
| 366 | + * @access public |
|
| 367 | + * @param array default values |
|
| 368 | + * @param mixed filter(s) to apply to default values |
|
| 369 | + * @throws PEAR_Error |
|
| 370 | + */ |
|
| 371 | 371 | function setDefaults($defaultValues = null, $filter = null) |
| 372 | 372 | { |
| 373 | 373 | if (is_array($defaultValues)) { |
@@ -377,15 +377,15 @@ discard block |
||
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | |
| 380 | - /** |
|
| 381 | - * Initializes constant form values. |
|
| 382 | - * These values won't get overridden by POST or GET vars |
|
| 383 | - * |
|
| 384 | - * @access public |
|
| 385 | - * @param array constant values |
|
| 386 | - * @param mixed filter(s) to apply to constant values |
|
| 387 | - * @throws PEAR_Error |
|
| 388 | - */ |
|
| 380 | + /** |
|
| 381 | + * Initializes constant form values. |
|
| 382 | + * These values won't get overridden by POST or GET vars |
|
| 383 | + * |
|
| 384 | + * @access public |
|
| 385 | + * @param array constant values |
|
| 386 | + * @param mixed filter(s) to apply to constant values |
|
| 387 | + * @throws PEAR_Error |
|
| 388 | + */ |
|
| 389 | 389 | function setConstants($constantValues = null, $filter = null) |
| 390 | 390 | { |
| 391 | 391 | if (is_array($constantValues)) { |
@@ -395,15 +395,15 @@ discard block |
||
| 395 | 395 | } |
| 396 | 396 | |
| 397 | 397 | |
| 398 | - /** |
|
| 399 | - * Adds new values to defaults or constants array |
|
| 400 | - * |
|
| 401 | - * @access private |
|
| 402 | - * @param array array to add values to (either defaults or constants) |
|
| 403 | - * @param array values to add |
|
| 404 | - * @param mixed filters to apply to new values |
|
| 405 | - * @throws PEAR_Error |
|
| 406 | - */ |
|
| 398 | + /** |
|
| 399 | + * Adds new values to defaults or constants array |
|
| 400 | + * |
|
| 401 | + * @access private |
|
| 402 | + * @param array array to add values to (either defaults or constants) |
|
| 403 | + * @param array values to add |
|
| 404 | + * @param mixed filters to apply to new values |
|
| 405 | + * @throws PEAR_Error |
|
| 406 | + */ |
|
| 407 | 407 | function _setDefaultsOrConstants(&$values, $newValues, $filter = null) |
| 408 | 408 | { |
| 409 | 409 | if (isset($filter)) { |
@@ -425,14 +425,14 @@ discard block |
||
| 425 | 425 | } |
| 426 | 426 | |
| 427 | 427 | |
| 428 | - /** |
|
| 429 | - * Recursively applies the callback function to the value |
|
| 430 | - * |
|
| 431 | - * @param mixed Callback function |
|
| 432 | - * @param mixed Value to process |
|
| 433 | - * @access private |
|
| 434 | - * @return mixed Processed values |
|
| 435 | - */ |
|
| 428 | + /** |
|
| 429 | + * Recursively applies the callback function to the value |
|
| 430 | + * |
|
| 431 | + * @param mixed Callback function |
|
| 432 | + * @param mixed Value to process |
|
| 433 | + * @access private |
|
| 434 | + * @return mixed Processed values |
|
| 435 | + */ |
|
| 436 | 436 | function _arrayMapRecursive($callback, $value) |
| 437 | 437 | { |
| 438 | 438 | if (!is_array($value)) { |
@@ -447,12 +447,12 @@ discard block |
||
| 447 | 447 | } |
| 448 | 448 | |
| 449 | 449 | |
| 450 | - /** |
|
| 451 | - * Sets the default values for the given page |
|
| 452 | - * |
|
| 453 | - * @access public |
|
| 454 | - * @param string Name of a page |
|
| 455 | - */ |
|
| 450 | + /** |
|
| 451 | + * Sets the default values for the given page |
|
| 452 | + * |
|
| 453 | + * @access public |
|
| 454 | + * @param string Name of a page |
|
| 455 | + */ |
|
| 456 | 456 | function applyDefaults($pageName) |
| 457 | 457 | { |
| 458 | 458 | $data =& $this->container(); |
@@ -465,13 +465,13 @@ discard block |
||
| 465 | 465 | } |
| 466 | 466 | |
| 467 | 467 | |
| 468 | - /** |
|
| 469 | - * Returns the form's values |
|
| 470 | - * |
|
| 471 | - * @access public |
|
| 472 | - * @param string name of the page, if not set then returns values for all pages |
|
| 473 | - * @return array |
|
| 474 | - */ |
|
| 468 | + /** |
|
| 469 | + * Returns the form's values |
|
| 470 | + * |
|
| 471 | + * @access public |
|
| 472 | + * @param string name of the page, if not set then returns values for all pages |
|
| 473 | + * @return array |
|
| 474 | + */ |
|
| 475 | 475 | function exportValues($pageName = null) |
| 476 | 476 | { |
| 477 | 477 | $data =& $this->container(); |
@@ -497,14 +497,14 @@ discard block |
||
| 497 | 497 | } |
| 498 | 498 | |
| 499 | 499 | |
| 500 | - /** |
|
| 501 | - * Returns the element's value |
|
| 502 | - * |
|
| 503 | - * @access public |
|
| 504 | - * @param string name of the page |
|
| 505 | - * @param string name of the element in the page |
|
| 506 | - * @return mixed value for the element |
|
| 507 | - */ |
|
| 500 | + /** |
|
| 501 | + * Returns the element's value |
|
| 502 | + * |
|
| 503 | + * @access public |
|
| 504 | + * @param string name of the page |
|
| 505 | + * @param string name of the element in the page |
|
| 506 | + * @return mixed value for the element |
|
| 507 | + */ |
|
| 508 | 508 | function exportValue($pageName, $elementName) |
| 509 | 509 | { |
| 510 | 510 | $data =& $this->container(); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | function &container($reset = false) |
| 104 | 104 | { |
| 105 | - $name = '_' . $this->_name . '_container'; |
|
| 105 | + $name = '_'.$this->_name.'_container'; |
|
| 106 | 106 | if (!isset($_SESSION[$name]) || $reset) { |
| 107 | 107 | $_SESSION[$name] = array( |
| 108 | 108 | 'defaults' => array(), |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | */ |
| 148 | 148 | function addAction($actionName, &$action) |
| 149 | 149 | { |
| 150 | - $this->_actions[$actionName] =& $action; |
|
| 150 | + $this->_actions[$actionName] = & $action; |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
@@ -159,8 +159,8 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | function addPage(&$page) |
| 161 | 161 | { |
| 162 | - $page->controller =& $this; |
|
| 163 | - $this->_pages[$page->getAttribute('id')] =& $page; |
|
| 162 | + $page->controller = & $this; |
|
| 163 | + $this->_pages[$page->getAttribute('id')] = & $page; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | function &getPage($pageName) |
| 176 | 176 | { |
| 177 | 177 | if (!isset($this->_pages[$pageName])) { |
| 178 | - return PEAR::raiseError('HTML_QuickForm_Controller: Unknown page "' . $pageName . '"'); |
|
| 178 | + return PEAR::raiseError('HTML_QuickForm_Controller: Unknown page "'.$pageName.'"'); |
|
| 179 | 179 | } |
| 180 | 180 | return $this->_pages[$pageName]; |
| 181 | 181 | } |
@@ -204,13 +204,13 @@ discard block |
||
| 204 | 204 | case 'submit': |
| 205 | 205 | case 'display': |
| 206 | 206 | case 'jump': |
| 207 | - include_once 'HTML/QuickForm/Action/' . ucfirst($actionName) . '.php'; |
|
| 208 | - $className = 'HTML_QuickForm_Action_' . $actionName; |
|
| 209 | - $this->_actions[$actionName] =& new $className(); |
|
| 207 | + include_once 'HTML/QuickForm/Action/'.ucfirst($actionName).'.php'; |
|
| 208 | + $className = 'HTML_QuickForm_Action_'.$actionName; |
|
| 209 | + $this->_actions[$actionName] = & new $className(); |
|
| 210 | 210 | return $this->_actions[$actionName]->perform($page, $actionName); |
| 211 | 211 | break; |
| 212 | 212 | default: |
| 213 | - return PEAR::raiseError('HTML_QuickForm_Controller: Unhandled action "' . $actionName . '" in page "' . $page->getAttribute('id') . '"'); |
|
| 213 | + return PEAR::raiseError('HTML_QuickForm_Controller: Unhandled action "'.$actionName.'" in page "'.$page->getAttribute('id').'"'); |
|
| 214 | 214 | } // switch |
| 215 | 215 | } |
| 216 | 216 | |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | function isValid($pageName = null) |
| 239 | 239 | { |
| 240 | - $data =& $this->container(); |
|
| 240 | + $data = & $this->container(); |
|
| 241 | 241 | foreach (array_keys($this->_pages) as $key) { |
| 242 | 242 | if (isset($pageName) && $pageName == $key) { |
| 243 | 243 | return true; |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | // We should handle the possible situation when the user has never |
| 246 | 246 | // seen a page of a non-modal multipage form |
| 247 | 247 | if (!$this->isModal() && null === $data['valid'][$key]) { |
| 248 | - $page =& $this->_pages[$key]; |
|
| 248 | + $page = & $this->_pages[$key]; |
|
| 249 | 249 | // Fix for bug #8687: the unseen page was considered |
| 250 | 250 | // submitted, so defaults for checkboxes and multiselects |
| 251 | 251 | // were not used. Shouldn't break anything since this flag |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | function findInvalid() |
| 322 | 322 | { |
| 323 | - $data =& $this->container(); |
|
| 323 | + $data = & $this->container(); |
|
| 324 | 324 | foreach (array_keys($this->_pages) as $key) { |
| 325 | 325 | if (!$data['valid'][$key]) { |
| 326 | 326 | return $key; |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | return $this->_actionName; |
| 344 | 344 | } |
| 345 | 345 | $names = array_map('preg_quote', array_keys($this->_pages)); |
| 346 | - $regex = '/^_qf_(' . implode('|', $names) . ')_(.+?)(_x)?$/'; |
|
| 346 | + $regex = '/^_qf_('.implode('|', $names).')_(.+?)(_x)?$/'; |
|
| 347 | 347 | foreach (array_keys($_REQUEST) as $key) { |
| 348 | 348 | if (preg_match($regex, $key, $matches)) { |
| 349 | 349 | return array($matches[1], $matches[2]); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | function setDefaults($defaultValues = null, $filter = null) |
| 372 | 372 | { |
| 373 | 373 | if (is_array($defaultValues)) { |
| 374 | - $data =& $this->container(); |
|
| 374 | + $data = & $this->container(); |
|
| 375 | 375 | return $this->_setDefaultsOrConstants($data['defaults'], $defaultValues, $filter); |
| 376 | 376 | } |
| 377 | 377 | } |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | function setConstants($constantValues = null, $filter = null) |
| 390 | 390 | { |
| 391 | 391 | if (is_array($constantValues)) { |
| 392 | - $data =& $this->container(); |
|
| 392 | + $data = & $this->container(); |
|
| 393 | 393 | return $this->_setDefaultsOrConstants($data['constants'], $constantValues, $filter); |
| 394 | 394 | } |
| 395 | 395 | } |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | */ |
| 456 | 456 | function applyDefaults($pageName) |
| 457 | 457 | { |
| 458 | - $data =& $this->container(); |
|
| 458 | + $data = & $this->container(); |
|
| 459 | 459 | if (!empty($data['defaults'])) { |
| 460 | 460 | $this->_pages[$pageName]->setDefaults($data['defaults']); |
| 461 | 461 | } |
@@ -474,8 +474,8 @@ discard block |
||
| 474 | 474 | */ |
| 475 | 475 | function exportValues($pageName = null) |
| 476 | 476 | { |
| 477 | - $data =& $this->container(); |
|
| 478 | - $values = array(); |
|
| 477 | + $data = & $this->container(); |
|
| 478 | + $values = array(); |
|
| 479 | 479 | if (isset($pageName)) { |
| 480 | 480 | $pages = array($pageName); |
| 481 | 481 | } else { |
@@ -507,8 +507,8 @@ discard block |
||
| 507 | 507 | */ |
| 508 | 508 | function exportValue($pageName, $elementName) |
| 509 | 509 | { |
| 510 | - $data =& $this->container(); |
|
| 511 | - return isset($data['values'][$pageName][$elementName])? $data['values'][$pageName][$elementName]: null; |
|
| 510 | + $data = & $this->container(); |
|
| 511 | + return isset($data['values'][$pageName][$elementName]) ? $data['values'][$pageName][$elementName] : null; |
|
| 512 | 512 | } |
| 513 | 513 | } |
| 514 | 514 | ?> |
