Replace short open tags.

diff --git a/framework/View/lib/Horde/View/Helper/Benchmark.php b/framework/View/lib/Horde/View/Helper/Benchmark.php
index 6f72435..70b9cc9 100644 (file)
--- a/framework/View/lib/Horde/View/Helper/Benchmark.php
+++ b/framework/View/lib/Horde/View/Helper/Benchmark.php
@@ -19,9 +19,9 @@
  * Measures the execution time of a block in a template
  * and reports the result to the log.  Example:
  *
- *  <? $bench = $this->benchmark("Notes section") ?>
+ *  <?php $bench = $this->benchmark("Notes section") ?>
  *    <?php echo $this->expensiveNotesOperation() ?>
- *  <? $bench->end() ?>
+ *  <?php $bench->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 aa67f8e..0eb72ec 100644 (file)
--- a/framework/View/lib/Horde/View/Helper/Capture.php
+++ b/framework/View/lib/Horde/View/Helper/Capture.php
@@ -31,9 +31,9 @@ class Horde_View_Helper_Capture extends Horde_View_Helper_Base
      * instance variable. You can use this instance variable anywhere
      * in your templates and even in your layout.  Example:
      *
-     *  <? $capture = $this->capture() ?>
+     *  <?php $capture = $this->capture() ?>
      *    Welcome To my shiny new web page!
-     *  <? $this->greeting = $capture->end() ?>
+     *  <?php $this->greeting = $capture->end() ?>
      *
      * @return Horde_View_Helper_Capture_Base
      */
@@ -48,9 +48,9 @@ class Horde_View_Helper_Capture extends Horde_View_Helper_Base
      * that will be named "contentForName" in another template
      * or in the layout.  Example:
      *
-     *    <? $capture = $this->contentFor("header") %>
+     *    <?php $capture = $this->contentFor("header") %>
      *      <script type="text/javascript"> alert('hello world') </script>
-     *    <? $capture->end() %>
+     *    <?php $capture->end() %>
      *
      * You can then use $this->contentForHeader anywhere in your templates:
      *

diff --git a/framework/View/lib/Horde/View/Helper/Text.php b/framework/View/lib/Horde/View/Helper/Text.php
index 4da554e..bf2805d 100644 (file)
--- a/framework/View/lib/Horde/View/Helper/Text.php
+++ b/framework/View/lib/Horde/View/Helper/Text.php
@@ -77,29 +77,29 @@ class Horde_View_Helper_Text extends Horde_View_Helper_Base
      * array every time it is called. This can be used for example, to alternate
      * classes for table rows:
      *
-     *   <? foreach($items as $item): ?>
+     *   <?php foreach($items as $item): ?>
      *     <tr class="<?php echo $this->cycle("even", "odd") ?>">
      *       <td>item</td>
      *     </tr>
-     *   <% endforeach %>
+     *   <?php endforeach ?>
      *
      * You can use named cycles to allow nesting in loops.  Passing an array as
      * the last parameter with a <tt>name</tt> key will create a named cycle.
      * You can manually reset a cycle by calling resetCycle() and passing the
      * name of the cycle.
      *
-     *   <? foreach($items as $item): ?>
+     *   <?php foreach($items as $item): ?>
      *     <tr class="<?php echo $this->cycle("even", "odd", array('name' => "row_class")) ?>">
      *       <td>
-     *         <? foreach ($item->values as $value) ?>
+     *         <?php foreach ($item->values as $value) ?>
      *           <span style="color:<?php echo $this->cycle("red", "green", "blue", array('name' => "colors")) ?>">
      *             value
      *           </span>
-     *         <% end %>
-     *         <? $this->resetCycle("colors") ?>
+     *         <?php endforeach ?>
+     *         <?php $this->resetCycle("colors") ?>
      *       </td>
      *    </tr>
-     *   <% endforeach %>
+     *   <?php endforeach ?>
      *
      */
     public function cycle($firstValue)

diff --git a/kronolith/templates/itip/notification.html.php b/kronolith/templates/itip/notification.html.php
index 8a45299..6391a8d 100644 (file)
--- a/kronolith/templates/itip/notification.html.php
+++ b/kronolith/templates/itip/notification.html.php
@@ -13,35 +13,35 @@
       <td style="font-weight:bold;vertical-align:top"><?php echo _("End:") ?></td>
       <td><?php echo $this->h($this->event->end->strftime('%x %X')) ?></td>
     </tr>
-    <? if (strlen($this->event->location)): ?>
+    <?php if (strlen($this->event->location)): ?>
     <tr>
       <td style="font-weight:bold;vertical-align:top"><?php echo _("Location:") ?></td>
       <td><?php echo $this->h($this->event->location) ?></td>
     </tr>
-    <? endif; ?>
-    <? if (strlen($this->event->description)): ?>
+    <?php endif; ?>
+    <?php if (strlen($this->event->description)): ?>
     <tr>
       <td style="font-weight:bold;vertical-align:top"><?php echo _("Description:") ?></td>
          <td><?php echo Horde_Text_Filter::filter($this->event->description, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO, 'callback' => null, 'class' => null, 'charset' => Horde_Nls::getCharset())) ?></td>
     </tr>
-    <? endif; ?>
-    <? if ($this->attendees): ?>
+    <?php endif; ?>
+    <?php if ($this->attendees): ?>
     <tr>
       <td style="font-weight:bold;vertical-align:top"><?php echo _("Attendees:") ?></td>
       <td>
