Fix replacement bugs (#309)

ChurchCRM · Feb 14, 2016 · bb42194 · bb42194
1 parent 9e92ee1
commit bb42194
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 50 deletions.
diff --git a/churchinfo/AutoPaymentEditor.php b/churchinfo/AutoPaymentEditor.php
@@ -532,7 +532,7 @@ function CreatePaymentMethod()
                 async: true,
                 traditional: false,
                 success: function (postbackdata) {
-                	if (gotPaymentRef ?> 0) {
+                	if (gotPaymentRef > 0) {
         	        	if (document.getElementById("EnableBankDraft").checked) {
             	        	accountVal = document.getElementById("Account").value;
         	            	document.getElementById("Account").value = "*****" + accountVal.substr (accountVal.length-4,4);
@@ -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) {

diff --git a/churchinfo/CSVExport.php b/churchinfo/CSVExport.php
@@ -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>

diff --git a/churchinfo/Canvas05Editor.php b/churchinfo/Canvas05Editor.php
@@ -96,22 +96,22 @@
 		<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>
 

diff --git a/churchinfo/CanvassEditor.php b/churchinfo/CanvassEditor.php
@@ -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>
 

diff --git a/churchinfo/CartView.php b/churchinfo/CartView.php
@@ -44,11 +44,11 @@
 // Confirmation message that people where added to Event from Cart
 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>
+             <p class="text-center callout callout-warning"><?= gettext("You have no items in your cart.") ?> </p>
         <?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>
+                    <p class="text-center callout callout-info"><?= $_GET["iCount"].' '.($_GET["iCount"] == 1 ? "Record":"Records").' Emptied into Event ID:'.$_GET["iEID"]  ?> </p>
                 <?php break;
             }
         }
@@ -177,15 +177,15 @@
             <a href="CartToGroup.php" class="btn btn-app"><i class="fa fa-object-ungroup"></i><?= gettext("Empty Cart to Group") ?></a>
         <?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>
+            <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>
+        <a href="CartToEvent.php" class="btn btn-app"><i class="fa fa-ticket"></i><?=  gettext("Empty Cart to Event") ?></a>
 
         <?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>
+            <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>
+        <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>
         <?
         if (count($_SESSION['aPeopleCart']) != 0) {
 

diff --git a/churchinfo/DepositSlipEditor.php b/churchinfo/DepositSlipEditor.php
@@ -810,19 +810,19 @@
 <?php } ?>
 		<?php if ($dep_Closed) { ?>
 		<td>
-			<a href="PledgeEditor.php?GroupKey=<?= $plg_GroupKey . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID >">View</a>
+			<a href="PledgeEditor.php?GroupKey=<?= $plg_GroupKey . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID ?>">View</a>
 		</td>
 		<?php } else { ?>
 		<td>
-			<a href="PledgeEditor.php?GroupKey=<?= $plg_GroupKey . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID >">Edit</a>
+			<a href="PledgeEditor.php?GroupKey=<?= $plg_GroupKey . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID ?>">Edit</a>
 		</td>
 		<td>
-			<a href="PledgeDelete.php?GroupKey=<?= $plg_GroupKey . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID >">Delete</a>
+			<a href="PledgeDelete.php?GroupKey=<?= $plg_GroupKey . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID ?>">Delete</a>
 		</td>
 		<?php } ?>
 <?php if ($dep_Type == 'BankDraft' || $dep_Type == 'CreditCard') { ?>
 		<td>
-			<a href="PledgeDetails.php?PledgeID=<?= $plg_plgID . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID >">Details</a>
+			<a href="PledgeDetails.php?PledgeID=<?= $plg_plgID . "&linkBack=DepositSlipEditor.php?DepositSlipID=" . $iDepositSlipID ?>">Details</a>
 		</td>
 <?php } ?>
 	</tr>

diff --git a/churchinfo/EventEditor.php b/churchinfo/EventEditor.php
@@ -391,7 +391,7 @@
 
 <form method="post" action="EventEditor.php" name="EventsEditor">
 <input type="hidden" name="EventID" value="<?= ($iEventID) ?>">
-<input type="hidden" name="EventExists" value="<?= $EventExists  ?>">
+<input type="hidden" name="EventExists" value="<?= $EventExists ?>">
 <?php // used to be ($iEventID ? $iEventID : $aEventID_POST['EID']) ?>
 <table cellpadding="3" width="75%" align="center">
   <caption>

diff --git a/churchinfo/FundRaiserEditor.php b/churchinfo/FundRaiserEditor.php
@@ -226,7 +226,7 @@
 	?>
 		<tr class="<?= $sRowClass ?>">
 			<td>
-				<a href="DonatedItemEditor.php?DonatedItemID=<?= $di_ID . "&linkBack=FundRaiserEditor.php?FundRaiserID=" . $iFundRaiserID >"><?= $di_Item ?></a>
+				<a href="DonatedItemEditor.php?DonatedItemID=<?= $di_ID . "&linkBack=FundRaiserEditor.php?FundRaiserID=" . $iFundRaiserID ?>"><?= $di_Item ?></a>
 			</td>
 			<td>
 				<?php if ($di_multibuy) echo "X"; ?>&nbsp;
@@ -253,7 +253,7 @@
 				<?= $di_minimum ?>&nbsp;
 			</td>
 			<td>
-				<a href="DonatedItemDelete.php?DonatedItemID=<?= $di_ID . "&linkBack=FundRaiserEditor.php?FundRaiserID=" . $iFundRaiserID >">Delete</a>
+				<a href="DonatedItemDelete.php?DonatedItemID=<?= $di_ID . "&linkBack=FundRaiserEditor.php?FundRaiserID=" . $iFundRaiserID ?>">Delete</a>
 			</td>
 		</tr>
 	<?php

diff --git a/churchinfo/GroupList.php b/churchinfo/GroupList.php
@@ -55,7 +55,7 @@
     <label for="addNewGruop"><?= gettext("Add New Group: ") ?></label>
     <input class="form-control newGroup" name="groupName" id="groupName" style="width:100%">
     <br>
-    <button type="button" class="btn btn-primary" id ="addNewGroup" ?>Add New Group</button>
+    <button type="button" class="btn btn-primary" id="addNewGroup">Add New Group</button>
 </form>
 <?php
 }

diff --git a/churchinfo/GroupPropsFormEditor.php b/churchinfo/GroupPropsFormEditor.php
@@ -332,14 +332,14 @@
 			<?= $aPropTypes[$aTypeFields[$row]]; ?>
 			</td>
 
-			<td class="TextColumn"><input type="text" name="<?= $row . "name" ?>" value="<?= htmlentities(stripslashes($aNameFields[$row]), ENT_NOQUOTES, "UTF-8") ?>" size="25" maxlength="40">
+			<td class="TextColumn"><input type="text" name="<?= $row ?>name" value="<?= htmlentities(stripslashes($aNameFields[$row]), ENT_NOQUOTES, "UTF-8") ?>" size="25" maxlength="40">
 				<?php
 				if ( array_key_exists ($row, $aNameErrors) && $aNameErrors[$row] )
 					echo "<span style=\"color: red;\"><BR>" . gettext("You must enter a name.") . " </span>";
 				?>
 			</td>
 
-			<td class="TextColumn"><textarea name="<?= $row . "desc" ?>" cols="30" rows="1" onKeyPress="LimitTextSize(this,60)"><?= htmlentities(stripslashes($aDescFields[$row]),ENT_NOQUOTES, "UTF-8") ?></textarea></td>
+			<td class="TextColumn"><textarea name="<?= $row ?>desc" cols="30" rows="1" onKeyPress="LimitTextSize(this,60)"><?= htmlentities(stripslashes($aDescFields[$row]),ENT_NOQUOTES, "UTF-8") ?></textarea></td>
 
 			<td class="TextColumn">
 			<?php
@@ -372,7 +372,7 @@
 			?></td>
 
 			<td class="TextColumn">
-				<input type="checkbox" Name="<?= $row . "show" ?>" value="1"	<?php if ($aPersonDisplayFields[$row]) echo " checked" ?>>
+				<input type="checkbox" name="<?= $row ?>show" value="1"	<?php if ($aPersonDisplayFields[$row]) echo " checked" ?>>
 			</td>
 		</tr>
 	<?php } ?>

diff --git a/churchinfo/Reports/SundaySchoolClassList.php b/churchinfo/Reports/SundaySchoolClassList.php
@@ -94,8 +94,7 @@
 			echo "<td>".$momEmail."</td>";
 			echo "</tr>";
 			}
