General whitespace cleanup

- Changed tabs to spaces
- Deleted trailing spaces
- Automatically fix code formatting in changed files
- Delete some more comments

src/AddDonors.php

@@ -1,17 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : AddDonors.php
- *  website     : https://churchcrm.io
- *  copyright   : Copyright 2009 Michael Wilt
- *
- * This script adds people who have donated but not registered as buyers to the
- * buyer list so they can get statements too.
- *
- ******************************************************************************/
-
-//Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -41,7 +29,7 @@
 
 // Get all the people listed as donors for this fundraiser
 $sSQL = "SELECT a.per_id as donorID FROM donateditem_di
-    	     LEFT JOIN person_per a ON di_donor_ID=a.per_ID
+             LEFT JOIN person_per a ON di_donor_ID=a.per_ID
          WHERE di_FR_ID = '" . $iFundRaiserID . "' ORDER BY a.per_id";
 $rsDonors = RunQuery($sSQL);
 
@@ -63,7 +51,7 @@
 
     if ($donorID > 0 && mysqli_num_rows($rsBuyer) == 0) {
         $sSQL = "INSERT INTO paddlenum_pn (pn_Num, pn_fr_ID, pn_per_ID)
-		                VALUES ('$extraPaddleNum', '$iFundRaiserID', '$donorID')";
+                        VALUES ('$extraPaddleNum', '$iFundRaiserID', '$donorID')";
         RunQuery($sSQL);
         $extraPaddleNum = $extraPaddleNum + 1;
     }

src/BackupDatabase.php

@@ -1,17 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : BackupDatabase.php
- *  last change : 2016-01-04
- *  description : Creates a backup file of the database.
- *
- *  https://churchcrm.io/
- *  Copyright 2003 Chris Gebhardt
-  *
- ******************************************************************************/
-
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -23,8 +11,6 @@
 // Otherwise, re-direct them to the main menu.
 AuthenticationManager::redirectHomeIfNotAdmin();
 
-
-// Set the page title and include HTML header
 $sPageTitle = gettext('Backup Database');
 require 'Include/Header.php';
 

src/BatchWinnerEntry.php

@@ -1,15 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : BatchWinnerEntry.php
- *  last change : 2011-04-01
- *  website     : https://churchcrm.io
- *  copyright   : Copyright 2011 Michael Wilt
-  *
- ******************************************************************************/
-
-//Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 

src/CSVCreateFile.php

@@ -1,15 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : CSVCreateFile.php
- *  last change : 2003-06-11
- *  website     : https://churchcrm.io
- *  copyright   : Copyright 2001-2003 Deane Barker, Chris Gebhardt, Michael Wilt
-  *
- ******************************************************************************/
-
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -217,8 +207,8 @@
 
     if ($sFormat === 'rollup') {
         $sSQL = "(SELECT *, 0 AS memberCount, per_LastName AS SortMe FROM $sPerTable $sJoinFamTable WHERE per_fam_ID = 0 $sWhereExt)
-		UNION (SELECT *, COUNT(*) AS memberCount, fam_Name AS SortMe FROM $sPerTable $sJoinFamTable WHERE per_fam_ID > 0 $sWhereExt GROUP BY per_fam_ID HAVING memberCount = 1)
-		UNION (SELECT *, COUNT(*) AS memberCount, fam_Name AS SortMe FROM $sPerTable $sJoinFamTable WHERE per_fam_ID > 0 $sWhereExt GROUP BY per_fam_ID HAVING memberCount > 1) ORDER BY SortMe";
+        UNION (SELECT *, COUNT(*) AS memberCount, fam_Name AS SortMe FROM $sPerTable $sJoinFamTable WHERE per_fam_ID > 0 $sWhereExt GROUP BY per_fam_ID HAVING memberCount = 1)
+        UNION (SELECT *, COUNT(*) AS memberCount, fam_Name AS SortMe FROM $sPerTable $sJoinFamTable WHERE per_fam_ID > 0 $sWhereExt GROUP BY per_fam_ID HAVING memberCount > 1) ORDER BY SortMe";
     } else {
         $sSQL = "SELECT * FROM $sPerTable $sJoinFamTable WHERE 1 = 1 $sWhereExt $sGroupBy ORDER BY per_LastName";
     }