-        <? foreach ($this->attendees as $attendee): ?>
-        <? if (strpos('@', $attendee) === false): ?>
+        <?php foreach ($this->attendees as $attendee): ?>
+        <?php if (strpos('@', $attendee) === false): ?>
         <?php echo $attendee ?><br />
-        <? else: ?>
+        <?php else: ?>
         <a href="mailto:<?php echo $attendee ?>"><?php echo $attendee ?></a><br />
-        <? endif; ?>
-        <? endforeach; ?>
+        <?php endif; ?>
+        <?php endforeach; ?>
       </td>
     </tr>
-    <? endif; ?>
+    <?php endif; ?>
   </tbody>
 </table>
 
 <p><?php echo _("Attached is an iCalendar file with more information about the event. If your mail client supports iTip requests you can use this file to easily update your local copy of the event.") ?></p>
 
-<p><? printf(_("If your email client doesn't support iTip requests you can use the following links to: %saccept%s, %saccept tentatively%s or %sdecline%s the event."), '<strong><a href="' . htmlspecialchars($this->linkAccept) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkTentative) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkDecline) . '">', '</a></strong>') ?></p>
+<p><?php printf(_("If your email client doesn't support iTip requests you can use the following links to: %saccept%s, %saccept tentatively%s or %sdecline%s the event."), '<strong><a href="' . htmlspecialchars($this->linkAccept) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkTentative) . '">', '</a></strong>', '<strong><a href="' . htmlspecialchars($this->linkDecline) . '">', '</a></strong>') ?></p>

diff --git a/kronolith/templates/itip/notification.plain.php b/kronolith/templates/itip/notification.plain.php
index 6383610..402f864 100644 (file)
--- a/kronolith/templates/itip/notification.plain.php
+++ b/kronolith/templates/itip/notification.plain.php
@@ -1,23 +1,23 @@
-<?php echo $this->subject ?> (<? printf(_("on %s at %s"), $this->event->start->strftime('%x'), $this->event->start->strftime('%X')) ?>)
+<?php echo $this->subject ?> (<?php printf(_("on %s at %s"), $this->event->start->strftime('%x'), $this->event->start->strftime('%X')) ?>)
 
-<? if (strlen($this->event->location)): ?>
+<?php if (strlen($this->event->location)): ?>
 <?php echo _("Location:") ?> <?php echo $this->event->location ?>
 
 
-<? endif; ?>
-<? if ($this->attendees): ?>
+<?php endif; ?>
+<?php if ($this->attendees): ?>
 <?php echo _("Attendees:") ?> <?php echo implode(', ', $this->attendees) ?>
 
 
-<? endif; ?>
-<? if (strlen($this->event->description)): ?>
+<?php endif; ?>
+<?php if (strlen($this->event->description)): ?>
 <?php echo _("The following is a more detailed description of the event:") ?>
 
 
 <?php echo $this->event->description ?>
 
 
-<? endif; ?>
+<?php endif; ?>
 <?php echo _("Attached is an iCalendar file with more information about the event. If your mail client supports iTip requests you can use this file to easily update your local copy of the event.") ?>
 
 

diff --git a/luxor/templates/directory.html.php b/luxor/templates/directory.html.php
index 46023f9..5620455 100644 (file)
--- a/luxor/templates/directory.html.php
+++ b/luxor/templates/directory.html.php
@@ -8,13 +8,13 @@
  </tr>
 </thead>
 <tbody>
- <? foreach ($this->files as $file): ?>
+ <?php foreach ($this->files as $file): ?>
  <tr>
   <td><a href="<?php echo $file['link'] ?>"><?php echo $file['icon'] ?> <?php echo $this->escape($file['name']) ?></a></td>
   <td><?php echo $this->escape($file['filesize']) ?> <?php echo $this->escape($file['bytes']) ?></td>
   <td><?php echo $this->escape($file['modtime']) ?></td>
   <td><?php echo $file['description'] ?></td>
  </tr>
- <? endforeach ?>
+ <?php endforeach ?>
 </tbody>
 </table>

diff --git a/luxor/templates/symbol.html.php b/luxor/templates/symbol.html.php
index fa57123..c37166b 100644 (file)
--- a/luxor/templates/symbol.html.php
+++ b/luxor/templates/symbol.html.php
@@ -6,24 +6,24 @@
 
 <div id="symbol-declarations">
 <h2><?php echo _("Declarations") ?></h2>
-<? foreach ($this->declarations as $declaration): ?>
+<?php foreach ($this->declarations as $declaration): ?>
  <dl class="box">
   <dt><?php echo $this->escape($declaration['title']) ?></dt>
-  <? foreach ($declaration['files'] as $file): ?>
+  <?php foreach ($declaration['files'] as $file): ?>
    <dd><?php echo $file ?></dd>
-  <? endforeach ?>
+  <?php endforeach ?>
  </dl>
-<? endforeach ?>
+<?php endforeach ?>
 </div>
 
 <div id="symbol-references">
 <h2><?php echo _("Referenced in") ?></h2>
-<? foreach ($this->references as $reference): ?>
+<?php foreach ($this->references as $reference): ?>
  <dl class="box">
   <dt><?php echo $reference['file'] ?></dt>
-   <? foreach ($reference['lines'] as $line): ?>
+   <?php foreach ($reference['lines'] as $line): ?>
    <dd><?php echo $line ?></dd>
-   <? endforeach ?>
+   <?php endforeach ?>
  </dl>
-<? endforeach ?>
+<?php endforeach ?>
 </div>