-
-		 ?>
+		?>
 			</tbody>
 		</table>
 	</div>
@@ -145,7 +144,7 @@
 				echo "</tr>";
 			}
 
-			 ?>
+			?>
 			</tbody>
 		</table>
 	</div>
@@ -158,9 +157,4 @@
 	} );
 </script>
 
-<?php
-require "../Include/Footer.php";
- ?>
-
-
-
+<?php require "../Include/Footer.php" ?>
diff --git a/churchinfo/SettingsGeneral.php b/churchinfo/SettingsGeneral.php
@@ -172,7 +172,7 @@
 				<td>&nbsp;</td>
 				<td>
 					<input type=submit class=btn name=save value='<?= gettext("Save Settings") ?>'>
-					<input type=submit class=btn name=cancel value='<?= gettext("Cancel")  ?>'>
+					<input type=submit class=btn name=cancel value='<?= gettext("Cancel") ?>'>
 				</td>
 			</tr>
 		</table>

diff --git a/churchinfo/WhyCameEditor.php b/churchinfo/WhyCameEditor.php
@@ -95,22 +95,22 @@
 		<td>
 		<table cellpadding="3">
 			<tr>
-				<td class="LabelColumn"><?= gettext("Why did you come to the church?") ></td>
+				<td class="LabelColumn"><?= gettext("Why did you come to the church?") ?></td>
 				<td><textarea name="Join" rows="3" cols="90"><?= $tJoin ?></textarea></td>
 			</tr>
 
 			<tr>
