diff --git a/src/AutoPaymentEditor.php b/src/AutoPaymentEditor.php index c144e4d9e9..140ea8a30b 100644 --- a/src/AutoPaymentEditor.php +++ b/src/AutoPaymentEditor.php @@ -583,7 +583,7 @@ function CreatePaymentMethod() - + - + - + @@ -634,7 +634,7 @@ function CreatePaymentMethod() - + - + - + @@ -688,7 +688,7 @@ function CreatePaymentMethod() - + diff --git a/src/BackupDatabase.php b/src/BackupDatabase.php index af7dcd9e67..c1ce7de137 100644 --- a/src/BackupDatabase.php +++ b/src/BackupDatabase.php @@ -55,7 +55,7 @@

- + : @@ -64,8 +64,8 @@     - - + : + :


> diff --git a/src/CSVExport.php b/src/CSVExport.php index 74ca0e35e6..57db558db4 100644 --- a/src/CSVExport.php +++ b/src/CSVExport.php @@ -79,111 +79,111 @@
- +
- +
-
- +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- + *
@@ -248,7 +248,7 @@
:
:
:
:
- + @@ -262,7 +262,7 @@
-

+

:

@@ -281,7 +281,7 @@
-

+

:

@@ -308,7 +308,7 @@
-

+

:

@@ -335,7 +335,7 @@
-

+

:

@@ -355,7 +355,7 @@
-

+

:

@@ -380,7 +380,7 @@
-

+

:

@@ -397,7 +397,7 @@
-

+

:

diff --git a/src/CanvassEditor.php b/src/CanvassEditor.php index fb51fb0aa6..3847e8fa34 100644 --- a/src/CanvassEditor.php +++ b/src/CanvassEditor.php @@ -199,7 +199,7 @@ ?> - + : diff --git a/src/CartToEvent.php b/src/CartToEvent.php index 7c48ff11b7..aacaa45305 100644 --- a/src/CartToEvent.php +++ b/src/CartToEvent.php @@ -64,7 +64,7 @@ ?>
-

+

:

@@ -73,7 +73,7 @@ - +
: - + + - + - + - + - + - + - + - + @@ -287,7 +287,7 @@ - + - + - + - + diff --git a/src/CartToGroup.php b/src/CartToGroup.php index 549282b79e..f7e907a452 100644 --- a/src/CartToGroup.php +++ b/src/CartToGroup.php @@ -70,11 +70,11 @@
-

+

:

: - :
: " . $sWeddingDateError ?>
: "; @@ -236,22 +236,22 @@
:
:
:
: OR @@ -264,9 +264,9 @@ @@ -276,7 +276,7 @@
:
: > @@ -295,7 +295,7 @@
: > @@ -303,7 +303,7 @@
: > @@ -311,7 +311,7 @@
:
- + - +
:
: @@ -65,7 +65,7 @@ - + - + - + - + - + - +
:
- +
diff --git a/src/DirectoryReports.php b/src/DirectoryReports.php index c2181f75ed..436d3fc723 100644 --- a/src/DirectoryReports.php +++ b/src/DirectoryReports.php @@ -99,7 +99,7 @@
:
:

