From 6afd0fd29bd356acaf80feff1bf701da16710df8 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 6 Jul 2010 18:53:02 -0600
Subject: [PATCH] Fix turba short tags templates

---
 turba/templates/search/advanced.html.php                 | 16 ++++++++--------
 turba/templates/search/basic.html.php                    | 12 ++++++------
 turba/templates/search/duplicate.html.php                | 10 +++++-----
 turba/templates/search/duplicate/contact_header.html.php |  8 ++++----
 turba/templates/search/duplicate/list.html.php           | 12 ++++++------
 turba/templates/search/header.html.php                   |  4 ++--
 turba/templates/search/vbook.html.php                    |  4 ++--
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/turba/templates/search/advanced.html.php b/turba/templates/search/advanced.html.php
index 8f0986db8..a80b5bc9c 100644
--- a/turba/templates/search/advanced.html.php
+++ b/turba/templates/search/advanced.html.php
@@ -6,24 +6,24 @@
    <input type="reset" class="button" name="reset" value="<?php echo _("Reset to Defaults") ?>" />
   </td>
  </tr>
- <? if (count($this->addressBooks) > 1): ?>
+ <?php if (count($this->addressBooks) > 1): ?>
  <tr>
   <td class="rightAlign"><strong><label for="source"><?php echo _("Address Book") ?></label></strong></td>
   <td class="leftAlign">
    <select id="source" name="source" onchange="directory_search.submit()">
-    <? foreach ($this->addressBooks as $key => $entry): ?>
+    <?php foreach ($this->addressBooks as $key => $entry): ?>
     <option<?php echo $key == $this->source ? ' selected="selected"' : '' ?> value="<?php echo $key ?>"><?php echo $this->h($entry['title']) ?></option>
-    <? endforeach; ?>
+    <?php endforeach; ?>
    </select>
   </td>
  </tr>
-<? endif; ?>
-<? foreach ($this->map as $name => $v): ?>
-<? if (substr($name, 0, 2) != '__'): ?>
+<?php endif; ?>
+<?php foreach ($this->map as $name => $v): ?>
+<?php if (substr($name, 0, 2) != '__'): ?>
  <tr>
   <td width="1%" class="nowrap rightAlign" ><strong><label for="<?php echo $name ?>"><?php echo $this->h($this->attributes[$name]['label']) ?></label></strong></td>
   <td class="leftAlign"><input type="text" size="30" id="<?php echo $name ?>" name="<?php echo $name ?>" value="<?php echo isset($this->criteria[$name]) ? $this->h($this->criteria[$name]) : '' ?>" /></td>
  </tr>
-<? endif; ?>
-<? endforeach; ?>
+<?php endif; ?>
+<?php endforeach; ?>
 </table>
diff --git a/turba/templates/search/basic.html.php b/turba/templates/search/basic.html.php
index 148200390..7dde15788 100644
--- a/turba/templates/search/basic.html.php
+++ b/turba/templates/search/basic.html.php
@@ -3,21 +3,21 @@ TurbaSearch.criteria = <?php echo json_encode($this->allCriteria) ?>;
 TurbaSearch.shareSources = <?php echo json_encode($this->shareSources) ?>;
 </script>
 
-<? if (count($this->addressBooks) > 1): ?>
+<?php if (count($this->addressBooks) > 1): ?>
 <strong><label for="source"><?php echo _("From") ?></label></strong>
 <select id="turbaSearchSource" name="source" onchange="TurbaSearch.updateCriteria();">
-  <? foreach ($this->addressBooks as $key => $entry): ?>
+  <?php foreach ($this->addressBooks as $key => $entry): ?>
   <option<?php echo $key == $this->source ? ' selected="selected"' : '' ?> value="<?php echo $key ?>"><?php echo $this->h($entry['title']) ?></option>
-  <? endforeach; ?>
+  <?php endforeach; ?>
 </select>
-<? endif; ?>
+<?php endif; ?>
 
 <strong><label for="criteria"><?php echo _("Find") ?></label></strong>
 <select id="turbaSearchCriteria" name="criteria">
-  <? foreach ($this->addressBooks[$this->source]['search'] as $field): ?>
+  <?php foreach ($this->addressBooks[$this->source]['search'] as $field): ?>
   <option<?php echo $field == $this->criteria ? ' selected="selected"' : '' ?> value="<?php echo $field ?>"><?php echo $this->h($this->attributes[$field]['label'])
  ?></option>
-  <? endforeach; ?>
+  <?php endforeach; ?>
 </select>
 
 <strong><label for="val"><?php echo _("Matching") ?></label></strong>
diff --git a/turba/templates/search/duplicate.html.php b/turba/templates/search/duplicate.html.php
index c8c2c4256..7fe1cf4ea 100644
--- a/turba/templates/search/duplicate.html.php
+++ b/turba/templates/search/duplicate.html.php
@@ -1,11 +1,11 @@
-<? if (count($this->addressBooks) > 1): ?>
+<?php if (count($this->addressBooks) > 1): ?>
 <strong><label for="source"><?php echo _("Search duplicates in:") ?></label></strong>
 <select id="turbaSearchSource" name="source">