src/CSVExport.php

@@ -1,16 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : CSVExport.php
- *  description : options for creating csv file
- *
- *  https://churchcrm.io/
- *  Copyright 2001-2002 Phillip Hullquist, Deane Barker
- *
- ******************************************************************************/
-
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -22,11 +11,11 @@
     RedirectUtils::securityRedirect("CSVExport");
 }
 
-//Get Classifications for the drop-down
+// Get Classifications for the drop-down
 $sSQL = 'SELECT * FROM list_lst WHERE lst_ID = 1 ORDER BY lst_OptionSequence';
 $rsClassifications = RunQuery($sSQL);
 
-//Get Family Roles for the drop-down
+// Get Family Roles for the drop-down
 $sSQL = 'SELECT * FROM list_lst WHERE lst_ID = 2 ORDER BY lst_OptionSequence';
 $rsFamilyRoles = RunQuery($sSQL);
 

src/CSVImport.php

@@ -1,19 +1,7 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : CSVImport.php
- *  last change : 2003-10-02
- *  description : Tool for importing CSV person data into InfoCentral
- *
- *  https://churchcrm.io/
- *  Copyright 2003 Chris Gebhardt
- *
- ******************************************************************************/
-
 namespace ChurchCRM;
 
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -32,6 +20,7 @@
 AuthenticationManager::redirectHomeIfNotAdmin();
 
 $logger = LoggerUtils::getAppLogger();
+
 /**
  * A monogamous society is assumed, however  it can be patriarchal or matriarchal
  **/

src/CartToEvent.php

@@ -1,19 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : CartToEvent.php
- *  last change : 2005-09-09
- *  description : Add cart records to an event
- *
- *  https://churchcrm.io/
- *  Copyright 2001-2003 Phillip Hullquist, Deane Barker, Chris Gebhardt
- *  Copyright 2005 Todd Pillars
- *  Copyright 2012 Michael Wilt
- *
- ******************************************************************************/
-
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 

src/CartToFamily.php

@@ -1,17 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : CartToFamily.php
- *  last change : 2003-10-09
- *  description : Add cart records to a family
- *
- *  https://churchcrm.io/
- *  Copyright 2003 Chris Gebhardt
-  *
- ******************************************************************************/
-
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 

src/CartToGroup.php

@@ -1,17 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : CartToGroup.php
- *  last change : 2003-06-23
- *  description : Add cart records to a group
- *
- *  https://churchcrm.io/
- *  Copyright 2001-2003 Phillip Hullquist, Deane Barker, Chris Gebhardt, Logel Philippe
-  *
- ******************************************************************************/
-
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -46,16 +34,13 @@
     RedirectUtils::redirect('GroupView.php?GroupID=' . $iGroupID . '&Action=EmptyCart');
 }
 
-$ormGroups = GroupQuery::Create()
-                                ->orderByName()
-                                ->find();
+$ormGroups = GroupQuery::Create()->orderByName()->find();
 
-// Set the page title and include HTML header
 $sPageTitle = gettext('Add Cart to Group');
 require 'Include/Header.php';
 
 if (count($_SESSION['aPeopleCart']) > 0) {
-    ?>
+?>
 
   <script src="skin/js/GroupRoles.js"></script>
 

src/Checkin.php

@@ -1,21 +1,7 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : Checkin.php
- *  last change : 2007-xx-x
- *  description : Quickly add attendees to an event
- *
- *  https://churchcrm.io/
- *  Copyright 2001-2003 Phillip Hullquist, Deane Barker, Chris Gebhardt
- *  Copyright 2005 Todd Pillars
- *  Copyright 2012 Michael Wilt
-  *
- ******************************************************************************/
-
 $sPageTitle = gettext('Event Checkin');
 
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 require 'Include/Header.php';
@@ -35,7 +21,6 @@
 $iChildID = 0 ;
 $iAdultID = 0;
 
-
 if (array_key_exists('EventID', $_POST)) {
     $EventID = InputUtils::legacyFilterInput($_POST['EventID'], 'int');
 } // from ListEvents button=Attendees

src/ChurchCRM/Service/DashboardService.php

@@ -43,7 +43,7 @@ public function getPersonCount(): array
     {
         $personCount = PersonQuery::Create('per')
             ->useFamilyQuery('fam', 'left join')
-                ->filterByDateDeactivated(null)
+            ->filterByDateDeactivated(null)
             ->endUse()
             ->count();
         $data = ['personCount' => $personCount];
@@ -88,7 +88,7 @@ public function getGroupStats(): array
           INNER JOIN group_grp ON grp_ID = p2g2r_grp_ID
           LEFT JOIN family_fam ON fam_ID = per_fam_ID
           where fam_DateDeactivated is  null and
-	            p2g2r_rle_ID = 2 and grp_Type = 4) as SundaySchoolKidsCount
+                p2g2r_rle_ID = 2 and grp_Type = 4) as SundaySchoolKidsCount
         from dual ;
         ';
         $rsQuickStat = RunQuery($sSQL);

