Skip to content

Commit

Permalink
User short echo tags (ChurchCRM#309)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dschwen
dschwen committed Feb 13, 2016
1 parent 546a0ad commit 8bf8ba4
Show file tree
Hide file tree
Showing 85 changed files with 1,291 additions and 1,291 deletions.
54 changes: 27 additions & 27 deletions churchinfo/AddEvent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@

<thead>
<tr>
<th><?php echo gettext("Event Type"); ?></td>
<th><?php echo gettext("Event Title"); ?></td>
<th><?php echo gettext("Description"); ?></td>
<th><?php echo gettext("Start Date/Time"); ?></td>
<th><?php echo gettext("Active"); ?></td>
<th><?php echo gettext("Action"); ?></td>
<th><?= gettext("Event Type") ?></td>
<th><?= gettext("Event Title") ?></td>
<th><?= gettext("Description") ?></td>
<th><?= gettext("Start Date/Time") ?></td>
<th><?= gettext("Active") ?></td>
<th><?= gettext("Action") ?></td>
</tr>
</thead>
<?php
Expand All @@ -149,26 +149,26 @@

//Display the row
?>
<tr class="<?php echo $sRowClass; ?>">
<td><?php echo $aEventType[$row]; ?></td>
<td><?php echo htmlentities(stripslashes($aEventTitle[$row]),ENT_NOQUOTES, "UTF-8"); ?></td>
<td><?php echo ($aEventDesc[$row] == '' ? "&nbsp;":$aEventDesc[$row]); ?>
<tr class="<?= $sRowClass ?>">
<td><?= $aEventType[$row] ?></td>
<td><?= htmlentities(stripslashes($aEventTitle[$row]),ENT_NOQUOTES, "UTF-8") ?></td>
<td><?= ($aEventDesc[$row] == '' ? "&nbsp;":$aEventDesc[$row]) ?>
<?php echo ($aEventText[$row] != '' ? "&nbsp;&nbsp;&nbsp;<a href=\"javascript:popUp('GetText.php?EID=".$aEventID[$row]."')\"><strong>text</strong></a>":""); ?></td>
<td><?php echo FormatDate($aEventStart[$row],1); ?></td>
<td align="center"><?php echo ($aEventStatus[$row] != 0 ? "No":"Yes"); ?></td>
<td><?= FormatDate($aEventStart[$row],1) ?></td>
<td align="center"><?= ($aEventStatus[$row] != 0 ? "No":"Yes") ?></td>
<td align="center">
<form name="EditEvent" action="EventEditor.php" method="POST">
<input type="hidden" name="EID" value="<?php echo $aEventID[$row]; ?>">
<input type="submit" name="Action" <?php echo 'value="' . gettext("Edit") . '"'; ?> class="btn">
<input type="hidden" name="EID" value="<?= $aEventID[$row] ?>">
<input type="submit" name="Action" <?= 'value="' . gettext("Edit") . '"' ?> class="btn">
</form>
</td>
<td>
<form name="DeactivateEvent" action="AddEvent.php" method="POST">
<input type="hidden" name="EID" value="<?php echo $aEventID[$row]; ?>">
<input type="hidden" name="EID" value="<?= $aEventID[$row] ?>">
<?php if ($aEventStatus[$row] == 0 ) { ?>
<input type="submit" name="Action" value="<?php echo gettext("Deactivate"); ?>" class="btn" onClick="return confirm('Are you sure you want to DEACTIVATE Event ID: <?php echo $aEventID[$row]; ?>')">
<input type="submit" name="Action" value="<?= gettext("Deactivate") ?>" class="btn" onClick="return confirm('Are you sure you want to DEACTIVATE Event ID: <?= $aEventID[$row] ?>')">
<?php } else { ?>
<input type="submit" name="Action" value="<?php echo gettext("Activate"); ?>" class="btn">
<input type="submit" name="Action" value="<?= gettext("Activate") ?>" class="btn">
<?php } ?>
</form>
</td>
Expand All @@ -191,7 +191,7 @@
<form method="post" action="AddEvent.php" name="AddEvent">
<table width="70%" align="center">
<tr>
<td class="LabelColumn"><?php echo gettext("Event Type:"); ?></td>
<td class="LabelColumn"><?= gettext("Event Type:") ?></td>
<td colspan="3">
<select name="newEventType">
<?php
Expand All @@ -214,26 +214,26 @@
</td>
</tr>
<tr>
<td class="LabelColumn"><?php echo gettext("Event Title:"); ?></td>
<td class="LabelColumn"><?= gettext("Event Title:") ?></td>
<td colspan="3">
<input type="text" name="newEventTitle" size="40" maxlength="100">
<?php if ( $bNewTitleError ) echo "<div><span style=\"color: red;\"><BR>" . gettext("You must enter a name.") . "</span></div>"; ?>
</td>
</tr>
<tr>
<td class="LabelColumn"><?php echo gettext("Event Desc:"); ?></td>
<td class="LabelColumn"><?= gettext("Event Desc:") ?></td>
<td colspan="3">
<input type="text" name="newEventDesc" size="40" maxlength="100">
<?php if ( $bNewDescError ) echo "<div><span style=\"color: red;\"><BR>" . gettext("You must enter a name.") . "</span></div>"; ?>
</td>
</tr>
<tr>
<td class="LabelColumn"><?php echo gettext("Event Sermon:"); ?></td>
<td class="LabelColumn"><?= gettext("Event Sermon:") ?></td>
<td colspan="3"><textarea name="newEventText" rows="10" cols="80"></textarea></td>
</tr>
<tr>
<td class="LabelColumn">
<?php echo gettext("Start Date:"); ?>
<?= gettext("Start Date:") ?>
</td>
<td>
<div class="form-group">
Expand All @@ -248,7 +248,7 @@
</div>
</td>
<td class="LabelColumn">
<?php echo gettext("Start Time:"); ?>
<?= gettext("Start Time:") ?>
</td>
<td>
<div class="form-group">
Expand All @@ -263,7 +263,7 @@
</tr>
<tr>
<td class="LabelColumn">
<?php echo gettext("End Date:"); ?>
<?= gettext("End Date:") ?>
</td>
<td>
<div class="form-group">
Expand All @@ -278,7 +278,7 @@
</div>
</td>
<td class="LabelColumn">
<?php echo gettext("End Time:"); ?>
<?= gettext("End Time:") ?>
</td>
<td>
<div class="form-group">
Expand All @@ -292,14 +292,14 @@
</td>
</tr>
<tr>
<td class="LabelColumn"><?php echo gettext("Event Status:"); ?></td>
<td class="LabelColumn"><?= gettext("Event Status:") ?></td>
<td colspan="3">
<input type="radio" name="newEventStatus" value="0" checked> Active <input type="radio" name="newEventStatus" value="1"> Inactive
<?php if ( $bNewStatusError ) echo "<div><span style=\"color: red;\"><BR>" . gettext("Is this Active or Inactive?") . "</span></div>"; ?>
</td>
</tr>
<tr>
<td colspan="4" align="center"><input type="submit" Name="AddEvent" <?php echo 'value="' . gettext("Add Event") . '"'; ?> class="btn"></td>
<td colspan="4" align="center"><input type="submit" Name="AddEvent" <?= 'value="' . gettext("Add Event") . '"' ?> class="btn"></td>
</tr>
</table>
</form>
Expand Down
6 changes: 3 additions & 3 deletions churchinfo/AutoPaymentDelete.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@

?>

<form method="post" action="AutoPaymentDelete.php?<?php echo "AutID=" . $iAutID . "&linkBack=" . $linkBack; ?>" name="AutoPaymentDelete">
<form method="post" action="AutoPaymentDelete.php?<?= "AutID=" . $iAutID . "&linkBack=" . $linkBack ?>" name="AutoPaymentDelete">

<table cellpadding="3" align="center">

<tr>
<td align="center">
<input type="submit" class="btn" value="<?php echo gettext("Delete"); ?>" name="Delete">
<input type="submit" class="btn" value="<?php echo gettext("Cancel"); ?>" name="Cancel">
<input type="submit" class="btn" value="<?= gettext("Delete") ?>" name="Delete">
<input type="submit" class="btn" value="<?= gettext("Cancel") ?>" name="Cancel">
</td>
</tr>
</table>
Expand Down
30 changes: 15 additions & 15 deletions churchinfo/AutoPaymentEditor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ function VancoErrorString (errNo)
case 67: return "Transaction must have at least one transaction fund.";
case 68: return "User is Inactive";
case 69: return "Expiration Date Invalid";
case 70: return "Account Type must be “C”, “S' for ACH and must be blank for Credit Card";
case 70: return "Account Type must be �C�, �S' for ACH and must be blank for Credit Card";
case 71: return "Class Code must be PPD, CCD, TEL, WEB, RCK or blank.";
case 72: return "Missing Client Data: Client ID";
case 73: return "Missing Customer Data: Customer ID or Name or Last Name & First Name";
Expand Down Expand Up @@ -431,7 +431,7 @@ function VancoErrorString (errNo)
case 572: return "Canadian Provence Required";
case 573: return "Canadian Postal Code Required";
case 574: return "Country Code Required";
case 578: return "Unable to Read Card Information. Please Click “Click to Swipe” Button and Try Again.";
case 578: return "Unable to Read Card Information. Please Click �Click to Swipe� Button and Try Again.";
case 610: return "Invalid Banking Information. Previous Notification of Change Received for this Account";
case 629: return "Invalid CVV2";
case 641: return "Fund ID Not Found";
Expand Down Expand Up @@ -501,8 +501,8 @@ function CreatePaymentMethod()
$.ajax({
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":"<?php echo $sessionid; ?>",
"nvpvar":"<?php echo $nvpvarcontent; ?>",
data: { "sessionid":"<?= $sessionid ?>",
"nvpvar":"<?= $nvpvarcontent ?>",
"newcustomer":"true",
"accounttype":accountType,
"accountnumber":accountNum,
Expand Down Expand Up @@ -567,14 +567,14 @@ function CreatePaymentMethod()
}
?>

<form method="post" action="AutoPaymentEditor.php?<?php echo "AutID=" . $iAutID . "&FamilyID=" . $iFamily . "&linkBack=" . $linkBack; ?>" name="AutoPaymentEditor">
<form method="post" action="AutoPaymentEditor.php?<?= "AutID=" . $iAutID . "&FamilyID=" . $iFamily . "&linkBack=" . $linkBack ?>" name="AutoPaymentEditor">

<table cellpadding="1" align="center">

<tr>
<td align="center">
<input type="submit" class="btn" value="<?php echo gettext("Save"); ?>" name="Submit">
<input type="button" class="btn" value="<?php echo gettext("Cancel"); ?>" name="Cancel" onclick="javascript:document.location='<?php if (strlen($linkBack) > 0) { echo $linkBack; } else {echo "Menu.php"; } ?>';">
<input type="submit" class="btn" value="<?= gettext("Save") ?>" name="Submit">
<input type="button" class="btn" value="<?= gettext("Cancel") ?>" name="Cancel" onclick="javascript:document.location='<?php if (strlen($linkBack) > 0) { echo $linkBack; } else {echo "Menu.php"; } ?>';">
</td>
</tr>

Expand All @@ -583,10 +583,10 @@ function CreatePaymentMethod()
<table cellpadding="1" align="center">

<tr>
<td class="LabelColumn"><?php echo gettext("Family:"); ?></td>
<td class="LabelColumn"><?= gettext("Family:") ?></td>
<td class="TextColumn">
<select name="Family" size="8">
<option value="0" selected><?php echo gettext("Unassigned"); ?></option>
<option value="0" selected><?= gettext("Unassigned") ?></option>
<option value="0">-----------------------</option>

<?php
Expand All @@ -605,19 +605,19 @@ function CreatePaymentMethod()
</tr>

<tr>
<td class="LabelColumn"><?php echo gettext("Automatic payment type"); ?></td>
<td class="LabelColumn"><?= gettext("Automatic payment type") ?></td>
<td class="TextColumn"><input type="radio" Name="EnableButton" value="1" id="EnableBankDraft"<?php if ($bEnableBankDraft) echo " checked"; ?>>Bank Draft
<input type="radio" Name="EnableButton" value="2" id="EnableCreditCard" <?php if ($bEnableCreditCard) echo " checked"; ?>>Credit Card
<input type="radio" Name="EnableButton" value="3" id="Disable" <?php if ((!$bEnableBankDraft)&&(!$bEnableCreditCard)) echo " checked"; ?>>Disable</td>
</tr>

<tr>
<td class="LabelColumn"><?php echo gettext("Date:"); ?></td>
<td class="TextColumn"><input type="text" name="NextPayDate" value="<?php echo $dNextPayDate; ?>" maxlength="10" id="NextPayDate" size="11" class="form-control pull-right active"></td>
<td class="LabelColumn"><?= gettext("Date:") ?></td>
<td class="TextColumn"><input type="text" name="NextPayDate" value="<?= $dNextPayDate ?>" maxlength="10" id="NextPayDate" size="11" class="form-control pull-right active"></td>
</tr>

<tr>
<td class="LabelColumn"><?php echo gettext("Fiscal Year:"); ?></td>
<td class="LabelColumn"><?= gettext("Fiscal Year:") ?></td>
<td class="TextColumnWithBottomBorder">
<?php PrintFYIDSelect ($iFYID, "FYID") ?>
</td>
Expand All @@ -634,10 +634,10 @@ function CreatePaymentMethod()
</tr>

<tr>
<td class="LabelColumn"><?php echo gettext("Fund:"); ?></td>
<td class="LabelColumn"><?= gettext("Fund:") ?></td>
<td class="TextColumn">
<select name="Fund">
<option value="0"><?php echo gettext("None"); ?></option>
<option value="0"><?= gettext("None") ?></option>
<?php
mysql_data_seek($rsFunds,0);
while ($row = mysql_fetch_array($rsFunds))
Expand Down
28 changes: 14 additions & 14 deletions churchinfo/BackupDatabase.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,31 @@
?>
<div class="box">
<div class="box-header">
<h3 class="box-title"><?php echo gettext("This tool will assist you in manually backing up the ChurchCRM database."); ?></h3>
<h3 class="box-title"><?= gettext("This tool will assist you in manually backing up the ChurchCRM database.") ?></h3>
</div>
<div class="box-body">
<ul>
<li><?php echo gettext("You should make a manual backup at least once a week unless you already have a regular backup procedule for your systems."); ?></li><br>
<li><?php echo gettext("After you download the backup file, you should make two copies. Put one of them in a fire-proof safe on-site and the other in a safe location off-site."); ?></li><br>
<li><?php echo gettext("If you are concerned about confidentiality of data stored in the ChurchCRM database, you should encrypt the backup data if it will be stored somewhere potentially accessible to others"); ?></li><br>
<li><?php echo gettext("For added backup security, you can e-mail the backup to yourself at an e-mail account hosted off-site or to a trusted friend. Be sure to use encryption if you do this, however."); ?></li>
<li><?= gettext("You should make a manual backup at least once a week unless you already have a regular backup procedule for your systems.") ?></li><br>
<li><?= gettext("After you download the backup file, you should make two copies. Put one of them in a fire-proof safe on-site and the other in a safe location off-site.") ?></li><br>
<li><?= gettext("If you are concerned about confidentiality of data stored in the ChurchCRM database, you should encrypt the backup data if it will be stored somewhere potentially accessible to others") ?></li><br>
<li><?= gettext("For added backup security, you can e-mail the backup to yourself at an e-mail account hosted off-site or to a trusted friend. Be sure to use encryption if you do this, however.") ?></li>
</ul>
<BR><BR>
<form method="post" action="/api/database/backup" id="BackupDatabase">
<?php echo gettext("Select archive type:"); ?>
<?php if ($hasGZIP) { ?><input type="radio" name="archiveType" value="0"><?php echo gettext("GZip"); ?><?php } ?>
<!--<?php if ($hasZIP) { ?><input type="radio" name="archiveType" value="1"><?php echo gettext("Zip"); ?><?php } ?>-->
<input type="radio" name="archiveType" value="2" checked><?php echo gettext("Uncompressed"); ?>
<input type="radio" name="archiveType" value="3" checked><?php echo gettext("tar.gz (Include Photos)"); ?>
<?= gettext("Select archive type:") ?>
<?php if ($hasGZIP) { ?><input type="radio" name="archiveType" value="0"><?= gettext("GZip") ?><?php } ?>
<!--<?php if ($hasZIP) { ?><input type="radio" name="archiveType" value="1"><?= gettext("Zip") ?><?php } ?>-->
<input type="radio" name="archiveType" value="2" checked><?= gettext("Uncompressed") ?>
<input type="radio" name="archiveType" value="3" checked><?= gettext("tar.gz (Include Photos)") ?>
<BR><BR>
<?php if ($hasPGP) { ?>
<input type="checkbox" name="encryptBackup" value="1"><?php echo gettext("Encrypt backup file with a password?"); ?>
<input type="checkbox" name="encryptBackup" value="1"><?= gettext("Encrypt backup file with a password?") ?>
&nbsp;&nbsp;&nbsp;
<?php echo gettext("Password:"); ?><input type="password" name="pw1">
<?php echo gettext("Re-type Password:"); ?><input type="password" name="pw2">
<?= gettext("Password:") ?><input type="password" name="pw1">
<?= gettext("Re-type Password:") ?><input type="password" name="pw2">
<BR><span id="passworderror" style="color: red"></span><BR><BR>
<?php } ?>
<input type="submit" class="btn btn-primary" name="doBackup" <?php echo 'value="' . gettext("Generate and Download Backup") . '"'; ?>>
<input type="submit" class="btn btn-primary" name="doBackup" <?= 'value="' . gettext("Generate and Download Backup") . '"' ?>>
</form>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions churchinfo/BatchWinnerEntry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@

?>

<form method="post" action="BatchWinnerEntry.php?<?php echo "CurrentFundraiser=" . "&linkBack=" . $linkBack; ?>" name="BatchWinnerEntry">
<form method="post" action="BatchWinnerEntry.php?<?= "CurrentFundraiser=" . "&linkBack=" . $linkBack ?>" name="BatchWinnerEntry">

<table cellpadding="3" align="center">
<tr>
<td class="LabelColumn"><?php echo gettext("Item"); ?></td>
<td class="LabelColumn"><?php echo gettext("Winner"); ?></td>
<td class="LabelColumn"><?php echo gettext("Price"); ?></td>
<td class="LabelColumn"><?= gettext("Item") ?></td>
<td class="LabelColumn"><?= gettext("Winner") ?></td>
<td class="LabelColumn"><?= gettext("Price") ?></td>
</tr>
<?php
for ($row = 0; $row < 10; $row += 1) {
Expand Down Expand Up @@ -109,8 +109,8 @@
?>
<tr>
<td align="center">
<input type="submit" class="btn" value="<?php echo gettext("Enter Winners"); ?>" name="EnterWinners">
<input type="button" class="btn" value="<?php echo gettext("Cancel"); ?>" name="Cancel" onclick="javascript:document.location='<?php if (strlen($linkBack) > 0) { echo $linkBack; } else {echo "Menu.php"; } ?>';">
<input type="submit" class="btn" value="<?= gettext("Enter Winners") ?>" name="EnterWinners">
<input type="button" class="btn" value="<?= gettext("Cancel") ?>" name="Cancel" onclick="javascript:document.location='<?php if (strlen($linkBack) > 0) { echo $linkBack; } else {echo "Menu.php"; } ?>';">
</td>
</tr>
</table>
Expand Down
Loading

0 comments on commit 8bf8ba4

Please sign in to comment.