@@ -201,7 +201,7 @@
: 1 col
2 cols
@@ -209,7 +209,7 @@
: Letter (8.5x11)
Legal (8.5x14)
@@ -217,7 +217,7 @@
: @@ -233,7 +233,7 @@ - +
: diff --git a/src/DonatedItemEditor.php b/src/DonatedItemEditor.php index c6b5491a5e..67dabe6ac8 100644 --- a/src/DonatedItemEditor.php +++ b/src/DonatedItemEditor.php @@ -192,17 +192,17 @@
- + - + - - + - + - + - +
:
: >
+ :
:
:
:
:
@@ -248,7 +248,7 @@ - + - + diff --git a/src/DonationFundEditor.php b/src/DonationFundEditor.php index 4db0ff5ee2..e982d63dad 100644 --- a/src/DonationFundEditor.php +++ b/src/DonationFundEditor.php @@ -247,13 +247,13 @@ function confirmDeleteFund( Fund ) { diff --git a/src/EditEventAttendees.php b/src/EditEventAttendees.php index 228377c395..a581f3ff33 100644 --- a/src/EditEventAttendees.php +++ b/src/EditEventAttendees.php @@ -31,9 +31,9 @@

-
-
-
+ :
+ :
+ :

diff --git a/src/EventEditor.php b/src/EventEditor.php index b9afbc6ca4..ac065b51cb 100644 --- a/src/EventEditor.php +++ b/src/EventEditor.php @@ -415,7 +415,7 @@

- + - + - + - + - + - + - + + +
:
:
-
+
:

" . gettext("You must enter a name.") . ""; ?>   		-
+
:
 
**:
**: @@ -450,20 +450,20 @@
**:
**:
* - + :
:
**: /> /> diff --git a/src/FamilyCustomFieldsEditor.php b/src/FamilyCustomFieldsEditor.php index 9194a7f646..7eeec69290 100644 --- a/src/FamilyCustomFieldsEditor.php +++ b/src/FamilyCustomFieldsEditor.php @@ -448,7 +448,7 @@ function confirmDeleteField( Field ) {
-
+
:
"; @@ -462,7 +462,7 @@ function confirmDeleteField( Field ) { 		-
+
:

" . gettext("You must enter a name") . ""; @@ -475,7 +475,7 @@ function confirmDeleteField( Field ) { 		-
+
:
  diff --git a/src/FamilyEditor.php b/src/FamilyEditor.php index 1a56dd1702..a8669d2414 100644 --- a/src/FamilyEditor.php +++ b/src/FamilyEditor.php @@ -676,7 +676,7 @@
- + " maxlength="48" class="form-control">
@@ -684,15 +684,15 @@

- + " size="50" maxlength="250" class="form-control">
- + " size="50" maxlength="250" class="form-control">
- + " maxlength="50" class="form-control">
@@ -702,22 +702,22 @@
- + " size="20" maxlength="30">
- +
@@ -734,11 +734,11 @@ if (!$bHaveXML) { // No point entering if values will just be overwritten ?>
- +
- +
@@ -757,7 +757,7 @@
- +
@@ -767,7 +767,7 @@
- +
@@ -777,7 +777,7 @@
- +
@@ -789,7 +789,7 @@
- +
@@ -799,7 +799,7 @@
-
+
>
@@ -808,7 +808,7 @@
-

+

:


" name="FamilySubmit">
@@ -818,7 +818,7 @@ if ($dWeddingDate == "0000-00-00" || $dWeddingDate == "NULL") $dWeddingDate = ""; ?>
- +
@@ -827,14 +827,14 @@
-
+
>
0 && mysql_num_rows($rsCanvassers) > 0) { ?>
- + "; while ($aCanvasser = mysql_fetch_array($rsCanvassers)) { @@ -850,7 +850,7 @@ if ($rsBraveCanvassers <> 0 && mysql_num_rows($rsBraveCanvassers) > 0) { ?>
- + "; @@ -878,7 +878,7 @@
- + " size="30" maxlength="50">
diff --git a/src/FamilyView.php b/src/FamilyView.php index a1c72ee237..ed43765ebf 100644 --- a/src/FamilyView.php +++ b/src/FamilyView.php @@ -190,11 +190,11 @@ class="btn btn-primary btn-block"> -
  • +
  • :
    • -
  • +
  • :
    • @@ -202,19 +202,19 @@ class="btn btn-primary btn-block"> -
    • +
  • :
    • -
    • +
  • :
    • -
    • +
  • :
    • -
  • +
  • :
    • isActive()) { ?> -
  • +
  • : isEmailInMailChimp($fam_Email) ?>
    • -

    +

    :


    @@ -785,7 +785,7 @@ class="fa fa-cart-plus">
    - + :
    diff --git a/src/FinancialReports.php b/src/FinancialReports.php index f5fce9058e..c400cb437d 100644 --- a/src/FinancialReports.php +++ b/src/FinancialReports.php @@ -114,7 +114,7 @@ $rsClassifications = RunQuery($sSQL); ?>

    		:

    :

    :
    		 - + - + - + diff --git a/src/GroupReports.php b/src/GroupReports.php index f1212715e0..4d0e95619a 100644 --- a/src/GroupReports.php +++ b/src/GroupReports.php @@ -36,13 +36,13 @@
    -

    +

    :

    - + @@ -65,13 +65,13 @@
    - +
    - +
    - + - + +?>
    :
    : " name="FindFundRaiserSubmit">
    : " name="FilterClear"> @@ -205,7 +205,7 @@ $sLimit25 = "selected"; if ($_SESSION['SearchLimit'] == "50") $sLimit50 = "selected"; - + echo "     ". gettext("Display:") . "  - + - + - + - +
    :
    :
    :
    @@ -192,14 +192,14 @@
    - +:
    - + @@ -218,11 +218,11 @@ while ($aRow = mysql_fetch_array($rsDonatedItems)) { extract($aRow); - + if ($di_Item == "") { $di_Item = "~"; } - + $sRowClass = "RowColorA"; ?> diff --git a/src/GroupEditor.php b/src/GroupEditor.php index 85fc27711f..4129f6d638 100644 --- a/src/GroupEditor.php +++ b/src/GroupEditor.php @@ -74,19 +74,19 @@
    - + ">
    - +
    - +
    - + :
    - +
    diff --git a/src/GroupPropsFormEditor.php b/src/GroupPropsFormEditor.php index 6315cd4d4b..c197217b9a 100644 --- a/src/GroupPropsFormEditor.php +++ b/src/GroupPropsFormEditor.php @@ -399,7 +399,7 @@
    -
    +
    :
    "; for ($iOptionID = 1; $iOptionID <= count($aPropTypes); $iOptionID++) @@ -412,7 +412,7 @@     		-
    +
    :

    " . gettext("You must enter a name.") . "    "; @@ -421,7 +421,7 @@       		-
    +
    :
     
    :

    @@ -139,7 +139,7 @@
    : 0) { diff --git a/src/GroupView.php b/src/GroupView.php index 8b48e2c802..fb409a0804 100644 --- a/src/GroupView.php +++ b/src/GroupView.php @@ -104,7 +104,7 @@
    - + :

    getName() ?> @@ -135,7 +135,7 @@

    - + :

    - + :
    diff --git a/src/ManageEnvelopes.php b/src/ManageEnvelopes.php index d5c60a15d6..48679e5bc8 100644 --- a/src/ManageEnvelopes.php +++ b/src/ManageEnvelopes.php @@ -68,7 +68,7 @@ } else { $sSortBy = "name"; } - + if (isset($_POST["AssignStartNum"])) { $iAssignStartNum = $_POST["AssignStartNum"]; } else { @@ -162,7 +162,7 @@ > > + >     		Envelope @@ -205,7 +205,7 @@

    diff --git a/src/MapUsingGoogle.php b/src/MapUsingGoogle.php index 686c833ab4..011b856721 100644 --- a/src/MapUsingGoogle.php +++ b/src/MapUsingGoogle.php @@ -160,7 +160,7 @@
    - + - + - + - + - +
    :
    :
    :
    :
    : diff --git a/src/PaddleNumEditor.php b/src/PaddleNumEditor.php index 3276bbe155..01ed7aabf9 100644 --- a/src/PaddleNumEditor.php +++ b/src/PaddleNumEditor.php @@ -159,12 +159,12 @@ - + - "; + echo "" . gettext("Email") . ":"; else - echo gettext("Email:") . ""; + echo gettext("Email") . ":"; ?>
    @@ -951,7 +951,7 @@ class="form-control">
    - +
    @@ -977,7 +977,7 @@ class="form-control">
    - +
    @@ -991,7 +991,7 @@ class="form-control">
    - +
    @@ -1005,7 +1005,7 @@ class="form-control">
    - +
    :
    + :
    -
    +
    :
    "; @@ -423,7 +423,7 @@ function confirmDeleteField(event) {     		-
    +
    :

    " . gettext("You must enter a name") . "    "; @@ -432,7 +432,7 @@ function confirmDeleteField(event) {       		-
    +
    :
      diff --git a/src/PersonEditor.php b/src/PersonEditor.php index f7e7323487..de663ddc8b 100644 --- a/src/PersonEditor.php +++ b/src/PersonEditor.php @@ -557,7 +557,7 @@
    - +
    - + " class="form-control" placeholder=""> @@ -579,7 +579,7 @@ class="form-control" placeholder="">

    - + " class="form-control"> @@ -588,7 +588,7 @@ class="form-control">
    - + " class="form-control"> @@ -597,7 +597,7 @@ class="form-control">
    - + " class="form-control"> @@ -606,7 +606,7 @@ class="form-control">
    - + " placeholder="" class="form-control"> @@ -615,7 +615,7 @@ class="form-control">

    - +
    - +
    - +
    @@ -700,7 +700,7 @@ class="form-control">
    - + @@ -750,7 +750,7 @@ class="form-control"> "; - echo gettext("Address1:"); + echo gettext("Address1").":"; if ($bFamilyAddress1) echo ""; @@ -765,7 +765,7 @@ class="form-control"> "; - echo gettext("Address2:"); + echo gettext("Address2").":"; if ($bFamilyAddress2) echo ""; @@ -780,7 +780,7 @@ class="form-control"> "; - echo gettext("City:"); + echo gettext("City").":"; if ($bFamilyCity) echo ""; @@ -799,7 +799,7 @@ class="form-control"> "; - echo gettext("State:"); + echo gettext("State").":"; if ($bFamilyState) echo ""; @@ -819,7 +819,7 @@ class="form-control"> "; - echo gettext("Zip:"); + echo gettext("Zip").":"; if ($bFamilyZip) echo ""; @@ -839,7 +839,7 @@ class="form-control"> "; - echo gettext("Country:"); + echo gettext("Country").":"; if ($bFamilyCountry) echo ""; @@ -870,9 +870,9 @@ class="form-control">
    @@ -890,9 +890,9 @@ class="form-control">
    @@ -912,9 +912,9 @@ class="form-control">
    @@ -935,9 +935,9 @@ class="form-control">
    - + - + @@ -565,7 +565,7 @@
    :
    :
    - + :
    diff --git a/src/PledgeEditor.php b/src/PledgeEditor.php index a63a6bb024..3ae97afc6f 100644 --- a/src/PledgeEditor.php +++ b/src/PledgeEditor.php @@ -91,15 +91,15 @@ if (! ($_SESSION['bFinance'] || $_SESSION['iUserID']==$aRow["plg_EditedBy"])) { Redirect("Menu.php"); exit; - } + } } } // Handle _POST input if the form was up and a button press came in if (isset($_POST["PledgeSubmit"]) or isset($_POST["PledgeSubmitAndAdd"]) or - isset($_POST["MatchFamily"]) or - isset($_POST["MatchEnvelope"]) or + isset($_POST["MatchFamily"]) or + isset($_POST["MatchEnvelope"]) or isset($_POST["SetDefaultCheck"]) or isset($_POST["SetFundTypeSelection"]) or isset($_POST["SplitTotal"])) { @@ -118,7 +118,7 @@ if (isset($_POST["FundSplit"])) { $iSelectedFund = FilterInput($_POST["FundSplit"]); $_SESSION['iSelectedFund'] = $iSelectedFund; - } + } $_SESSION['iSelectedFund'] = $iSelectedFund; // set from drop-down if set, saved session default, or by calcuation @@ -130,18 +130,18 @@ $iFYID = CurrentFY(); } $_SESSION['idefaultFY'] = $iFYID; - + if (array_key_exists ("CheckNo", $_POST)) $iCheckNo = FilterInput($_POST["CheckNo"], 'int'); else $iCheckNo = 0; - + if (array_key_exists ("Schedule", $_POST)) $iSchedule = FilterInput($_POST["Schedule"]); else $iSchedule='Once'; $_SESSION['iDefaultSchedule'] = $iSchedule; - + $iMethod = FilterInput($_POST["Method"]); if (!$iMethod) { if ($sGroupKey) { @@ -153,7 +153,7 @@ $rsMethod = RunQuery($sSQL); $num = mysql_num_rows($rsMethod); if ($num) { // set iMethod to last record's setting - extract(mysql_fetch_array($rsMethod)); + extract(mysql_fetch_array($rsMethod)); $iMethod = $plg_method; } else { $iMethod = "CHECK"; @@ -163,7 +163,7 @@ } } $_SESSION['idefaultPaymentMethod'] = $iMethod; - + $iEnvelope = 0; if (array_key_exists ("Envelope", $_POST)) $iEnvelope = FilterInput($_POST["Envelope"], 'int'); @@ -186,19 +186,19 @@ } else { $iSelectedFund = $fundId; } - + $iTotalAmount = 0; $sSQL = "SELECT DISTINCT plg_famID, plg_CheckNo, plg_date, plg_method, plg_FYID from pledge_plg where plg_GroupKey='" . $sGroupKey . "'"; // don't know if we need plg_date or plg_method here... leave it here for now $rsFam = RunQuery($sSQL); extract(mysql_fetch_array($rsFam)); - + $iFamily = $plg_famID; $iCheckNo = $plg_CheckNo; $iFYID = $plg_FYID; - + $sSQL = "SELECT plg_plgID, plg_fundID, plg_amount, plg_comment from pledge_plg where plg_GroupKey='" . $sGroupKey . "'"; - + $rsAmounts = RunQuery($sSQL); while ($aRow = mysql_fetch_array($rsAmounts)) { extract($aRow); @@ -369,7 +369,7 @@ $sGroupKey = genGroupKey($iAutID, $iFamily, $fun_id, $dDate); } else { $sGroupKey = genGroupKey("cash", $iFamily, $fun_id, $dDate); - } + } } $sSQL = "INSERT INTO pledge_plg (plg_famID, plg_FYID, plg_date, plg_amount, plg_schedule, plg_method, plg_comment, plg_DateLastEdited, plg_EditedBy, plg_PledgeOrPayment, plg_fundID, plg_depID, plg_CheckNo, plg_scanString, plg_aut_ID, plg_NonDeductible, plg_GroupKey) VALUES ('" . $iFamily . "','" . $iFYID . "','" . $dDate . "','" . $nAmount[$fun_id] . "','" . $iSchedule . "','" . $iMethod . "','" . $sComment[$fun_id] . "'"; @@ -415,7 +415,7 @@ } } elseif (isset($_POST["MatchEnvelope"])) { // Match envelope is similar to match check- use the envelope number to choose a family - + $iEnvelope = FilterInput($_POST["Envelope"], 'int'); if ($iEnvelope && strlen($iEnvelope) > 0) { $sSQL = "SELECT fam_ID FROM family_fam WHERE fam_Envelope=" . $iEnvelope; @@ -488,7 +488,7 @@ $sPageTitle = gettext("Pledge Editor"); } elseif ($iCurrentDeposit) { $sPageTitle = gettext("Payment Editor: ") . $dep_Type . gettext(" Deposit Slip #") . $iCurrentDeposit . " ($dep_Date)"; - + $checksFit = $iChecksPerDepositForm; $sSQL = "SELECT plg_FamID, plg_plgID, plg_checkNo, plg_method from pledge_plg where plg_method=\"CHECK\" and plg_depID=" . $iCurrentDeposit; @@ -520,7 +520,7 @@ if ($dep_Closed && $sGroupKey && $PledgeOrPayment == 'Payment') { $sPageTitle .= "   ". gettext("Deposit closed") .""; -} +} //$familySelectHtml = buildFamilySelect($iFamily, $sDirRoleHead, $sDirRoleSpouse); $sFamilyName = ""; @@ -553,7 +553,7 @@ $cancelText = "Cancel"; } else { $cancelText = "Return"; - } ?> + } ?>
    - + - + - + @@ -782,7 +782,7 @@ - $fun_name) { ?> diff --git a/src/PrintView.php b/src/PrintView.php index cca1ffa5d6..b92e372675 100644 --- a/src/PrintView.php +++ b/src/PrintView.php @@ -168,17 +168,17 @@
    ") ?>" name="MatchEnvelope"> @@ -624,7 +624,7 @@ $fun_name) { ?> - + @@ -688,13 +688,13 @@
    >
    - + - + - + @@ -207,7 +207,7 @@
    :  
    :  
    :  
    - + - + - + - + @@ -255,22 +255,22 @@
    :
    :  
    :  
    :  
    - + - + - + - + @@ -293,7 +293,7 @@ - +:
    :  
    :  
    :  
    :  
    @@ -338,7 +338,7 @@ } ?>
    - +:
    - +: - + - + diff --git a/src/PropertyDelete.php b/src/PropertyDelete.php index 1828721218..a05ab01385 100644 --- a/src/PropertyDelete.php +++ b/src/PropertyDelete.php @@ -52,7 +52,7 @@ ?>

    - + :

    diff --git a/src/PropertyEditor.php b/src/PropertyEditor.php index caccd846fe..ae1c9f0438 100644 --- a/src/PropertyEditor.php +++ b/src/PropertyEditor.php @@ -142,7 +142,7 @@

    - + " size="50">
    @@ -174,7 +174,7 @@
    - + " size="50">
    diff --git a/src/PropertyTypeDelete.php b/src/PropertyTypeDelete.php index a9a1ecf40b..8f20a7db5d 100644 --- a/src/PropertyTypeDelete.php +++ b/src/PropertyTypeDelete.php @@ -64,7 +64,7 @@

    - + :

    diff --git a/src/PropertyTypeEditor.php b/src/PropertyTypeEditor.php index 45caad99d6..b3e95a566a 100644 --- a/src/PropertyTypeEditor.php +++ b/src/PropertyTypeEditor.php @@ -93,7 +93,7 @@

    :
    :
    - + - + - + diff --git a/src/PropertyUnassign.php b/src/PropertyUnassign.php index 37d450d8d1..0f245afedc 100644 --- a/src/PropertyUnassign.php +++ b/src/PropertyUnassign.php @@ -115,7 +115,7 @@ - +
    :
    : " size="40">
    :
    :
    diff --git a/src/ReminderReport.php b/src/ReminderReport.php index 1f1a53c7f5..06ffac510c 100644 --- a/src/ReminderReport.php +++ b/src/ReminderReport.php @@ -43,7 +43,7 @@ - + diff --git a/src/Reports/ConfirmReport.php b/src/Reports/ConfirmReport.php index ea6163d68e..4b7b513494 100644 --- a/src/Reports/ConfirmReport.php +++ b/src/Reports/ConfirmReport.php @@ -26,7 +26,7 @@ function PDF_ConfirmReport() { $this->leftX = 10; $this->SetFont("Times",'',10); $this->SetMargins(10,20); - + $this->SetAutoPageBreak(false); } @@ -84,12 +84,12 @@ function FinishPage ($curY) { $rsCustomFields = RunQuery($sSQL); $numCustomFields = mysql_num_rows($rsCustomFields); -if ($numCustomFields > 0) +if ($numCustomFields > 0) { $iFieldNum = 0; while ( $rowCustomField = mysql_fetch_array($rsCustomFields, MYSQL_ASSOC) ) { - extract($rowCustomField); + extract($rowCustomField); $sCustomFieldName[$iFieldNum] = $custom_Name; $iFieldNum += 1; } @@ -114,14 +114,14 @@ function FinishPage ($curY) { //If this is a report for a single family, name the file accordingly. if ($_GET["familyId"]) { $filename = "ConfirmReport-".$fam_Name.".pdf"; - } + } - $curY = $pdf->StartNewPage ($fam_ID, $fam_Name, $fam_Address1, $fam_Address2, $fam_City, + $curY = $pdf->StartNewPage ($fam_ID, $fam_Name, $fam_Address1, $fam_Address2, $fam_City, $fam_State, $fam_Zip, $fam_Country); $curY += $pdf->incrementY; $pdf->SetFont("Times",'B',10); - $pdf->WriteAtCell ($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext ("Family name")); + $pdf->WriteAtCell ($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext ("Family Name")); $pdf->SetFont("Times",'',10); $pdf->WriteAtCell ($dataCol, $curY, $dataWid, $fam_Name); $curY += $pdf->incrementY; $pdf->SetFont("Times",'B',10); @@ -137,7 +137,7 @@ function FinishPage ($curY) { $pdf->SetFont("Times",'',10); $pdf->WriteAtCell ($dataCol, $curY, $dataWid, ($fam_City . ", " . $fam_State . " " . $fam_Zip)); $curY += $pdf->incrementY; $pdf->SetFont("Times",'B',10); - $pdf->WriteAtCell ($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext ("Home phone")); + $pdf->WriteAtCell ($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext ("Home Phone")); $pdf->SetFont("Times",'',10); $pdf->WriteAtCell ($dataCol, $curY, $dataWid, $fam_HomePhone); $curY += $pdf->incrementY; $pdf->SetFont("Times",'B',10); @@ -237,7 +237,7 @@ function FinishPage ($curY) { { $hideAgeStr="No"; } - + $pdf->WriteAtCell ($XBirthday, $curY, $XHideAge - $XBirthday, $birthdayStr); $pdf->WriteAtCell ($XHideAge, $curY, $XCellPhone - $XHideAge,$hideAgeStr); $pdf->WriteAtCell ($XCellPhone, $curY, $XClassification - $XCellPhone, $per_CellPhone); @@ -254,7 +254,7 @@ function FinishPage ($curY) { $xSize = 40; $numCustomFields = mysql_num_rows($rsCustomFields); - if ($numCustomFields > 0) + if ($numCustomFields > 0) { extract($aMember); $sSQL = "SELECT * FROM person_custom WHERE per_ID = " . $per_ID; @@ -269,15 +269,15 @@ function FinishPage ($curY) { // Calculations (without groups) show 84 mm is needed. // For the Letter size of 279 mm, this says that curY can be no bigger than 195 mm. // Leaving 12 mm for a bottom margin yields 183 mm. - $numWide = 0; // starting value for columns + $numWide = 0; // starting value for columns while ( $rowCustomField = mysql_fetch_array($rsCustomFields, MYSQL_BOTH) ) { extract($rowCustomField); if($sCustomFieldName[$custom_Order - 1]) { $currentFieldData = trim($aCustomData[$custom_Field]); - - + + $OutStr = $sCustomFieldName[$custom_Order-1] . " : " . $currentFieldData . " "; $pdf->WriteAtCell($xInc,$curY, $xSize, $sCustomFieldName[$custom_Order-1]); if($currentFieldData == "") @@ -350,5 +350,5 @@ function FinishPage ($curY) { if ($iPDFOutputType == 1) $pdf->Output($filename, "D"); else - $pdf->Output(); + $pdf->Output(); ?> diff --git a/src/Reports/ConfirmReportEmail.php b/src/Reports/ConfirmReportEmail.php index e7c32b7a1a..ea1a9e9464 100644 --- a/src/Reports/ConfirmReportEmail.php +++ b/src/Reports/ConfirmReportEmail.php @@ -30,7 +30,7 @@ function EmailPDF_ConfirmReport() $this->leftX = 10; $this->SetFont("Times", '', 10); $this->SetMargins(10, 20); - + $this->SetAutoPageBreak(false); } @@ -141,7 +141,7 @@ function getEmailConnection() $curY += $pdf->incrementY; $pdf->SetFont("Times", 'B', 10); - $pdf->WriteAtCell($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext("Family name")); + $pdf->WriteAtCell($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext("Family Name")); $pdf->SetFont("Times", '', 10); $pdf->WriteAtCell($dataCol, $curY, $dataWid, $fam_Name); $curY += $pdf->incrementY; $pdf->SetFont("Times", 'B', 10); @@ -157,7 +157,7 @@ function getEmailConnection() $pdf->SetFont("Times", '', 10); $pdf->WriteAtCell($dataCol, $curY, $dataWid, ($fam_City . ", " . $fam_State . " " . $fam_Zip)); $curY += $pdf->incrementY; $pdf->SetFont("Times", 'B', 10); - $pdf->WriteAtCell($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext("Home phone")); + $pdf->WriteAtCell($pdf->leftX, $curY, $dataCol - $pdf->leftX, gettext("Home Phone")); $pdf->SetFont("Times", '', 10); $pdf->WriteAtCell($dataCol, $curY, $dataWid, $fam_HomePhone); $curY += $pdf->incrementY; $pdf->SetFont("Times", 'B', 10); @@ -287,7 +287,7 @@ function getEmailConnection() // Calculations (without groups) show 84 mm is needed. // For the Letter size of 279 mm, this says that curY can be no bigger than 195 mm. // Leaving 12 mm for a bottom margin yields 183 mm. - $numWide = 0; // starting value for columns + $numWide = 0; // starting value for columns while ($rowCustomField = mysql_fetch_array($rsCustomFields, MYSQL_BOTH)) { extract($rowCustomField); diff --git a/src/SelectDelete.php b/src/SelectDelete.php index 2e14355a22..05a3e6707f 100644 --- a/src/SelectDelete.php +++ b/src/SelectDelete.php @@ -141,7 +141,7 @@ function DeletePerson($iPersonID) // Delete all associated Notes associated with this Family record $sSQL = "DELETE FROM note_nte WHERE nte_fam_ID = " . $iFamilyID; RunQuery($sSQL); - + // Delete Family pledges $sSQL = "DELETE FROM pledge_plg WHERE plg_PledgeOrPayment = 'Pledge' AND plg_FamID = " . $iFamilyID; RunQuery($sSQL); @@ -226,7 +226,7 @@ function DeletePerson($iPersonID) echo "" . gettext("Return to Person View")."

    "; } else { echo "
    "; - echo gettext("Please confirm deletion of:") ." " . $per_FirstName . " " . $per_LastName. ""; + echo gettext("Please confirm deletion of") .": " . $per_FirstName . " " . $per_LastName. ""; echo gettext(" (This action CANNOT be undone!)"). "
    "; echo "

    "; echo "" . gettext("Yes, delete this record") . " " ; @@ -244,19 +244,19 @@ function DeletePerson($iPersonID) // Donations from Family. Current user not authorized for Finance echo "

    " . gettext("Sorry, there are records of donations from this family. This family may not be deleted.") . "

    "; echo "" . gettext("Return to Family View") . "

    "; - + } elseif ($bIsDonor && $_SESSION['bFinance']) { - // Donations from Family. Current user authorized for Finance. + // Donations from Family. Current user authorized for Finance. // Select another family to move donations to. echo "

    " . gettext("WARNING: This family has records of donations and may NOT be deleted until these donations are associated with another family.") . "

    "; echo ""; echo "
    "; - echo "
    " . gettext("Family Name:") . " $fam_Name
    "; + echo "
    " . gettext("Family Name") . ":" . " $fam_Name
    "; echo "

    " . gettext("Please select another family with whom to associate these donations:"); echo "
    ".gettext("WARNING: This action can not be undone and may have legal implications!")."

    "; echo ""; echo "     "; echo ""; echo "
    "; - + // Show payments connected with family // ----------------------------------- echo "

    "; @@ -366,7 +366,7 @@ function DeletePerson($iPersonID) } echo "
    :
    "; - + } else { // No Donations from family. Normal delete confirmation echo $DonationMessage; @@ -374,7 +374,7 @@ function DeletePerson($iPersonID) echo gettext("Note: This will also delete all Notes associated with this Family record."); echo gettext(" (this action cannot be undone)") . "

    "; echo "
    "; - echo "" . gettext("Family Name:") . ""; + echo "" . gettext("Family Name") . ":"; echo " " . $fam_Name; echo "

    "; echo "
    " . gettext("Family Members:") . "
      "; diff --git a/src/SelectList.php b/src/SelectList.php index 17eb190916..937bb2871c 100644 --- a/src/SelectList.php +++ b/src/SelectList.php @@ -480,7 +480,7 @@ ?>
      - +:
      - +
      - +
      - +
      - +
      - +
      diff --git a/src/TaxReport.php b/src/TaxReport.php index 4ba3b89560..ec0b083aa8 100644 --- a/src/TaxReport.php +++ b/src/TaxReport.php @@ -42,7 +42,7 @@ - + diff --git a/src/UserEditor.php b/src/UserEditor.php index 6df0a81c92..4c70637470 100644 --- a/src/UserEditor.php +++ b/src/UserEditor.php @@ -328,7 +328,7 @@ function StyleSheetOptions($currentStyle) { //Yes, so display the people drop-down ?> - + - + @@ -358,59 +358,59 @@ function StyleSheetOptions($currentStyle) { - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/UserPasswordChange.php b/src/UserPasswordChange.php index 8c4f9bf2df..f3abf26acf 100644 --- a/src/UserPasswordChange.php +++ b/src/UserPasswordChange.php @@ -219,16 +219,16 @@
      - +
      - +
      - +
      diff --git a/src/UserReset.php b/src/UserReset.php index 4c02e10c30..75b3977433 100644 --- a/src/UserReset.php +++ b/src/UserReset.php @@ -52,7 +52,7 @@
      -

      +

      :

      diff --git a/src/VolunteerOpportunityEditor.php b/src/VolunteerOpportunityEditor.php index 4488d3b4d4..29bcae90a6 100644 --- a/src/VolunteerOpportunityEditor.php +++ b/src/VolunteerOpportunityEditor.php @@ -79,7 +79,7 @@ require "Include/Header.php"; ?>
      -
      +
      :
      :
      :
      :
      :
      : >
      : >
      : >
      : >
      : >
      : >
      : >
      : > 
      : > 
      : > 
      :
      @@ -435,13 +435,13 @@ diff --git a/src/external/templates/registration/family-register-members.php b/src/external/templates/registration/family-register-members.php index 6ad15f9f61..02b9b032a3 100644 --- a/src/external/templates/registration/family-register-members.php +++ b/src/external/templates/registration/family-register-members.php @@ -14,7 +14,7 @@

      " . $family->getName() . " " . gettext("family members") ?>

      + class="box-title">" . $family->getName() . " " . gettext("Family Members") ?>
      diff --git a/src/sundayschool/SundaySchoolReports.php b/src/sundayschool/SundaySchoolReports.php index b5607d4844..4c81320218 100644 --- a/src/sundayschool/SundaySchoolReports.php +++ b/src/sundayschool/SundaySchoolReports.php @@ -126,7 +126,7 @@
       
      -
      +
      :

      " . gettext("You must enter a name.") . "      "; ?>         		-
      +
      :
       
      - +
      :