Merge branch 'master' into snyk-upgrade-0d807b69503038ae9273fa6674a8877f

cypress/support/ui-commands.js

@@ -15,7 +15,7 @@ Cypress.Commands.add("loginAdmin", (location, checkMatchingLocation = true) => {
 });
 
 Cypress.Commands.add("loginStandard", (location, checkMatchingLocation = true) => {
-    cy.login("[email protected]", "abc123", location, checkMatchingLocation);
+    cy.login("[email protected]", "basicjoe", location, checkMatchingLocation);
 });
 
 Cypress.Commands.add("login", (username, password, location, checkMatchingLocation = true) => {

docker/cypress.json

@@ -10,6 +10,6 @@
     "projectId": "n4qnyb",
     "env": {
         "admin.api.key": "ajGwpy8Pdai22XDUpqjC5Ob04v0eG7EGgb4vz2bD2juT8YDmfM",
-        "user.api.key": "cjcPihn8wDwVeRIiNnKfpj0HGgCYbcxaD9SaF6BNJKLtVrnGFr"
+        "user.api.key": "JZJApQ9XOnF7nvupWZlTWBRrqMtHE9eNcWBTUzEWGqL4Sdqp6C"
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "churchcrm",
-    "version": "4.5.2",
+    "version": "4.5.3",
     "description": "Free Church CRM Software",
     "repository": {
         "type": "git",

src/BackupDatabase.php

@@ -42,7 +42,7 @@
         <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>
         </ul>
         <BR><BR>
-        <form method="post" action="<?= sRootPath ?>/api/database/backup" id="BackupDatabase">
+        <form method="post" action="<?= $sRootPath ?>/api/database/backup" id="BackupDatabase">
         <?= gettext('Select archive type') ?>:
         <input type="radio" name="archiveType" value="2" checked><?= gettext('Database Only (.sql)') ?>
         <input type="radio" name="archiveType" value="3" checked><?= gettext('Database and Photos (.tar.gz)') ?>

src/EventNames.php

@@ -146,9 +146,8 @@
             $cSQL = "SELECT evctnm_countid, evctnm_countname FROM eventcountnames_evctnm WHERE evctnm_eventtypeid='$aTypeID[$row]' ORDER BY evctnm_countid";
             $cOpps = RunQuery($cSQL);
             $numCounts = mysqli_num_rows($cOpps);
-            $cCountName = '';
             if ($numCounts) {
-                $cCountName = '';
+                $cCountName = [];
                 for ($c = 1; $c <= $numCounts; $c++) {
                     $cRow = mysqli_fetch_array($cOpps, MYSQLI_BOTH);
                     extract($cRow);

src/PersonView.php

@@ -464,7 +464,7 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <?php foreach ($person->getFamily()->getPeople() as $familyMember) {
+                                    <?php foreach ($person->getFamily()->getPeopleSorted() as $familyMember) {
                     $tmpPersonId = $familyMember->getId(); ?>
                                         <tr>
                                             <td>

src/RestoreDatabase.php

@@ -38,7 +38,7 @@
     <p><?= gettext('CAUTION: This will completely erase the existing database, and replace it with the backup') ?></p>
     <p><?= gettext('If you upload a backup from ChurchInfo, or a previous version of ChurchCRM, it will be automatically upgraded to the current database schema') ?></p>
     <p><?= gettext("Maximum upload size")?>: <span class="maxUploadSize"></span></p>
-    <form id="restoredatabase" action="<?= sRootPath ?>/api/database/restore" method="POST"
+    <form id="restoredatabase" action="<?= $sRootPath ?>/api/database/restore" method="POST"
           enctype="multipart/form-data">
       <input type="file" name="restoreFile" id="restoreFile" multiple=""><br>
       <label for="restorePassword"><?= gettext("Password (if any)") ?>:</label>

src/api/routes/people/people-families.php

@@ -28,7 +28,7 @@
         foreach ($families as $family) {
             if (empty($family->getEmail())) {
                 $hasEmail = false;
-                foreach ($family->getPeople() as $person) {
+                foreach ($family->getPeopleSorted() as $person) {
                     if (!empty($person->getEmail() || !empty($person->getWorkEmail()))) {
                         $hasEmail = true;
                         break;

src/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "churchcrm/crm",
-    "version": "4.5.2",
+    "version": "4.5.3",
     "type": "project",
     "keywords": [
         "church",

src/mysql/upgrade.json

@@ -308,9 +308,10 @@
     "current": {
         "versions": [
             "4.5.0",
-            "4.5.1"
+            "4.5.1",
+            "4.5.2"
         ],
         "scripts": [],
-        "dbVersion": "4.5.2"
+        "dbVersion": "4.5.3"
     }
 }

src/v2/templates/people/family-view.php

@@ -221,7 +221,7 @@ class="fa fa-minus"></i>
                         </div>
                     </div>
                     <div class="card-body row row-flex row-flex-wrap">
-                        <?php foreach ($family->getPeople() as $person) { ?>
+                        <?php foreach ($family->getPeopleSorted() as $person) { ?>
                             <div class="col-sm-6">
                                 <div class="card card-primary">
                                     <div class="card-body box-profile">