Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: tests/test_conditions.html.phpt
- ===================================================================
- RCS file: /repository/pear/HTML_Template_Flexy/tests/test_conditions.html.phpt,v
- retrieving revision 1.1
- diff -u -r1.1 test_conditions.html.phpt
- --- tests/test_conditions.html.phpt 22 Jan 2005 05:25:19 -0000 1.1
- +++ tests/test_conditions.html.phpt 27 Oct 2008 07:30:08 -0000
- @@ -16,13 +16,13 @@
- <H2>Conditions</H2>
- <p>a condition <?php if ($t->condition) {?> hello <?php } else {?> world <?php }?></p>
- <p>a negative condition <?php if (!$t->condition) {?> hello <?php } else {?> world <?php }?></p>
- -<p>a conditional method <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'condition'))) if ($t->condition()) { ?> hello <?php } else {?> world <?php }?></p>
- -<p>a negative conditional method <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'condition'))) if (!$t->condition()) { ?> hello <?php } else {?> world <?php }?></p>
- +<p>a conditional method <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'condition'))) if ($t->condition()) { ?> hello <?php } else {?> world <?php }?></p>
- +<p>a negative conditional method <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'condition'))) if (!$t->condition()) { ?> hello <?php } else {?> world <?php }?></p>
- <?php if ($t->test) {?><span>test</span><?php }?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'test'))) if ($t->test()) { ?><span>test</span><?php }?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'test'))) if ($t->test("aaa bbb",$t->ccc,"asdfasdf asdf ")) { ?><span>test</span><?php }?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'test'))) if ($t->test()) { ?><span>test</span><?php }?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'test'))) if ($t->test("aaa bbb",$t->ccc,"asdfasdf asdf ")) { ?><span>test</span><?php }?>
- @@ -72,4 +72,4 @@
- -<H2>Notices and errros</H2>
- \ No newline at end of file
- +<H2>Notices and errros</H2>
- Index: tests/test_forms.html.phpt
- ===================================================================
- RCS file: /repository/pear/HTML_Template_Flexy/tests/test_forms.html.phpt,v
- retrieving revision 1.8
- diff -u -r1.8 test_forms.html.phpt
- --- tests/test_forms.html.phpt 25 Nov 2005 06:28:48 -0000 1.8
- +++ tests/test_forms.html.phpt 27 Oct 2008 07:30:09 -0000
- @@ -76,16 +76,25 @@
- <?php echo $this->elements['aaa3']->toHtml();?>
- <!-- bug 5267 -->
- - <?php $element = $this->elements['opt_1'];
- - $element = $this->mergeElement($element,$this->elements['opt[]']);
- + <?php
- + $element = $this->elements['opt_1'];
- + if (isset($this->elements['opt[]'])) {
- + $element = $this->mergeElement($element,$this->elements['opt[]']);
- + }
- echo $element->toHtml();?>
- <label for="opt_1">option 1</label>
- - <?php $element = $this->elements['opt_2'];
- - $element = $this->mergeElement($element,$this->elements['opt[]']);
- + <?php
- + $element = $this->elements['opt_2'];
- + if (isset($this->elements['opt[]'])) {
- + $element = $this->mergeElement($element,$this->elements['opt[]']);
- + }
- echo $element->toHtml();?>
- <label for="opt_3">option 2</label>
- - <?php $element = $this->elements['opt_3'];
- - $element = $this->mergeElement($element,$this->elements['opt[]']);
- + <?php
- + $element = $this->elements['opt_3'];
- + if (isset($this->elements['opt[]'])) {
- + $element = $this->mergeElement($element,$this->elements['opt[]']);
- + }
- echo $element->toHtml();?>
- <label for="opt_3">option 3</label>
- @@ -100,21 +109,33 @@
- #bug bug6058
- - <br /><?php $element = $this->elements['1'];
- - $element = $this->mergeElement($element,$this->elements['payment_1_type']);
- + <br /><?php
- + $element = $this->elements['1'];
- + if (isset($this->elements['payment_1_type'])) {
- + $element = $this->mergeElement($element,$this->elements['payment_1_type']);
- + }
- echo $element->toHtml();?>
- Credit card
- - <br /><?php $element = $this->elements['2'];
- - $element = $this->mergeElement($element,$this->elements['payment_1_type']);
- + <br /><?php
- + $element = $this->elements['2'];
- + if (isset($this->elements['payment_1_type'])) {
- + $element = $this->mergeElement($element,$this->elements['payment_1_type']);
- + }
- echo $element->toHtml();?>
- Cheque
- - <br /><?php $element = $this->elements['3'];
- - $element = $this->mergeElement($element,$this->elements['payment_2_type']);
- + <br /><?php
- + $element = $this->elements['3'];
- + if (isset($this->elements['payment_2_type'])) {
- + $element = $this->mergeElement($element,$this->elements['payment_2_type']);
- + }
- echo $element->toHtml();?>
- Credit card
- - <br /><?php $element = $this->elements['4'];
- - $element = $this->mergeElement($element,$this->elements['payment_2_type']);
- + <br /><?php
- + $element = $this->elements['4'];
- + if (isset($this->elements['payment_2_type'])) {
- + $element = $this->mergeElement($element,$this->elements['payment_2_type']);
- + }
- echo $element->toHtml();?>
- Cheque
- @@ -186,7 +207,7 @@
- </form>
- Array
- (
- - [test] => html_template_flexy_element Object
- + [test] => HTML_Template_Flexy_Element Object
- (
- [tag] => form
- [attributes] => Array
- @@ -204,7 +225,7 @@
- [value] =>
- )
- - [test123] => html_template_flexy_element Object
- + [test123] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -222,7 +243,7 @@
- [value] =>
- )
- - [test123a] => html_template_flexy_element Object
- + [test123a] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -243,7 +264,7 @@
- [value] =>
- )
- - [test123ab] => html_template_flexy_element Object
- + [test123ab] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -263,7 +284,7 @@
- [value] =>
- )
- - [fred] => html_template_flexy_element Object
- + [fred] => HTML_Template_Flexy_Element Object
- (
- [tag] => textarea
- [attributes] => Array
- @@ -282,7 +303,7 @@
- [value] =>
- )
- - [aaa1] => html_template_flexy_element Object
- + [aaa1] => HTML_Template_Flexy_Element Object
- (
- [tag] => select
- [attributes] => Array
- @@ -294,7 +315,7 @@
- (
- [0] =>
- - [1] => html_template_flexy_element Object
- + [1] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -314,7 +335,7 @@
- [2] =>
- - [3] => html_template_flexy_element Object
- + [3] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -335,7 +356,7 @@
- [4] =>
- - [5] => html_template_flexy_element Object
- + [5] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -363,7 +384,7 @@
- [value] =>
- )
- - [aaa3] => html_template_flexy_element Object
- + [aaa3] => HTML_Template_Flexy_Element Object
- (
- [tag] => select
- [attributes] => Array
- @@ -375,7 +396,7 @@
- (
- [0] =>
- - [1] => html_template_flexy_element Object
- + [1] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -395,7 +416,7 @@
- [2] =>
- - [3] => html_template_flexy_element Object
- + [3] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -416,7 +437,7 @@
- [4] =>
- - [5] => html_template_flexy_element Object
- + [5] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -445,7 +466,7 @@
- [value] =>
- )
- - [opt_1] => html_template_flexy_element Object
- + [opt_1] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -467,7 +488,7 @@
- [value] =>
- )
- - [opt_2] => html_template_flexy_element Object
- + [opt_2] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -489,7 +510,7 @@
- [value] =>
- )
- - [opt_3] => html_template_flexy_element Object
- + [opt_3] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -511,7 +532,7 @@
- [value] =>
- )
- - [List] => html_template_flexy_element Object
- + [List] => HTML_Template_Flexy_Element Object
- (
- [tag] => select
- [attributes] => Array
- @@ -523,7 +544,7 @@
- (
- [0] =>
- - [1] => html_template_flexy_element Object
- + [1] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -544,7 +565,7 @@
- [2] =>
- - [3] => html_template_flexy_element Object
- + [3] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -565,7 +586,7 @@
- [4] =>
- - [5] => html_template_flexy_element Object
- + [5] => HTML_Template_Flexy_Element Object
- (
- [tag] => option
- [attributes] => Array
- @@ -594,7 +615,7 @@
- [value] =>
- )
- - [_submit[4]] => html_template_flexy_element Object
- + [_submit[4]] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -614,7 +635,7 @@
- [value] =>
- )
- - [_submit[5]] => html_template_flexy_element Object
- + [_submit[5]] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -634,7 +655,7 @@
- [value] =>
- )
- - [testupload] => html_template_flexy_element Object
- + [testupload] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -653,8 +674,25 @@
- [value] =>
- )
- - [payment_1_type] =>
- - [1] => html_template_flexy_element Object
- + [payment_1_type] => HTML_Template_Flexy_Element Object
- + (
- + [tag] => input
- + [attributes] => Array
- + (
- + [type] => radio
- + )
- +
- + [children] => Array
- + (
- + )
- +
- + [override] =>
- + [prefix] =>
- + [suffix] =>
- + [value] =>
- + )
- +
- + [1] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -676,7 +714,7 @@
- [value] =>
- )
- - [2] => html_template_flexy_element Object
- + [2] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -698,8 +736,25 @@
- [value] =>
- )
- - [payment_2_type] =>
- - [3] => html_template_flexy_element Object
- + [payment_2_type] => HTML_Template_Flexy_Element Object
- + (
- + [tag] => input
- + [attributes] => Array
- + (
- + [type] => radio
- + )
- +
- + [children] => Array
- + (
- + )
- +
- + [override] =>
- + [prefix] =>
- + [suffix] =>
- + [value] =>
- + )
- +
- + [3] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -721,7 +776,7 @@
- [value] =>
- )
- - [4] => html_template_flexy_element Object
- + [4] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -743,7 +798,7 @@
- [value] =>
- )
- - [picture] => html_template_flexy_element Object
- + [picture] => HTML_Template_Flexy_Element Object
- (
- [tag] => img
- [attributes] => Array
- @@ -762,7 +817,7 @@
- [value] =>
- )
- - [testing] => html_template_flexy_element Object
- + [testing] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -781,7 +836,7 @@
- [value] =>
- )
- - [_submit[2]] => html_template_flexy_element Object
- + [_submit[2]] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -801,7 +856,7 @@
- [value] =>
- )
- - [testing2] => html_template_flexy_element Object
- + [testing2] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -819,7 +874,7 @@
- [value] =>
- )
- - [_submit[1]] => html_template_flexy_element Object
- + [_submit[1]] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -838,7 +893,7 @@
- [value] =>
- )
- - [testingxhtml] => html_template_flexy_element Object
- + [testingxhtml] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -859,7 +914,7 @@
- [value] =>
- )
- - [xhtmllisttest] => html_template_flexy_element Object
- + [xhtmllisttest] => HTML_Template_Flexy_Element Object
- (
- [tag] => select
- [attributes] => Array
- @@ -881,7 +936,7 @@
- [value] =>
- )
- - [testingcheckbox] => html_template_flexy_element Object
- + [testingcheckbox] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -901,7 +956,7 @@
- [value] =>
- )
- - [test_mix] => html_template_flexy_element Object
- + [test_mix] => HTML_Template_Flexy_Element Object
- (
- [tag] => form
- [attributes] => Array
- @@ -919,7 +974,7 @@
- [value] =>
- )
- - [testing5] => html_template_flexy_element Object
- + [testing5] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -937,7 +992,7 @@
- [value] =>
- )
- - [_submit[3]] => html_template_flexy_element Object
- + [_submit[3]] => HTML_Template_Flexy_Element Object
- (
- [tag] => input
- [attributes] => Array
- @@ -1037,4 +1092,4 @@
- -<form name="test_mix" action=""><input name="testing5" value=""><input type="submit" name="_submit[3]"></form>
- \ No newline at end of file
- +<form name="test_mix" action=""><input name="testing5" value=""><input type="submit" name="_submit[3]"></form>
- Index: tests/test_looping.html.phpt
- ===================================================================
- RCS file: /repository/pear/HTML_Template_Flexy/tests/test_looping.html.phpt,v
- retrieving revision 1.2
- diff -u -r1.2 test_looping.html.phpt
- --- tests/test_looping.html.phpt 25 Jan 2005 06:11:56 -0000 1.2
- +++ tests/test_looping.html.phpt 27 Oct 2008 07:30:09 -0000
- @@ -24,7 +24,7 @@
- Bug #84
- <?php if ($this->options['strict'] || (is_array($t->list) || is_object($t->list))) foreach($t->list as $i) {?>
- - <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'method'))) echo htmlspecialchars($t->method($i));?>
- + <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'method'))) echo htmlspecialchars($t->method($i));?>
- <?php }?>
- <?php if ($this->options['strict'] || (is_array($t->list) || is_object($t->list))) foreach($t->list as $i => $j) {?>
- @@ -33,7 +33,7 @@
- <table>
- <?php if ($this->options['strict'] || (is_array($t->xyz) || is_object($t->xyz))) foreach($t->xyz as $abcd => $def) {?><tr>
- - <td><?php echo htmlspecialchars($abcd);?>, <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'test'))) echo htmlspecialchars($t->test($def));?></td>
- + <td><?php echo htmlspecialchars($abcd);?>, <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'test'))) echo htmlspecialchars($t->test($def));?></td>
- </tr><?php }?>
- </table>
- @@ -106,4 +106,4 @@
- 1:2
- 2:3
- 3:4
- -]]>
- \ No newline at end of file
- +]]>
- Index: tests/test_methods.html.phpt
- ===================================================================
- RCS file: /repository/pear/HTML_Template_Flexy/tests/test_methods.html.phpt,v
- retrieving revision 1.1
- diff -u -r1.1 test_methods.html.phpt
- --- tests/test_methods.html.phpt 22 Jan 2005 05:25:19 -0000 1.1
- +++ tests/test_methods.html.phpt 27 Oct 2008 07:30:09 -0000
- @@ -13,72 +13,72 @@
- ===Compiled file: methods.html===
- <h2>Methods</H2>
- -<p>Calling a method <?php if ($this->options['strict'] || (isset($t->a) && method_exists($t->a,'helloWorld'))) echo htmlspecialchars($t->a->helloWorld());?></p>
- -<p>or <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'includeBody'))) echo $t->includeBody();?></P>
- -<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getImageDir'))) echo htmlspecialchars($t->getImageDir());?>/someimage.jpg">
- -<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getImageDir'))) echo $t->getImageDir();?>/someimage.jpg">
- -<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getImageDir'))) echo urlencode($t->getImageDir());?>/someimage.jpg">
- +<p>Calling a method <?php if ($this->options['strict'] || (isset($t->a) && method_exists($t->a, 'helloWorld'))) echo htmlspecialchars($t->a->helloWorld());?></p>
- +<p>or <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'includeBody'))) echo $t->includeBody();?></P>
- +<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getImageDir'))) echo htmlspecialchars($t->getImageDir());?>/someimage.jpg">
- +<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getImageDir'))) echo $this->plugin("h%7",$t->getImageDir());?>/someimage.jpg">
- +<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getImageDir'))) echo $this->plugin("u%7",$t->getImageDir());?>/someimage.jpg">
- -<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getImageDir'))) echo htmlspecialchars($t->getImageDir());?>/someimage.jpg">
- -<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getImageDir'))) echo htmlspecialchars($t->getImageDir());?>/someimage.jpg">
- +<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getImageDir'))) echo htmlspecialchars($t->getImageDir());?>/someimage.jpg">
- +<img src="<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getImageDir'))) echo htmlspecialchars($t->getImageDir());?>/someimage.jpg">
- -<span class="<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getBgnd'))) echo htmlspecialchars($t->getBgnd($t->valueArr['isConfigurable']));?>"></span>
- +<span class="<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getBgnd'))) echo htmlspecialchars($t->getBgnd($t->valueArr['isConfigurable']));?>"></span>
- <h2>Full Method testing</h2>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,$t->hij));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,"def","hij"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,$t->hij));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo htmlspecialchars($t->abc($t->abc,"def","hij"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,"hij"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc("abc",$t->def,$t->hij));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,"hij"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo htmlspecialchars($t->abc("abc",$t->def,$t->hij));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc($t->abc,$t->def,$t->hij);?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc($t->abc,"def","hij");?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc($t->abc,$t->def,"hij");?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc("abc",$t->def,$t->hij);?>
- -
- -
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,$t->def,$t->hij));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,"def","hij"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,$t->def,"hij"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc("abc",$t->def,$t->hij));?>
- -
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc(123,$t->def,$t->hij));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,123,123));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,123));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc("abc",123,$t->hij));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo $t->abc($t->abc,$t->def,$t->hij);?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo $t->abc($t->abc,"def","hij");?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo $t->abc($t->abc,$t->def,"hij");?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo $t->abc("abc",$t->def,$t->hij);?>
- +
- +
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo urlencode($t->abc($t->abc,$t->def,$t->hij));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo urlencode($t->abc($t->abc,"def","hij"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo urlencode($t->abc($t->abc,$t->def,"hij"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo urlencode($t->abc("abc",$t->def,$t->hij));?>
- +
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo htmlspecialchars($t->abc(123,$t->def,$t->hij));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo urlencode($t->abc($t->abc,123,123));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,123));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'abc'))) echo urlencode($t->abc("abc",123,$t->hij));?>
- <h2>Real life method testing </h2>
- -Invoice number: <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"number"));?> Place:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"place"));?> Date: <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"date"));?> Payment:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"payment"));?> Payment date:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"payment_date"));?> Seller: Name 1:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"name1"));?> Name 2: <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"name2"));?> NIP:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"nip"));?> Street: <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"street"));?> City:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"code"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"city"));?> Buyer: Name 1:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"name1"));?> Name 2: <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"name2"));?> NIP:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"nip"));?> Street: <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"street"));?> City:
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"code"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"city"));?>
- +Invoice number: <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"number"));?> Place:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"place"));?> Date: <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"date"));?> Payment:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"payment"));?> Payment date:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"payment_date"));?> Seller: Name 1:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"name1"));?> Name 2: <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"name2"));?> NIP:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"nip"));?> Street: <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"street"));?> City:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"code"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"city"));?> Buyer: Name 1:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"name1"));?> Name 2: <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"name2"));?> NIP:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"nip"));?> Street: <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"street"));?> City:
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"code"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"city"));?>
- # Name <?php if ($t->show_pkwiu) {?> PKWIU<?php }?> Count Netto VAT Brutto
- -<?php if ($this->options['strict'] || (is_array($t->positions) || is_object($t->positions))) foreach($t->positions as $position) {?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"nr"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"name"));?> <?php if ($t->show_pkwiu) {?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"pkwiu"));?><?php }?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"count"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"netto"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"vat"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"brutto"));?>
- +<?php if ($this->options['strict'] || (is_array($t->positions) || is_object($t->positions))) foreach($t->positions as $position) {?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"nr"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"name"));?> <?php if ($t->show_pkwiu) {?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"pkwiu"));?><?php }?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"count"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"netto"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"vat"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"brutto"));?>
- <?php }?> <?php if ($t->edit_positions) {?> # Name <?php if ($t->show_pkwiu) {?> PKWIU<?php }?> Count
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($t->position,"netto_mode")) { ?> Netto<?php } else {?> <?php }?> VAT
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($t->position,"netto_mode")) { ?> <?php } else {?> Brutto<?php }?>
- -<?php if ($this->options['strict'] || (is_array($t->edit_positions) || is_object($t->edit_positions))) foreach($t->edit_positions as $k => $position) {?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"nr"));?>
- -<?php if ($t->show_pkwiu) {?> <?php }?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($position,"netto_mode")) { ?> <?php } else {?>
- -<?php }?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($position,"netto_mode")) { ?> <?php } else {?> <?php }?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) if ($t->getelem($t->position,"netto_mode")) { ?> Netto<?php } else {?> <?php }?> VAT
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) if ($t->getelem($t->position,"netto_mode")) { ?> <?php } else {?> Brutto<?php }?>
- +<?php if ($this->options['strict'] || (is_array($t->edit_positions) || is_object($t->edit_positions))) foreach($t->edit_positions as $k => $position) {?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($position,"nr"));?>
- +<?php if ($t->show_pkwiu) {?> <?php }?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) if ($t->getelem($position,"netto_mode")) { ?> <?php } else {?>
- +<?php }?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) if ($t->getelem($position,"netto_mode")) { ?> <?php } else {?> <?php }?>
- <?php }?> <?php }?> #
- -<?php if ($this->options['strict'] || (is_array($t->sum) || is_object($t->sum))) foreach($t->sum as $sum) {?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"nr"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"netto"));?>
- -<?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"vat"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"brutto"));?>
- +<?php if ($this->options['strict'] || (is_array($t->sum) || is_object($t->sum))) foreach($t->sum as $sum) {?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($sum,"nr"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($sum,"netto"));?>
- +<?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($sum,"vat"));?> <?php if ($this->options['strict'] || (isset($t) && method_exists($t, 'getelem'))) echo htmlspecialchars($t->getelem($sum,"brutto"));?>
- <?php }?>
- @@ -120,4 +120,4 @@
- Name 2: NIP:
- Street: City:
- # Name Count Netto VAT Brutto
- - #
- \ No newline at end of file
- + #
- Index: tests/test_namespaces.html.phpt
- ===================================================================
- RCS file: /repository/pear/HTML_Template_Flexy/tests/test_namespaces.html.phpt,v
- retrieving revision 1.1
- diff -u -r1.1 test_namespaces.html.phpt
- --- tests/test_namespaces.html.phpt 22 Jan 2005 05:25:19 -0000 1.1
- +++ tests/test_namespaces.html.phpt 27 Oct 2008 07:30:09 -0000
- @@ -101,11 +101,7 @@
- </html:select>
- <!-- test toElement -->
- - <menulist id="supplier_id">
- - <menupopup>
- - <menuitem id="itemSubCatAll" label="-- Select --" value="0" />
- - </menupopup>
- - </menulist>
- + <menulist id="supplier_id"><menupopup><menuitem id="itemSubCatAll" label="-- Select --" value="0" /></menupopup></menulist>
- <!-- test using flexy stuff -->
- <menulist id="supplier_id2">
- <menupopup>
- @@ -113,9 +109,5 @@
- </menulist>
- <!-- test args on menupopup -->
- - <menulist id="product_category">
- - <menupopup onpopuphiding="cTree.categorySelect(this.parentNode.value,1);">
- - <menuitem id="prodCatAll" label="-- All --" value="0" />
- - </menupopup>
- - </menulist>
- -</window>
- \ No newline at end of file
- + <menulist id="product_category"><menupopup onpopuphiding="cTree.categorySelect(this.parentNode.value,1);"><menuitem id="prodCatAll" label="-- All --" value="0" /></menupopup></menulist>
- +</window>
- Index: tests/test_plugin_modifiers.html.phpt
- ===================================================================
- RCS file: /repository/pear/HTML_Template_Flexy/tests/test_plugin_modifiers.html.phpt,v
- retrieving revision 1.3
- diff -u -r1.3 test_plugin_modifiers.html.phpt
- --- tests/test_plugin_modifiers.html.phpt 14 May 2005 04:18:18 -0000 1.3
- +++ tests/test_plugin_modifiers.html.phpt 27 Oct 2008 07:30:09 -0000
- @@ -32,7 +32,7 @@
- Bug #3946 - inside raw!
- -<input type="checkbox" name="useTextarea3" <?php if ($this->options['strict'] || (isset($t->person) && method_exists($t->person,'useTextarea'))) echo $this->plugin("checked",$t->person->useTextarea());?>>
- +<input type="checkbox" name="useTextarea3" <?php if ($this->options['strict'] || (isset($t->person) && method_exists($t->person, 'useTextarea'))) echo $this->plugin("checked",$t->person->useTextarea());?>>
- @@ -51,4 +51,4 @@
- ===Compiling flexy_raw_with_element.html===
- -Error:/var/svn_live/pear/HTML_Template_Flexy/tests/templates/flexy_raw_with_element.html on Line 5 in Tag <INPUT>:<BR>Flexy:raw can only be used with flexy:ignore, to prevent conversion of html elements to flexy elements
- \ No newline at end of file
- +Error:/home/clockwerx/pear/HTML_Template_Flexy/tests/templates/flexy_raw_with_element.html on Line 5 in Tag <INPUT>:<BR>Flexy:raw can only be used with flexy:ignore, to prevent conversion of html elements to flexy elements
- Index: tests/test_usesname.html.phpt
- ===================================================================
- RCS file: /repository/pear/HTML_Template_Flexy/tests/test_usesname.html.phpt,v
- retrieving revision 1.1
- diff -u -r1.1 test_usesname.html.phpt
- --- tests/test_usesname.html.phpt 29 Jun 2005 03:19:20 -0000 1.1
- +++ tests/test_usesname.html.phpt 27 Oct 2008 07:30:09 -0000
- @@ -35,9 +35,16 @@
- <body>
- <?php echo $this->elements['formtest']->toHtmlnoClose();?>
- <?php if ($this->options['strict'] || (is_array($t->data) || is_object($t->data))) foreach($t->data as $key => $row) {?>
- - <?php echo htmlspecialchars($key);?>: <?php if (!isset($this->elements[sprintf('data%s',$key)])) $this->elements[sprintf('data%s',$key)]= $this->elements['data%s'];
- - $this->elements[sprintf('data%s',$key)] = $this->mergeElement($this->elements['data%s'],$this->elements[sprintf('data%s',$key)]);
- + <?php echo htmlspecialchars($key);?>: <?php
- + if (!isset($this->elements[sprintf('data%s',$key)])) {
- + $this->elements[sprintf('data%s',$key)]= $this->elements['data%s'];
- + }
- + $this->elements[sprintf('data%s',$key)] = $this->mergeElement(
- + $this->elements['data%s'],
- + $this->elements[sprintf('data%s',$key)]
- + );
- $this->elements[sprintf('data%s',$key)]->attributes['name'] = sprintf('data%s',$key);
- +
- echo $this->elements[sprintf('data%s',$key)]->toHtml();?><br>
- <?php }?>
- </form>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement