From: Jan Schneider Date: Mon, 5 Jul 2010 21:43:07 +0000 (+0200) Subject: short_open_tags can't be set through ini_set(), not even in PHP 5.3. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f694e1112316d4cc7bef9e9275e538f64628095a;p=horde.git short_open_tags can't be set through ini_set(), not even in PHP 5.3. --- diff --git a/babel/view.php b/babel/view.php index 14240d46d..dd40c8f1f 100644 --- a/babel/view.php +++ b/babel/view.php @@ -355,15 +355,15 @@ if (!$app) { ?> - - + +
MSGID REFERENCES STATUS
-
  +
 
diff --git a/content/app/views/Tag/recentTags.html.php b/content/app/views/Tag/recentTags.html.php index d069cec3e..9cd22cc03 100644 --- a/content/app/views/Tag/recentTags.html.php +++ b/content/app/views/Tag/recentTags.html.php @@ -1,5 +1,5 @@
    results as $tag): ?> -
  • escape($tag['tag_name']) ?>
  • +
  • escape($tag['tag_name']) ?>
diff --git a/content/app/views/Tag/searchTags.html.php b/content/app/views/Tag/searchTags.html.php index 5aeaf2e81..7a76eec98 100644 --- a/content/app/views/Tag/searchTags.html.php +++ b/content/app/views/Tag/searchTags.html.php @@ -1,5 +1,5 @@
    results as $tag_id => $tag_name): ?> -
  • escape($tag_name) ?>
  • +
  • escape($tag_name) ?>
diff --git a/flexdemo/garland/main.html.php b/flexdemo/garland/main.html.php index cfcdeabe6..abd097b26 100644 --- a/flexdemo/garland/main.html.php +++ b/flexdemo/garland/main.html.php @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@
- render('app.html.php') ?> + render('app.html.php') ?>
@@ -42,7 +42,7 @@ diff --git a/flexdemo/garland/right.html.php b/flexdemo/garland/right.html.php index 34388a487..73fd064fc 100644 --- a/flexdemo/garland/right.html.php +++ b/flexdemo/garland/right.html.php @@ -1 +1 @@ -blockContent('flexdemo', 'menu') ?> \ No newline at end of file +blockContent('flexdemo', 'menu') ?> \ No newline at end of file diff --git a/framework/View/lib/Horde/View/Base.php b/framework/View/lib/Horde/View/Base.php index 61edf1ac3..785048418 100644 --- a/framework/View/lib/Horde/View/Base.php +++ b/framework/View/lib/Horde/View/Base.php @@ -261,7 +261,7 @@ abstract class Horde_View_Base * * *
- * renderPartial('sidebarInfo') ?> + * renderPartial('sidebarInfo') ?> *
*
* diff --git a/framework/View/lib/Horde/View/Helper/Benchmark.php b/framework/View/lib/Horde/View/Helper/Benchmark.php index dc4945794..6f7243566 100644 --- a/framework/View/lib/Horde/View/Helper/Benchmark.php +++ b/framework/View/lib/Horde/View/Helper/Benchmark.php @@ -20,7 +20,7 @@ * and reports the result to the log. Example: * * benchmark("Notes section") ?> - * expensiveNotesOperation() ?> + * expensiveNotesOperation() ?> * end() ?> * * Will add something like "Notes section (0.34523)" to the log. diff --git a/framework/View/lib/Horde/View/Helper/Capture.php b/framework/View/lib/Horde/View/Helper/Capture.php index 6049a2fc6..aa67f8e93 100644 --- a/framework/View/lib/Horde/View/Helper/Capture.php +++ b/framework/View/lib/Horde/View/Helper/Capture.php @@ -54,7 +54,7 @@ class Horde_View_Helper_Capture extends Horde_View_Helper_Base * * You can then use $this->contentForHeader anywhere in your templates: * - * contentForHeader ?> + * contentForHeader ?> * * @param string $name Name of the content that becomes the instance * variable name. "foo" -> "$this->contentForFoo" diff --git a/framework/View/lib/Horde/View/Helper/Tag.php b/framework/View/lib/Horde/View/Helper/Tag.php index 5f779b641..91384c6f5 100644 --- a/framework/View/lib/Horde/View/Helper/Tag.php +++ b/framework/View/lib/Horde/View/Helper/Tag.php @@ -100,7 +100,7 @@ class Horde_View_Helper_Tag extends Horde_View_Helper_Base * Escapes a value for output in a view template. * * - *

escape($this->templateVar) ?>

+ *

escape($this->templateVar) ?>

*
* * @param mixed $var The output to escape. diff --git a/framework/View/lib/Horde/View/Helper/Text.php b/framework/View/lib/Horde/View/Helper/Text.php index b557f5348..4da554e3a 100644 --- a/framework/View/lib/Horde/View/Helper/Text.php +++ b/framework/View/lib/Horde/View/Helper/Text.php @@ -39,7 +39,7 @@ class Horde_View_Helper_Text extends Horde_View_Helper_Base * Escapes a value for output in a view template. * * - *

h($this->templateVar) ?>

+ *

h($this->templateVar) ?>

*
* * @param mixed $var The output to escape. @@ -78,7 +78,7 @@ class Horde_View_Helper_Text extends Horde_View_Helper_Base * classes for table rows: * * - * "> + * "> * * * <% endforeach %> @@ -89,10 +89,10 @@ class Horde_View_Helper_Text extends Horde_View_Helper_Base * name of the cycle. * * - * "row_class")) ?>"> + * "row_class")) ?>"> *
item
* values as $value) ?> - * "colors")) ?>"> + * "colors")) ?>"> * value * * <% end %> diff --git a/framework/View/test/Horde/View/fixtures/_myPartial.html.php b/framework/View/test/Horde/View/fixtures/_myPartial.html.php index f374d0e0e..e4e7bd2c1 100644 --- a/framework/View/test/Horde/View/fixtures/_myPartial.html.php +++ b/framework/View/test/Horde/View/fixtures/_myPartial.html.php @@ -1 +1 @@ -

myVar2 ?>

\ No newline at end of file +

myVar2 ?>

\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/_myPartialLocals.html.php b/framework/View/test/Horde/View/fixtures/_myPartialLocals.html.php index 74607ebb8..1f4c65a22 100644 --- a/framework/View/test/Horde/View/fixtures/_myPartialLocals.html.php +++ b/framework/View/test/Horde/View/fixtures/_myPartialLocals.html.php @@ -1 +1 @@ -

\ No newline at end of file +

\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/_myPartialObject.html.php b/framework/View/test/Horde/View/fixtures/_myPartialObject.html.php index e2db662fb..9c6878375 100644 --- a/framework/View/test/Horde/View/fixtures/_myPartialObject.html.php +++ b/framework/View/test/Horde/View/fixtures/_myPartialObject.html.php @@ -1 +1 @@ -

string_value ?>

\ No newline at end of file +

string_value ?>

\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/subdir/testRender.html.php b/framework/View/test/Horde/View/fixtures/subdir/testRender.html.php index 5ecca9358..2a102e22c 100644 --- a/framework/View/test/Horde/View/fixtures/subdir/testRender.html.php +++ b/framework/View/test/Horde/View/fixtures/subdir/testRender.html.php @@ -1 +1 @@ -
subdir myVar ?>
\ No newline at end of file +
subdir myVar ?>
\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/testEscape.html.php b/framework/View/test/Horde/View/fixtures/testEscape.html.php index f56541960..b6f55ee48 100644 --- a/framework/View/test/Horde/View/fixtures/testEscape.html.php +++ b/framework/View/test/Horde/View/fixtures/testEscape.html.php @@ -1 +1 @@ -
test h($this->myVar) ?> quotes
\ No newline at end of file +
test h($this->myVar) ?> quotes
\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/testPartial.html.php b/framework/View/test/Horde/View/fixtures/testPartial.html.php index bbf96b6dd..b2aca8f3d 100644 --- a/framework/View/test/Horde/View/fixtures/testPartial.html.php +++ b/framework/View/test/Horde/View/fixtures/testPartial.html.php @@ -1 +1 @@ -
myVar1 ?>renderPartial('myPartial') ?>
\ No newline at end of file +
myVar1 ?>renderPartial('myPartial') ?>
\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/testPartialCollection.html.php b/framework/View/test/Horde/View/fixtures/testPartialCollection.html.php index cc3b3a417..af5ba679b 100644 --- a/framework/View/test/Horde/View/fixtures/testPartialCollection.html.php +++ b/framework/View/test/Horde/View/fixtures/testPartialCollection.html.php @@ -1 +1 @@ -
renderPartial('myPartialObject', array('collection' => $this->myObjects)) ?>
\ No newline at end of file +
renderPartial('myPartialObject', array('collection' => $this->myObjects)) ?>
\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/testPartialLocals.html.php b/framework/View/test/Horde/View/fixtures/testPartialLocals.html.php index e6cc6446f..ac981f330 100644 --- a/framework/View/test/Horde/View/fixtures/testPartialLocals.html.php +++ b/framework/View/test/Horde/View/fixtures/testPartialLocals.html.php @@ -1 +1 @@ -
renderPartial('myPartialLocals', array('locals' => array('a' => 'hello', 'b' => 'world'))) ?>
\ No newline at end of file +
renderPartial('myPartialLocals', array('locals' => array('a' => 'hello', 'b' => 'world'))) ?>
\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/testPartialObject.html.php b/framework/View/test/Horde/View/fixtures/testPartialObject.html.php index d61d7ec42..5072bdbf9 100644 --- a/framework/View/test/Horde/View/fixtures/testPartialObject.html.php +++ b/framework/View/test/Horde/View/fixtures/testPartialObject.html.php @@ -1 +1 @@ -
renderPartial('myPartialObject', array('object' => $this->myObject)) ?>
\ No newline at end of file +
renderPartial('myPartialObject', array('object' => $this->myObject)) ?>
\ No newline at end of file diff --git a/framework/View/test/Horde/View/fixtures/testRender.html.php b/framework/View/test/Horde/View/fixtures/testRender.html.php index b764885ee..d893f8e4d 100644 --- a/framework/View/test/Horde/View/fixtures/testRender.html.php +++ b/framework/View/test/Horde/View/fixtures/testRender.html.php @@ -1 +1 @@ -
myVar ?>
\ No newline at end of file +
myVar ?>
\ No newline at end of file diff --git a/koward/lib/Koward/View/Check/run.html.php b/koward/lib/Koward/View/Check/run.html.php index ea945e832..c05dc7bc6 100644 --- a/koward/lib/Koward/View/Check/run.html.php +++ b/koward/lib/Koward/View/Check/run.html.php @@ -1,5 +1,5 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> +renderPartial('header'); ?> +renderPartial('menu'); ?> test)) { diff --git a/koward/lib/Koward/View/Check/show.html.php b/koward/lib/Koward/View/Check/show.html.php index f58908fef..f2629773b 100644 --- a/koward/lib/Koward/View/Check/show.html.php +++ b/koward/lib/Koward/View/Check/show.html.php @@ -1,5 +1,5 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> +renderPartial('header'); ?> +renderPartial('menu'); ?> renderPartial('header'); ?> -renderPartial('menu'); ?> +renderPartial('header'); ?> +renderPartial('menu'); ?>
-

welcome ?>

+

welcome ?>

diff --git a/koward/lib/Koward/View/Index/login.html.php b/koward/lib/Koward/View/Index/login.html.php index 58f90660c..e4ba62829 100644 --- a/koward/lib/Koward/View/Index/login.html.php +++ b/koward/lib/Koward/View/Index/login.html.php @@ -1,12 +1,12 @@ -renderPartial('header'); ?> +renderPartial('header'); ?> koward->notification->notify(array('listeners' => 'status')) ?> -
+
diff --git a/koward/lib/Koward/View/Object/add.html.php b/koward/lib/Koward/View/Object/add.html.php index 5185924e7..767d0369e 100644 --- a/koward/lib/Koward/View/Object/add.html.php +++ b/koward/lib/Koward/View/Object/add.html.php @@ -1,4 +1,4 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> -form->renderActive(new Horde_Form_Renderer(), $this->vars, +renderPartial('header'); ?> +renderPartial('menu'); ?> +form->renderActive(new Horde_Form_Renderer(), $this->vars, $this->post, 'post'); ?> \ No newline at end of file diff --git a/koward/lib/Koward/View/Object/delete.html.php b/koward/lib/Koward/View/Object/delete.html.php index f120ba671..78976426f 100644 --- a/koward/lib/Koward/View/Object/delete.html.php +++ b/koward/lib/Koward/View/Object/delete.html.php @@ -1,7 +1,7 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> +renderPartial('header'); ?> +renderPartial('menu'); ?> - +
@@ -9,7 +9,7 @@

" /> - +
diff --git a/koward/lib/Koward/View/Object/edit.html.php b/koward/lib/Koward/View/Object/edit.html.php index 5185924e7..767d0369e 100644 --- a/koward/lib/Koward/View/Object/edit.html.php +++ b/koward/lib/Koward/View/Object/edit.html.php @@ -1,4 +1,4 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> -form->renderActive(new Horde_Form_Renderer(), $this->vars, +renderPartial('header'); ?> +renderPartial('menu'); ?> +form->renderActive(new Horde_Form_Renderer(), $this->vars, $this->post, 'post'); ?> \ No newline at end of file diff --git a/koward/lib/Koward/View/Object/listall.html.php b/koward/lib/Koward/View/Object/listall.html.php index d3c162c37..6a0dfe4bc 100644 --- a/koward/lib/Koward/View/Object/listall.html.php +++ b/koward/lib/Koward/View/Object/listall.html.php @@ -1,9 +1,9 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> +renderPartial('header'); ?> +renderPartial('menu'); ?> -addBuiltinHelpers(); ?> +addBuiltinHelpers(); ?> -tabs->render($this->object_type); ?> +tabs->render($this->object_type); ?> objectlist)): ?> @@ -17,7 +17,7 @@ attributes as $attribute => $info): ?> - + @@ -26,20 +26,20 @@ allowEdit): ?> allowDelete): ?> attributes as $attribute => $ainfo): ?> diff --git a/koward/lib/Koward/View/Object/search.html.php b/koward/lib/Koward/View/Object/search.html.php index 4a1473fe3..d910b54d6 100644 --- a/koward/lib/Koward/View/Object/search.html.php +++ b/koward/lib/Koward/View/Object/search.html.php @@ -1,10 +1,10 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> +renderPartial('header'); ?> +renderPartial('menu'); ?> -addBuiltinHelpers(); ?> +addBuiltinHelpers(); ?> objectlist)): ?> - form->renderActive(new Horde_Form_Renderer(), $this->vars, + form->renderActive(new Horde_Form_Renderer(), $this->vars, $this->post, 'post'); ?>
- + - + - escape($info[$attribute]) . ''; ?> + escape($info[$attribute]) . ''; ?> - escape($info[$attribute]) ?> + escape($info[$attribute]) ?>
@@ -17,7 +17,7 @@ attributes as $attribute => $info): ?> - + @@ -26,12 +26,12 @@ allowEdit): ?> allowDelete): ?> attributes as $attribute => $ainfo): ?> @@ -48,9 +48,9 @@ } ?> - escape($value) . ''; ?> + escape($value) . ''; ?> - escape($value) ?> + escape($value) ?> diff --git a/koward/lib/Koward/View/Object/view.html.php b/koward/lib/Koward/View/Object/view.html.php index 282be9606..70a0cd111 100644 --- a/koward/lib/Koward/View/Object/view.html.php +++ b/koward/lib/Koward/View/Object/view.html.php @@ -1,5 +1,5 @@ -renderPartial('header'); ?> -renderPartial('menu'); ?> +renderPartial('header'); ?> +renderPartial('menu'); ?> actions)) { echo $this->actions->renderActive(new Horde_Form_Renderer(), $this->vars, diff --git a/koward/lib/Koward/View/shared/_menu.html.php b/koward/lib/Koward/View/shared/_menu.html.php index 6aaf09724..d0364e426 100644 --- a/koward/lib/Koward/View/shared/_menu.html.php +++ b/koward/lib/Koward/View/shared/_menu.html.php @@ -1,5 +1,5 @@ current_user)): ?>
- + - +
- + - - + + - - + + event->location)): ?> - - + + event->description)): ?> - - + + attendees): ?> - + @@ -42,6 +42,6 @@
h($this->event->getTitle()) ?>h($this->event->getTitle()) ?>
h($this->event->start->strftime('%x %X')) ?>h($this->event->start->strftime('%x %X')) ?>
h($this->event->end->strftime('%x %X')) ?>h($this->event->end->strftime('%x %X')) ?>
h($this->event->location) ?>h($this->event->location) ?>
event->description, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO, 'callback' => null, 'class' => null, 'charset' => Horde_Nls::getCharset())) ?>event->description, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO, 'callback' => null, 'class' => null, 'charset' => Horde_Nls::getCharset())) ?>
attendees as $attendee): ?> -
+
-
+
-

