Skip to content

Commit

Permalink
Merge pull request #306 from dschwen/rmshortopen_305
Browse files Browse the repository at this point in the history 
Replace short open tags
  • Loading branch information
@DawoudIO
DawoudIO committed Feb 10, 2016
2 parents 4975b43 + 2f01df1 commit 546a0ad
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
16 changes: 8 additions & 8 deletions churchinfo/CartView.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
if (array_key_exists('aPeopleCart', $_SESSION) and count($_SESSION['aPeopleCart']) == 0) {
if (!array_key_exists("Message", $_GET)) {?>
<p class="text-center callout callout-warning"><?= gettext("You have no items in your cart.") ;?> </p>
<? } else {
<?php } else {
switch ($_GET["Message"]) {
case "aMessage": ?>
<p class="text-center callout callout-info"><?= $_GET["iCount"].' '.($_GET["iCount"] == 1 ? "Record":"Records").' Emptied into Event ID:'.$_GET["iEID"] ;?> </p>
<? break;
<?php break;
}
}
echo '<p align="center"><input type="button" name="Exit" class="btn btn-primary" value="'.gettext("Back to Menu").'" '."onclick=\"javascript:document.location='Menu.php';\"></p>\n";
Expand Down Expand Up @@ -173,17 +173,17 @@
</div>
<div class="box-body">
<a href="CartView.php?Action=EmptyCart" class="btn btn-app"><i class="fa fa-trash"></i><?= gettext("Empty Cart") ?></a>
<? if ($_SESSION['bManageGroups']) { ?>
<?php if ($_SESSION['bManageGroups']) { ?>
<a href="CartToGroup.php" class="btn btn-app"><i class="fa fa-object-ungroup"></i><?= gettext("Empty Cart to Group") ?></a>
<? } ?>
<? if ($_SESSION['bAddRecords']) { ?>
<?php } ?>
<?php if ($_SESSION['bAddRecords']) { ?>
<a href="CartToFamily.php" class="btn btn-app"><i class="fa fa-users"></i><?= gettext("Empty Cart to Family") ?></a>
<? } ?>
<?php } ?>
<a href="CartToEvent.php" class="btn btn-app"><i class="fa fa-ticket"></i><?= gettext("Empty Cart to Event") ?></a>

<? if ($bExportCSV) { ?>
<?php if ($bExportCSV) { ?>
<a href="CSVExport.php?Source=cart" class="btn btn-app"><i class="fa fa-file-excel-o"></i><?= gettext("CSV Export") ?></a>
<? } ?>
<?php } ?>
<a href="MapUsingGoogle.php?GroupID=0" class="btn btn-app"><i class="fa fa-map-marker"></i><?= gettext("Map Cart") ?></a>
<a href="Reports/NameTags.php?labeltype=74536&labelfont=times&labelfontsize=36" class="btn btn-app"><i class="fa fa-file-pdf-o"></i><?= gettext("Name Tags") ?></a>
<?
Expand Down
2 changes: 1 addition & 1 deletion churchinfo/GroupView.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@

<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><? echo gettext('Group Members:')?></h3>
<h3 class="box-title"><?php echo gettext('Group Members:')?></h3>
</div>
<div class="box-body">
<!-- START GROUP MEMBERS LISTING for group $iGroupID; -->
Expand Down
18 changes: 9 additions & 9 deletions churchinfo/MembersDashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@
<a href="SelectList.php?mode=person" class="btn btn-app"><i class="fa fa-user"></i><?= gettext("All People") ?></a>
<a href="OptionManager.php?mode=classes" class="btn btn-app"><i class="fa fa-gears"></i><?= gettext("Classifications Manager") ?></a>
<a href="VolunteerOpportunityEditor.php" class="btn btn-app"><i class="fa fa-bullhorn"></i><?= gettext("Volunteer Opportunities") ?></a>
<? if ($_SESSION['bAdmin']) {?>
<?php if ($_SESSION['bAdmin']) {?>
<a href="PersonCustomFieldsEditor.php" class="btn btn-app"><i class="fa fa-gear"></i><?= gettext("Custom Person Fields") ?></a>
<? } ?>
<?php } ?>
<br/>
<a href="FamilyList.php" class="btn btn-app"><i class="fa fa-users"></i><?= gettext("All Families") ?></a>
<a href="OptionManager.php?mode=famroles" class="btn btn-app"><i class="fa fa-cubes"></i><?= gettext("Family Roles") ?></a>
<a href="GeoPage.php" class="btn btn-app"><i class="fa fa-globe"></i><?= gettext("Family Geographic") ?></a>
<a href="MapUsingGoogle.php?GroupID=-1" class="btn btn-app"><i class="fa fa-map"></i><?= gettext("Family Map") ?></a>
<a href="UpdateAllLatLon.php" class="btn btn-app"><i class="fa fa-map-pin"></i><?= gettext("Update All Family Coordinates") ?></a>
<? if ($_SESSION['bAdmin']) {?>
<?php if ($_SESSION['bAdmin']) {?>
<a href="FamilyCustomFieldsEditor.php" class="btn btn-app"><i class="fa fa-gear"></i><?= gettext("Custom Family Fields") ?></a>
<? } ?>
<?php } ?>

</div>
</div>
Expand Down Expand Up @@ -139,7 +139,7 @@
<th>% of Members</th>
<th style="width: 40px">Count</th>
</tr>
<? foreach ($demographicStats as $key => $value) { ?>
<?php foreach ($demographicStats as $key => $value) { ?>
<tr>
<td><?= $key ?></td>
<td>
Expand All @@ -149,7 +149,7 @@
</td>
<td><span class="badge bg-green"><?= $value ?></span></td>
</tr>
<? } ?>
<?php } ?>
</table>
</div>
</div>
Expand All @@ -173,7 +173,7 @@
<th>% of Members</th>
<th style="width: 40px">Count</th>
</tr>
<? foreach ($personStats as $key => $value) { ?>
<?php foreach ($personStats as $key => $value) { ?>
<tr>
<td><?= $key ?></td>
<td>
Expand All @@ -183,7 +183,7 @@
</td>
<td><span class="badge bg-green"><?= $value ?></span></td>
</tr>
<? } ?>
<?php } ?>
</table>
<!-- /.box-body-->
</div>
Expand Down Expand Up @@ -264,4 +264,4 @@
//and append it to your page somewhere
$('#gender-donut-legend').append(legend);
</script>
<? require 'Include/Footer.php'; ?>
<?php require 'Include/Footer.php'; ?>
2 changes: 1 addition & 1 deletion churchinfo/PropertyList.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

<div class="box box-body">

<? if ($_SESSION['bMenuOptions'])
<?php if ($_SESSION['bMenuOptions'])
{
//Display the new property link
echo "<p align=\"center\"><a class='btn btn-primary' href=\"PropertyEditor.php?Type=" . $sType . "\">" . gettext("Add a New") . " " . $sTypeName . " " . gettext("Property") . "</a></p>";
Expand Down
12 changes: 6 additions & 6 deletions churchinfo/SelectList.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1063,17 +1063,17 @@
}?>
</td>
<td>
<? if ($_SESSION['bEditRecords']) {?>
<?php if ($_SESSION['bEditRecords']) {?>
<a href="PersonEditor.php?PersonID=<?= $per_ID ?>">
<span class="fa-stack">
<i class="fa fa-square fa-stack-2x"></i>
<i class="fa fa-pencil fa-stack-1x fa-inverse"></i>
</span>
</a>
<? }?>
<?php }?>
</td>
<td>
<? if (!isset($_SESSION['aPeopleCart']) || !in_array($per_ID, $_SESSION['aPeopleCart'], false)) {
<?php if (!isset($_SESSION['aPeopleCart']) || !in_array($per_ID, $_SESSION['aPeopleCart'], false)) {

// Add to cart option
if (mb_substr($sRedirect, -1, 1) == '?')
Expand All @@ -1089,7 +1089,7 @@
</span>
</a>
</td>
<? } else {
<?php } else {
// Remove from cart option
if (mb_substr($sRedirect, -1, 1) == '?')
echo "<a href=\"" .$sRedirect. "RemoveFromPeopleCart=" .$per_ID. "\">";
Expand All @@ -1103,7 +1103,7 @@
<i class="fa fa-remove fa-stack-1x fa-inverse"></i>
</span>
</a>
<? }
<?php }

if ($iMode == 1) {
echo "<td><a href=\"PrintView.php?PersonID=" .$per_ID. "\">"; ?>
Expand All @@ -1112,7 +1112,7 @@
<i class="fa fa-print fa-stack-1x fa-inverse"></i>
</span>
</a>
<? } else {
<?php } else {
echo "<td><a href=\"PersonToGroup.php?PersonID=" .$per_ID;
echo "&amp;prevquery=" . rawurlencode($_SERVER["QUERY_STRING"]) . "\">";
echo gettext("Add to Group") . "</a></td>";
Expand Down
2 changes: 1 addition & 1 deletion churchinfo/UserEditor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,4 +523,4 @@ function StyleSheetOptions($currentStyle) {
<!-- /.box-body -->
</div>
<!-- /.box -->
<? require 'Include/Footer.php'; ?>
<?php require 'Include/Footer.php'; ?>

0 comments on commit 546a0ad

Please sign in to comment.