Skip to content

Commit

Permalink
Remove semicolon from remaining short echo tags (ChurchCRM#309)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dschwen
dschwen committed Feb 16, 2016
1 parent 39f043b commit ac4f529
Show file tree
Hide file tree
Showing 42 changed files with 238 additions and 238 deletions.
6 changes: 3 additions & 3 deletions churchinfo/AddEvent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@

require "Include/Header.php";
?>
<link rel="stylesheet" type="text/css" href="<?= $sRootPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.css">
<script type="text/javascript" language="javascript" src="<?= $sRootPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
<script type="text/javascript" language="javascript" src="<?= $sRootPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.js"></script>
<link rel="stylesheet" type="text/css" href="<?= $sRootPath >/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.css">
<script type="text/javascript" language="javascript" src="<?= $sRootPath >/vendor/almasaeed2010/adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
<script type="text/javascript" language="javascript" src="<?= $sRootPath >/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.js"></script>

<?php

Expand Down
48 changes: 24 additions & 24 deletions churchinfo/AutoPaymentEditor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,8 @@ function CreatePaymentMethod()
type: "POST",
url: "<?php if ($VancoTest) echo "https://www.vancodev.com/cgi-bin/wsnvptest.vps";
else echo "https://www.vancoservices.com/cgi-bin/wsnvp.vps"; ?>",
data: { "sessionid":"<?= $sessionid; ?>",
"nvpvar":"<?= $nvpvarcontent; ?>",
data: { "sessionid":"<?= $sessionid >",
"nvpvar":"<?= $nvpvarcontent >",
"newcustomer":"true",
"accounttype":accountType,
"accountnumber":accountNum,
Expand All @@ -526,7 +526,7 @@ function CreatePaymentMethod()
var errorList = vancodata["errorlist"];
$.ajax({
type: "POST",
url: "<?= $VancoUrltoredirect; ?>",
url: "<?= $VancoUrltoredirect >",
data: vancodata,
dataType: 'json',
async: true,
Expand All @@ -548,7 +548,7 @@ function CreatePaymentMethod()
for (var i = 0; i < errorArr.length; i++)
errorStr += "Error " + errorArr[i] + ": " + VancoErrorString(Number(errorArr[i])) + "\n";
alert (errorStr);
window.location = "<?= RedirectURL ("AutoPaymentEditor.php")."?AutID=$iAutID&FamilyID=$aut_FamID$&linkBack=$linkBack"; ?>";
window.location = "<?= RedirectURL ("AutoPaymentEditor.php")."?AutID=$iAutID&FamilyID=$aut_FamID$&linkBack=$linkBack" >";
}
},
error: function (jqXHR, textStatus, errorThrown, nashuadata) {
Expand Down Expand Up @@ -625,12 +625,12 @@ function CreatePaymentMethod()
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Payment amount"); ?></td>
<td class="LabelColumn"><?= gettext("Payment amount") ></td>
<td class="TextColumn"><input type="text" name="Amount" value="<?= $nAmount ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Payment interval (months)"); ?></td>
<td class="LabelColumn"><?= gettext("Payment interval (months)") ></td>
<td class="TextColumn"><input type="text" name="Interval" value="<?= $iInterval ?>"></td>
</tr>

Expand Down Expand Up @@ -659,99 +659,99 @@ function CreatePaymentMethod()
</tr>

<tr>
<td class="LabelColumn"><?= gettext("First name"); ?></td>
<td class="LabelColumn"><?= gettext("First name") ></td>
<td class="TextColumn"><input type="text" id="FirstName" name="FirstName" value="<?= $tFirstName ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Last name"); ?></td>
<td class="LabelColumn"><?= gettext("Last name") ></td>
<td class="TextColumn"><input type="text" id="LastName" name="LastName" value="<?= $tLastName ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Address 1"); ?></td>
<td class="LabelColumn"><?= gettext("Address 1") ></td>
<td class="TextColumn"><input type="text" id="Address1" name="Address1" value="<?= $tAddress1 ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Address 2"); ?></td>
<td class="LabelColumn"><?= gettext("Address 2") ></td>
<td class="TextColumn"><input type="text" id="Address2" name="Address2" value="<?= $tAddress2 ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("City"); ?></td>
<td class="LabelColumn"><?= gettext("City") ></td>
<td class="TextColumn"><input type="text" id="City" name="City" value="<?= $tCity ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("State"); ?></td>
<td class="LabelColumn"><?= gettext("State") ></td>
<td class="TextColumn"><input type="text" id="State" name="State" value="<?= $tState ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Zip code"); ?></td>
<td class="LabelColumn"><?= gettext("Zip code") ></td>
<td class="TextColumn"><input type="text" id="Zip" name="Zip" value="<?= $tZip ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Country"); ?></td>
<td class="LabelColumn"><?= gettext("Country") ></td>
<td class="TextColumn"><input type="text" id="Country" name="Country" value="<?= $tCountry ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Phone"); ?></td>
<td class="LabelColumn"><?= gettext("Phone") ></td>
<td class="TextColumn"><input type="text" id="Phone" name="Phone" value="<?= $tPhone ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Email"); ?></td>
<td class="LabelColumn"><?= gettext("Email") ></td>
<td class="TextColumn"><input type="text" id="Email" name="Email" value="<?= $tEmail ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Credit Card"); ?></td>
<td class="LabelColumn"><?= gettext("Credit Card") ></td>
<td class="TextColumn"><input type="text" id="CreditCard" name="CreditCard" value="<?= $tCreditCard ?>"></td>
</tr>
<?php
if ($sElectronicTransactionProcessor == "Vanco") {
?>
<tr>
<td class="LabelColumn"><?= gettext("Vanco Credit Card Method"); ?></td>
<td class="LabelColumn"><?= gettext("Vanco Credit Card Method") ></td>
<td class="TextColumn"><input type="text" id="CreditCardVanco" name="CreditCardVanco" value="<?= $tCreditCardVanco ?>" readonly></td>
</tr>
<?php
}
?>