src/ChurchCRM/Service/PersonService.php

@@ -13,12 +13,7 @@ class PersonService
     public function search(string $searchTerm, $includeFamilyRole = true): array
     {
         $searchLikeString = '%' . $searchTerm . '%';
-        $people = PersonQuery::create()->
-        filterByFirstName($searchLikeString, Criteria::LIKE)->
-        _or()->filterByMiddleName($searchLikeString, Criteria::LIKE)->
-        _or()->filterByLastName($searchLikeString, Criteria::LIKE)->
-        _or()->filterByEmail($searchLikeString, Criteria::LIKE)->
-        limit(15)->find();
+        $people = PersonQuery::create()->filterByFirstName($searchLikeString, Criteria::LIKE)->_or()->filterByMiddleName($searchLikeString, Criteria::LIKE)->_or()->filterByLastName($searchLikeString, Criteria::LIKE)->_or()->filterByEmail($searchLikeString, Criteria::LIKE)->limit(15)->find();
         $return = [];
         foreach ($people as $person) {
             $values['id'] = $person->getId();
@@ -58,8 +53,8 @@ public function search(string $searchTerm, $includeFamilyRole = true): array
     public function getPeopleEmailsAndGroups(): array
     {
         $sSQL = "SELECT per_FirstName, per_LastName, per_Email, per_ID, group_grp.grp_Name, lst_OptionName
-	            from person_per
-    		        left JOIN person2group2role_p2g2r on
+                from person_per
+                    left JOIN person2group2role_p2g2r on
                   person2group2role_p2g2r.p2g2r_per_ID = person_per.per_id
 
                 left JOIN group_grp ON

src/DepositSlipEditor.php

@@ -1,15 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : DepositSlipEditor.php
- *  last change : 2014-12-14
- *  website     : https://churchcrm.io
- *  copyright   : Copyright 2001, 2002, 2003-2014 Deane Barker, Chris Gebhardt, Michael Wilt
- *
- ******************************************************************************/
-
-//Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 

src/DirectoryReports.php

@@ -1,18 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : DirectoryReports.php
- *  last change : 2003-09-03
- *  description : form to invoke directory report
- *
- *  https://churchcrm.io/
- *  Copyright 2003 Chris Gebhardt
- *  Copyright 2004-2012 Michael Wilt
-  *
- ******************************************************************************/
-
-// Include the function library
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -23,7 +10,6 @@
 // Check for Create Directory user permission.
 AuthenticationManager::redirectHomeIfFalse(AuthenticationManager::getCurrentUser()->isCreateDirectoryEnabled());
 
-// Set the page title and include HTML header
 $sPageTitle = gettext('Directory reports');
 require 'Include/Header.php';
 

src/DonatedItemDelete.php

@@ -1,14 +1,5 @@
 <?php
 
-/*******************************************************************************
-*
-*  filename    : Reports/PaddleNumDelete.php
-*  last change : 2011-04-03
-*  description : Deletes a specific donated item
-*  copyright   : Copyright 2009 Michael Wilt
-
-******************************************************************************/
-
 require 'Include/Config.php';
 require 'Include/Functions.php';