From e658d924d5342394b1e7316c120cd95cfdcba3ef Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Sun, 28 Feb 2016 19:20:31 +0000
Subject: Fix PHP upgrade related issues

---
diff --git a/site/app/views/addons/display.thtml b/site/app/views/addons/display.thtml
index 0affbb4..7c08731 100644
--- a/site/app/views/addons/display.thtml
+++ b/site/app/views/addons/display.thtml
@@ -253,7 +253,7 @@ if (!empty($coll_addon_added)) {
     <p <?=$addon['Translation']['description']['locale_html']?>>
       <?=nl2br($addon['Translation']['description']['string'])?>
     </p>
-    <? if (count($previews) > 1): // Only show this if there are 2 or more images. ?>
+    <?php if (count($previews) > 1): // Only show this if there are 2 or more images. ?>
       <h4><?=___('Image Gallery')?></h4>
       <?php
       foreach (array_slice($previews, 1) as $preview):
@@ -265,8 +265,8 @@ if (!empty($coll_addon_added)) {
            href="<?=$full?>" title="<?=$caption?>">
           <img src="<?=$thumb?>" alt="" />
         </a>
-      <? endforeach; ?>
-    <? endif; ?>
+      <?php endforeach; ?>
+    <?php endif; ?>
 
     <?php
     $support_email = $addon['Translation']['supportemail']['string'];
@@ -421,11 +421,11 @@ if (!empty($coll_addon_added)) {
                 $addon['Translation']['name']['string'])?></p>
   <p>
     <a class="more-info" href="<?=$html->url('/addon/'.$addon_id.'/developers')?>">
-        <? if (count($devs) > 1): ?>
+        <?php if (count($devs) > 1): ?>
           <?=n___('Meet the Developer', 'Meet the Developers', count($devs))?>
-        <? else: ?>
+        <?php else: ?>
           <?=sprintf(___('Meet %1$s'), $dev['User']['display_name'])?>
-        <? endif; ?>
+        <?php endif; ?>
     </a>
   </p>
 </div>
@@ -479,7 +479,7 @@ if (!empty($coll_addon_added)) {
         <?=$this->renderElement('addon_tags',array('userTags'=>$userTags, 'developerTags'=>$developerTags,'addon_id'=>$addon_id, 'origin'=>'users')); ?>
     </div>
 
-    <? if ($loggedIn): ?>
+    <?php if ($loggedIn): ?>
         <a href="#" id="addatag"><?=___('Add a tag');?></a>
         <div class="addtagform ">
             <form id='tagForm' action="<?=$html->url("/tags/add/")?>" method="POST">
@@ -490,11 +490,11 @@ if (!empty($coll_addon_added)) {
             </form>
             <span class="hint"><?=___('Comma-separated, minimum of 2 characters.  Example: <span class="example">ocean, sail boat, water</span>')?></span>
         </div>
-    <? else: ?>
-        <?echo sprintf(
+    <?php else: ?>
+        <?= sprintf(
             ___('<a href="%1$s">Register</a> or <a href="%2$s">Log in</a> to add tags'),
             $html->url('/users/register', false), $html->url($html->login_url())); ?>
-    <? endif; ?>
+    <?php endif; ?>
 
 </div>
 <!-- /.highlight-->
diff --git a/site/app/views/addons/fortag.thtml b/site/app/views/addons/fortag.thtml
index e59592b..25b5c06 100644
--- a/site/app/views/addons/fortag.thtml
+++ b/site/app/views/addons/fortag.thtml
@@ -1,9 +1,9 @@
 <h2><?=count($addons)?> Addons found for tag <b><i><?=$tag_text?></i></b></h2>
 
-<?
+<?php
                 foreach ($addons as $var => $val) {
                     echo $this->renderElement('amo2009/homepage_addon', array('addon' => $val));
                 }
 
 
-?>
\ No newline at end of file
+?>
diff --git a/site/app/views/addons/home.thtml b/site/app/views/addons/home.thtml
index 61e4251..5bfb911 100644
--- a/site/app/views/addons/home.thtml
+++ b/site/app/views/addons/home.thtml
@@ -77,18 +77,18 @@ $this->viewVars['bodyclass'] = 'home';
 
     <?=$this->renderElement('amo2009/search')?>
 
-    <? if(APP_ID == APP_FIREFOX): ?>
+    <?php if(APP_ID == APP_FIREFOX): ?>
         <?=$this->renderElement('amo2009/teaser_collections', array(
             'teaser_collection_promos' => $teaser_collection_promos,
             'promoted_collections'  => $promoted_collections
         ))?>
-    <? endif; ?>
+    <?php endif; ?>
 
-    <? if(APP_ID == APP_MOBILE): ?>
+    <?php if(APP_ID == APP_MOBILE): ?>
         <h2><?=___('Browse Mobile Add-ons')?></h2>
-    <? else: ?>
+    <?php else: ?>
         <h2><?=___('Browse Add-ons')?></h2>
-    <? endif; ?>
+    <?php endif; ?>
     <div class="primary">
         <div class="featured show-<?=$featured_type?> listing" id="featured">
             <div class="featured-inner">
diff --git a/site/app/views/addons/policy.thtml b/site/app/views/addons/policy.thtml
index 803f81c..e438473 100644
--- a/site/app/views/addons/policy.thtml
+++ b/site/app/views/addons/policy.thtml
@@ -51,7 +51,7 @@ else
 <div id="content" class="primary prose" role="main">
 
   <h2 class="name"<?=$addon['Translation']['name']['locale_html']?>>
-    <?=$addon['Translation']['name']['string']?><?php if (empty($policy)) {?> <?=$addon['Version'][0]['Version']['version']?><? }?>
+    <?=$addon['Translation']['name']['string']?><?php if (empty($policy)) {?> <?=$addon['Version'][0]['Version']['version']?><?php }?>
   </h2>
 
   <h3 class="author"> <?=___('by')?> <?=$html->linkUsersFromModel($addon['User'], 0);?></h3>
diff --git a/site/app/views/admin/collections_promobox.thtml b/site/app/views/admin/collections_promobox.thtml
index 1d0d1cc..0fa1d21 100644
--- a/site/app/views/admin/collections_promobox.thtml
+++ b/site/app/views/admin/collections_promobox.thtml
@@ -56,13 +56,13 @@
             will be shown on the front page, if more exist for a locale they will be randomly chosen.  Collections specified for a locale
             are given priority over collections specified for all locales.</p>
 
-        <? if (!empty($errors['main'])): ?>
-            <?echo $this->renderElement('notification', array('msg' => $errors['main'], 'type' => 'error')); ?>
-        <? endif; ?>
+        <?php if (!empty($errors['main'])): ?>
+            <?= $this->renderElement('notification', array('msg' => $errors['main'], 'type' => 'error')); ?>
+        <?php endif; ?>
 
-        <? if (isset($changeSuccess) && $changeSuccess): ?>
-            <?echo $this->renderElement('notification', array('msg' => 'Changes Saved', 'type' => 'success')); ?>
-        <? endif; ?>
+        <?php if (isset($changeSuccess) && $changeSuccess): ?>
+            <?= $this->renderElement('notification', array('msg' => 'Changes Saved', 'type' => 'success')); ?>
+        <?php endif; ?>
 
         <h4>Add a New Collection</h4>
         <?=$html->formTag('/admin/collections/promobox', 'post', array('id' => 'collection-promobox-add-form-all')); ?>
@@ -74,26 +74,26 @@
         </form>
 
         <hr />
-        <? foreach ($locales as $locale => $english_name): ?>
-            <? if (array_key_exists($locale, $promoted_collections)): ?>
+        <?php foreach ($locales as $locale => $english_name): ?>
+            <?php if (array_key_exists($locale, $promoted_collections)): ?>
                 <h4><?=$english_name?> (<?=$locale?>)</h4>
                 <ul>
-                    <? foreach ($promoted_collections[$locale] as $tnt => $collections): ?>
-                        <? foreach ($collections as $collection_id => $collection): ?>
+                    <?php foreach ($promoted_collections[$locale] as $tnt => $collections): ?>
+                        <?php foreach ($collections as $collection_id => $collection): ?>
                             <li>
                                 <?=$html->formTag('/admin/collections/promobox', 'post', array('id' => 'collection-promobox-delete-form-all')); ?>
-                                    <?echo $html->submitImage('developers/delete.png', array('title'=> 'Remove', 'alt' => 'Remove')); ?>
+                                    <?= $html->submitImage('developers/delete.png', array('title'=> 'Remove', 'alt' => 'Remove')); ?>
                                     <?=$html->image("developers/".array_search($collection['application_id'], $app_shortnames).".png")?>
                                     (<?=$titles_and_taglines[$tnt]['title']?>) <?=$collection['name']?>
                                     <input type="hidden" name="target" value="<?=$collection_id?>--<?=$tnt?>--<?=$locale?>" />
                                     <input type="hidden" name="action" value="delete" />
                                 </form>
                             </li>
-                        <? endforeach; ?>
-                    <? endforeach; ?>
+                        <?php endforeach; ?>
+                    <?php endforeach; ?>
                 </ul>
-            <? endif; ?>
-        <? endforeach; ?>
+            <?php endif; ?>
+        <?php endforeach; ?>
 
         <script type="text/javascript">
             $(document).ready(function() {
diff --git a/site/app/views/admin/collections_promoboxstructure.thtml b/site/app/views/admin/collections_promoboxstructure.thtml
index 8e90ce3..97ffb7d 100644
--- a/site/app/views/admin/collections_promoboxstructure.thtml
+++ b/site/app/views/admin/collections_promoboxstructure.thtml
@@ -56,13 +56,13 @@
         <p>This page manages the names and the taglines of the categories in the promotion box.  Once they are 
             added to this page they will appear in the L10n.</p>
 
-        <? if (!empty($errors['main'])): ?>
-            <?echo $this->renderElement('notification', array('msg' => $errors['main'], 'type' => 'error')); ?>
-        <? endif; ?>
+        <?php if (!empty($errors['main'])): ?>
+            <?= $this->renderElement('notification', array('msg' => $errors['main'], 'type' => 'error')); ?>
+        <?php endif; ?>
 
-        <? if (isset($changeSuccess) && $changeSuccess): ?>
-            <?echo $this->renderElement('notification', array('msg' => 'Changes Saved', 'type' => 'success')); ?>
-        <? endif; ?>
+        <?php if (isset($changeSuccess) && $changeSuccess): ?>
+            <?= $this->renderElement('notification', array('msg' => 'Changes Saved', 'type' => 'success')); ?>
+        <?php endif; ?>
 
         <h4>Add a New Collection</h4>
         <?=$html->formTag('/admin/collections/promobox', 'post', array('id' => 'collection-promobox-add-form-all')); ?>
@@ -75,26 +75,26 @@
 
         <hr />
 
-        <? foreach ($locales as $locale => $english_name): ?>
-            <? if (array_key_exists($locale, $promoted_collections)): ?>
+        <?php foreach ($locales as $locale => $english_name): ?>
+            <?php if (array_key_exists($locale, $promoted_collections)): ?>
                 <h4><?=$english_name?> (<?=$locale?>)</h4>
                 <ul>
-                    <? foreach ($promoted_collections[$locale] as $tnt => $collections): ?>
-                        <? foreach ($collections as $collection_id => $collection): ?>
+                    <?php foreach ($promoted_collections[$locale] as $tnt => $collections): ?>
+                        <?php foreach ($collections as $collection_id => $collection): ?>
                             <li>
                                 <?=$html->formTag('/admin/collections/promobox', 'post', array('id' => 'collection-promobox-delete-form-all')); ?>
-                                    <?echo $html->submitImage('developers/delete.png', array('title'=> 'Remove', 'alt' => 'Remove')); ?>
+                                    <?= $html->submitImage('developers/delete.png', array('title'=> 'Remove', 'alt' => 'Remove')); ?>
                                     <?=$html->image("developers/".array_search($collection['application_id'], $app_shortnames).".png")?>
                                     (<?=$titles_and_taglines[$tnt]['title']?>) <?=$collection['name']?>
                                     <input type="hidden" name="target" value="<?=$collection_id?>--<?=$tnt?>--<?=$locale?>" />
                                     <input type="hidden" name="action" value="delete" />
                                 </form>
                             </li>
-                        <? endforeach; ?>
-                    <? endforeach; ?>
+                        <?php endforeach; ?>
+                    <?php endforeach; ?>
                 </ul>
-            <? endif; ?>
-        <? endforeach; ?>
+            <?php endif; ?>
+        <?php endforeach; ?>
 
         <script type="text/javascript">
             $(document).ready(function() {
diff --git a/site/app/views/admin/statistics_contributions.thtml b/site/app/views/admin/statistics_contributions.thtml
index 05b6c8e..5103c53 100644
--- a/site/app/views/admin/statistics_contributions.thtml
+++ b/site/app/views/admin/statistics_contributions.thtml
@@ -140,7 +140,7 @@ $this->layout = 'amo2009';
     <div class="listing-footer">
       <img src="<?=$html->urlImage('ajax_loading.gif')?>" id="stats-table-loading" style="display:none;float:left;padding:5px 2px;" width="15" height="15" alt="<?=___('Loading data...')?>" />
       <ol id="stats-table-pagination" class="pagination"></ol>
-      <a href="#" id="stats-csv-download"><? echo ___('View this table in CSV format') ?></a>
+      <a href="#" id="stats-csv-download"><?php echo ___('View this table in CSV format') ?></a>
     </div>
   </div><!-- #stats-table-listing -->
 </div><!-- .primary -->
diff --git a/site/app/views/admin/variables.thtml b/site/app/views/admin/variables.thtml
index a14966e..29db307 100644
--- a/site/app/views/admin/variables.thtml
+++ b/site/app/views/admin/variables.thtml
@@ -56,11 +56,11 @@
 
         <h2>PHP info</h2>
         <div>
-            <? phpinfo(INFO_GENERAL); ?>
-            <? phpinfo(INFO_CONFIGURATION); ?>
-            <? phpinfo(INFO_MODULES); ?>
-            <? phpinfo(INFO_ENVIRONMENT); ?>
-            <? phpinfo(INFO_VARIABLES); ?>
+            <?= phpinfo(INFO_GENERAL); ?>
+            <?= phpinfo(INFO_CONFIGURATION); ?>
+            <?= phpinfo(INFO_MODULES); ?>
+            <?= phpinfo(INFO_ENVIRONMENT); ?>
+            <?= phpinfo(INFO_VARIABLES); ?>
         </div>
 
     </div>
diff --git a/site/app/views/developers/validator.thtml b/site/app/views/developers/validator.thtml
index 35f7e76..ed8b390 100644
--- a/site/app/views/developers/validator.thtml
+++ b/site/app/views/developers/validator.thtml
@@ -61,17 +61,17 @@ $this->layout = 'amo2009';
             <form id="upload-form" method="post" enctype="multipart/form-data" action="<?=$html->url('/developers/json/fileupload/temp')?>" target="upload-frame" onsubmit="return validate.validate();">
             <?=$html->hiddenSession();?>
 
-            <? if(!empty($all_addons)): ?>
+            <?php if(!empty($all_addons)): ?>
             <p><label><?=___('Check my hosted add-on: ')?>
                 <select id="addon-list" name="addon-list">
                     <option value=""></option>
-                    <? pr($all_addons);foreach ($all_addons as $id => $addon): ?>
+                    <?php pr($all_addons);foreach ($all_addons as $id => $addon): ?>
                         <option value="<?=$id?>"><?=$addon?></option>
-                    <? endforeach; ?>
+                    <?php endforeach; ?>
                 </select>
             </label></p>
             <p><strong><?=___(/* L10n: Used as a divider in the page.  One large option is above, one large option below. */ 'OR')?></strong></p>
-            <? endif; ?>
+            <?php endif; ?>
             <p><label><?=___('Upload an add-on to check: ')?><input id="upload-field" type="file" name="file" /></label></p>
             <div class="submit">
                 <button type="submit" class="require-privs button prominent"><?=___('Run Tests')?></button>
diff --git a/site/app/views/editors/review.thtml b/site/app/views/editors/review.thtml
index 13accd1..f3e728e 100644
--- a/site/app/views/editors/review.thtml
+++ b/site/app/views/editors/review.thtml
@@ -289,10 +289,10 @@ if (!empty($addon['Translation']['developercomments']['string'])) {
         <div class="top"><a href="#top"><?=___('Top')?></a></div>
     </div>
     <br class="clear">
-    <? foreach($version['File'] as $file) : ?>
+    <?php foreach($version['File'] as $file) : ?>
         <h4><?= $html->link(sprintf(___('Validation results for %s'), $file['filename']), '/developers/versions/validate/' . $version['Version']['id'] . '#test-results-' . $file['id']) ?></h4>
         <?= $this->renderElement('developers/testresults_header', array('test_groups' => $file['groups'], 'all_groups' => $test_groups, 'file' => array('File' => $file), 'counts' => $file['counts'], 'external_link' => true)); ?>
-    <? endforeach; ?>
+    <?php endforeach; ?>
 </div>
 <br class="clear">
 <div id="history">
diff --git a/site/app/views/editors/reviewlog.thtml b/site/app/views/editors/reviewlog.thtml
index c56da59..88326ea 100644
--- a/site/app/views/editors/reviewlog.thtml
+++ b/site/app/views/editors/reviewlog.thtml
@@ -109,6 +109,6 @@
         ?>
         </table>
         
-        <? if (!empty($approvals)) echo $this->renderElement('pagination');?>
+        <?php if (!empty($approvals)) echo $this->renderElement('pagination');?>
     </div>
 </div>
diff --git a/site/app/views/editors/reviews_queue.thtml b/site/app/views/editors/reviews_queue.thtml
index 43fb4a9..23873aa 100644
--- a/site/app/views/editors/reviews_queue.thtml
+++ b/site/app/views/editors/reviews_queue.thtml
@@ -57,7 +57,7 @@
         <div class="reviewed-on"><?= sprintf(___('by %1$s on %2$s (rated %3$s)'), $html->linkUserFromModel($review['User']), strftime(___('%B %e, %Y'), strtotime($review['Review']['created'])), $review['Review']['rating'])?></div>
         <?=nl2br($review['Translation']['body']['string'])?>
 
-        <? /* Developer reply? */
+        <?php /* Developer reply? */
         if (!empty($review['Review']['reply_to'])):
             $replyto = $review['Review']['reply_to'];
             $replyto['Translation'] = (array_key_exists(LANG, $replyto['Translation']) ?
@@ -68,7 +68,7 @@
             <div class="reviewed-on"><?= sprintf(___('by %1$s on %2$s (rated %3$s)'), $html->linkUserFromModel($replyto['User']), strftime(___('%B %e, %Y'), strtotime($replyto['Review']['created'])), $replyto['Review']['rating'])?></div>
             <?=nl2br($replyto['Translation']['body']['string'])?>
         </div>
-        <? endif; ?>
+        <?php endif; ?>
 
         <?php /* List out the review flags selected by users */ ?>
         <?php if ($flags = @$reviews_flags[$review['Review']['id']]): ?>
@@ -93,7 +93,7 @@
                 <?php endif; ?>
 
             </ul>
-        <? endif; ?>
+        <?php endif; ?>
 
         </ul>
         <div class="reviewAction">
diff --git a/site/app/views/elements/amo2009/addons/developers/other_addons.thtml b/site/app/views/elements/amo2009/addons/developers/other_addons.thtml
index 09887ad..ff94a04 100644
--- a/site/app/views/elements/amo2009/addons/developers/other_addons.thtml
+++ b/site/app/views/elements/amo2009/addons/developers/other_addons.thtml
@@ -61,4 +61,4 @@
     </ul>
   </div>
 </div>
-<? endif; ?>
+<?php endif; ?>
diff --git a/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml b/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml
index 789808a..05fe99a 100644
--- a/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml
+++ b/site/app/views/elements/amo2009/collections/collector_info_secondary.thtml
@@ -42,20 +42,20 @@ $showSecondBox = false;
 ?>
 
 <div class="secondary" role="complementary">
-  <? if ($showFirstBox): ?>
+  <?php if ($showFirstBox): ?>
       <div class="highlight">
         <h3><?=___('What are Collections?')?></h3>
         <p><?=___('Collections are groups of related add-ons assembled for easy sharing.')?></p>
-        <? if ($showCreateLink): ?>
+        <?php if ($showCreateLink): ?>
             <p>
               <a class="more-info" href="<?=$html->url('/collections/add')?>">
                 <?=___('Create a Collection', 'collections_index_a_create')?>
               </a>
             </p>
-        <? endif; ?>
+        <?php endif; ?>
       </div>
-  <? endif; ?>
-  <? if ($showSecondBox && (APP_ID == APP_FIREFOX)): ?>
+  <?php endif; ?>
+  <?php if ($showSecondBox && (APP_ID == APP_FIREFOX)): ?>
       <div class="highlight">
         <h3><?=___('Add-on Collector', 'collections_index_header_collector')?></h3>
         <p class="teaser-img">
@@ -71,6 +71,6 @@ $showSecondBox = false;
           </a>
         </p>
       </div>
-  <? endif; ?>
+  <?php endif; ?>
 </div> <!-- secondary -->
 
diff --git a/site/app/views/elements/amo2009/collections/collector_sidebar_download.thtml b/site/app/views/elements/amo2009/collections/collector_sidebar_download.thtml
index a5140de..71a4ed7 100644
--- a/site/app/views/elements/amo2009/collections/collector_sidebar_download.thtml
+++ b/site/app/views/elements/amo2009/collections/collector_sidebar_download.thtml
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 ?>
 
-<? if(APP_ID == APP_FIREFOX): ?>
+<?php if(APP_ID == APP_FIREFOX): ?>
 <p class="teaser-img">
 <a href="<?=$html->url('/pages/collector')?>">  
 <img src="<?=$html->url('/img/amo2009/illustrations/logo-collections-download-146x159.png',
@@ -56,4 +56,4 @@
      echo $installButton->button($params);
   ?>
 </div>
-<? endif; ?>
+<?php endif; ?>
diff --git a/site/app/views/elements/amo2009/homepage_addon.thtml b/site/app/views/elements/amo2009/homepage_addon.thtml
index 1ddb676..67fb320 100644
--- a/site/app/views/elements/amo2009/homepage_addon.thtml
+++ b/site/app/views/elements/amo2009/homepage_addon.thtml
@@ -115,7 +115,7 @@ if (isset($addonStatus) && in_array($addonStatus, $experimental_status)) {
 </div>
 
 <?php if (false): ?>
-<? if (!empty($flag)) echo '<h6 class="flag">'.$flag.'</h6>'; ?>
+<?php if (!empty($flag)) echo '<h6 class="flag">'.$flag.'</h6>'; ?>
 <?php if (isset($addonFiles)): ?>
 
 <p class="updated">
diff --git a/site/app/views/elements/amo2009/reviews.thtml b/site/app/views/elements/amo2009/reviews.thtml
index 49e5241..3bab17d 100644
--- a/site/app/views/elements/amo2009/reviews.thtml
+++ b/site/app/views/elements/amo2009/reviews.thtml
@@ -47,7 +47,7 @@ $addon_id = $addon['Addon']['id'];
 ?>
 
 <?=$this->renderElement('amo2009/stars',array('rating' => $rating))?>
-<?
+<?php
 $_url = $html->url('/addon/'.$addon_id);
 if (!empty($collection_uuid))
     $_url = $html->appendParametersToUrl($_url, array('collection_id' => $collection_uuid));
diff --git a/site/app/views/elements/amo2009/teaser_collections.thtml b/site/app/views/elements/amo2009/teaser_collections.thtml
index 2f938fa..7158385 100644
--- a/site/app/views/elements/amo2009/teaser_collections.thtml
+++ b/site/app/views/elements/amo2009/teaser_collections.thtml
@@ -80,7 +80,7 @@
 
                         <?php foreach ($teaser_collection_promos[$id] as $idx=>$addon): ?>
                             <?php if ($idx>=3) break; ?>
-                            <?  $flags = array($html->byStatus($addon, array('experimental' => 'experimental', 'recommended' => 'recommended', 'default' => 'default'))); ?>
+                            <?php  $flags = array($html->byStatus($addon, array('experimental' => 'experimental', 'recommended' => 'recommended', 'default' => 'default'))); ?>
                             <div class="<?=(0==$idx)?'first ':''?>column">
                                 <div class="column-inner item <?=join(' ', $flags)?>">
                                 <a title="<?=___('Learn more about this add-on') ?>"
diff --git a/site/app/views/elements/amo2009/users/vcard.thtml b/site/app/views/elements/amo2009/users/vcard.thtml
index b9d95e2..4a0a509 100644
--- a/site/app/views/elements/amo2009/users/vcard.thtml
+++ b/site/app/views/elements/amo2009/users/vcard.thtml
@@ -67,24 +67,24 @@ if (!isset($table_class)) {
         <th><?=___('Name', 'addon_developer_th_name')?></th>
         <td class="fn n"><?=$user['display_name']?></td>
       </tr>
-      <? if (!empty($user['location'])): ?>
+      <?php if (!empty($user['location'])): ?>
       <tr>
         <th><?=___('Location', 'addon_developer_th_location')?></th>
         <td class="adr"><?=$user['location']?></td>
       </tr>
-      <? endif; ?>
-      <? if (!empty($user['occupation'])): ?>
+      <?php endif; ?>
+      <?php if (!empty($user['occupation'])): ?>
       <tr>
         <th><?=___('Occupation', 'addon_developer_th_occupation')?></th>
         <td class="role"><?=$user['occupation']?></td>
       </tr>
-      <? endif; ?>
-      <? if (!empty($user['homepage'])): ?>
+      <?php endif; ?>
+      <?php if (!empty($user['homepage'])): ?>
       <tr>
         <th><?=___('Homepage', 'addon_developer_th_homepage')?></th>
         <td><a class="url" href="<?=$user['homepage']?>"><?=$user['homepage']?></a></td>
       </tr>
-      <? endif; ?>
+      <?php endif; ?>
       <?php if (!$user['emailhidden']): ?>
           <tr>
             <th><?=___('Email address', 'addon_developer_th_email')?></th>
diff --git a/site/app/views/elements/app_compatibility.thtml b/site/app/views/elements/app_compatibility.thtml
index 2756956..bbb06fe 100644
--- a/site/app/views/elements/app_compatibility.thtml
+++ b/site/app/views/elements/app_compatibility.thtml
@@ -49,6 +49,6 @@
     <ul>
         <?php foreach($compatible_apps as $app): ?>
             <li><?=$this->renderElement('app_versions', array('app' => $app))?></li>
-        <? endforeach; ?>
+        <?php endforeach; ?>
     </ul>
 </div>
diff --git a/site/app/views/elements/developers/editorsmenu.thtml b/site/app/views/elements/developers/editorsmenu.thtml
index 88b664a..5405858 100644
--- a/site/app/views/elements/developers/editorsmenu.thtml
+++ b/site/app/views/elements/developers/editorsmenu.thtml
@@ -63,9 +63,9 @@ if (empty($mode)) {
             <li<?=($page == 'logs') ? ' class="selected"' : ''?>><?=$html->link(___('Event Log', 'editorcp_menu_eventlog_link'), '/editors/logs')?></li>
             <li<?=($page == 'reviewlog') ? ' class="selected"' : ''?>><?=$html->link(___('Review Log', 'editorcp_menu_reviewlog_link'), '/editors/reviewlog')?></li>
             <li<?=($page == 'performance') ? ' class="selected"' : ''?>><?=$html->link(___('Performance'), '/editors/performance')?></li>
-            <? if($this->controller->SimpleAcl->actionAllowed('Admin', 'EditorsMOTD', $this->controller->Session->read('User'))): ?>
+            <?php if($this->controller->SimpleAcl->actionAllowed('Admin', 'EditorsMOTD', $this->controller->Session->read('User'))): ?>
               <li><?= $html->link(___('MOTD'), '/editors/motd') ?></li>
-            <? endif ?>
+            <?php endif ?>
 
             <li><?=$html->link(___('Back to Main', 'editorcp_menu_mainpage_link'), '/')?></li>
         </ul>
diff --git a/site/app/views/elements/developers/review_motd.thtml b/site/app/views/elements/developers/review_motd.thtml
index 77f46cb..918ea5a 100644
--- a/site/app/views/elements/developers/review_motd.thtml
+++ b/site/app/views/elements/developers/review_motd.thtml
@@ -37,8 +37,8 @@
  * ***** END LICENSE BLOCK ***** */ 
  ?>
 
-<? if (!empty($message)): ?>
+<?php if (!empty($message)): ?>
 <div class="review-motd">
     <?= $message ?>
 </div>
-<? endif ?>
+<?php endif ?>
diff --git a/site/app/views/elements/developers/testresults.thtml b/site/app/views/elements/developers/testresults.thtml
index c97b735..c4a94f2 100644
--- a/site/app/views/elements/developers/testresults.thtml
+++ b/site/app/views/elements/developers/testresults.thtml
@@ -39,7 +39,7 @@
       
 <div class="graybox rounded spaced field validation">
     <?= $this->renderElement('developers/testresults_header', array('test_groups' => $test_groups, 'all_groups' => $all_groups, 'file' => $file, 'external_link' => false, 'counts' => $counts)); ?>
-    <? if (!$validation_disabled) : ?>
+    <?php if (!$validation_disabled) : ?>
         <div class="action-button-container">
             <a href="#" onclick="versions_validate.runTest(<?=$file['File']['id']?>, <?=$addon['Addon']['addontype_id']?>); return false;" class="button prominent">
                 <?= ___('Validate') ?>
@@ -48,18 +48,18 @@
             <?= ___('Loading Results ...') ?>
         </span>
         </div>
-    <? else: ?> 
+    <?php else: ?> 
         <?= ___('Validation temporarily disabled, try again later.') ?>
-    <? endif; ?>
+    <?php endif; ?>
 
     <div id="test-details-<?=$file['File']['id']?>">
-        <? if(!empty($file['TestResult'])) : ?>
-            <? foreach($test_groups as $group) : ?>
+        <?php if(!empty($file['TestResult'])) : ?>
+            <?php foreach($test_groups as $group) : ?>
                 <?= $this->renderElement('developers/testresults_group', array('group' => $group, 'file' => $file)); ?>
-            <? endforeach; ?>
-        <? else : ?>
+            <?php endforeach; ?>
+        <?php else : ?>
             <i><?=___('No test results found.', 'devcp_versions_validate_no_results')?></i>
-        <? endif; ?>
+        <?php endif; ?>
     </div>
 </div>
 
diff --git a/site/app/views/elements/developers/testresults_group.thtml b/site/app/views/elements/developers/testresults_group.thtml
index 18a5707..96cc2b8 100644
--- a/site/app/views/elements/developers/testresults_group.thtml
+++ b/site/app/views/elements/developers/testresults_group.thtml
@@ -52,14 +52,14 @@ if ($group['counts'][TEST_WARN] == 0 && $group['counts'][TEST_FAIL] == 0) {
     <a href="#test-summary-<?=$file['File']['id']?>"><?=___('Back to Top')?></a>
 </div>
 <div id="test-details-<?=$file['File']['id']?>-<?=$group['TestGroup']['id']?>">
-<? if (!empty($group['cases'])) : ?>
+<?php if (!empty($group['cases'])) : ?>
     <div class="results-list <?=$group_class?>">
-    <? foreach ($group['cases'] as $case) : ?>
+    <?php foreach ($group['cases'] as $case) : ?>
         <h5><?=$case['name']?> [<?=$html->link(___('help', 'devcp_validation_help'), '/pages/validation#help-'.$case['id'])?>]</h5>
         <ul class="test-results">
-        <? $resultNum = 0; ?>
-        <? if (!empty($case['results'])) : ?>
-            <? foreach ($case['results'] as $result) : ?>
+        <?php $resultNum = 0; ?>
+        <?php if (!empty($case['results'])) : ?>
+            <?php foreach ($case['results'] as $result) : ?>
                 <?
                 $resultNum++;
                 switch ($result['result']) {
@@ -77,46 +77,46 @@ if ($group['counts'][TEST_WARN] == 0 && $group['counts'][TEST_FAIL] == 0) {
                 }
                 ?>
                 <li class="<?=$class?>">
-                    <? if ($result['filename'] != '') : ?>
-                        <? if (is_numeric($file['File']['id'])) : ?>
+                    <?php if ($result['filename'] != '') : ?>
+                        <?php if (is_numeric($file['File']['id'])) : ?>
                             <a href="<?=SITE_URL . '/files/browse/' . $file['File']['id'] . '/0/?start=' . $result['filename']?>" target="_blank">
                                 <?=$result['filename']?><?=($result['line'] != 0 ? " ({$result['line']})" : '')?>
                             </a> :
-                        <? else: ?>
+                        <?php else: ?>
                             <?=$result['filename']?><?=($result['line'] != 0 ? " ({$result['line']})" : '')?> :
-                        <? endif; ?>
-                    <? endif; ?>
-                    <? if (!empty($result['message'])) : ?>
+                        <?php endif; ?>
+                    <?php endif; ?>
+                    <?php if (!empty($result['message'])) : ?>
                         <?=$result['message']?>
-                    <? else: ?>
+                    <?php else: ?>
                         <?=$case['description']?>
-                    <? endif; ?>
-                    <? if (!empty($result['preview'])) : ?>
+                    <?php endif; ?>
+                    <?php if (!empty($result['preview'])) : ?>
                         <div class="code">
-                            <? foreach ($result['preview'] as $line => $code) : ?>
+                            <?php foreach ($result['preview'] as $line => $code) : ?>
                                 <div class="line<?=($line==$result['line'] ? ' target' : '')?>"><?=$code?>&nbsp;</div>
-                            <? endforeach; ?>
+                            <?php endforeach; ?>
                         </div>
-                    <? endif; ?>
+                    <?php endif; ?>
                 </li>
-                <? if ($resultNum == 3 && count($case['results']) > 3) : ?>
+                <?php if ($resultNum == 3 && count($case['results']) > 3) : ?>
                 <li class="more">
                     <a href="#" onclick="versions_validate.showMore($(this)); return false;" class="show-more-link"><?=sprintf(n___('Show %1$s more result', 'Show %1$s more results', count($case['results']) - 3), count($case['results']) - 3)?></a>
                 </li>
                 <div class="hidden-results">
-                <? endif; ?>
-            <? endforeach; ?>
-        <? endif; ?>
-        <? if ($resultNum > 3) : ?>
+                <?php endif; ?>
+            <?php endforeach; ?>
+        <?php endif; ?>
+        <?php if ($resultNum > 3) : ?>
             </div>
-        <? endif; ?>
+        <?php endif; ?>
         </ul>
-    <? endforeach; ?>
+    <?php endforeach; ?>
     </div>
-    <? if ($group_class =='passed') : ?>
+    <?php if ($group_class =='passed') : ?>
         <i><?= ___('All tests passed.') ?> <a href="#" onclick="versions_validate.showPasses($(this)); return false;"><?= n___('Show pass', 'Show passes', count($group['cases'])) ?></a></i>
-    <? endif; ?>
-<? else: ?>
+    <?php endif; ?>
+<?php else: ?>
     <i><?= ___('No test results found.', 'devcp_versions_validate_no_results') ?></i>
-<? endif; ?>
+<?php endif; ?>
 </div>
diff --git a/site/app/views/elements/developers/testresults_header.thtml b/site/app/views/elements/developers/testresults_header.thtml
index 6db7c32..6202a59 100644
--- a/site/app/views/elements/developers/testresults_header.thtml
+++ b/site/app/views/elements/developers/testresults_header.thtml
@@ -41,24 +41,24 @@
         <?= $this->renderElement('developers/testresults_stats', array('counts' => $counts, 'short' => false, 'multiline' => false)) ?>
     </div>
     <ul id="test-summary-<?=$file['File']['id']?>" class="test-summary">
-    <? if (!empty($all_groups)) : ?>
-        <? foreach ($all_groups as $group) : ?>
+    <?php if (!empty($all_groups)) : ?>
+        <?php foreach ($all_groups as $group) : ?>
         <li id="results-summary-<?=$file['File']['id']?>-<?=$group['TestGroup']['id']?>">
-            <? 
+            <?php 
                 $href = ($external_link ? $html->url('/developers/versions/validate/' . $version['Version']['id']) : ''); ?>
             <a href="<?=$href?>#test-group-<?=$file['File']['id']?>-<?=$group['TestGroup']['id']?>">
                 <?=$group['TestGroup']['name']?>
             </a>
             <span class="results">
-                <? $counts = array(0,0,0); ?>
-                <? if (!empty($test_groups[$group['TestGroup']['id']])) : ?>
-                    <? $counts = $test_groups[$group['TestGroup']['id']]['counts']; ?>
-                <? endif; ?>
+                <?php $counts = array(0,0,0); ?>
+                <?php if (!empty($test_groups[$group['TestGroup']['id']])) : ?>
+                    <?php $counts = $test_groups[$group['TestGroup']['id']]['counts']; ?>
+                <?php endif; ?>
                 <?= $this->renderElement('developers/testresults_stats', array('counts' => $counts, 'short' => true, 'multiline' => false)) ?>
             </span>
         </li>
-        <? endforeach; ?>
-    <? else : ?>
+        <?php endforeach; ?>
+    <?php else : ?>
             <i><?=___('No test results found.', 'devcp_versions_validate_no_results')?></i>
-    <? endif; ?>
+    <?php endif; ?>
     </ul>
diff --git a/site/app/views/elements/developers/testresults_stats.thtml b/site/app/views/elements/developers/testresults_stats.thtml
index 33218ff..bebe453 100644
--- a/site/app/views/elements/developers/testresults_stats.thtml
+++ b/site/app/views/elements/developers/testresults_stats.thtml
@@ -37,42 +37,42 @@
  * ***** END LICENSE BLOCK ***** */
 ?>
 
-<? if ($counts[TEST_FAIL] > 0) : ?>
+<?php if ($counts[TEST_FAIL] > 0) : ?>
     <span class="error-count">
-        <? if ($short) : ?>
+        <?php if ($short) : ?>
             <?= $counts[TEST_FAIL] ?>
-        <? else: ?>
+        <?php else: ?>
             <?=sprintf(n___('%1$s error', '%1$s errors', $counts[TEST_FAIL]), $counts[TEST_FAIL]) ?>
-        <? endif; ?>
+        <?php endif; ?>
     </span>
-    <? if ($multiline) : ?>
+    <?php if ($multiline) : ?>
         <br/>
-    <? endif; ?>
-<? endif; ?>
-<? if ($counts[TEST_WARN] > 0) : ?>
+    <?php endif; ?>
+<?php endif; ?>
+<?php if ($counts[TEST_WARN] > 0) : ?>
     <span class="warning-count">
-        <? if ($short) : ?>
+        <?php if ($short) : ?>
             <?= $counts[TEST_WARN] ?>
-        <? else: ?>
+        <?php else: ?>
             <?=sprintf(n___('%1$s warning', '%1$s warnings', $counts[TEST_WARN]), $counts[TEST_WARN]) ?>
-        <? endif; ?>
+        <?php endif; ?>
     </span>
-    <? if ($multiline) : ?>
+    <?php if ($multiline) : ?>
         <br/>
-    <? endif; ?>
-<? endif; ?>
-<? if ($counts[TEST_PASS] > 0) : ?>
+    <?php endif; ?>
+<?php endif; ?>
+<?php if ($counts[TEST_PASS] > 0) : ?>
     <span class="pass-count">
-        <? if ($short) : ?>
+        <?php if ($short) : ?>
             <?= $counts[TEST_PASS] ?>
-        <? else: ?>
+        <?php else: ?>
             <?=sprintf(n___('%1$s pass', '%1$s pass', $counts[TEST_PASS]), $counts[TEST_PASS]) ?>
-        <? endif; ?>
+        <?php endif; ?>
     </span>
-<? endif; ?>
-<? if ($counts == array(0,0,0)) : ?>
+<?php endif; ?>
+<?php if ($counts == array(0,0,0)) : ?>
     <span><i><?=___('No test results found.', 'devcp_error_no_test_results')?></i></span>
-<? endif; ?>
-<? if ($short) : ?>
+<?php endif; ?>
+<?php if ($short) : ?>
     <span class="loading-count"><?=___('Running test...')?></span>
-<? endif; ?>
+<?php endif; ?>
diff --git a/site/app/views/elements/developers/validation.thtml b/site/app/views/elements/developers/validation.thtml
index b855534..9bf53f5 100644
--- a/site/app/views/elements/developers/validation.thtml
+++ b/site/app/views/elements/developers/validation.thtml
@@ -55,13 +55,13 @@
                 <a id="new-file-button" href="#" onclick="upload.uploadNewFile(); return false;" class="remove-button rounded">
                     <?= $new_file_message ?>
                 </a>
-                <? if ($allow_completion): ?>
+                <?php if ($allow_completion): ?>
                     <a id="continue-button" href="#" onclick="upload.completeUpload(); return false;" class="action-button rounded">
                         <?= ___('Continue') ?>
                     </a>
                     <br/><br/>
                     <div id="complete-loading"><?=$html->image('ajax_loading.gif')?>&nbsp;<?=___('Completing your add-on...')?></div>
-                <? endif ?>
+                <?php endif ?>
             </div>
         </div>
     </div>
diff --git a/site/app/views/elements/feature.thtml b/site/app/views/elements/feature.thtml
index 7435151..6d5f6d1 100644
--- a/site/app/views/elements/feature.thtml
+++ b/site/app/views/elements/feature.thtml
@@ -93,7 +93,7 @@ else
 
 <h4 class="name" title="<?=___('Learn more about this add-on') ?>"><a href="<?=$html->url("/addon/{$addonId}")?>"><img src="<?=$addonIconPath?>" width="32" height="32" alt="" class="icon"/><?=$addonName?></a></h4>
 <h5 class="author" title="<?=___('View Author\'s Profile') ?>"><?=___('by')?> <?=$html->linkUsersFromModel($addonAuthors, 0);?></h5>
-<? if (!empty($flag)) echo '<h6 class="flag">'.$flag.'</h6>'; ?>
+<?php if (!empty($flag)) echo '<h6 class="flag">'.$flag.'</h6>'; ?>
 <p class="preview-img"><a href="<?=$html->url("/addon/{$addonId}")?>"><img src="<?=$addonThumbPath?>" alt="<?=$_alt?>" title="<?=$_alt?>"/></a></p>
 <p class="desc"><?=$addonSummary?></p>
 <p class="rating"><?=$this->renderElement('stars',array('rating' => $addonRating))?><?php if ($addonReviews > 0) { ?> <a href="<?=$html->url('/addon/'.$addonId.'#reviews')?>"><?=sprintf(n___('%1$s review','%1$s reviews', $addonReviews), $addonReviews)?></a><?php } ?></p>
diff --git a/site/app/views/errors/error401.thtml b/site/app/views/errors/error401.thtml
index f1c6816..acc9473 100644
--- a/site/app/views/errors/error401.thtml
+++ b/site/app/views/errors/error401.thtml
@@ -37,8 +37,8 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<? $this->controller->disableCache(); ?>
-<? $this->layout='mozilla'; // use regular layout ?>
+<?php $this->controller->disableCache(); ?>
+<?php $this->layout='mozilla'; // use regular layout ?>
 
 <div id="content">
     <?=$this->renderElement('search')?>
diff --git a/site/app/views/facebook/favorites.thtml b/site/app/views/facebook/favorites.thtml
index 87658ec..aee558a 100644
--- a/site/app/views/facebook/favorites.thtml
+++ b/site/app/views/facebook/favorites.thtml
@@ -40,7 +40,7 @@
     <div class='subtabs clearfix'>
         <div class="tab<?=($action == 'mine' ? '' : ' unselected')?>"><a href="<?=FB_URL?>/favorites/mine">My Favorites</a></div>
         <div class="tab<?=($action == 'friends' ? ' selected' : ' unselected')?>"><a href="<?=FB_URL?>/favorites/friends">Friend Favorites</a></div>
-        <? /* <div class="tab<?=($action == 'networks' ? '' : ' unselected')?>"><a href="<?=FB_URL?>/favorites/networks">Network Favorites</a></div> */ ?>
+        <?php /* <div class="tab<?=($action == 'networks' ? '' : ' unselected')?>"><a href="<?=FB_URL?>/favorites/networks">Network Favorites</a></div> */ ?>
         <?=($action == 'addon' ? '<div class="tab"><a href="'.FB_URL.'/favorites/addon/'.$addon['Addon']['id'].'">Add-on Details</a></div>' : '')?>
         <?=($action == 'user' ? '<div class="tab"><a href="'.FB_URL.'/favorites/user/'.$user_id.'">User Favorites</a></div>' : '')?>
     </div>
@@ -144,4 +144,4 @@
             echo '<div class="nofavorites">No favorites yet!</div>';
         }
     ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/app/views/facebook/search.thtml b/site/app/views/facebook/search.thtml
index f37fe1e..d3e5537 100644
--- a/site/app/views/facebook/search.thtml
+++ b/site/app/views/facebook/search.thtml
@@ -52,7 +52,7 @@ $facebook->globalURLAdditional = "?q={$q}";
             <li<?=($current['type'] == 'none' ? ' class="current"' : '')?>><a href="<?=FB_URL."/search?q={$q}"?>">All results</a></li>
             <?=($count['extensions'] > 0 ? (($count['extensions'] == 1) ? '<li'.($current['type'] == ADDON_EXTENSION ? ' class="current"' : '').'><a href="'.FB_URL.'/search/type:'.ADDON_EXTENSION.'?q='.$q.'">1 extension</a></li>' : '<li'.($current['type'] == ADDON_EXTENSION ? ' class="current"' : '').'><a href="'.FB_URL.'/search/type:'.ADDON_EXTENSION.'?q='.$q.'">'.$count['extensions'].' extensions</a></li>') : '<li class="empty"><span>No extensions</span></li>')?>
             <?=($count['themes'] > 0 ? (($count['themes'] == 1) ? '<li'.($current['type'] == ADDON_THEME ? ' class="current"' : '').'><a href="'.FB_URL.'/search/type:'.ADDON_THEME.'?q='.$q.'">1 theme</a></li>' : '<li'.($current['type'] == ADDON_THEME ? ' class="current"' : '').'><a href="'.FB_URL.'/search/type:'.ADDON_THEME.'?q='.$q.'">'.$count['themes'].' themes</a></li>') : '<li class="empty"><span>No themes</span></li>')?>
-            <? /* ($count['friends'] > 0 ? '<li'.($current['type'] == 'friends' ? ' class="current"' : '').'><a href="'.FB_URL.'/search/type:friends?q='.$q.'">'.$count['friends'].' from friends</a></li>' : '<li class="empty"><span>None from friends</span></li>') */ ?>
+            <?php /* ($count['friends'] > 0 ? '<li'.($current['type'] == 'friends' ? ' class="current"' : '').'><a href="'.FB_URL.'/search/type:friends?q='.$q.'">'.$count['friends'].' from friends</a></li>' : '<li class="empty"><span>None from friends</span></li>') */ ?>
         </ul>
     </div>
     <?=$facebook->pageNumbers($current, $count, 'search')?>
@@ -62,4 +62,4 @@ $facebook->globalURLAdditional = "?q={$q}";
 
 <div class="bar clearfix footer_bar">
     <?=$facebook->pageNumbers($current, $count, 'search')?>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/app/views/reviews/add.thtml b/site/app/views/reviews/add.thtml
index f2a094b..ebdb90e 100644
--- a/site/app/views/reviews/add.thtml
+++ b/site/app/views/reviews/add.thtml
@@ -49,10 +49,10 @@ $this->layout = 'amo2009';
     <div id="content-main">
 
 <h2><?=sprintf((@$this->data['Review']['id'] > 0) ? ___('Edit Review for %s') : ___('Add a review for %s'), $addon['Translation']['name']['string']); ?></h2>
-<? $reviewRating = @$this->data['Review']['rating']; ?>
+<?php $reviewRating = @$this->data['Review']['rating']; ?>
 <?php echo sprintf(___('<p>Keep these tips in mind:</p><ul><li>Write like you\'re telling a friend about your experience with the add-on.  Give specifics and helpful details, such as what features you liked and/or disliked, how easy to use it is, and any disadvantages it has.  Avoid generic language such as calling it "Great" or "Bad" unless you can give reasons why you believe this is so.</li><li>Please do not post bug reports in reviews. We do not make your email address available to add-on developers and they may need to contact you to help resolve your issue. See the <a href="%1$s">support section</a> to find out where to get assistance for this add-on.</li><li>Please keep reviews clean, avoid the use of improper language and do not post any personal information.</li></ul><p>Please read the <a href="%2$s">Review Guidelines</a> for more detail about user add-on reviews.</p>'), $html->url("/addon/{$addon['Addon']['id']}#support"), $html->url('/pages/review_guide')); ?>
 
-<? // if this is a developer reply, show the original review
+<?php // if this is a developer reply, show the original review
 if (!empty($reply_to)) {
     echo "<p>".___('Developer reply to:')."</p>";
     ?>
@@ -64,12 +64,12 @@ if (!empty($reply_to)) {
     </div>
     <?=nl2br($reply_to['Translation']['body']['string'])?>
     </div>
-<? } ?>
+<?php } ?>
 
-<? if (isset($errorMessage)):?>
+<?php if (isset($errorMessage)):?>
 <div class="amo-form-error"><?= ___('There are errors in this form. Please correct them and resubmit.')?></div>
 <p></p>
-<? endif;?>
+<?php endif;?>
 
 <form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box" id="long-review">
     <?=$html->hiddenSession() ?>
@@ -77,11 +77,11 @@ if (!empty($reply_to)) {
     <div>
         <?=$html->tagErrorMsg('Review/title', ___('This field must not be empty.'))?>
     </div>
-    <? if (empty($reply_to)): ?>
+    <?php if (empty($reply_to)): ?>
     <div>
         <?=$html->tagErrorMsg('Review/rating', ___('You must select a rating.'))?>
     </div>
-    <? endif; ?>
+    <?php endif; ?>
 </form>
 
  </div>
diff --git a/site/app/views/reviews/display.thtml b/site/app/views/reviews/display.thtml
index 0639c38..bf64b95 100644
--- a/site/app/views/reviews/display.thtml
+++ b/site/app/views/reviews/display.thtml
@@ -156,12 +156,12 @@ foreach ($reviews as $review):
 
     </div>
 
-    <? if ($other_count = @($reviews_others_counts[$review['Review']['id']])): ?>
+    <?php if ($other_count = @($reviews_others_counts[$review['Review']['id']])): ?>
         <div class="others-by-user-load" id="others-by-user-load-<?=$review['Review']['id']?>">
         </div>
-    <? endif ?>
+    <?php endif ?>
 
-    <? // developer reply?
+    <?php // developer reply?
     if (!empty($review['Review']['reply'])):
     $reply = $review['Review']['reply'];
     $reply['Translation'] = (array_key_exists(LANG, $reply['Translation']) ?
@@ -219,11 +219,11 @@ foreach ($reviews as $review):
         </div>
         <?=nl2br($reply['Translation']['body']['string'])?>
         </div>
-    <? endif; ?>
-<? endforeach; ?>
+    <?php endif; ?>
+<php? endforeach; ?>
 
 <?php if (!$bare): ?>
-<? if (!empty($reviews)) echo $this->renderElement('amo2009/pagination');?>
+<?php if (!empty($reviews)) echo $this->renderElement('amo2009/pagination');?>
 <div class="clearboth"> <hr /> </div>
 
 <ul>
diff --git a/site/app/views/reviews/review_added.thtml b/site/app/views/reviews/review_added.thtml
index 39c9aef..35ea61c 100644
--- a/site/app/views/reviews/review_added.thtml
+++ b/site/app/views/reviews/review_added.thtml
@@ -49,7 +49,7 @@ $this->layout = 'amo2009';
     
     <h2><?=sprintf(___('Reviews for %s', 'reviews_header'), $addon['Translation']['name']['string']);?></h2>
     <?=$this->renderElement('notification', array('type' => 'success', 'msg' => ___('Your review was saved successfully. Thanks!')));?>
-    <? if (isset($moderated) && $moderated) 
+    <?php if (isset($moderated) && $moderated) 
         $this->renderElement('notification', array('type' => 'notification', 'msg' => ___('Please note: Before your review shows up on the public site it will be moderated by an editor.'))); ?>
 
 <ul>
diff --git a/site/app/views/statistics/index.thtml b/site/app/views/statistics/index.thtml
index 87b87f8..7624f1c 100644
--- a/site/app/views/statistics/index.thtml
+++ b/site/app/views/statistics/index.thtml
@@ -121,7 +121,7 @@
     </div>
     <div class="listing-footer">
       <ol id="stats-table-pagination" class="pagination"></ol>
-      <a href="<?=$html->url('/statistics/sitecsv/week')?>" id="stats-csv-download"><? echo ___('View this table in CSV format') ?></a>
+      <a href="<?=$html->url('/statistics/sitecsv/week')?>" id="stats-csv-download"><?php echo ___('View this table in CSV format') ?></a>
     </div>
   </div>
 
diff --git a/site/app/views/statistics/xml.thtml b/site/app/views/statistics/xml.thtml
index 2426633..e37304f 100644
--- a/site/app/views/statistics/xml.thtml
+++ b/site/app/views/statistics/xml.thtml
@@ -12,4 +12,4 @@ if (!empty($xml)) {
 
 echo '</data>';
 
-?>
\ No newline at end of file
+?>
diff --git a/site/app/views/tags/ajax/tag_added.thtml b/site/app/views/tags/ajax/tag_added.thtml
index 338c81e..0ccdff7 100644
--- a/site/app/views/tags/ajax/tag_added.thtml
+++ b/site/app/views/tags/ajax/tag_added.thtml
@@ -40,6 +40,6 @@
 //$this->layout = 'amo2009';
 ?>
 <?=$this->renderElement('addon_tags',$relatedTags);
-if (!empty($message)) { ?><div id='tagMessage' class="tagnotice <?=$status?>"><?=$message?></div><? }
+if (!empty($message)) { ?><div id='tagMessage' class="tagnotice <?=$status?>"><?=$message?></div><?php }
 
- ?>
\ No newline at end of file
+ ?>
diff --git a/site/app/views/tags/tag_added.thtml b/site/app/views/tags/tag_added.thtml
index ba40e1a..0efd00d 100644
--- a/site/app/views/tags/tag_added.thtml
+++ b/site/app/views/tags/tag_added.thtml
@@ -47,8 +47,8 @@
 ?>
 <?=$this->renderElement('addon_tags', array('userTags'=>$userTags, 'developerTags'=>$developerTags, 'origin'=>'users')); ?>
 
-<? if (!empty($message)) : ?>
+<?php if (!empty($message)) : ?>
 
     <div id='tagMessage' class="tagnotice <?=$status?>"><?=$message?></div>
 
-<? endif; ?>
+<?php endif; ?>
diff --git a/site/app/views/users/edit.thtml b/site/app/views/users/edit.thtml
index 7eec060..3030264 100644
--- a/site/app/views/users/edit.thtml
+++ b/site/app/views/users/edit.thtml
@@ -62,16 +62,16 @@ $this->translationBox = array(
 
 <?php if (isset($confirmation_page) && $confirmation_page): ?>
 
-    <?echo $this->renderElement('notification', array('type' => 'success', 'msg' => $confirmation_message))?>
+    <?= $this->renderElement('notification', array('type' => 'success', 'msg' => $confirmation_message))?>
 
     <?php if (isset($newemail) && $newemail): ?>
-        <?echo $this->renderElement('notification', array('type' => 'success', 'description' => sprintf(___('An email has been sent to %1$s to confirm your new email address. For the change to take effect, you need to click on the link provided in this email. Until then, you can keep logging in with your current email address.'), $newemail)));?>
+        <?= $this->renderElement('notification', array('type' => 'success', 'description' => sprintf(___('An email has been sent to %1$s to confirm your new email address. For the change to take effect, you need to click on the link provided in this email. Until then, you can keep logging in with your current email address.'), $newemail)));?>
     <?php endif; ?>
 
 <?php endif; ?>
 
 <?php if(isset($errorMessage)): ?>
-    <?echo $this->renderElement('notification', array('type' => 'error', 'msg' => ___('There are errors in this form. Please correct them and resubmit.')));?>
+    <?= $this->renderElement('notification', array('type' => 'error', 'msg' => ___('There are errors in this form. Please correct them and resubmit.')));?>
 <p></p>
 <?php endif; ?>
 
@@ -133,7 +133,7 @@ $this->translationBox = array(
                 <?php if(!empty($this->data['User']['picture_data'])): ?>
                     <label for="UserRemovepicture"><?=___('Remove this picture?')?></label>
                     <?=$html->checkBox('User/removepicture') ?><br />
-                <? endif; ?>
+                <?php endif; ?>
                 <label for="UserRemovepicture"><?=___('Upload a new picture?')?></label>
                 <?=$html->file('User/picture_data') ?>
                 <?=$html->tagErrorMsg('User/picture_data', @$picture_error)?>
diff --git a/site/app/views/users/email/confirm_plain.thtml b/site/app/views/users/email/confirm_plain.thtml
index c95fa21..1f0eb9f 100644
--- a/site/app/views/users/email/confirm_plain.thtml
+++ b/site/app/views/users/email/confirm_plain.thtml
@@ -1,4 +1,4 @@
-<?
+<?php
 $confirmurl = SITE_URL.$html->url('/users/verify/'.$userid.'/'
     .$data['User']['confirmationcode'], true);
 
diff --git a/site/app/views/users/email/pwreset_plain.thtml b/site/app/views/users/email/pwreset_plain.thtml
index 9f58558..73f3c39 100644
--- a/site/app/views/users/email/pwreset_plain.thtml
+++ b/site/app/views/users/email/pwreset_plain.thtml
@@ -1,4 +1,4 @@
-<?
+<?php
 $reseturl = SITE_URL.$html->url('/users/pwreset/'.$data['User']['id']
     .'/'.$resetcode, true);
 
diff --git a/site/app/views/users/login.thtml b/site/app/views/users/login.thtml
index df895ea..aea6a56 100644
--- a/site/app/views/users/login.thtml
+++ b/site/app/views/users/login.thtml
@@ -74,7 +74,7 @@
 <form action="<?=$html->entities($html->url())?>" method="post" id="login" class="featured-inner object-lead">
     <?=$html->hiddenSession() ?>
     <div>
-        <?
+        <?php
         $redir = (isset($_GET['to'])) ? urldecode($_GET['to']) : urldecode(@$this->data['Login']['referer']);
         $redir = $html->entities($redir);
         echo $html->hidden('Login/referer', array('value' => $redir));
--
cgit v0.9.1