<tr>
<td class="LabelColumn"><?= gettext("Expiration Month"); ?></td>
<td class="LabelColumn"><?= gettext("Expiration Month") ></td>
<td class="TextColumn"><input type="text" id="ExpMonth" name="ExpMonth" value="<?= $tExpMonth ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Expiration Year"); ?></td>
<td class="LabelColumn"><?= gettext("Expiration Year") ></td>
<td class="TextColumn"><input type="text" id="ExpYear" name="ExpYear" value="<?= $tExpYear ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Bank Name"); ?></td>
<td class="LabelColumn"><?= gettext("Bank Name") ></td>
<td class="TextColumn"><input type="text" id="BankName" name="BankName" value="<?= $tBankName ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Bank Route Number"); ?></td>
<td class="LabelColumn"><?= gettext("Bank Route Number") ></td>
<td class="TextColumn"><input type="text" id="Route" name="Route" value="<?= $tRoute ?>"></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Bank Account Number"); ?></td>
<td class="LabelColumn"><?= gettext("Bank Account Number") ></td>
<td class="TextColumn"><input type="text" id="Account" name="Account" value="<?= $tAccount ?>"></td>
</tr>
<?php
if ($sElectronicTransactionProcessor == "Vanco") {
?>
<tr>
<td class="LabelColumn"><?= gettext("Vanco Bank Account Method"); ?></td>
<td class="LabelColumn"><?= gettext("Vanco Bank Account Method") ></td>
<td class="TextColumn"><input type="text" id="AccountVanco" name="AccountVanco" value="<?= $tAccountVanco ?>" readonly></td>
</tr>
<?php
Expand Down
2 changes: 1 addition & 1 deletion churchinfo/CSVExport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
<b><?= gettext("To:") ?>&nbsp;</b>
</td>
<td>
<input type="text" name="BirthDate2" size="11" maxlength="10" value="<?=(date("Y-m-d")); ?>" id="BirthdayDate2">
<input type="text" name="BirthDate2" size="11" maxlength="10" value="<?=(date("Y-m-d")) >" id="BirthdayDate2">
</td>
</tr>
</table>
Expand Down
64 changes: 32 additions & 32 deletions churchinfo/CSVImport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,29 +225,29 @@ function AssignRoles()
?>
<td>
<select name="<?= "col" . $col ?>" class="columns">
<option value="0"><?= gettext("Ignore this Field"); ?></option>
<option value="1"><?= gettext("Title"); ?></option>
<option value="2"><?= gettext("First Name"); ?></option>
<option value="3"><?= gettext("Middle Name"); ?></option>
<option value="4"><?= gettext("Last Name"); ?></option>
<option value="5"><?= gettext("Suffix"); ?></option>
<option value="6"><?= gettext("Gender"); ?></option>
<option value="7"><?= gettext("Donation Envelope"); ?></option>
<option value="8"><?= gettext("Address1"); ?></option>
<option value="9"><?= gettext("Address2"); ?></option>
<option value="10"><?= gettext("City"); ?></option>
<option value="11"><?= gettext("State"); ?></option>
<option value="12"><?= gettext("Zip"); ?></option>
<option value="13"><?= gettext("Country"); ?></option>
<option value="14"><?= gettext("Home Phone"); ?></option>
<option value="15"><?= gettext("Work Phone"); ?></option>
<option value="16"><?= gettext("Mobile Phone"); ?></option>
<option value="17"><?= gettext("Email"); ?></option>
<option value="18"><?= gettext("Work / Other Email"); ?></option>
<option value="19"><?= gettext("Birth Date"); ?></option>
<option value="20"><?= gettext("Membership Date"); ?></option>
<option value="21"><?= gettext("Wedding Date"); ?></option>
<?= $sPerCustomFieldList.$sFamCustomFieldList; ?>
<option value="0"><?= gettext("Ignore this Field") ></option>
<option value="1"><?= gettext("Title") ></option>
<option value="2"><?= gettext("First Name") ></option>
<option value="3"><?= gettext("Middle Name") ></option>
<option value="4"><?= gettext("Last Name") ></option>
<option value="5"><?= gettext("Suffix") ></option>
<option value="6"><?= gettext("Gender") ></option>
<option value="7"><?= gettext("Donation Envelope") ></option>
<option value="8"><?= gettext("Address1") ></option>
<option value="9"><?= gettext("Address2") ></option>
<option value="10"><?= gettext("City") ></option>
<option value="11"><?= gettext("State") ></option>
<option value="12"><?= gettext("Zip") ></option>
<option value="13"><?= gettext("Country") ></option>
<option value="14"><?= gettext("Home Phone") ></option>
<option value="15"><?= gettext("Work Phone") ></option>
<option value="16"><?= gettext("Mobile Phone") ></option>
<option value="17"><?= gettext("Email") ></option>
<option value="18"><?= gettext("Work / Other Email") ></option>
<option value="19"><?= gettext("Birth Date") ></option>
<option value="20"><?= gettext("Membership Date") ></option>
<option value="21"><?= gettext("Wedding Date") ></option>
<?= $sPerCustomFieldList.$sFamCustomFieldList >
</select>
</td>
<?php
Expand All @@ -256,28 +256,28 @@ function AssignRoles()
echo "</table>";
?>
<BR>
<input type="checkbox" value="1" name="IgnoreFirstRow"><?= gettext("Ignore first CSV row (to exclude a header)"); ?>
<input type="checkbox" value="1" name="IgnoreFirstRow"><?= gettext("Ignore first CSV row (to exclude a header)") >
<BR><BR>
<BR>
<input type="checkbox" value="1" name="MakeFamilyRecords" checked="true">
<select name="MakeFamilyRecordsMode">
<option value="0"><?= gettext("Make Family records based on last name and address") ?></option>
<?= $sPerCustomFieldList.$sFamCustomFieldList; ?>
<?= $sPerCustomFieldList.$sFamCustomFieldList >
</select>

<BR><BR>
<select name="FamilyMode">
<option value="0"><?= gettext("Patriarch"); ?></option>
<option value="1"><?= gettext("Matriarch"); ?></option>
<option value="0"><?= gettext("Patriarch") ></option>
<option value="1"><?= gettext("Matriarch") ></option>
</select>
<?= gettext("Family Type: used with Make Family records... option above"); ?>
<?= gettext("Family Type: used with Make Family records... option above") >
<BR><BR>
<select name="DateMode">
<option value="1">YYYY-MM-DD</option>
<option value="2">MM-DD-YYYY</option>
<option value="3">DD-MM-YYYY</option>
</select>
<?= gettext("NOTE: Separators (dashes, etc.) or lack thereof do not matter"); ?>
<?= gettext("NOTE: Separators (dashes, etc.) or lack thereof do not matter") >
<BR><BR>
<?php
$sCountry = $sDefaultCountry;
Expand All @@ -289,7 +289,7 @@ function AssignRoles()
?>
<BR><BR>
<select name="Classification">
<option value="0"><?= gettext("Unassigned"); ?></option>
<option value="0"><?= gettext("Unassigned") ></option>
<option value="0">-----------------------</option>

<?php
Expand All @@ -301,9 +301,9 @@ function AssignRoles()
}
?>
</select>
<?= gettext("Classification"); ?>
<?= gettext("Classification") >
<BR><BR>
<input type="submit" class="btn btn-primary" value="<?= gettext("Perform Import"); ?>" name="DoImport">
<input type="submit" class="btn btn-primary" value="<?= gettext("Perform Import") >" name="DoImport">
</form>