+

', '', '', '', '', '') ?>

diff --git a/kronolith/templates/itip/notification.plain.php b/kronolith/templates/itip/notification.plain.php index 65f8bc502..6383610e0 100644 --- a/kronolith/templates/itip/notification.plain.php +++ b/kronolith/templates/itip/notification.plain.php @@ -1,40 +1,40 @@ -subject ?> (event->start->strftime('%x'), $this->event->start->strftime('%X')) ?>) +subject ?> (event->start->strftime('%x'), $this->event->start->strftime('%X')) ?>) event->location)): ?> - event->location ?> + event->location ?> attendees): ?> - attendees) ?> + attendees) ?> event->description)): ?> - + -event->description ?> +event->description ?> - + - + - + -linkAccept ?> +linkAccept ?> - + -linkTentative ?> +linkTentative ?> - + -linkDecline ?> +linkDecline ?> diff --git a/luxor/templates/directory.html.php b/luxor/templates/directory.html.php index 7ad47ecf1..46023f979 100644 --- a/luxor/templates/directory.html.php +++ b/luxor/templates/directory.html.php @@ -1,19 +1,19 @@ - - - - + + + + files as $file): ?> - - - - + + + + diff --git a/luxor/templates/symbol.html.php b/luxor/templates/symbol.html.php index 87afb9840..fa57123ee 100644 --- a/luxor/templates/symbol.html.php +++ b/luxor/templates/symbol.html.php @@ -1,28 +1,28 @@

