Commits

anatoly techtonik committed 8d47083

Use full <?php tags for all the sources - they are off by
default in PHP 5.4

Found all files with short <? tags:
grep -E -i "<\\?([^p]|$)" --include="*.php" -R .

Used the following VIM expressions to replace:
:%s/<?\(php\)\@!$/<?php/gc
:%s/<?\(php\)\@! /<?php/gc
:%s/<?\(php\)\@!/<?php /gc

Comments (0)

Files changed (17)

-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 </div>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>

documentation.php

-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 <p>
 This page contains links to general SCons documentation,
 and to documentation (man page and User's Guide)
-for the current stable release of SCons:  <?echo $cur_stable_rel;?>.
+for the current stable release of SCons:  <?php echo $cur_stable_rel;?>.
 Man pages and User's Guides for other releases
 of SCons are available at the
 <a href="docversions.php">Version-Specific SCons Documentation</a>
 </p>
 
 
-<h3> SCons <?echo $cur_stable_rel;?> man page </h3>
+<h3> SCons <?php echo $cur_stable_rel;?> man page </h3>
 <p>
 The man page for the current stable release of
 <span class="sconslogo">SCons</span>.
 </ul>
 
 
-<h3> SCons <?echo $cur_stable_rel;?> User Guide </h3>
+<h3> SCons <?php echo $cur_stable_rel;?> User Guide </h3>
 
 <p>
 The User's Guide for the current stable release of
 </p>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 most recent releases.
 The current stable release of
 <span class="sconslogo">SCons</span>
-is <?echo $cur_stable_rel;?>.
+is <?php echo $cur_stable_rel;?>.
 </p>
 
 <h3> SCons man page </h3>
     <docformat>PostScript</docformat>
     <docformat>Plain text</docformat>
   </sconsversionrow>
-<?
+<?php
     foreach ( $docversions as $inx => $ver) {
       echo "  <sconsversionrow>\n";
       echo "    <sconsversion>$ver</sconsversion>\n";
     <docformat>PostScript</docformat>
     <docformat>Plain text</docformat>
   </sconsversionrow>
-<?
+<?php
     foreach ( $docversions as $inx => $ver) {
       echo "  <sconsversionrow>\n";
       echo "    <sconsversion>$ver</sconsversion>\n";
     <docformat>PDF</docformat>
     <docformat>PostScript</docformat>
   </sconsversionrow>
-<?
+<?php
     foreach ( $apiversions as $inx => $ver) {
       echo "  <sconsversionrow>\n";
       echo "    <sconsversion>$ver</sconsversion>\n";
 </div>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 <p> Thanks again for consideration a donation.  </p>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 
 <!-- INTRO PARAGRAPH -->
 <p>
-<? if (strcmp($cur_latest_rel, "") == 0): ?>
+<?php if (strcmp($cur_latest_rel, "") == 0): ?>
 <!-- INTRO WHEN THE STABLE AND LATEST RELEASES ARE THE SAME -->
 <strong>The current production, and latest, release</strong>
-<? else: ?>
+<?php else: ?>
 <!-- INTRO WHEN THE STABLE AND LATEST RELEASES ARE DIFFERENT -->
 <strong>The current production release</strong>
-<? endif; ?>
+<?php endif; ?>
 of <span class="sconslogo">SCons</span> is
-<strong><?echo $cur_stable_rel;?></strong>
+<strong><?php echo $cur_stable_rel;?></strong>
 [<a href="CHANGES.txt">ChangeLog</a>].
 
-<? if (strcmp($old_stable_rel, "") != 0): ?>
+<?php if (strcmp($old_stable_rel, "") != 0): ?>
 <!-- ADD WHEN OLDER STABLE RELEASE IS STILL BEING MENTIONED -->
 <div>
 The last stable release prior to this one is
-<strong><?echo $old_stable_rel;?></strong>.
+<strong><?php echo $old_stable_rel;?></strong>.
 </div>
-<? endif; ?>
+<?php endif; ?>
 
-<? if (strcmp($cur_latest_rel, "") != 0 && strcmp($old_latest_rel, "") != 0): ?>
+<?php if (strcmp($cur_latest_rel, "") != 0 && strcmp($old_latest_rel, "") != 0): ?>
 
 <!-- ADD WHEN THERE ARE TWO LATEST RELEASES -->
 <!--- FIX this logic, it's not right
 <div>
 <strong>There are two "latest" releases</strong>
 of <span class="sconslogo">SCons</span>:
-<strong><?echo $cur_latest_rel;?></strong>
+<strong><?php echo $cur_latest_rel;?></strong>
 [<a href="CHANGES-2.x.txt">ChangeLog</a>]
 is the latest release
 and
-<strong><?echo $old_latest_rel;?></strong>
+<strong><?php echo $old_latest_rel;?></strong>
 [<a href="CHANGES-1.x.txt">ChangeLog</a>]
 is the latest version of the previous stable release.
 </div>
 -->
 
-<? else: ?>
+<?php else: ?>
 
-<? if (strcmp($cur_latest_rel, "") != 0): ?>
+<?php if (strcmp($cur_latest_rel, "") != 0): ?>
 <!-- ADD WHEN 2.x IS LATEST RELEASE -->
 The latest developmental release is
-<strong><?echo $cur_latest_rel;?></strong>
+<strong><?php echo $cur_latest_rel;?></strong>
 [<a href="CHANGES-2.x.txt">ChangeLog</a>].
-<? endif; ?>
+<?php endif; ?>
 
-<? if (strcmp($old_latest_rel, "") != 0): ?>
+<?php if (strcmp($old_latest_rel, "") != 0): ?>
 <!-- ADD WHEN 1.x IS LATEST RELEASE -->
 The latest development version of the previous stable release is
-<strong><?echo $old_latest_rel;?></strong>
+<strong><?php echo $old_latest_rel;?></strong>
 [<a href="CHANGES-1.x.txt">ChangeLog</a>].
-<? endif; ?>
+<?php endif; ?>
 
-<? endif; ?>  <!-- end of two releases v. one or none -->
+<?php endif; ?>  <!-- end of two releases v. one or none -->
 </p>
 
 <!-- END INTRO PARAGRAPH -->
 want to try out <span class="sconslogo">SCons</span>:
 </p>
 
-<?
+<?php
 function dl_version($title, $rel)
 {?>
 <div id="sconsdownloadtable">
 <downloadtable>
   <downloadrow>
     <downloadversion>&nbsp;</downloadversion>
-    <downloadversion><?echo $title?> (<?echo $rel?>)</downloadversion>
-  </downloadrow><? 
+    <downloadversion><?php echo $title?> (<?php echo $rel?>)</downloadversion>
+  </downloadrow><?php 
 }
 function dl_description($pkg, $suffix, $title)
 {
 	$pkg = $pkg.$suffix;
 	global $downloadpage; ?>
   <downloadrow>
-    <downloaddescription><?echo $title;?></downloaddescription>
-    <downloadentry><a href="<?echo $downloadpage;?>/<?echo $pkg;?>"><?echo $pkg;?></a></downloadentry>
+    <downloaddescription><?php echo $title;?></downloaddescription>
+    <downloadentry><a href="<?php echo $downloadpage;?>/<?php echo $pkg;?>"><?php echo $pkg;?></a></downloadentry>
   </downloadrow>
-<? }
+<?php }
 function dl_finis()
 { ?>
 </downloadtable>
-</div><?
+</div><?php
 }
 
 function dl_dist($title, $rel)
 <span class="sconslogo">SCons</span>:
 </p>
 
-<?
+<?php
 function dl_local($title, $rel)
 {
 	if (strcmp($rel, "") == 0): return; endif;
 The <span class="sconslogo">scons-src</span> packages contain the complete source tree, including everything we use to package <span class="sconslogo">SCons</span> and all of the regression tests. You might want one of these packages if you have concerns about whether <span class="sconslogo">SCons</span> is working correctly on your operating system and wanted to run the regression tests, or if you want to contribute to <span class="sconslogo">SCons</span> development:
 </p>
 
-<?
+<?php
 function dl_src($title, $rel)
 {
 	if (strcmp($rel, "") == 0): return; endif;
 ?>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 FAQ</a> instead of this page.
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 </ol>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>

includes/templates.php

-<?
+<?php
 // We always want this.
 error_reporting(E_ALL);
 
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 	<meta name="robots" content="all" />
-	<title>SCons: <?echo $title?></title>
+	<title>SCons: <?php echo $title?></title>
 
 	<!-- fixes Flash of Unstyled Content. http://www.bluerobot.com/web/css/fouc.asp -->
 	<script type="text/javascript"></script>
 
 </div> 
 
-<?
+<?php
 function tmpl_version($title, $rel)
 {?>
-      <li><?echo $title;?> (<?echo $rel;?>)</li>
-      <ul class="subsubmenuitems"><?
+      <li><?php echo $title;?> (<?php echo $rel;?>)</li>
+      <ul class="subsubmenuitems"><?php
 }
 function tmpl_description($pkg, $suffix, $label)
 {
 	$pkg = $pkg.$suffix;
 	$link = $downloadpage."/".$pkg;
 	?>
-	  <li><a href="<?echo $link;?>"><?echo $label;?></a></li><?
+	  <li><a href="<?php echo $link;?>"><?php echo $label;?></a></li><?php
 }
 function tmpl_finis()
 {
 ?>
-      </ul><?
+      </ul><?php
 }?>
 
 <div id="menu">
 <ul class="menuitems">
-<li><a href="."<?if(!strcmp($page,"home"))echo $currentpage;?>>Home</a></li>
-<li><a href="wiki/FrequentlyAskedQuestions"<?if(!strcmp($page,"faq"))echo $currentpage;?>>FAQ</a></li>
+<li><a href="."<?php if(!strcmp($page,"home"))echo $currentpage;?>>Home</a></li>
+<li><a href="wiki/FrequentlyAskedQuestions"<?php if(!strcmp($page,"faq"))echo $currentpage;?>>FAQ</a></li>
 <li><a href="/wiki/">Wiki</a></li>
 <li><a href="/shop.php">Shop</a></li>
-<li><a href="contact.php"<?if(!strcmp($page,"contact"))echo $currentpage;?>>Contact</a></li>
-<li><a href="download.php"<?if(!strcmp($page,"download"))echo $currentpage;?>>Download</a><br />
+<li><a href="contact.php"<?php if(!strcmp($page,"contact"))echo $currentpage;?>>Contact</a></li>
+<li><a href="download.php"<?php if(!strcmp($page,"download"))echo $currentpage;?>>Download</a><br />
     <ul class="submenuitems">
-<?
+<?php
 function tmpl_download($title, $rel)
 {
 	if (strcmp($rel, "") == 0): return; endif;
       <li><a href="http://sourceforge.net/project/showfiles.php?group_id=30337">Other versions</a> (SourceForge)</li>
     </ul>
 </li>
-<li> <a href="documentation.php"<?if(!strcmp($page,"docs"))echo $currentpage;?>>Documentation</a><br />
+<li> <a href="documentation.php"<?php if(!strcmp($page,"docs"))echo $currentpage;?>>Documentation</a><br />
     <ul class="submenuitems">
-<?
+<?php
 function tmpl_doc_desc($rel, $trailer, $title)
 {
 	$href = "doc/".$rel."/HTML/".$trailer.".html"; ?>
-	<li><a href="<?echo $href;?>"><?echo $title;?></a></li><?
+	<li><a href="<?php echo $href;?>"><?php echo $title;?></a></li><?php
 }
 function tmpl_doc($title, $rel)
 {
 ?>
     </ul>
 </li>
-<li><a href="dev.php"<?if(!strcmp($page,"dev"))echo $currentpage;?>>Development</a></li>
-<li><a href="https://bitbucket.org/scons/scons"<?if(!strcmp($page,"source"))echo $currentpage;?>>Source (bitbucket)</a></li>
-<li><a href="lists.php"<?if(!strcmp($page,"lists"))echo $currentpage;?>>Mailing Lists</a><br />
+<li><a href="dev.php"<?php if(!strcmp($page,"dev"))echo $currentpage;?>>Development</a></li>
+<li><a href="https://bitbucket.org/scons/scons"<?php if(!strcmp($page,"source"))echo $currentpage;?>>Source (bitbucket)</a></li>
+<li><a href="lists.php"<?php if(!strcmp($page,"lists"))echo $currentpage;?>>Mailing Lists</a><br />
     <ul class="submenuitems">
     <li>Archives:</li>
 	<ul class="submenuitems">
-	<li><a href="<?echo $listpage;?>?listName=announce">announce</a></li>
-	<li><a href="<?echo $listpage;?>?listName=dev">dev</a></li>
-	<li><a href="<?echo $listpage;?>?listName=users">users</a></li>
+	<li><a href="<?php echo $listpage;?>?listName=announce">announce</a></li>
+	<li><a href="<?php echo $listpage;?>?listName=dev">dev</a></li>
+	<li><a href="<?php echo $listpage;?>?listName=users">users</a></li>
 	</ul>
     </ul>
 </li>
 	<li><a href="http://scons.tigris.org/feature-request.html">Feature requests</a></li>
 	</ul>
 	</li>
-<li><a href="news.php"<?if(!strcmp($page,"news"))echo $currentpage;?>>News</a></li>
-<li><a href="links.php"<?if(!strcmp($page,"links"))echo $currentpage;?>>Links</a></li>
-<li><a href="logos.php"<?if(!strcmp($page,"logos"))echo $currentpage;?>>Logos</a></li>
-<li><a href="refer.php"<?if(!strcmp($page,"references"))echo $currentpage;?>>References</a></li>
-<li><a href="donate.php"<?if(!strcmp($page,"donate"))echo $currentpage;?>>Donate</a></li>
+<li><a href="news.php"<?php if(!strcmp($page,"news"))echo $currentpage;?>>News</a></li>
+<li><a href="links.php"<?php if(!strcmp($page,"links"))echo $currentpage;?>>Links</a></li>
+<li><a href="logos.php"<?php if(!strcmp($page,"logos"))echo $currentpage;?>>Logos</a></li>
+<li><a href="refer.php"<?php if(!strcmp($page,"references"))echo $currentpage;?>>References</a></li>
+<li><a href="donate.php"<?php if(!strcmp($page,"donate"))echo $currentpage;?>>Donate</a></li>
 </ul>
 
 <div id="osrating">
 </div>
 
 </div> <!-- menu -->
-<?
+<?php
 
 } // End make_top
 
 </div> <!-- End main -->
 </body>
 </html>
-	<?
+	<?php
 }
 
 // Call the specified function once with the label and name of each

includes/versions.php

-<?
+<?php
 // We always want this.
 error_reporting(E_ALL);
 
-<?
+<?php
 	include "includes/templates.php";
         include "includes/versions.php";
 
 
 </div> <!-- End bodycontent -->
 
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 <div id="bodycontent">
 <h2 class="pagetitle"> Links </h2>
 
-<?
+<?php
 
 include "links-raw.xhtml";
 
 ?>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 <ul class="hack">
 <li><a href="mailto:announce-subscribe@scons.tigris.org">subscribe to mailing list</a></li>
 <li><a
-href="<?echo $listpage;?>?listName=announce">Tigris.org forum interface</a></li>
+href="<?php echo $listpage;?>?listName=announce">Tigris.org forum interface</a></li>
 <li><a
 href="http://news.gmane.org/gmane.comp.programming.tools.scons.announce">GMANE archive</a></li>
 </ul>
 <ul class="hack">
 <li><a href="mailto:commits-subscribe@scons.tigris.org">subscribe to mailing list</a></li>
 <li><a
-href="<?echo $listpage;?>?listName=commits">Tigris.org forum interface</a></li>
+href="<?php echo $listpage;?>?listName=commits">Tigris.org forum interface</a></li>
 </ul>
 
 <h3 id="issues">Notification of Issues</h3>
 <ul class="hack">
 <li><a href="mailto:issues-subscribe@scons.tigris.org">subscribe to mailing list</a></li>
 <li><a
-href="<?echo $listpage;?>?listName=issues">Tigris.org forum interface</a></li>
+href="<?php echo $listpage;?>?listName=issues">Tigris.org forum interface</a></li>
 </ul>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 Unported license.
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 <div id="bodycontent">
 <h2 class="pagetitle"> News </h2>
 
-<?
+<?php
 
 include "news-raw.xhtml";
 
 ?>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
 	include "includes/versions.php";
 
 <span class="sconslogo">SCons</span>;
 here's what some of them have to say about it.
 
-<?
+<?php
 
 include "refer-raw.xhtml";
 
 ?>
 
 </div> <!-- End bodycontent -->
-<?
+<?php
 	make_bottom();
 ?>
-<?
+<?php
 	include "includes/templates.php";
         //include "includes/versions.php";
 
 </div>
 
 </div>
+
+</div> <!-- End bodycontent -->
+<?php
+        make_bottom();
+?>
+