@@ -9,18 +9,18 @@ |
||
9 | 9 | class HTML_QuickForm_Rule_FileName extends HTML_QuickForm_Rule |
10 | 10 | { |
11 | 11 | |
12 | - /** |
|
13 | - * @param $value array Uploaded file info (from $_FILES) |
|
14 | - * @param null $options |
|
15 | - * @return bool |
|
16 | - */ |
|
17 | - public function validate($value, $options = null) |
|
18 | - { |
|
19 | - if ((isset($elementValue['error']) && $elementValue['error'] == 0) || |
|
20 | - (!empty($elementValue['tmp_name']) && $elementValue['tmp_name'] != 'none')) { |
|
21 | - return is_uploaded_file($elementValue['tmp_name']); |
|
22 | - } else { |
|
23 | - return false; |
|
24 | - } |
|
25 | - } |
|
12 | + /** |
|
13 | + * @param $value array Uploaded file info (from $_FILES) |
|
14 | + * @param null $options |
|
15 | + * @return bool |
|
16 | + */ |
|
17 | + public function validate($value, $options = null) |
|
18 | + { |
|
19 | + if ((isset($elementValue['error']) && $elementValue['error'] == 0) || |
|
20 | + (!empty($elementValue['tmp_name']) && $elementValue['tmp_name'] != 'none')) { |
|
21 | + return is_uploaded_file($elementValue['tmp_name']); |
|
22 | + } else { |
|
23 | + return false; |
|
24 | + } |
|
25 | + } |
|
26 | 26 | } |
@@ -7,22 +7,22 @@ |
||
7 | 7 | */ |
8 | 8 | class HTML_QuickForm_Rule_MaxFileSize extends HTML_QuickForm_Rule |
9 | 9 | { |
10 | - /** |
|
11 | - * @param $value array Uploaded file info (from $_FILES) |
|
12 | - * @param null $options |
|
13 | - * @return bool |
|
14 | - */ |
|
15 | - public function validate($elementValue, $maxSize) |
|
16 | - { |
|
17 | - if (!empty($elementValue['error']) && |
|
18 | - (UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error']) |
|
19 | - ) { |
|
20 | - return false; |
|
21 | - } |
|
22 | - if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) { |
|
23 | - return true; |
|
24 | - } |
|
10 | + /** |
|
11 | + * @param $value array Uploaded file info (from $_FILES) |
|
12 | + * @param null $options |
|
13 | + * @return bool |
|
14 | + */ |
|
15 | + public function validate($elementValue, $maxSize) |
|
16 | + { |
|
17 | + if (!empty($elementValue['error']) && |
|
18 | + (UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error']) |
|
19 | + ) { |
|
20 | + return false; |
|
21 | + } |
|
22 | + if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) { |
|
23 | + return true; |
|
24 | + } |
|
25 | 25 | |
26 | - return ($maxSize >= @filesize($elementValue['tmp_name'])); |
|
27 | - } |
|
26 | + return ($maxSize >= @filesize($elementValue['tmp_name'])); |
|
27 | + } |
|
28 | 28 | } |
@@ -6,24 +6,24 @@ |
||
6 | 6 | */ |
7 | 7 | class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare |
8 | 8 | { |
9 | - /** |
|
10 | - * Function to check an array of fields |
|
11 | - * @param array of field names |
|
9 | + /** |
|
10 | + * Function to check an array of fields |
|
11 | + * @param array of field names |
|
12 | 12 | * @param string operator ==, >=, etc |
13 | 13 | * @param string the value to compare |
14 | - * @return boolean True if date is valid |
|
15 | - */ |
|
16 | - function validate($values, $operator_and_max_value) { |
|
14 | + * @return boolean True if date is valid |
|
15 | + */ |
|
16 | + function validate($values, $operator_and_max_value) { |
|
17 | 17 | if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) { |
18 | - $final_value = 0; |
|
19 | - foreach ($values as $value) { |
|
20 | - $final_value += $value; |
|
21 | - } |
|
22 | - $params = explode('@', $operator_and_max_value); |
|
23 | - $operator = $params[0]; |
|
24 | - $max_value = $params[1]; |
|
25 | - return parent::validate(array($final_value, $max_value), $operator); |
|
18 | + $final_value = 0; |
|
19 | + foreach ($values as $value) { |
|
20 | + $final_value += $value; |
|
21 | + } |
|
22 | + $params = explode('@', $operator_and_max_value); |
|
23 | + $operator = $params[0]; |
|
24 | + $max_value = $params[1]; |
|
25 | + return parent::validate(array($final_value, $max_value), $operator); |
|
26 | 26 | } |
27 | 27 | return false; |
28 | - } |
|
28 | + } |
|
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -25,12 +25,12 @@ discard block |
||
25 | 25 | |
26 | 26 | function GetInt4d($data, $pos) |
27 | 27 | { |
28 | - $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); |
|
29 | - if ($value>=4294967294) |
|
30 | - { |
|
31 | - $value=-2; |
|
32 | - } |
|
33 | - return $value; |
|
28 | + $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); |
|
29 | + if ($value>=4294967294) |
|
30 | + { |
|
31 | + $value=-2; |
|
32 | + } |
|
33 | + return $value; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | |
@@ -45,30 +45,30 @@ discard block |
||
45 | 45 | |
46 | 46 | function read($sFileName){ |
47 | 47 | |
48 | - // check if file exist and is readable (Darko Miljanovic) |
|
49 | - if(!is_readable($sFileName)) { |
|
50 | - $this->error = 1; |
|
51 | - return false; |
|
52 | - } |
|
48 | + // check if file exist and is readable (Darko Miljanovic) |
|
49 | + if(!is_readable($sFileName)) { |
|
50 | + $this->error = 1; |
|
51 | + return false; |
|
52 | + } |
|
53 | 53 | |
54 | - $this->data = @file_get_contents($sFileName); |
|
55 | - if (!$this->data) { |
|
56 | - $this->error = 1; |
|
57 | - return false; |
|
58 | - } |
|
59 | - //echo IDENTIFIER_OLE; |
|
60 | - //echo 'start'; |
|
61 | - if (substr($this->data, 0, 8) != IDENTIFIER_OLE) { |
|
62 | - $this->error = 1; |
|
63 | - return false; |
|
64 | - } |
|
54 | + $this->data = @file_get_contents($sFileName); |
|
55 | + if (!$this->data) { |
|
56 | + $this->error = 1; |
|
57 | + return false; |
|
58 | + } |
|
59 | + //echo IDENTIFIER_OLE; |
|
60 | + //echo 'start'; |
|
61 | + if (substr($this->data, 0, 8) != IDENTIFIER_OLE) { |
|
62 | + $this->error = 1; |
|
63 | + return false; |
|
64 | + } |
|
65 | 65 | $this->numBigBlockDepotBlocks = GetInt4d($this->data, NUM_BIG_BLOCK_DEPOT_BLOCKS_POS); |
66 | 66 | $this->sbdStartBlock = GetInt4d($this->data, SMALL_BLOCK_DEPOT_BLOCK_POS); |
67 | 67 | $this->rootStartBlock = GetInt4d($this->data, ROOT_START_BLOCK_POS); |
68 | 68 | $this->extensionBlock = GetInt4d($this->data, EXTENSION_BLOCK_POS); |
69 | 69 | $this->numExtensionBlocks = GetInt4d($this->data, NUM_EXTENSION_BLOCK_POS); |
70 | 70 | |
71 | - /* |
|
71 | + /* |
|
72 | 72 | echo $this->numBigBlockDepotBlocks." "; |
73 | 73 | echo $this->sbdStartBlock." "; |
74 | 74 | echo $this->rootStartBlock." "; |
@@ -78,16 +78,16 @@ discard block |
||
78 | 78 | //echo "sbdStartBlock = $this->sbdStartBlock\n"; |
79 | 79 | $bigBlockDepotBlocks = array(); |
80 | 80 | $pos = BIG_BLOCK_DEPOT_BLOCKS_POS; |
81 | - // echo "pos = $pos"; |
|
82 | - $bbdBlocks = $this->numBigBlockDepotBlocks; |
|
81 | + // echo "pos = $pos"; |
|
82 | + $bbdBlocks = $this->numBigBlockDepotBlocks; |
|
83 | 83 | |
84 | 84 | if ($this->numExtensionBlocks != 0) { |
85 | 85 | $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS)/4; |
86 | 86 | } |
87 | 87 | |
88 | 88 | for ($i = 0; $i < $bbdBlocks; $i++) { |
89 | - $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos); |
|
90 | - $pos += 4; |
|
89 | + $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos); |
|
90 | + $pos += 4; |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | } |
107 | 107 | } |
108 | 108 | |
109 | - // var_dump($bigBlockDepotBlocks); |
|
109 | + // var_dump($bigBlockDepotBlocks); |
|
110 | 110 | |
111 | 111 | // readBigBlockDepot |
112 | 112 | $pos = 0; |
@@ -123,26 +123,26 @@ discard block |
||
123 | 123 | } |
124 | 124 | } |
125 | 125 | |
126 | - //var_dump($this->bigBlockChain); |
|
126 | + //var_dump($this->bigBlockChain); |
|
127 | 127 | //echo '=====2'; |
128 | 128 | // readSmallBlockDepot(); |
129 | 129 | $pos = 0; |
130 | - $index = 0; |
|
131 | - $sbdBlock = $this->sbdStartBlock; |
|
132 | - $this->smallBlockChain = array(); |
|
130 | + $index = 0; |
|
131 | + $sbdBlock = $this->sbdStartBlock; |
|
132 | + $this->smallBlockChain = array(); |
|
133 | 133 | |
134 | - while ($sbdBlock != -2) { |
|
134 | + while ($sbdBlock != -2) { |
|
135 | 135 | |
136 | - $pos = ($sbdBlock + 1) * BIG_BLOCK_SIZE; |
|
136 | + $pos = ($sbdBlock + 1) * BIG_BLOCK_SIZE; |
|
137 | 137 | |
138 | - for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) { |
|
139 | - $this->smallBlockChain[$index] = GetInt4d($this->data, $pos); |
|
140 | - $pos += 4; |
|
141 | - $index++; |
|
142 | - } |
|
138 | + for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) { |
|
139 | + $this->smallBlockChain[$index] = GetInt4d($this->data, $pos); |
|
140 | + $pos += 4; |
|
141 | + $index++; |
|
142 | + } |
|
143 | 143 | |
144 | - $sbdBlock = $this->bigBlockChain[$sbdBlock]; |
|
145 | - } |
|
144 | + $sbdBlock = $this->bigBlockChain[$sbdBlock]; |
|
145 | + } |
|
146 | 146 | |
147 | 147 | |
148 | 148 | // readData(rootStartBlock) |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | } |
164 | 164 | |
165 | - function __readData($bl) { |
|
165 | + function __readData($bl) { |
|
166 | 166 | $block = $bl; |
167 | 167 | $pos = 0; |
168 | 168 | $data = ''; |
@@ -171,28 +171,28 @@ discard block |
||
171 | 171 | $pos = ($block + 1) * BIG_BLOCK_SIZE; |
172 | 172 | $data = $data.substr($this->data, $pos, BIG_BLOCK_SIZE); |
173 | 173 | //echo "pos = $pos data=$data\n"; |
174 | - $block = $this->bigBlockChain[$block]; |
|
174 | + $block = $this->bigBlockChain[$block]; |
|
175 | + } |
|
176 | + return $data; |
|
175 | 177 | } |
176 | - return $data; |
|
177 | - } |
|
178 | 178 | |
179 | 179 | function __readPropertySets(){ |
180 | 180 | $offset = 0; |
181 | 181 | //var_dump($this->entry); |
182 | 182 | while ($offset < strlen($this->entry)) { |
183 | - $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE); |
|
183 | + $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE); |
|
184 | 184 | |
185 | - $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8); |
|
185 | + $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8); |
|
186 | 186 | |
187 | - $type = ord($d[TYPE_POS]); |
|
188 | - //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1; |
|
187 | + $type = ord($d[TYPE_POS]); |
|
188 | + //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1; |
|
189 | 189 | |
190 | - $startBlock = GetInt4d($d, START_BLOCK_POS); |
|
191 | - $size = GetInt4d($d, SIZE_POS); |
|
190 | + $startBlock = GetInt4d($d, START_BLOCK_POS); |
|
191 | + $size = GetInt4d($d, SIZE_POS); |
|
192 | 192 | |
193 | 193 | $name = ''; |
194 | 194 | for ($i = 0; $i < $nameSize ; $i++) { |
195 | - $name .= $d[$i]; |
|
195 | + $name .= $d[$i]; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | $name = str_replace("\x00", "", $name); |
@@ -221,50 +221,50 @@ discard block |
||
221 | 221 | |
222 | 222 | |
223 | 223 | function getWorkBook(){ |
224 | - if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){ |
|
224 | + if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){ |
|
225 | 225 | // getSmallBlockStream(PropertyStorage ps) |
226 | 226 | |
227 | - $rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']); |
|
227 | + $rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']); |
|
228 | 228 | |
229 | - $streamData = ''; |
|
230 | - $block = $this->props[$this->wrkbook]['startBlock']; |
|
231 | - //$count = 0; |
|
232 | - $pos = 0; |
|
233 | - while ($block != -2) { |
|
234 | - $pos = $block * SMALL_BLOCK_SIZE; |
|
235 | - $streamData .= substr($rootdata, $pos, SMALL_BLOCK_SIZE); |
|
229 | + $streamData = ''; |
|
230 | + $block = $this->props[$this->wrkbook]['startBlock']; |
|
231 | + //$count = 0; |
|
232 | + $pos = 0; |
|
233 | + while ($block != -2) { |
|
234 | + $pos = $block * SMALL_BLOCK_SIZE; |
|
235 | + $streamData .= substr($rootdata, $pos, SMALL_BLOCK_SIZE); |
|
236 | 236 | |
237 | - $block = $this->smallBlockChain[$block]; |
|
238 | - } |
|
237 | + $block = $this->smallBlockChain[$block]; |
|
238 | + } |
|
239 | 239 | |
240 | - return $streamData; |
|
240 | + return $streamData; |
|
241 | 241 | |
242 | 242 | |
243 | - }else{ |
|
243 | + }else{ |
|
244 | 244 | |
245 | - $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE; |
|
246 | - if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) { |
|
247 | - $numBlocks++; |
|
248 | - } |
|
245 | + $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE; |
|
246 | + if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) { |
|
247 | + $numBlocks++; |
|
248 | + } |
|
249 | 249 | |
250 | - if ($numBlocks == 0) return ''; |
|
250 | + if ($numBlocks == 0) return ''; |
|
251 | 251 | |
252 | - //echo "numBlocks = $numBlocks\n"; |
|
253 | - //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE]; |
|
254 | - //print_r($this->wrkbook); |
|
255 | - $streamData = ''; |
|
256 | - $block = $this->props[$this->wrkbook]['startBlock']; |
|
257 | - //$count = 0; |
|
258 | - $pos = 0; |
|
259 | - //echo "block = $block"; |
|
260 | - while ($block != -2) { |
|
261 | - $pos = ($block + 1) * BIG_BLOCK_SIZE; |
|
262 | - $streamData .= substr($this->data, $pos, BIG_BLOCK_SIZE); |
|
263 | - $block = $this->bigBlockChain[$block]; |
|
264 | - } |
|
265 | - //echo 'stream'.$streamData; |
|
266 | - return $streamData; |
|
267 | - } |
|
252 | + //echo "numBlocks = $numBlocks\n"; |
|
253 | + //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE]; |
|
254 | + //print_r($this->wrkbook); |
|
255 | + $streamData = ''; |
|
256 | + $block = $this->props[$this->wrkbook]['startBlock']; |
|
257 | + //$count = 0; |
|
258 | + $pos = 0; |
|
259 | + //echo "block = $block"; |
|
260 | + while ($block != -2) { |
|
261 | + $pos = ($block + 1) * BIG_BLOCK_SIZE; |
|
262 | + $streamData .= substr($this->data, $pos, BIG_BLOCK_SIZE); |
|
263 | + $block = $this->bigBlockChain[$block]; |
|
264 | + } |
|
265 | + //echo 'stream'.$streamData; |
|
266 | + return $streamData; |
|
267 | + } |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | } |
@@ -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))); |
@@ -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) { |
@@ -1496,10 +1496,10 @@ discard block |
||
1496 | 1496 | */ |
1497 | 1497 | function isElementFrozen($element) |
1498 | 1498 | { |
1499 | - if (isset($this->_elementIndex[$element])) { |
|
1500 | - return $this->_elements[$this->_elementIndex[$element]]->isFrozen(); |
|
1501 | - } |
|
1502 | - return false; |
|
1499 | + if (isset($this->_elementIndex[$element])) { |
|
1500 | + return $this->_elements[$this->_elementIndex[$element]]->isFrozen(); |
|
1501 | + } |
|
1502 | + return false; |
|
1503 | 1503 | } // end func isElementFrozen |
1504 | 1504 | |
1505 | 1505 | // }}} |
@@ -1697,7 +1697,7 @@ discard block |
||
1697 | 1697 | */ |
1698 | 1698 | function isFrozen() |
1699 | 1699 | { |
1700 | - return $this->_freezeAll; |
|
1700 | + return $this->_freezeAll; |
|
1701 | 1701 | } // end func isFrozen |
1702 | 1702 | |
1703 | 1703 | // }}} |
@@ -1725,14 +1725,14 @@ discard block |
||
1725 | 1725 | // }}} |
1726 | 1726 | // {{{ accept() |
1727 | 1727 | |
1728 | - /** |
|
1729 | - * Accepts a renderer |
|
1730 | - * |
|
1731 | - * @param object An HTML_QuickForm_Renderer object |
|
1732 | - * @since 3.0 |
|
1733 | - * @access public |
|
1734 | - * @return void |
|
1735 | - */ |
|
1728 | + /** |
|
1729 | + * Accepts a renderer |
|
1730 | + * |
|
1731 | + * @param object An HTML_QuickForm_Renderer object |
|
1732 | + * @since 3.0 |
|
1733 | + * @access public |
|
1734 | + * @return void |
|
1735 | + */ |
|
1736 | 1736 | function accept(&$renderer) { |
1737 | 1737 | $renderer->startForm($this); |
1738 | 1738 | foreach (array_keys($this->_elements) as $key) { |
@@ -1748,13 +1748,13 @@ discard block |
||
1748 | 1748 | // }}} |
1749 | 1749 | // {{{ defaultRenderer() |
1750 | 1750 | |
1751 | - /** |
|
1752 | - * Returns a reference to default renderer object |
|
1753 | - * |
|
1754 | - * @access public |
|
1755 | - * @since 3.0 |
|
1756 | - * @return HTML_QuickForm_Renderer_Default |
|
1757 | - */ |
|
1751 | + /** |
|
1752 | + * Returns a reference to default renderer object |
|
1753 | + * |
|
1754 | + * @access public |
|
1755 | + * @since 3.0 |
|
1756 | + * @return HTML_QuickForm_Renderer_Default |
|
1757 | + */ |
|
1758 | 1758 | function &defaultRenderer() { |
1759 | 1759 | if (!isset($GLOBALS['_HTML_QuickForm_default_renderer'])) { |
1760 | 1760 | // Modified by Ivan Tcholakov, 16-MAR-2010. Suppressing a deprecation warning on PHP 5.3 |
@@ -1922,7 +1922,7 @@ discard block |
||
1922 | 1922 | // |
1923 | 1923 | $this->accept($renderer); |
1924 | 1924 | return $renderer->toArray(); |
1925 | - } // end func toArray |
|
1925 | + } // end func toArray |
|
1926 | 1926 | |
1927 | 1927 | // }}} |
1928 | 1928 | // {{{ exportValue() |
@@ -2003,15 +2003,15 @@ discard block |
||
2003 | 2003 | // }}} |
2004 | 2004 | // {{{ isSubmitted() |
2005 | 2005 | |
2006 | - /** |
|
2007 | - * Tells whether the form was already submitted |
|
2008 | - * |
|
2009 | - * This is useful since the _submitFiles and _submitValues arrays |
|
2010 | - * may be completely empty after the trackSubmit value is removed. |
|
2011 | - * |
|
2012 | - * @access public |
|
2013 | - * @return bool |
|
2014 | - */ |
|
2006 | + /** |
|
2007 | + * Tells whether the form was already submitted |
|
2008 | + * |
|
2009 | + * This is useful since the _submitFiles and _submitValues arrays |
|
2010 | + * may be completely empty after the trackSubmit value is removed. |
|
2011 | + * |
|
2012 | + * @access public |
|
2013 | + * @return bool |
|
2014 | + */ |
|
2015 | 2015 | function isSubmitted() |
2016 | 2016 | { |
2017 | 2017 | return $this->_flagSubmitted; |
@@ -2102,24 +2102,24 @@ discard block |
||
2102 | 2102 | // {{{ properties |
2103 | 2103 | |
2104 | 2104 | /** |
2105 | - * Prefix for all error messages |
|
2106 | - * @var string |
|
2107 | - */ |
|
2105 | + * Prefix for all error messages |
|
2106 | + * @var string |
|
2107 | + */ |
|
2108 | 2108 | var $error_message_prefix = 'QuickForm Error: '; |
2109 | 2109 | |
2110 | 2110 | // }}} |
2111 | 2111 | // {{{ constructor |
2112 | 2112 | |
2113 | 2113 | /** |
2114 | - * Creates a quickform error object, extending the PEAR_Error class |
|
2115 | - * |
|
2116 | - * @param int $code the error code |
|
2117 | - * @param int $mode the reaction to the error, either return, die or trigger/callback |
|
2118 | - * @param int $level intensity of the error (PHP error code) |
|
2119 | - * @param mixed $debuginfo any information that can inform user as to nature of the error |
|
2120 | - */ |
|
2114 | + * Creates a quickform error object, extending the PEAR_Error class |
|
2115 | + * |
|
2116 | + * @param int $code the error code |
|
2117 | + * @param int $mode the reaction to the error, either return, die or trigger/callback |
|
2118 | + * @param int $level intensity of the error (PHP error code) |
|
2119 | + * @param mixed $debuginfo any information that can inform user as to nature of the error |
|
2120 | + */ |
|
2121 | 2121 | function HTML_QuickForm_Error($code = QUICKFORM_ERROR, $mode = PEAR_ERROR_RETURN, |
2122 | - $level = E_USER_NOTICE, $debuginfo = null) |
|
2122 | + $level = E_USER_NOTICE, $debuginfo = null) |
|
2123 | 2123 | { |
2124 | 2124 | if (is_int($code)) { |
2125 | 2125 | $this->PEAR_Error(HTML_QuickForm::errorMessage($code), $code, $mode, $level, $debuginfo); |
@@ -1,63 +1,62 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */ |
3 | 3 | /** |
4 | - * PEAR::HTML_Table makes the design of HTML tables easy, flexible, reusable and |
|
5 | - * efficient. |
|
6 | - * |
|
7 | - * The PEAR::HTML_Table package provides methods for easy and efficient design |
|
8 | - * of HTML tables. |
|
9 | - * - Lots of customization options. |
|
10 | - * - Tables can be modified at any time. |
|
11 | - * - The logic is the same as standard HTML editors. |
|
12 | - * - Handles col and rowspans. |
|
13 | - * - PHP code is shorter, easier to read and to maintain. |
|
14 | - * - Tables options can be reused. |
|
15 | - * |
|
16 | - * For auto filling of data and such then check out |
|
17 | - * http://pear.php.net/package/HTML_Table_Matrix |
|
18 | - * |
|
19 | - * PHP versions 4 and 5 |
|
20 | - * |
|
21 | - * LICENSE: |
|
22 | - * |
|
23 | - * Copyright (c) 2005-2007, Adam Daniel <[email protected]>, |
|
24 | - * Bertrand Mansion <[email protected]>, |
|
25 | - * Mark Wiesemann <[email protected]> |
|
26 | - * All rights reserved. |
|
27 | - * |
|
28 | - * Redistribution and use in source and binary forms, with or without |
|
29 | - * modification, are permitted provided that the following conditions |
|
30 | - * are met: |
|
31 | - * |
|
32 | - * * Redistributions of source code must retain the above copyright |
|
33 | - * notice, this list of conditions and the following disclaimer. |
|
34 | - * * Redistributions in binary form must reproduce the above copyright |
|
35 | - * notice, this list of conditions and the following disclaimer in the |
|
36 | - * documentation and/or other materials provided with the distribution. |
|
37 | - * * The names of the authors may not be used to endorse or promote products |
|
38 | - * derived from this software without specific prior written permission. |
|
39 | - * |
|
40 | - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS |
|
41 | - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
|
42 | - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
|
43 | - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
|
44 | - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
|
45 | - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
|
46 | - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
|
47 | - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
|
48 | - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING |
|
49 | - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
|
50 | - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
51 | - |
|
52 | - * |
|
53 | - * @category HTML |
|
54 | - * @package HTML_Table |
|
55 | - * @author Adam Daniel <[email protected]> |
|
56 | - * @author Bertrand Mansion <[email protected]> |
|
57 | - * @license http://www.opensource.org/licenses/bsd-license.php New BSD License |
|
58 | - * @version CVS: $Id: Table.php,v 1.39 2007/06/25 16:44:43 wiesemann Exp $ |
|
59 | - * @link http://pear.php.net/package/HTML_Table |
|
60 | - */ |
|
4 | + * PEAR::HTML_Table makes the design of HTML tables easy, flexible, reusable and |
|
5 | + * efficient. |
|
6 | + * |
|
7 | + * The PEAR::HTML_Table package provides methods for easy and efficient design |
|
8 | + * of HTML tables. |
|
9 | + * - Lots of customization options. |
|
10 | + * - Tables can be modified at any time. |
|
11 | + * - The logic is the same as standard HTML editors. |
|
12 | + * - Handles col and rowspans. |
|
13 | + * - PHP code is shorter, easier to read and to maintain. |
|
14 | + * - Tables options can be reused. |
|
15 | + * |
|
16 | + * For auto filling of data and such then check out |
|
17 | + * http://pear.php.net/package/HTML_Table_Matrix |
|
18 | + * |
|
19 | + * PHP versions 4 and 5 |
|
20 | + * |
|
21 | + * LICENSE: |
|
22 | + * |
|
23 | + * Copyright (c) 2005-2007, Adam Daniel <[email protected]>, |
|
24 | + * Bertrand Mansion <[email protected]>, |
|
25 | + * Mark Wiesemann <[email protected]> |
|
26 | + * All rights reserved. |
|
27 | + * |
|
28 | + * Redistribution and use in source and binary forms, with or without |
|
29 | + * modification, are permitted provided that the following conditions |
|
30 | + * are met: |
|
31 | + * |
|
32 | + * * Redistributions of source code must retain the above copyright |
|
33 | + * notice, this list of conditions and the following disclaimer. |
|
34 | + * * Redistributions in binary form must reproduce the above copyright |
|
35 | + * notice, this list of conditions and the following disclaimer in the |
|
36 | + * documentation and/or other materials provided with the distribution. |
|
37 | + * * The names of the authors may not be used to endorse or promote products |
|
38 | + * derived from this software without specific prior written permission. |
|
39 | + * |
|
40 | + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS |
|
41 | + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
|
42 | + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
|
43 | + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
|
44 | + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
|
45 | + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
|
46 | + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
|
47 | + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
|
48 | + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING |
|
49 | + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
|
50 | + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
51 | + * |
|
52 | + * @category HTML |
|
53 | + * @package HTML_Table |
|
54 | + * @author Adam Daniel <[email protected]> |
|
55 | + * @author Bertrand Mansion <[email protected]> |
|
56 | + * @license http://www.opensource.org/licenses/bsd-license.php New BSD License |
|
57 | + * @version CVS: $Id: Table.php,v 1.39 2007/06/25 16:44:43 wiesemann Exp $ |
|
58 | + * @link http://pear.php.net/package/HTML_Table |
|
59 | + */ |
|
61 | 60 | |
62 | 61 | /** |
63 | 62 | * PEAR::HTML_Table makes the design of HTML tables easy, flexible, reusable and efficient. |
@@ -256,7 +255,7 @@ discard block |
||
256 | 255 | |
257 | 256 | $body = $this->_tbodyCount++; |
258 | 257 | $this->_tbodies[$body] = new HTML_Table_Storage($this->_tabOffset, |
259 | - $this->_useTGroups); |
|
258 | + $this->_useTGroups); |
|
260 | 259 | $this->_tbodies[$body]->setAutoFill($this->_autoFill); |
261 | 260 | $this->_tbodies[$body]->setAttributes($attributes); |
262 | 261 | return $body; |
@@ -308,7 +307,7 @@ discard block |
||
308 | 307 | if (isset($colgroup)) { |
309 | 308 | $attributes = $this->_parseAttributes($attributes); |
310 | 309 | $this->_colgroup[] = array('attr' => $attributes, |
311 | - 'contents' => $colgroup); |
|
310 | + 'contents' => $colgroup); |
|
312 | 311 | } else { |
313 | 312 | $this->_colgroup = array(); |
314 | 313 | } |
@@ -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 | } |
@@ -71,13 +71,13 @@ |
||
71 | 71 | // }}} |
72 | 72 | // {{{ accept() |
73 | 73 | |
74 | - /** |
|
75 | - * Accepts a renderer |
|
76 | - * |
|
77 | - * @param HTML_QuickForm_Renderer renderer object |
|
78 | - * @access public |
|
79 | - * @return void |
|
80 | - */ |
|
74 | + /** |
|
75 | + * Accepts a renderer |
|
76 | + * |
|
77 | + * @param HTML_QuickForm_Renderer renderer object |
|
78 | + * @access public |
|
79 | + * @return void |
|
80 | + */ |
|
81 | 81 | //function accept(&$renderer) |
82 | 82 | function accept(&$renderer, $required=false, $error=null) |
83 | 83 | { |