- escape($this->title) ?> + escape($this->title) ?>

-

+

declarations as $declaration): ?>
-
escape($declaration['title']) ?>
+
escape($declaration['title']) ?>
-
+
-

+

references as $reference): ?>
-
+
-
+
diff --git a/turba/templates/search/advanced.html.php b/turba/templates/search/advanced.html.php index c3538f1e3..8f0986db8 100644 --- a/turba/templates/search/advanced.html.php +++ b/turba/templates/search/advanced.html.php @@ -2,17 +2,17 @@
addressBooks) > 1): ?> - + @@ -21,8 +21,8 @@ map as $name => $v): ?> - - + + diff --git a/turba/templates/search/basic.html.php b/turba/templates/search/basic.html.php index f4e87f47f..148200390 100644 --- a/turba/templates/search/basic.html.php +++ b/turba/templates/search/basic.html.php @@ -1,25 +1,25 @@ addressBooks) > 1): ?> - + - + - + -" /> +" /> diff --git a/turba/templates/search/duplicate.html.php b/turba/templates/search/duplicate.html.php index cdef321b9..c8c2c4256 100644 --- a/turba/templates/search/duplicate.html.php +++ b/turba/templates/search/duplicate.html.php @@ -1,11 +1,11 @@ addressBooks) > 1): ?> - + -" /> +" /> \ No newline at end of file diff --git a/turba/templates/search/duplicate/contact_header.html.php b/turba/templates/search/duplicate/contact_header.html.php index 314ccb85b..097dc9a0e 100644 --- a/turba/templates/search/duplicate/contact_header.html.php +++ b/turba/templates/search/duplicate/contact_header.html.php @@ -1,31 +1,31 @@
changed): ?>

- changed ?> + changed ?>

first): ?> -
- - - - - " /> + + + + + + " /> -
- - - + + + + - " /> + " /> -
- - - + + + + - " /> + " />
diff --git a/turba/templates/search/duplicate/header.html.php b/turba/templates/search/duplicate/header.html.php index 1933bd9a0..f044d11f6 100644 --- a/turba/templates/search/duplicate/header.html.php +++ b/turba/templates/search/duplicate/header.html.php @@ -1,3 +1,3 @@
-

h(sprintf(_("Duplicates of %s \"%s\""), $this->type, $this->value)) ?>

+

h(sprintf(_("Duplicates of %s \"%s\""), $this->type, $this->value)) ?>

diff --git a/turba/templates/search/duplicate/list.html.php b/turba/templates/search/duplicate/list.html.php index a81c7d564..c7cf6c2b0 100644 --- a/turba/templates/search/duplicate/list.html.php +++ b/turba/templates/search/duplicate/list.html.php @@ -3,19 +3,19 @@
duplicates as $field => $duplicates): ?> -

h(sprintf(_("Duplicates of %s"), $this->attributes[$field]['label'])) ?>

+

h(sprintf(_("Duplicates of %s"), $this->attributes[$field]['label'])) ?>

escape($file['name']) ?>escape($file['filesize']) ?> escape($file['bytes']) ?>escape($file['modtime']) ?> escape($file['name']) ?>escape($file['filesize']) ?> escape($file['bytes']) ?>escape($file['modtime']) ?>
  - " /> - " /> + " /> + " />
- - + + $list): ?> - - + + diff --git a/turba/templates/search/header.html.php b/turba/templates/search/header.html.php index 709118af8..845cd6334 100644 --- a/turba/templates/search/header.html.php +++ b/turba/templates/search/header.html.php @@ -1,6 +1,6 @@
- + uniqueSource): ?> - + diff --git a/turba/templates/search/vbook.html.php b/turba/templates/search/vbook.html.php index 44b2fc830..468874c30 100644 --- a/turba/templates/search/vbook.html.php +++ b/turba/templates/search/vbook.html.php @@ -1,9 +1,9 @@ hasShare): ?> -
shareSources[$this->source] ? '' : ' style="display:none"' ?>> +
shareSources[$this->source] ? '' : ' style="display:none"' ?>> - + - +