-				<td class="LabelColumn"><?= gettext("Why do you keep coming?") ></td>
+				<td class="LabelColumn"><?= gettext("Why do you keep coming?") ?></td>
 				<td><textarea name="Come" rows="3" cols="90"><?= $tCome ?></textarea></td>
 			</tr>
 
 			<tr>
-				<td class="LabelColumn"><?= gettext("Do you have any suggestions for us?") ></td>
+				<td class="LabelColumn"><?= gettext("Do you have any suggestions for us?") ?></td>
 				<td><textarea name="Suggest" rows="3" cols="90"><?= $tSuggest ?></textarea></td>
 			</tr>
 
 			<tr>
-				<td class="LabelColumn"><?= gettext("How did you learn of the church?") ></td>
+				<td class="LabelColumn"><?= gettext("How did you learn of the church?") ?></td>
 				<td><textarea name="HearOfUs" rows="3" cols="90"><?= $tHearOfUs ?></textarea></td>
 			</tr>
 		</table>

diff --git a/churchinfo/eGive.php b/churchinfo/eGive.php
@@ -355,7 +355,7 @@ function importDoneFixOrContinue() {
 	global $familySelectHtml;
 
 	?>
-	<form method="post" action="eGive.php?<?= "DepositSlipID=".$iDepositSlipID ?>">
+	<form method="post" action="eGive.php?DepositSlipID=<?= $iDepositSlipID ?>">
 	<?php
 	if ($importError) { // the only way we can fail to import data is if we're missing the egive IDs, so build a table, with text input, and prompt for it.
         ?>

diff --git a/churchinfo/mailchimp/MailChimpDashboard.php b/churchinfo/mailchimp/MailChimpDashboard.php
@@ -29,7 +29,7 @@
 
 if ($isActive) {
     $mcLists =  $mailchimp->getLists();
- ?>
+?>
     <div class="row">
         <?php foreach ($mcLists as $list) { ?>
         <div class="col-lg-4 col-md-2 col-sm-2">
@@ -91,4 +91,4 @@
 <?php }
 
 require "../Include/Footer.php";
-?>
+?>
diff --git a/churchinfo/vendor/fpdf17/makefont/makefont.php b/churchinfo/vendor/fpdf17/makefont/makefont.php
@@ -305,7 +305,7 @@ function MakeDefinitionFile($file, $type, $enc, $embed, $map, $info)
 		else
 			$s .= '$originalsize = '.$info['OriginalSize'].";\n";
 	}
-	$s .= " ?>\n";
+	$s .= "?>\n";
 	SaveToFile($file, $s, 't');
 }
 
@@ -370,4 +370,4 @@ function MakeFont($fontfile, $enc='cp1252', $embed=true)
 		$embed = true;
 	MakeFont($fontfile, $enc, $embed);
 }