<?php
Expand Down
10 changes: 5 additions & 5 deletions churchinfo/Canvas05Editor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,27 @@
<td>
<table cellpadding="3">
<tr>
<td class="LabelColumn"><?= gettext("Do you like the color of the church?"); ?></td>
<td class="LabelColumn"><?= gettext("Do you like the color of the church?") ></td>
<td><textarea name="ChurchColor" rows="3" cols="90"><?= $tChurchColor ?></textarea></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("What are we doing right?"); ?></td>
<td class="LabelColumn"><?= gettext("What are we doing right?") ></td>
<td><textarea name="DoingRight" rows="3" cols="90"><?= $tDoingRight ?></textarea></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("How can we improve?"); ?></td>
<td class="LabelColumn"><?= gettext("How can we improve?") ></td>
<td><textarea name="CanImprove" rows="3" cols="90"><?= $tCanImprove ?></textarea></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Will you pledge by March 31?"); ?></td>
<td class="LabelColumn"><?= gettext("Will you pledge by March 31?") ></td>
<td><textarea name="PledgeByMar31" rows="3" cols="90"><?= $tPledgeByMar31 ?></textarea></td>
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Canvasser Comments:"); ?></td>
<td class="LabelColumn"><?= gettext("Canvasser Comments:") ></td>
<td><textarea name="Comments" rows="3" cols="90"><?= $tComments ?></textarea></td>
</tr>