-  <? foreach ($this->addressBooks as $key => $entry): ?>
+  <?php foreach ($this->addressBooks as $key => $entry): ?>
   <option<?php echo $key == $this->source ? ' selected="selected"' : '' ?> value="<?php echo $key ?>"><?php echo $this->h($entry['title']) ?></option>
-  <? endforeach; ?>
+  <?php endforeach; ?>
 </select>
 <input class="button" type="submit" name="search" value="<?php echo _("Search") ?>" />
-<? endif; ?>
+<?php endif; ?>
 </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/turba/templates/search/duplicate/contact_header.html.php b/turba/templates/search/duplicate/contact_header.html.php
index 097dc9a0e..985564d7e 100644
--- a/turba/templates/search/duplicate/contact_header.html.php
+++ b/turba/templates/search/duplicate/contact_header.html.php
@@ -1,11 +1,11 @@
 <div class="turba-duplicate-contact solidbox">
-  <? if ($this->changed): ?>
+  <?php if ($this->changed): ?>
   <p>
     <?php echo _("Last change: ") . $this->changed ?>
   </p>
-  <? endif; ?>
+  <?php endif; ?>
   <div class="turba-duplicate-forms">
-    <? if (!$this->first): ?>
+    <?php if (!$this->first): ?>
     <form action="<?php echo $this->mergeUrl ?>">
       <input type="hidden" name="source" value="<?php echo $this->source ?>" />
       <input type="hidden" name="key" value="<?php echo $this->h($this->id) ?>" />
@@ -13,7 +13,7 @@
       <input type="hidden" name="merge_into" value="<?php echo $this->h($this->mergeTarget) ?>" />
       <input type="submit" class="button" value="<?php echo _("<< Merge this into the first contact") ?>" />
     </form>
-    <? endif; ?>
+    <?php endif; ?>
     <form action="<?php echo $this->contactUrl ?>">
       <input type="hidden" name="source" value="<?php echo $this->source ?>" />
       <input type="hidden" name="key" value="<?php echo $this->h($this->id) ?>" />
diff --git a/turba/templates/search/duplicate/list.html.php b/turba/templates/search/duplicate/list.html.php
index c7cf6c2b0..3d9b8a379 100644
--- a/turba/templates/search/duplicate/list.html.php
+++ b/turba/templates/search/duplicate/list.html.php
@@ -1,8 +1,8 @@
-<? if ($this->hasDuplicate): ?>
+<?php if ($this->hasDuplicate): ?>
 <br class="clear" />
-<? endif; ?>
+<?php endif; ?>
 <br />
-<? foreach ($this->duplicates as $field => $duplicates): ?>
+<?php foreach ($this->duplicates as $field => $duplicates): ?>
 <h3><?php echo $this->h(sprintf(_("Duplicates of %s"), $this->attributes[$field]['label'])) ?></h3>
 <table class="horde-table horde-block-links sortable">
   <thead>
@@ -12,12 +12,12 @@
     </tr>
   </thead>
   <tbody>
-    <? foreach ($duplicates as $value => $list): ?>
+    <?php foreach ($duplicates as $value => $list): ?>
     <tr>
       <td><a href="<?php echo $this->link->add(array('type' => $field, 'dupe' => $value)) ?>"><?php echo $this->h($value) ?></a></td>
       <td><a href="<?php echo $this->link->add(array('type' => $field, 'dupe' => $value)) ?>"><?php echo $list->count() ?></a></td>
     </tr>
-    <? endforeach; ?>
+    <?php endforeach; ?>
   </tbody>
 </table>
-<? endforeach; ?>
+<?php endforeach; ?>
diff --git a/turba/templates/search/header.html.php b/turba/templates/search/header.html.php
index 845cd6334..a3a19524e 100644
--- a/turba/templates/search/header.html.php
+++ b/turba/templates/search/header.html.php
@@ -1,6 +1,6 @@
 <div class="text" style="padding:1em">
 <form name="directory_search" action="search.php" method="get" onsubmit="RedBox.loading(); return true;">
 <?php echo Horde_Util::formInput() ?>
-<? if ($this->uniqueSource): ?>
+<?php if ($this->uniqueSource): ?>
 <input type="hidden" id="turbaSearchSource" name="source" value="<?php echo $this->uniqueSource ?>" />
-<? endif; ?>
+<?php endif; ?>
diff --git a/turba/templates/search/vbook.html.php b/turba/templates/search/vbook.html.php
index 468874c30..ccf146004 100644
--- a/turba/templates/search/vbook.html.php
+++ b/turba/templates/search/vbook.html.php
@@ -1,4 +1,4 @@
-<? if ($this->hasShare): ?>
+<?php if ($this->hasShare): ?>
 <div id="vbook-form"<?php echo $this->shareSources[$this->source] ? '' : ' style="display:none"' ?>>
   <input type="checkbox" id="save-vbook" name="save_vbook" />
   <strong><label for="save-vbook"><?php echo _("Save search as a virtual address book?") ?></label></strong>
@@ -11,7 +11,7 @@
   });
   </script>
 </div>
-<? endif; ?>
+<?php endif; ?>
 </form>
 </div>
 <br />
-- 
2.11.0