- ?>
+?>
diff --git a/churchinfo/vendor/google-map/GoogleMap.php b/churchinfo/vendor/google-map/GoogleMap.php
@@ -132,7 +132,7 @@ class GoogleMapAPI {
     /**
      * use onLoad() to load the map javascript.
      * if enabled, be sure to include on your webpage:
-     * <?=$mapobj->printOnLoad ?> or manually create an onload function 
+     * <?=$mapobj->printOnLoad?> or manually create an onload function 
      * that calls the map's onload function using $this->printOnLoadFunction
      *
      * @var bool
@@ -2807,4 +2807,4 @@ function addPolygonByCoordsArray($polygon_array,$id=false,$color='',$weight=0,$o
         return $id;
     }
 }
- ?>
+?>
diff --git a/churchinfo/vendor/sdk-php-1.8.0/lib/AuthorizeNetARB.php b/churchinfo/vendor/sdk-php-1.8.0/lib/AuthorizeNetARB.php
@@ -117,7 +117,7 @@ protected function _getPostUrl()
     protected function _setPostString()
     {
         $this->_post_string =<<<XML
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <ARB{$this->_request_type} xmlns= "AnetApi/xml/v1/schema/AnetApiSchema.xsd">
     <merchantAuthentication>
         <name>{$this->_api_login}</name>
@@ -156,4 +156,4 @@ public function getSubscriptionStatus()
         return $this->_getElementContents("Status");
     }
 
-}
+}
diff --git a/churchinfo/vendor/sdk-php-1.8.0/lib/AuthorizeNetCIM.php b/churchinfo/vendor/sdk-php-1.8.0/lib/AuthorizeNetCIM.php
@@ -362,7 +362,7 @@ protected function _setPostString()
      */
     private function _constructXml($request_type)
     {
-        $string = '<?xml version="1.0" encoding="utf-8" ?><'.$request_type.' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></'.$request_type.'>';
+        $string = '<?xml version="1.0" encoding="utf-8"?><'.$request_type.' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></'.$request_type.'>';
         $this->_xml = @new SimpleXMLElement($string);
         $merchant = $this->_xml->addChild('merchantAuthentication');
         $merchant->addChild('name',$this->_api_login);

diff --git a/churchinfo/vendor/sdk-php-1.8.0/lib/AuthorizeNetTD.php b/churchinfo/vendor/sdk-php-1.8.0/lib/AuthorizeNetTD.php
@@ -187,7 +187,7 @@ protected function _setPostString()
      */
     private function _constructXml($request_type)
     {
-        $string = '<?xml version="1.0" encoding="utf-8" ?><'.$request_type.' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></'.$request_type.'>';
+        $string = '<?xml version="1.0" encoding="utf-8"?><'.$request_type.' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></'.$request_type.'>';
         $this->_xml = @new SimpleXMLElement($string);
         $merchant = $this->_xml->addChild('merchantAuthentication');
         $merchant->addChild('name',$this->_api_login);