Expand Down
12 changes: 6 additions & 6 deletions churchinfo/CanvassAutomation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
name="SetDefaultFY">
</td>
<td align="left" width="75%">
<p><input type="checkbox" name="SetDefaultFYConfirm"><?= gettext("Check to confirm"); ?></p>
<p><input type="checkbox" name="SetDefaultFYConfirm"><?= gettext("Check to confirm") ></p>
</td>
</tr>

Expand All @@ -127,7 +127,7 @@
</td>
<td align="left" width="75%">
<?= gettext("Randomly assign canvassers to all Families. The Canvassers are
taken from the &quot;Canvassers&quot; Group."); ?>
taken from the &quot;Canvassers&quot; Group.") >
<p><input type="checkbox" name="AssignCanvassersConfirm"><?= gettext("Check to confirm") ?></p>
</td>
</tr>
Expand All @@ -139,7 +139,7 @@
</td>
<td align="left" width="75%">
<?= gettext("Randomly assign canvassers to non-pledging Families. The Canvassers are
taken from the &quot;BraveCanvassers&quot; Group."); ?>
taken from the &quot;BraveCanvassers&quot; Group.") >
<p><input type="checkbox" name="AssignNonPledgingConfirm"><?= gettext("Check to confirm") ?></p>
</td>
</tr>
Expand All @@ -152,7 +152,7 @@
<td align="left" width="75%">
<?= gettext("Clear all the canvasser assignments for all families. <p>Important
note: this will lose any canvasser assignments that have been made by hand.</p>"); ?>
<input type="checkbox" name="ClearCanvasserAssignmentsConfirm"><?= gettext("Check to confirm"); ?>
<input type="checkbox" name="ClearCanvasserAssignmentsConfirm"><?= gettext("Check to confirm") >
</td>
</tr>

Expand All @@ -164,7 +164,7 @@
<td align="left" width="75%">
<?= gettext("Turn on the &quot;Ok To Canvass&quot; field for all Families. <p>Important
note: this will lose any &quot;Ok To Canvass&quot; fields that have been set by hand.</p>"); ?>
<input type="checkbox" name="SetAllOkToCanvassConfirm"><?= gettext("Check to confirm"); ?>
<input type="checkbox" name="SetAllOkToCanvassConfirm"><?= gettext("Check to confirm") >
</td>
</tr>

Expand All @@ -176,7 +176,7 @@
<td align="left" width="75%">
<?= gettext("Turn off the &quot;Ok To Canvass&quot; field for all Families. <p>Important
note: this will lose any &quot;Ok To Canvass&quot; fields that have been set by hand.</p>"); ?>
<input type="checkbox" name="ClearAllOkToCanvassConfirm"><?= gettext("Check to confirm"); ?>
<input type="checkbox" name="ClearAllOkToCanvassConfirm"><?= gettext("Check to confirm") >
</td>
</tr>

Expand Down
4 changes: 2 additions & 2 deletions churchinfo/CanvassEditor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@

<tr>
<td class="LabelColumn"><?= gettext("Date:") ?></td>
<td class="TextColumn"><input type="text" name="Date" value="<?= $dDate; ?>" maxlength="10" id="sel1" size="11" class="form-control pull-right active" ><font color="red"><?= $sDateError ?></font></td>
<td class="TextColumn"><input type="text" name="Date" value="<?= $dDate >" maxlength="10" id="sel1" size="11" class="form-control pull-right active" ><font color="red"><?= $sDateError ?></font></td>
</tr>


Expand Down Expand Up @@ -235,7 +235,7 @@
</tr>

<tr>
<td class="LabelColumn"><?= gettext("Why Not Interested?"); ?></td>
<td class="LabelColumn"><?= gettext("Why Not Interested?") ></td>
<td><textarea name="WhyNotInterested" rows="1" cols="90"><?= $tWhyNotInterested ?></textarea></td>
</tr>

Expand Down
Loading

0 comments on commit ac4f529

Please sign in to comment.