diff --git a/.editorconfig b/.editorconfig index 050478d68a..c6e9bd351a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,7 +9,6 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -# 2 space indentation [*.{php,scss,js,json}] indent_size = 4 charset = utf-8 diff --git a/.gitattributes b/.gitattributes index 9e7ab1994c..d1c1f726d8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,33 @@ -* text=auto -* eol=lf -*.jpg binary -*.git binary -*.png binary -*.xcf binary -*.pdf binary -*.mo binary +# Define text file attributes: +# - Treat them astext +# - Ensure no CRLF line-endings, neither on checkout nor on checkin +# - Detect whitespace errors: +# - Exposed by default in `git diff --color` on the CLI +# - Validate with `git diff --check` +# - Deny applying with `git apply --whitespace=error-all` +# - Fix automatically with `git apply --whitespace=fix` + +*.css text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.html text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=4 diff=html +*.js text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.json text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.lock text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=4 +*.md text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.php text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=4 diff=php +*.po text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.sh text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.sql text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.svg text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 +*.twig text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=4 +*.xml text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=4 +*.yml text eol=lf whitespace=space-before-tab,tab-in-indent,trailing-space,tabwidth=2 + +# Define binary file attributes: +# - Do not treat them as text +*.gif binary +*.ico binary +*.jpg binary +*.mo binary +*.pdf binary +*.png binary +*.ttf binary diff --git a/src/AddDonors.php b/src/AddDonors.php index ec42b3f653..983c4b9793 100644 --- a/src/AddDonors.php +++ b/src/AddDonors.php @@ -1,17 +1,5 @@ 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; } diff --git a/src/BackupDatabase.php b/src/BackupDatabase.php index 1c427140ca..0ffafc839f 100644 --- a/src/BackupDatabase.php +++ b/src/BackupDatabase.php @@ -1,17 +1,5 @@ /skin/js/BackupDatabase.js"> - + - - + 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"; } diff --git a/src/CSVExport.php b/src/CSVExport.php index 1280d5083c..8797544998 100644 --- a/src/CSVExport.php +++ b/src/CSVExport.php @@ -1,16 +1,5 @@ @@ -68,7 +56,6 @@ -
@@ -460,5 +447,5 @@
- - + @@ -957,4 +945,3 @@ function GetAge(int $Month, int $Day, ?int $Year): int diff --git a/src/CartToEvent.php b/src/CartToEvent.php index 9ad35ab951..1c743ec1de 100644 --- a/src/CartToEvent.php +++ b/src/CartToEvent.php @@ -1,19 +1,5 @@ diff --git a/src/CartToFamily.php b/src/CartToFamily.php index 43b39c369d..cecd94fc8c 100644 --- a/src/CartToFamily.php +++ b/src/CartToFamily.php @@ -1,17 +1,5 @@

- : @@ -363,4 +349,5 @@ } ?> - +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) { - ?> +?> @@ -100,6 +85,4 @@ echo '

' . gettext('Your cart is empty!') . '

'; } - require 'Include/Footer.php'; -?> diff --git a/src/Checkin.php b/src/Checkin.php index f9064fa190..98bb36ab33 100644 --- a/src/Checkin.php +++ b/src/Checkin.php @@ -1,21 +1,7 @@ filterByInActive(1, Criteria::NOT_EQUAL) ->find(); @@ -218,7 +198,6 @@ class="col-sm-2 control-label"> $attendee->save(); } - //delete if (isset($_POST['Delete'])) { EventAttendQuery::create() @@ -299,10 +278,8 @@ class="col-sm-2 control-label">
@@ -321,7 +298,7 @@ class="col-sm-2 control-label"> filterByEventId($EventID) ->find(); @@ -460,7 +437,6 @@ function loadPerson($iPersonID) $familyRole = gettext('(No assigned family)'); } - $html = '
' . '

' . $person->getTitle() . ' ' . $person->getFullName() . '

' . '
' . $familyRole . '
' . diff --git a/src/ChurchCRM/Bootstrapper.php b/src/ChurchCRM/Bootstrapper.php index 6a3c6e53c7..4ff535efb9 100644 --- a/src/ChurchCRM/Bootstrapper.php +++ b/src/ChurchCRM/Bootstrapper.php @@ -276,9 +276,8 @@ private static function buildConnectionManagerConfig(): array private static function configureUserEnvironment(): void // TODO: This function needs to stop creating global variable-variables. { global $cnInfoCentral; - if (AuthenticationManager::validateUserSessionIsActive(false)) { // set on POST to /session/begin + if (AuthenticationManager::validateUserSessionIsActive(false)) { // set on POST to /session/begin // Load user variables from user config table. - // ************************************************** $sSQL = 'SELECT ucfg_name, ucfg_value AS value ' . "FROM userconfig_ucfg WHERE ucfg_per_ID='" . AuthenticationManager::getCurrentUser()->getId() . "'"; $rsConfig = mysqli_query($cnInfoCentral, $sSQL); // Can't use RunQuery -- not defined yet diff --git a/src/ChurchCRM/Reports/ChurchInfoReport.php b/src/ChurchCRM/Reports/ChurchInfoReport.php index 8f9e9f7513..30c028d211 100644 --- a/src/ChurchCRM/Reports/ChurchInfoReport.php +++ b/src/ChurchCRM/Reports/ChurchInfoReport.php @@ -1,16 +1,5 @@ paperFormat); diff --git a/src/ChurchCRM/Service/DashboardService.php b/src/ChurchCRM/Service/DashboardService.php index fac01e7492..3c57d7d204 100644 --- a/src/ChurchCRM/Service/DashboardService.php +++ b/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); diff --git a/src/ChurchCRM/Service/PersonService.php b/src/ChurchCRM/Service/PersonService.php index 17b332459c..718d65468b 100644 --- a/src/ChurchCRM/Service/PersonService.php +++ b/src/ChurchCRM/Service/PersonService.php @@ -13,12 +13,12 @@ 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 +58,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 diff --git a/src/ChurchCRM/model/ChurchCRM/Person.php b/src/ChurchCRM/model/ChurchCRM/Person.php index 07a8eb691e..7bc28fc0e5 100644 --- a/src/ChurchCRM/model/ChurchCRM/Person.php +++ b/src/ChurchCRM/model/ChurchCRM/Person.php @@ -584,7 +584,6 @@ public function getCustomFields($allPersonCustomFields, $customMapping, &$Custom } $thisPersonCustomFields = $rawQry->findOneByPerId($this->getId()); - // get custom column names and values $personCustom = []; if ($thisPersonCustomFields) { @@ -595,7 +594,6 @@ public function getCustomFields($allPersonCustomFields, $customMapping, &$Custom $personCustom[] = $temp; $CustomList[$temp] += 1; - if (array_key_exists($value, $customMapping[$column]['Elements'])) { $temp = $name_func($customMapping[$column]['Name'], $customMapping[$column]['Elements'][$value]); $personCustom[] = $temp; diff --git a/src/ChurchCRM/view/MenuRenderer.php b/src/ChurchCRM/view/MenuRenderer.php index 823841bf44..7cd19631fd 100644 --- a/src/ChurchCRM/view/MenuRenderer.php +++ b/src/ChurchCRM/view/MenuRenderer.php @@ -67,7 +67,6 @@ private static function renderSubMenuItem(MenuItem $menuItem): void hasCounters()) { diff --git a/src/ConvertIndividualToFamily.php b/src/ConvertIndividualToFamily.php index 693389e805..8438b4e281 100644 --- a/src/ConvertIndividualToFamily.php +++ b/src/ConvertIndividualToFamily.php @@ -1,26 +1,5 @@ getType() . ' ' . gettext('Deposit Slip Number: ') . $iDepositSlipID; //Is this the second pass? @@ -181,7 +170,6 @@
- +require 'Include/Footer.php'; diff --git a/src/DirectoryReports.php b/src/DirectoryReports.php index 56ffb92ea7..a9242ca993 100644 --- a/src/DirectoryReports.php +++ b/src/DirectoryReports.php @@ -1,18 +1,5 @@ isCreateDirectoryEnabled()); -// Set the page title and include HTML header $sPageTitle = gettext('Directory reports'); require 'Include/Header.php'; ?>
- -
@@ -278,7 +262,6 @@ echo ''; } ?> -


@@ -286,4 +269,5 @@

- +save(); $bGetKeyBack = true; - // Existing record (update) + // Existing record (update) } else { $donatedItem = DonatedItemQuery::create()->findOneById($iDonatedItemID); $donatedItem @@ -131,21 +120,21 @@ RedirectUtils::redirect("DonatedItemEditor.php?CurrentFundraiser=$iCurrentFundraiser&linkBack=", $linkBack); } } else { - //FirstPass + //FirstPass //Are we editing or adding? if (strlen($iDonatedItemID) > 0) { //Editing.... //Get all the data on this record $sSQL = "SELECT di_ID, di_Item, di_multibuy, di_donor_ID, di_buyer_ID, - a.per_FirstName as donorFirstName, a.per_LastName as donorLastName, - b.per_FirstName as buyerFirstName, b.per_LastName as buyerLastName, - di_title, di_description, di_sellprice, di_estprice, di_materialvalue, - di_minimum, di_picture - FROM donateditem_di - LEFT JOIN person_per a ON di_donor_ID=a.per_ID - LEFT JOIN person_per b ON di_buyer_ID=b.per_ID - WHERE di_ID = '" . $iDonatedItemID . "'"; + a.per_FirstName as donorFirstName, a.per_LastName as donorLastName, + b.per_FirstName as buyerFirstName, b.per_LastName as buyerLastName, + di_title, di_description, di_sellprice, di_estprice, di_materialvalue, + di_minimum, di_picture + FROM donateditem_di + LEFT JOIN person_per a ON di_donor_ID=a.per_ID + LEFT JOIN person_per b ON di_buyer_ID=b.per_ID + WHERE di_ID = '" . $iDonatedItemID . "'"; $rsDonatedItem = RunQuery($sSQL); extract(mysqli_fetch_array($rsDonatedItem)); @@ -213,29 +202,29 @@ - +
- +
@@ -258,26 +247,26 @@
- - + +
@@ -290,8 +279,7 @@
- +
@@ -310,7 +298,7 @@
-
+
@@ -323,12 +311,11 @@ isAddRecordsEnabled()) : ?> - + - - + -
- -
- - + - + - - + 0) { $aArrJoin = implode(',', $aArr); $sSQL = 'SELECT t1.per_ID, t1.per_Title, t1.per_FirstName, t1.per_MiddleName, t1.per_LastName, t1.per_Suffix, t1.per_Email, t1.per_HomePhone, t1.per_Country, t1.per_MembershipDate, t2.fam_HomePhone, t2.fam_Country, t1.per_Gender - FROM person_per AS t1, family_fam AS t2 - WHERE t1.per_fam_ID = t2.fam_ID AND t1.per_ID NOT IN (' . $aArrJoin . ") AND per_cls_ID IN ('1','2','5') - ORDER BY t1.per_LastName, t1.per_ID"; + FROM person_per AS t1, family_fam AS t2 + WHERE t1.per_fam_ID = t2.fam_ID AND t1.per_ID NOT IN (' . $aArrJoin . ") AND per_cls_ID IN ('1','2','5') + ORDER BY t1.per_LastName, t1.per_ID"; } else { $sSQL = "SELECT t1.per_ID, t1.per_Title, t1.per_FirstName, t1.per_MiddleName, t1.per_LastName, t1.per_Suffix, t1.per_Email, t1.per_HomePhone, t1.per_Country, t1.per_MembershipDate, t2.fam_HomePhone, t2.fam_Country, t1.per_Gender FROM person_per AS t1, family_fam AS t2 WHERE t1.per_fam_ID = t2.fam_ID AND per_cls_ID IN ('1','2','5') - ORDER BY t1.per_LastName, t1.per_ID"; + ORDER BY t1.per_LastName, t1.per_ID"; } $sPageTitle = gettext('Event Nonattendees'); } elseif ($sPostChoice === 'Guests') { $sSQL = 'SELECT t1.per_ID, t1.per_Title, t1.per_FirstName, t1.per_MiddleName, t1.per_LastName, t1.per_Suffix, t1.per_HomePhone, t1.per_Country, t1.per_Gender FROM person_per AS t1, events_event AS t2, event_attend AS t3 WHERE t1.per_ID = t3.person_id AND t2.event_id = t3.event_id AND t3.event_id = ' . $iEventId . " AND per_cls_ID IN ('0','3') - ORDER BY t1.per_LastName, t1.per_ID"; + ORDER BY t1.per_LastName, t1.per_ID"; $sPageTitle = gettext('Event Guests'); } } elseif ($sGetAction === 'List' && !empty($sGetEvent)) { @@ -122,147 +111,142 @@ // Construct the form ?> -
-

+

- -


- ' . gettext($type_name) . - '' . "
\n"; - } - ?> + +


+ ' . gettext($type_name) . + '' . "
\n"; + } + ?>
- - 0) { ?> -
-
-

-
-
- - - - - - - - - - - - - - - - + + + +
-
- - - - - 0) { ?> +
+
+

+
+
+ + + + + + + + + + + + + + + + - - + + - - - -
+ + + + + + - - - -
- - - - - -
- 		-
- - - - - + +
+ 		+
+ + + + + +
+ 		+
+ + + + + - name="Type" value="" class="btn btn-default"> -
-
+ $gOpps = RunQuery($gSQL); + $gNumGuestAttend = mysqli_fetch_row($gOpps)[0]; ?> + name="Type" value="" class="btn btn-default"> + +
+
- 0) { ?> -
-
-

-
-
- - - - - - - - - - - - - - - - - - - -
' . $aEmail[$row] . '' : '' ?>
+
+
+

+
+
+ + + + + + + + + + + + + + + + + + + +
' . $aEmail[$row] . '' : '' ?>
+
-
-
- - - - + - + diff --git a/src/EventNames.php b/src/EventNames.php index cd30054840..8548ee8021 100644 --- a/src/EventNames.php +++ b/src/EventNames.php @@ -337,5 +337,5 @@ $('#eventNames').DataTable(window.CRM.plugin.dataTable); }); - - + -
- - +getCountryCode(), $pasfut = 'past'); if ((strlen($dWeddingDate) > 0) && $dateString === false) { $sWeddingDateError = '' - . gettext('Not a valid Wedding Date') . ''; + . gettext('Not a valid Wedding Date') . ''; $bErrorFlag = true; } else { $dWeddingDate = $dateString; @@ -215,7 +203,7 @@ if (strlen($sEmail) > 0) { if (checkEmail($sEmail) == false) { $sEmailError = '' - . gettext('Email is Not Valid') . ''; + . gettext('Email is Not Valid') . ''; $bErrorFlag = true; $sEmail = null; } @@ -335,7 +323,7 @@ $note->save(); RunQuery('LOCK TABLES person_custom WRITE'); $sSQL = 'INSERT INTO person_custom (per_ID) VALUES (' - . $dbPersonId . ')'; + . $dbPersonId . ')'; RunQuery($sSQL); RunQuery('UNLOCK TABLES'); } @@ -553,9 +541,7 @@ } require 'Include/Header.php'; - ?> -
@@ -572,67 +558,66 @@
- + + ?>
-

+

- +
- +
- +
-

+

- -
- - - maxlength="10" size="8"> + + maxlength="10" size="8">
-
-
-
- - -
-
- - -
-
- +
+
+ + +
+
+ + +
+
+ @@ -642,7 +627,7 @@

- +
@@ -653,10 +638,10 @@
- "' data-mask> + "' data-mask> > + echo ' checked'; + } ?>>
@@ -665,8 +650,8 @@
- "' data-mask/> - > + "' data-mask /> + >
@@ -675,7 +660,7 @@
- "' data-mask> + "' data-mask> >
@@ -691,13 +676,13 @@ -
-
- > -
- +
+ > + + @@ -719,276 +704,276 @@ ">
+ ?>
- -
-
-

-
- -
-
-
-
-
- - +
+
+

+
+ +
+
+
+
+
+ + +
-
- 0) { - ?> -
-
-

-
- -
-
-
- isEnabledSecurity($aSecurityType[$fam_custom_FieldSec])) { + ?> +
+
+

+
+ +
+
+
+ isEnabledSecurity($aSecurityType[$fam_custom_FieldSec])) { ?> -
-
- - ' . $aCustomErrors[$fam_custom_Field] . ''; - echo '
'; - } - } ?> -
-
- -
-
-

-
- -
-
-
+
+
+ + 0) { - ?> - - - -
-
new person records.') : '' ?>
-


-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - '; - } - echo '
- -
- 		- - - - - - - - - - - - - - - - -
- - 		-
'; - - echo '
'; - } - - echo ''; - echo ''; - - echo ' '; - if (AuthenticationManager::getCurrentUser()->isAddRecordsEnabled()) { - echo ' '; - } - echo ' 0) { - echo " onclick=\"javascript:document.location='v2/family/$iFamilyID';\">"; - } else { - echo " onclick=\"javascript:document.location='" . SystemURLs::getRootPath() . "/v2/family';\">"; - } - echo ''; - ?> - - - + } ?> +
+
+

+
+ +
+
+
+ + 0) { + ?> + + + +
+
new person records.') : '' ?>
+


+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + '; + } + echo '
+ +
+ 		+ + + + + + + + + + + + + + + + +
+ + 		+
'; + + echo '
'; + } + + echo ''; + echo ''; + + echo ' '; + if (AuthenticationManager::getCurrentUser()->isAddRecordsEnabled()) { + echo ' '; + } + echo ' 0) { + echo " onclick=\"javascript:document.location='v2/family/$iFamilyID';\">"; + } else { + echo " onclick=\"javascript:document.location='" . SystemURLs::getRootPath() . "/v2/family';\">"; + } + echo ''; + ?> + + diff --git a/src/FindDepositSlip.php b/src/FindDepositSlip.php index 08dc44fc75..62d6adc908 100644 --- a/src/FindDepositSlip.php +++ b/src/FindDepositSlip.php @@ -1,15 +1,5 @@ - - +
-
- - - - - - - - - - - - - - - - - - - - -
:
: - -
: - -
- + + + + + + + + + + + + + + + + + + + + + +
:
: + +
: + +
+
- +
-setSearchLimit(InputUtils::legacyFilterInput($_GET['Number'], 'int')); - $currentUser->save(); -} + setSearchLimit(InputUtils::legacyFilterInput($_GET['Number'], 'int')); + $currentUser->save(); + } -// Select the proper sort SQL -switch ($sSort) { - case 'number': - $sOrderSQL = 'ORDER BY fr_ID DESC'; - break; - default: - $sOrderSQL = ' ORDER BY fr_Date DESC, fr_ID DESC'; - break; -} + // Select the proper sort SQL + switch ($sSort) { + case 'number': + $sOrderSQL = 'ORDER BY fr_ID DESC'; + break; + default: + $sOrderSQL = ' ORDER BY fr_Date DESC, fr_ID DESC'; + break; + } -// Append a LIMIT clause to the SQL statement -$tableSizeSetting = AuthenticationManager::getCurrentUser() - ->getSetting("ui.table.size"); -if (empty($tableSizeSetting)) { - $iPerPage = 10; -} else { - $iPerPage = $tableSizeSetting->getValue(); -} -if (empty($_GET['Result_Set'])) { - $Result_Set = 0; -} else { - $Result_Set = InputUtils::legacyFilterInput($_GET['Result_Set'], 'int'); -} -$sLimitSQL = " LIMIT $Result_Set, $iPerPage"; - -// Build SQL query -$sSQL = "SELECT fr_ID, fr_Date, fr_Title FROM fundraiser_fr $sCriteria $sOrderSQL $sLimitSQL"; -$sSQLTotal = "SELECT COUNT(fr_ID) FROM fundraiser_fr $sCriteria"; - -// Execute SQL statement and get total result -$rsDep = RunQuery($sSQL); -$rsTotal = RunQuery($sSQLTotal); -list($Total) = mysqli_fetch_row($rsTotal); - -echo '
'; -echo '
'; -// Show previous-page link unless we're at the first page -if ($Result_Set < $Total && $Result_Set > 0) { - $thisLinkResult = $Result_Set - $iPerPage; - if ($thisLinkResult < 0) { - $thisLinkResult = 0; - } - echo '' . gettext('Previous Page') . '  '; -} + // Append a LIMIT clause to the SQL statement + $tableSizeSetting = AuthenticationManager::getCurrentUser() + ->getSetting("ui.table.size"); + if (empty($tableSizeSetting)) { + $iPerPage = 10; + } else { + $iPerPage = $tableSizeSetting->getValue(); + } + if (empty($_GET['Result_Set'])) { + $Result_Set = 0; + } else { + $Result_Set = InputUtils::legacyFilterInput($_GET['Result_Set'], 'int'); + } + $sLimitSQL = " LIMIT $Result_Set, $iPerPage"; + + // Build SQL query + $sSQL = "SELECT fr_ID, fr_Date, fr_Title FROM fundraiser_fr $sCriteria $sOrderSQL $sLimitSQL"; + $sSQLTotal = "SELECT COUNT(fr_ID) FROM fundraiser_fr $sCriteria"; + + // Execute SQL statement and get total result + $rsDep = RunQuery($sSQL); + $rsTotal = RunQuery($sSQLTotal); + list($Total) = mysqli_fetch_row($rsTotal); + + echo '
'; + echo ''; + // Show previous-page link unless we're at the first page + if ($Result_Set < $Total && $Result_Set > 0) { + $thisLinkResult = $Result_Set - $iPerPage; + if ($thisLinkResult < 0) { + $thisLinkResult = 0; + } + echo '' . gettext('Previous Page') . '  '; + } -// Calculate starting and ending Page-Number Links -$Pages = ceil($Total / $iPerPage); -$startpage = (ceil($Result_Set / $iPerPage)) - 6; -if ($startpage <= 2) { - $startpage = 1; -} -$endpage = (ceil($Result_Set / $iPerPage)) + 9; -if ($endpage >= ($Pages - 1)) { - $endpage = $Pages; -} + // Calculate starting and ending Page-Number Links + $Pages = ceil($Total / $iPerPage); + $startpage = (ceil($Result_Set / $iPerPage)) - 6; + if ($startpage <= 2) { + $startpage = 1; + } + $endpage = (ceil($Result_Set / $iPerPage)) + 9; + if ($endpage >= ($Pages - 1)) { + $endpage = $Pages; + } -// Show Link "1 ..." if startpage does not start at 1 -if ($startpage != 1) { - echo "1 ... "; -} + // Show Link "1 ..." if startpage does not start at 1 + if ($startpage != 1) { + echo "1 ... "; + } -// Display page links -if ($Pages > 1) { - for ($c = $startpage; $c <= $endpage; $c++) { - $b = $c - 1; - $thisLinkResult = $iPerPage * $b; - if ($thisLinkResult != $Result_Set) { - echo "$c "; - } else { - echo '  [ ' . $c . ' ]  '; + // Display page links + if ($Pages > 1) { + for ($c = $startpage; $c <= $endpage; $c++) { + $b = $c - 1; + $thisLinkResult = $iPerPage * $b; + if ($thisLinkResult != $Result_Set) { + echo "$c "; + } else { + echo '  [ ' . $c . ' ]  '; + } } } -} -// Show Link "... xx" if endpage is not the maximum number of pages -if ($endpage != $Pages) { - $thisLinkResult = ($Pages - 1) * $iPerPage; - echo " $Pages"; -} + // Show Link "... xx" if endpage is not the maximum number of pages + if ($endpage != $Pages) { + $thisLinkResult = ($Pages - 1) * $iPerPage; + echo " $Pages"; + } -// Show next-page link unless we're at the last page -if ($Result_Set >= 0 && $Result_Set < $Total) { - $thisLinkResult = $Result_Set + $iPerPage; - if ($thisLinkResult < $Total) { - echo "  " . gettext('Next Page') . '  '; + // Show next-page link unless we're at the last page + if ($Result_Set >= 0 && $Result_Set < $Total) { + $thisLinkResult = $Result_Set + $iPerPage; + if ($thisLinkResult < $Total) { + echo "  " . gettext('Next Page') . '  '; + } } -} -// Display Record Limit -echo ''; -if (isset($sSort)) { - echo ''; -} + // Display Record Limit + echo ''; + if (isset($sSort)) { + echo ''; + } -$sLimit5 = ''; -$sLimit10 = ''; -$sLimit20 = ''; -$sLimit25 = ''; -$sLimit50 = ''; - -if ($iPerPage === 5) { - $sLimit5 = 'selected'; -} elseif ($iPerPage === 10) { - $sLimit10 = 'selected'; -} elseif ($iPerPage === 20) { - $sLimit20 = 'selected'; -} elseif ($iPerPage === 25) { - $sLimit25 = 'selected'; -} elseif ($iPerPage === 50) { - $sLimit50 = 'selected'; -} + $sLimit5 = ''; + $sLimit10 = ''; + $sLimit20 = ''; + $sLimit25 = ''; + $sLimit50 = ''; + + if ($iPerPage === 5) { + $sLimit5 = 'selected'; + } elseif ($iPerPage === 10) { + $sLimit10 = 'selected'; + } elseif ($iPerPage === 20) { + $sLimit20 = 'selected'; + } elseif ($iPerPage === 25) { + $sLimit25 = 'selected'; + } elseif ($iPerPage === 50) { + $sLimit50 = 'selected'; + } -echo '     ' . gettext('Display:') . "  -   - -

'; - -// Column Headings -echo "\n - \n - \n - \n - \n - \n - "; - -// Display Deposits -while (list($fr_ID, $fr_Date, $fr_Title) = mysqli_fetch_row($rsDep)) { - echo "'; - echo ""; - echo ""; - // Get deposit total - echo ""; -} -echo '
" . gettext('Edit') . "" . gettext('Number') . "" . gettext('Date') . "" . gettext('Title') . "
" . gettext('Edit') . '$fr_ID$fr_Date$fr_Title
'; -?> + echo '     ' . gettext('Display:') . "  +   + +

'; + + // Column Headings + echo "\n + \n + \n + \n + \n + \n + "; + + // Display Deposits + while (list($fr_ID, $fr_Date, $fr_Title) = mysqli_fetch_row($rsDep)) { + echo "'; + echo ""; + echo ""; + // Get deposit total + echo ""; + } + echo '
" . gettext('Edit') . "" . gettext('Number') . "" . gettext('Date') . "" . gettext('Title') . "
" . gettext('Edit') . '$fr_ID$fr_Date$fr_Title
'; + ?>
- +reload(); $iFundRaiserID = $fundraiser->getId(); - // Existing record (update) + // Existing record (update) } else { $fundraiser = FundRaiserQuery::create()->findOneById($iFundRaiserID); $fundraiser @@ -120,13 +110,13 @@ if ($iFundRaiserID > 0) { //Get the items for this fundraiser $sSQL = "SELECT di_ID, di_Item, di_multibuy, - a.per_FirstName as donorFirstName, a.per_LastName as donorLastName, - b.per_FirstName as buyerFirstName, b.per_LastName as buyerLastName, - di_title, di_sellprice, di_estprice, di_materialvalue, di_minimum - FROM donateditem_di - LEFT JOIN person_per a ON di_donor_ID=a.per_ID - LEFT JOIN person_per b ON di_buyer_ID=b.per_ID - WHERE di_FR_ID = '" . $iFundRaiserID . "' ORDER BY di_multibuy,SUBSTR(di_item,1,1),cast(SUBSTR(di_item,2) as unsigned integer),SUBSTR(di_item,4)"; + a.per_FirstName as donorFirstName, a.per_LastName as donorLastName, + b.per_FirstName as buyerFirstName, b.per_LastName as buyerLastName, + di_title, di_sellprice, di_estprice, di_materialvalue, di_minimum + FROM donateditem_di + LEFT JOIN person_per a ON di_donor_ID=a.per_ID + LEFT JOIN person_per b ON di_buyer_ID=b.per_ID + WHERE di_FR_ID = '" . $iFundRaiserID . "' ORDER BY di_multibuy,SUBSTR(di_item,1,1),cast(SUBSTR(di_item,2) as unsigned integer),SUBSTR(di_item,4)"; $rsDonatedItems = RunQuery($sSQL); } else { $rsDonatedItems = 0; @@ -142,130 +132,131 @@ ?>
-
- - - - - - + - - + -
- - - 0) { - echo '\n"; - echo '\n"; - echo '\n"; - echo '\n"; - echo '\n"; - } - ?> -
- - - - - +
:
- - + - - - -
: + + + 0) { + echo '\n"; + echo '\n"; + echo '\n"; + echo '\n"; + echo '\n"; + } + ?> +
:
- 		+ + + + + + + + + + + + + + + +
:
:
:
+
+ -
+
-: -
-
- - - - - - - - - - - - - - - -: +
+
+
+ + + + + + + + + + + + + - $sRowClass = 'RowColorA'; ?> - - - - - - - - - - - - - + + + + + + + + + + + + + + -
- - -   - -   - -   - -   - -   - -   - -   - -   - - Delete -
+ + +   + +   + +   + +   + +   + +   + +   + +   + + Delete +
-
+ +
- +/skin/js/GeoPage.js"> diff --git a/src/GetText.php b/src/GetText.php index 2fcd373b47..199ce89ab9 100644 --- a/src/GetText.php +++ b/src/GetText.php @@ -1,16 +1,5 @@ isManageGroupsEnabled()); -//Set the page title $sPageTitle = gettext('Group Editor'); $groupService = new GroupService(); -//Get the GroupID from the querystring. Redirect to Menu if no groupID is present, since this is an edit-only form. + +// Get the GroupID from the querystring. Redirect to Menu if no groupID is present, since this is an edit-only form. if (array_key_exists('GroupID', $_GET)) { $iGroupID = InputUtils::legacyFilterInput($_GET['GroupID'], 'int'); } else { @@ -198,5 +187,5 @@ var groupID =; - - +

- -
isManageGroupsEnabled()) { - ?> - +?>
@@ -84,7 +65,5 @@ }); - diff --git a/src/GroupPropsEditor.php b/src/GroupPropsEditor.php index 9bd2102aca..73dd12f22b 100644 --- a/src/GroupPropsEditor.php +++ b/src/GroupPropsEditor.php @@ -1,17 +1,5 @@ - -

-
- -
- +
+

+
+ +
+ - -
-
-

-
-
-
- - - - // Make sure we're at the beginning of the properties list resource (2nd pass code used it) - mysqli_data_seek($rsPropList, 0); +
+
+

+
+
+ - while ($rowPropList = mysqli_fetch_array($rsPropList, MYSQLI_BOTH)) { - extract($rowPropList); ?> -
- - + + +
: + ' . $aPropErrors[$prop_Field] . ''; + // Make sure we're at the beginning of the properties list resource (2nd pass code used it) + mysqli_data_seek($rsPropList, 0); + + while ($rowPropList = mysqli_fetch_array($rsPropList, MYSQLI_BOTH)) { + extract($rowPropList); ?> + + + + + + - - - - - - - -
: + ' . $aPropErrors[$prop_Field] . ''; + } ?> +
-

- -   - -
- +
+

+ +   + +
+ +
-
- - diff --git a/src/GroupPropsFormEditor.php b/src/GroupPropsFormEditor.php index 20b87389f3..53f67aad30 100644 --- a/src/GroupPropsFormEditor.php +++ b/src/GroupPropsFormEditor.php @@ -1,21 +1,5 @@ - 9) { - $newListID = $aTemp[0] + 1; - } else { - $newListID = 10; - } - - // Insert into the lists table with an example option. - $listOption = new ListOption(); - $listOption - ->setId($newListID) - ->setOptionId(1) - ->setOptionSequence(1) - ->setOptionName(gettext('Default Option')); - $listOption->save(); + if (isset($_POST[$iPropID . 'show'])) { + $aPersonDisplayFields[$iPropID] = true; + } else { + $aPersonDisplayFields[$iPropID] = false; + } + } - $newSpecial = "'$newListID'"; + // If no errors, then update. + if (!$bErrorFlag) { + for ($iPropID = 1; $iPropID <= $numRows; $iPropID++) { + if ($aPersonDisplayFields[$iPropID]) { + $temp = 'true'; } else { - $newSpecial = 'NULL'; + $temp = 'false'; } - // Insert into the master table - $sSQL = "INSERT INTO `groupprop_master` - ( `grp_ID` , `prop_ID` , `prop_Field` , `prop_Name` , `prop_Description` , `type_ID` , `prop_Special` ) - VALUES ('" . $iGroupID . "', '" . $newRowNum . "', 'c" . $newFieldNum . "', '" . $newFieldName . "', '" . $newFieldDesc . "', '" . $newFieldType . "', $newSpecial);"; - RunQuery($sSQL); - - // Insert into the group-specific properties table - $sSQL = 'ALTER TABLE `groupprop_' . $iGroupID . '` ADD `c' . $newFieldNum . '` '; + $sSQL = "UPDATE groupprop_master + SET `prop_Name` = '" . $aNameFields[$iPropID] . "', + `prop_Description` = '" . $aDescFields[$iPropID] . "', + `prop_Special` = " . $aSpecialFields[$iPropID] . ", + `prop_PersonDisplay` = '" . $temp . "' + WHERE `grp_ID` = '" . $iGroupID . "' AND `prop_ID` = '" . $iPropID . "';"; - switch ($newFieldType) { - case 1: - $sSQL .= "ENUM('false', 'true')"; - break; - case 2: - $sSQL .= 'DATE'; - break; - case 3: - $sSQL .= 'VARCHAR(50)'; - break; - case 4: - $sSQL .= 'VARCHAR(100)'; - break; - case 5: - $sSQL .= 'TEXT'; - break; - case 6: - $sSQL .= 'YEAR'; - break; - case 7: - $sSQL .= "ENUM('winter', 'spring', 'summer', 'fall')"; - break; - case 8: - $sSQL .= 'INT'; - break; - case 9: - $sSQL .= 'MEDIUMINT(9)'; - break; - case 10: - $sSQL .= 'DECIMAL(10,2)'; - break; - case 11: - $sSQL .= 'VARCHAR(30)'; + RunQuery($sSQL); + } + } + } else { + // Check if we're adding a field + if (isset($_POST['AddField'])) { + $newFieldType = InputUtils::legacyFilterInput($_POST['newFieldType'], 'int'); + $newFieldName = InputUtils::legacyFilterInput($_POST['newFieldName']); + $newFieldDesc = InputUtils::legacyFilterInput($_POST['newFieldDesc']); + + if (strlen($newFieldName) == 0) { + $bNewNameError = true; + } else { + $sSQL = 'SELECT prop_Name FROM groupprop_master WHERE grp_ID = ' . $iGroupID; + $rsPropNames = RunQuery($sSQL); + while ($aRow = mysqli_fetch_array($rsPropNames)) { + if ($aRow[0] == $newFieldName) { + $bDuplicateNameError = true; break; - case 12: - $sSQL .= 'TINYINT(4)'; + } } - $sSQL .= ' DEFAULT NULL ;'; - RunQuery($sSQL); + if (!$bDuplicateNameError) { + // Get the new prop_ID (highest existing plus one) + $sSQL = 'SELECT prop_ID FROM groupprop_master WHERE grp_ID = ' . $iGroupID; + $rsPropList = RunQuery($sSQL); + $newRowNum = mysqli_num_rows($rsPropList) + 1; + + // Find the highest existing field number in the group's table to determine the next free one. + // This is essentially an auto-incrementing system where deleted numbers are not re-used. + $tableName = 'groupprop_' . $iGroupID; + + $fields = mysqli_query($cnInfoCentral, 'SELECT * FROM ' . $tableName); + $newFieldNum = mysqli_num_fields($fields); + + // If we're inserting a new custom-list type field, create a new list and get its ID + if ($newFieldType == 12) { + // Get the first available lst_ID for insertion. lst_ID 0-9 are reserved for permanent lists. + $sSQL = 'SELECT MAX(lst_ID) FROM list_lst'; + $aTemp = mysqli_fetch_array(RunQuery($sSQL)); + if ($aTemp[0] > 9) { + $newListID = $aTemp[0] + 1; + } else { + $newListID = 10; + } - $bNewNameError = false; - } - } - } + // Insert into the lists table with an example option. + $listOption = new ListOption(); + $listOption + ->setId($newListID) + ->setOptionId(1) + ->setOptionSequence(1) + ->setOptionName(gettext('Default Option')); + $listOption->save(); - // Get data for the form as it now exists.. - $sSQL = 'SELECT * FROM groupprop_master WHERE grp_ID = ' . $iGroupID . ' ORDER BY prop_ID'; + $newSpecial = "'$newListID'"; + } else { + $newSpecial = 'NULL'; + } - $rsPropList = RunQuery($sSQL); - $numRows = mysqli_num_rows($rsPropList); + // Insert into the master table + $sSQL = "INSERT INTO `groupprop_master` + ( `grp_ID` , `prop_ID` , `prop_Field` , `prop_Name` , `prop_Description` , `type_ID` , `prop_Special` ) + VALUES ('" . $iGroupID . "', '" . $newRowNum . "', 'c" . $newFieldNum . "', '" . $newFieldName . "', '" . $newFieldDesc . "', '" . $newFieldType . "', $newSpecial);"; + RunQuery($sSQL); + + // Insert into the group-specific properties table + $sSQL = 'ALTER TABLE `groupprop_' . $iGroupID . '` ADD `c' . $newFieldNum . '` '; + + switch ($newFieldType) { + case 1: + $sSQL .= "ENUM('false', 'true')"; + break; + case 2: + $sSQL .= 'DATE'; + break; + case 3: + $sSQL .= 'VARCHAR(50)'; + break; + case 4: + $sSQL .= 'VARCHAR(100)'; + break; + case 5: + $sSQL .= 'TEXT'; + break; + case 6: + $sSQL .= 'YEAR'; + break; + case 7: + $sSQL .= "ENUM('winter', 'spring', 'summer', 'fall')"; + break; + case 8: + $sSQL .= 'INT'; + break; + case 9: + $sSQL .= 'MEDIUMINT(9)'; + break; + case 10: + $sSQL .= 'DECIMAL(10,2)'; + break; + case 11: + $sSQL .= 'VARCHAR(30)'; + break; + case 12: + $sSQL .= 'TINYINT(4)'; + } - // Create arrays of the properties. - for ($row = 1; $row <= $numRows; $row++) { - $aRow = mysqli_fetch_array($rsPropList, MYSQLI_BOTH); - extract($aRow); + $sSQL .= ' DEFAULT NULL ;'; + RunQuery($sSQL); - // This is probably more clear than using a multi-dimensional array - $aNameFields[$row] = $prop_Name; - $aDescFields[$row] = $prop_Description; - $aSpecialFields[$row] = $prop_Special; - $aFieldFields[$row] = $prop_Field; - $aTypeFields[$row] = $type_ID; - $aPersonDisplayFields[$row] = ($prop_PersonDisplay == 'true'); - } -} + $bNewNameError = false; + } + } + } -// Construct the form -?> + // Get data for the form as it now exists.. + $sSQL = 'SELECT * FROM groupprop_master WHERE grp_ID = ' . $iGroupID . ' ORDER BY prop_ID'; -
+ $rsPropList = RunQuery($sSQL); + $numRows = mysqli_num_rows($rsPropList); -
- + // Create arrays of the properties. + for ($row = 1; $row <= $numRows; $row++) { + $aRow = mysqli_fetch_array($rsPropList, MYSQLI_BOTH); + extract($aRow); - -

-
- - - - - - - - - - - - - + - +
-
-
- ' . gettext('Invalid fields or selections. Changes not saved! Please correct and try again!') . ''; - } ?> -

- for ($row = 1; $row <= $numRows; $row++) { - ?> - - - + + + + + + + + + + + + + + + + - "; ?> - - + + for ($row = 1; $row <= $numRows; $row++) { + ?> + + + + + + + + + + + + + + + + + +
' . gettext('You must enter a name') . ' '; } ?> - - - - - - - - - - - - - - - - - - -

'; - } - if ($row < $numRows) { - echo "'; - } ?> + if ($numRows == 0) { + ?> +
+

+
+ +
+
+
+ ' . gettext('Invalid fields or selections. Changes not saved! Please correct and try again!') . ''; + } ?> +

- -
+

+ 		+ '; + } + if ($row < $numRows) { + echo "'; + } ?> + + "; ?> + + + +
' . gettext('You must enter a name') . ' '; + } ?> + 		+ '; + echo ''; + + $sSQL = 'SELECT grp_ID,grp_Name FROM group_grp ORDER BY grp_Name'; + + $rsGroupList = RunQuery($sSQL); + + while ($aRow = mysqli_fetch_array($rsGroupList)) { + extract($aRow); + + echo ' + > +
+ + + + + + +
+ +
+ 		+
- '; - echo ''; - - $sSQL = 'SELECT grp_ID,grp_Name FROM group_grp ORDER BY grp_Name'; - - $rsGroupList = RunQuery($sSQL); - - while ($aRow = mysqli_fetch_array($rsGroupList)) { - extract($aRow); - - echo ' - > -
- - - - -
- + +
- 		-
- - - - - - - -
-
:
- '; - for ($iOptionID = 1; $iOptionID <= count($aPropTypes); $iOptionID++) { - echo '		 -
:
- -
' . gettext('You must enter a name') . ''; - } - if ($bDuplicateNameError) { - echo '

' . gettext('That field name already exists.') . '
'; - } - ?> -   - 		-
:
- -   + 		+ + + + + + + + + +
+
:
+ '; + for ($iOptionID = 1; $iOptionID <= count($aPropTypes); $iOptionID++) { + echo '		 +
:
+ +
' . gettext('You must enter a name') . ''; + } + if ($bDuplicateNameError) { + echo '

' . gettext('That field name already exists.') . '
'; + } + ?> +   + 		+
:
+ +   + 		+ +
- -
-
-
+ +
-
- - + @@ -151,13 +137,10 @@

-
- - - - +findOneById($iGroupID); -//Look up the default role name +// Look up the default role name $defaultRole = ListOptionQuery::create()->filterById($thisGroup->getRoleListId())->filterByOptionId($thisGroup->getDefaultRole())->findOne(); -//Get the group's type name +// Get the group's type name if ($thisGroup->getType() > 0) { $sGroupType = ListOptionQuery::create()->filterById(3)->filterByOptionId($thisGroup->getType())->findOne()->getOptionName(); } else { $sGroupType = gettext('Unassigned'); } -//Get the Properties assigned to this Group +// Get the Properties assigned to this Group $sSQL = "SELECT pro_Name, pro_ID, pro_Prompt, r2p_Value, prt_Name, pro_prt_ID FROM record2property_r2p LEFT JOIN property_pro ON pro_ID = r2p_pro_ID LEFT JOIN propertytype_prt ON propertytype_prt.prt_ID = property_pro.pro_prt_ID WHERE pro_Class = 'g' AND r2p_record_ID = " . $iGroupID . - ' ORDER BY prt_Name, pro_Name'; + ' ORDER BY prt_Name, pro_Name'; $rsAssignedProperties = RunQuery($sSQL); -//Get all the properties +// Get all the properties $sSQL = "SELECT * FROM property_pro WHERE pro_Class = 'g' ORDER BY pro_Name"; $rsProperties = RunQuery($sSQL); @@ -65,37 +49,36 @@ $rsPropList = RunQuery($sSQL); $numRows = mysqli_num_rows($rsPropList); -//Set the page title $sPageTitle = gettext('Group View') . ' : ' . $thisGroup->getName(); require 'Include/Header.php'; ?>
-
-

-
-
+
+

+
+
- isManageGroupsEnabled()) { - echo '' . gettext('Edit this Group') . ''; - echo ''; ?> + isManageGroupsEnabled()) { + echo '' . gettext('Edit this Group') . ''; + echo ''; ?> getHasSpecialProps()) { - echo '' . gettext('Edit Group-Specific Properties Form') . ''; - } - }?> + if ($thisGroup->getHasSpecialProps()) { + echo '' . gettext('Edit Group-Specific Properties Form') . ''; + } + } ?> - - + + - getUserConfigString("sMailtoDelimiter"); - while (list($per_Email, $fam_Email, $virt_RoleName) = mysqli_fetch_row($rsEmailList)) { - $sEmail = SelectWhichInfo($per_Email, $fam_Email, false); - if ($sEmail) { - /* if ($sEmailLink) // Don't put delimiter before first email + $rsEmailList = RunQuery($sSQL); + $sEmailLink = ''; + $roleEmails = []; + $sMailtoDelimiter = AuthenticationManager::getCurrentUser()->getUserConfigString("sMailtoDelimiter"); + while (list($per_Email, $fam_Email, $virt_RoleName) = mysqli_fetch_row($rsEmailList)) { + $sEmail = SelectWhichInfo($per_Email, $fam_Email, false); + if ($sEmail) { + /* if ($sEmailLink) // Don't put delimiter before first email $sEmailLink .= $sMailtoDelimiter; */ - // Add email only if email address is not already in string - if (!stristr($sEmailLink, $sEmail)) { - $sEmailLink .= $sEmail .= $sMailtoDelimiter; - $roleEmails[$virt_RoleName] = $sEmailLink; + // Add email only if email address is not already in string + if (!stristr($sEmailLink, $sEmail)) { + $sEmailLink .= $sEmail .= $sMailtoDelimiter; + $roleEmails[$virt_RoleName] = $sEmailLink; + } } } - } - if ($sEmailLink) { - // Add default email if default email has been set and is not already in string - if (SystemConfig::getValue('sToEmailAddress') != '' && !stristr($sEmailLink, SystemConfig::getValue('sToEmailAddress'))) { - $sEmailLink .= $sMailtoDelimiter . SystemConfig::getValue('sToEmailAddress'); - } - $sEmailLink = urlencode($sEmailLink); // Mailto should comply with RFC 2368 - - if (AuthenticationManager::getCurrentUser()->isEmailEnabled()) { // Does user have permission to email groups - // Display link - ?> -
- - - -
+ if ($sEmailLink) { + // Add default email if default email has been set and is not already in string + if (SystemConfig::getValue('sToEmailAddress') != '' && !stristr($sEmailLink, SystemConfig::getValue('sToEmailAddress'))) { + $sEmailLink .= $sMailtoDelimiter . SystemConfig::getValue('sToEmailAddress'); + } + $sEmailLink = urlencode($sEmailLink); // Mailto should comply with RFC 2368 + + if (AuthenticationManager::getCurrentUser()->isEmailEnabled()) { // Does user have permission to email groups + // Display link + ?> +
+ + + +
-
- - - -
+
+ + + +
- isEmailEnabled()) { // Does user have permission to email groups - // Display link - echo '' . gettext('Text Group') . ''; - echo ''; + if ($sPhoneLink) { + if (AuthenticationManager::getCurrentUser()->isEmailEnabled()) { // Does user have permission to email groups + // Display link + echo '' . gettext('Text Group') . ''; + echo ''; + } } - } - ?> -
+ ?> +
getDescription() ?> -

+

+

+

-
-
-

-
-
-
-
:
-
:
-
-
+
+

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

-
-
- - - - -
- : - - getHasSpecialProps()) { - // Create arrays of the properties. - for ($row = 1; $row <= $numRows; $row++) { - $aRow = mysqli_fetch_array($rsPropList, MYSQLI_BOTH); - extract($aRow); - - $aNameFields[$row] = $prop_Name; - $aDescFields[$row] = $prop_Description; - $aFieldFields[$row] = $prop_Field; - $aTypeFields[$row] = $type_ID; - } - - // Construct the table +
+
+

+
+
+ + + '; - - //Alternate the row style - $sRowClass = AlternateRowStyle($sRowClass); - - $sAssignedProperties .= $pro_ID . ','; + } else { + echo '

' . gettext('Disabled for this group.') . '

'; } - echo '
+ : - if (!$numRows) { - echo '

'; - } else { - ?> - - - - - - '; - echo ''; - echo ''; - echo ''; - echo ''; - } - echo '
' . $aPropTypes[$aTypeFields[$row]] . '' . $aNameFields[$row] . '' . $aDescFields[$row] . ' 
'; - } - } else { - echo '

' . gettext('Disabled for this group.') . '

'; - } - - //Print Assigned Properties - echo '
'; - echo '' . gettext('Assigned Properties') . ':'; - $sAssignedProperties = ','; - - //Was anything returned? - if (mysqli_num_rows($rsAssignedProperties) == 0) { - // No, indicate nothing returned - echo '

' . gettext('No property assignments') . '.

'; - } else { - // Display table of properties?> - - - - isManageGroupsEnabled()) { - echo ''; - echo ''; - } - echo ''; - - $last_pro_prt_ID = ''; - $bIsFirst = true; - - //Loop through the rows - while ($aRow = mysqli_fetch_array($rsAssignedProperties)) { - $pro_Prompt = ''; - $r2p_Value = ''; - - extract($aRow); - - if ($pro_prt_ID != $last_pro_prt_ID) { - echo ''; - - $bIsFirst = false; - $last_pro_prt_ID = $pro_prt_ID; - $sRowClass = 'RowColorB'; - } else { - echo ''; - echo ''; + if ($thisGroup->getHasSpecialProps()) { + // Create arrays of the properties. + for ($row = 1; $row <= $numRows; $row++) { + $aRow = mysqli_fetch_array($rsPropList, MYSQLI_BOTH); + extract($aRow); + + $aNameFields[$row] = $prop_Name; + $aDescFields[$row] = $prop_Description; + $aFieldFields[$row] = $prop_Field; + $aTypeFields[$row] = $type_ID; } - echo ''; - echo ''; - - if (strlen($pro_Prompt) > 0 && AuthenticationManager::getCurrentUser()->isManageGroupsEnabled()) { - echo ''; - } else { - echo ''; - } + // Construct the table - if (AuthenticationManager::getCurrentUser()->isManageGroupsEnabled()) { - echo ''; + ?> +
- - ' . gettext('Edit Value') . '' . gettext('Remove') . '
' . $prt_Name . '
 ' . $pro_Name . ' ' . $r2p_Value . ' ' . gettext('Edit Value') . ' ' . gettext('Remove') . ''; + if (!$numRows) { + echo '

'; } else { - echo '		 
+ + + + + + '; + echo ''; + echo ''; + echo ''; + echo ''; + } + echo '
' . $aPropTypes[$aTypeFields[$row]] . '' . $aNameFields[$row] . '' . $aDescFields[$row] . ' 
'; } - - echo '
'; - } - - if (AuthenticationManager::getCurrentUser()->isManageGroupsEnabled()) { - echo '
'; - echo '

'; - echo '' . gettext('Assign a New Property:') . ''; - echo ' + + + isManageGroupsEnabled()) { + echo ''; + echo ''; + } + echo ''; + + $last_pro_prt_ID = ''; + $bIsFirst = true; + + //Loop through the rows + while ($aRow = mysqli_fetch_array($rsAssignedProperties)) { + $pro_Prompt = ''; + $r2p_Value = ''; + + extract($aRow); + + if ($pro_prt_ID != $last_pro_prt_ID) { + echo ''; + + $bIsFirst = false; + $last_pro_prt_ID = $pro_prt_ID; + $sRowClass = 'RowColorB'; + } else { + echo ''; + echo ''; + } + + echo ''; + echo ''; + + if (strlen($pro_Prompt) > 0 && AuthenticationManager::getCurrentUser()->isManageGroupsEnabled()) { + echo ''; + } else { + echo ''; + } + + if (AuthenticationManager::getCurrentUser()->isManageGroupsEnabled()) { + echo ''; + } + + echo ''; + + //Alternate the row style + $sRowClass = AlternateRowStyle($sRowClass); + + $sAssignedProperties .= $pro_ID . ','; + } + + echo '
+ + ' . gettext('Edit Value') . '' . gettext('Remove') . '
' . $prt_Name . '
 ' . $pro_Name . ' ' . $r2p_Value . ' ' . gettext('Edit Value') . ' ' . gettext('Remove') . ''; + } else { + echo ' 
'; + } - //If the property doesn't already exist for this Person, write the '; - } - } + if (AuthenticationManager::getCurrentUser()->isManageGroupsEnabled()) { + echo ''; + echo '

'; + echo '' . gettext('Assign a New Property:') . ''; + echo ''; - echo ' '; - echo '

'; - } else { - echo '


'; - } - ?> + while ($aRow = mysqli_fetch_array($rsProperties)) { + extract($aRow); + //If the property doesn't already exist for this Person, write the '; + } + } + echo ''; + echo ' '; + echo '

'; + } else { + echo '


'; + } + ?>
-
-
- -
-
-

-
-
-
- - -
-
- - -
-
-
-
- -
- - - -
-
-
- - + + +
+ +
+
+

+
+
+
+ + +
+
+ + +
+
+
+
+ +
+ + +
- - - - + }); + }); + + + @@ -30,5 +16,3 @@ // Reset the Global Message $_SESSION['sGlobalMessage'] = ''; - -?> diff --git a/src/Include/Footer.php b/src/Include/Footer.php index 95f1189597..793cf6945a 100644 --- a/src/Include/Footer.php +++ b/src/Include/Footer.php @@ -1,16 +1,5 @@ diff --git a/src/Include/FooterNotLoggedIn.php b/src/Include/FooterNotLoggedIn.php index d02e7e33ff..2fa2c13372 100644 --- a/src/Include/FooterNotLoggedIn.php +++ b/src/Include/FooterNotLoggedIn.php @@ -9,7 +9,6 @@ © ChurchCRM. .
- diff --git a/src/Include/Functions.php b/src/Include/Functions.php index 38fc9ca51a..471a20ec7c 100644 --- a/src/Include/Functions.php +++ b/src/Include/Functions.php @@ -1,14 +1,5 @@ 11) { $sAMPM = gettext('pm'); if ($h > 12) { @@ -1275,8 +1260,6 @@ function formatNumber($iNumber, $sMode = 'integer') } } - - function FilenameToFontname($filename, $family) { if ($filename == $family) { diff --git a/src/Include/GetGroupArray.php b/src/Include/GetGroupArray.php index cb85e2f1b8..6375f973a1 100644 --- a/src/Include/GetGroupArray.php +++ b/src/Include/GetGroupArray.php @@ -1,24 +1,17 @@ /skin/js/CRMJSOM.js"> diff --git a/src/Include/Header.php b/src/Include/Header.php index 03a5335484..396528dfd6 100644 --- a/src/Include/Header.php +++ b/src/Include/Header.php @@ -51,7 +51,6 @@ Home - @@ -74,7 +73,6 @@
-
  • @@ -105,7 +103,6 @@
    • -
  • diff --git a/src/Include/LabelFunctions.php b/src/Include/LabelFunctions.php index 188340a779..cb697f2c3b 100644 --- a/src/Include/LabelFunctions.php +++ b/src/Include/LabelFunctions.php @@ -1,20 +1,5 @@ - ' . gettext('Start Row') . ': - - - - - - - ' . gettext('Start Column') . ': - - - - - '; + + ' . gettext('Start Row') . ': + + + + + + + ' . gettext('Start Column') . ': + + + + + '; } function IgnoreIncompleteAddresses(): void { echo ' - - ' . gettext('Ignore Incomplete
    Addresses') . ': - - - - - '; + + ' . gettext('Ignore Incomplete
    Addresses') . ': + + + + + '; } function LabelFileType(): void { echo ' - - ' . gettext('File Type') . ': - - - - - '; + + ' . gettext('File Type') . ': + + + + + '; } diff --git a/src/Include/LoadConfigs.php b/src/Include/LoadConfigs.php index b0e0f88b60..57cb44fff5 100644 --- a/src/Include/LoadConfigs.php +++ b/src/Include/LoadConfigs.php @@ -1,23 +1,11 @@ - diff --git a/src/LettersAndLabels.php b/src/LettersAndLabels.php index 0816168e1b..ccfaa5eb8a 100644 --- a/src/LettersAndLabels.php +++ b/src/LettersAndLabels.php @@ -1,21 +1,5 @@ - - +isAddEvent()) { @@ -72,8 +52,7 @@ } } -/// top of main form -// +// Top of main form $sSQL = 'SELECT DISTINCT event_types.* FROM event_types RIGHT JOIN events_event ON event_types.type_id=events_event.event_type @@ -366,7 +345,5 @@ $('#listEvents').DataTable(window.CRM.plugin.dataTable); }); - diff --git a/src/ManageEnvelopes.php b/src/ManageEnvelopes.php index ee2fbc6827..e3f37e37ac 100644 --- a/src/ManageEnvelopes.php +++ b/src/ManageEnvelopes.php @@ -1,15 +1,5 @@ isFinanceEnabled()); $envelopesToWrite = []; -// get the array of envelopes of interest, indexed by family id +// Get the array of envelopes of interest, indexed by family ID $envelopesByFamID = getEnvelopes($iClassification); -// get the array of family name/description strings, also indexed by family id +// Get the array of family name/description strings, also indexed by family ID $familyArray = getFamilyList(SystemConfig::getValue('sDirRoleHead'), SystemConfig::getValue('sDirRoleSpouse'), $iClassification); asort($familyArray); @@ -113,8 +102,6 @@ ?> - - @@ -214,7 +201,7 @@ diff --git a/src/MapUsingGoogle.php b/src/MapUsingGoogle.php index 5f9f0dbfb3..81fecb80f3 100644 --- a/src/MapUsingGoogle.php +++ b/src/MapUsingGoogle.php @@ -11,7 +11,6 @@ use ChurchCRM\Utils\InputUtils; use Propel\Runtime\ActiveQuery\Criteria; -//Set the page title $sPageTitle = gettext('View on Map'); require 'Include/Header.php'; @@ -167,7 +166,6 @@ class="legendicon" src='https://www.google.com/intl/en_us/mapfiles/ms/micons/, lng: }; - var markerIcons = ; var iconsJSON = toJSON() ?>; var icons = iconsJSON.ListOptions; @@ -312,4 +310,4 @@ function initialize() { +require 'Include/Footer.php'; diff --git a/src/MemberRoleChange.php b/src/MemberRoleChange.php index 90763058ea..2b91c7f091 100644 --- a/src/MemberRoleChange.php +++ b/src/MemberRoleChange.php @@ -1,15 +1,5 @@ isManageGroupsEnabled()); -//Set the page title $sPageTitle = gettext('Member Role Change'); -//Get the GroupID from the querystring +// Get the GroupID from the querystring $iGroupID = InputUtils::legacyFilterInput($_GET['GroupID'], 'int'); -//Get the PersonID from the querystring +// Get the PersonID from the querystring $iPersonID = InputUtils::legacyFilterInput($_GET['PersonID'], 'int'); -//Get the return location flag from the querystring +// Get the return location flag from the querystring $iReturn = $_GET['Return']; -//Was the form submitted? +// Was the form submitted? if (isset($_POST['Submit'])) { //Get the new role $iNewRole = InputUtils::legacyFilterInput($_POST['NewRole']); @@ -49,7 +38,7 @@ } } -//Get their current role +// Get their current role $sSQL = 'SELECT per_FirstName, per_LastName, grp_Name, grp_RoleListID, lst_OptionID, ' . 'lst_OptionName AS sRoleName, p2g2r_rle_ID AS iRoleID ' . 'FROM person_per ' . @@ -62,11 +51,10 @@ $rsCurrentRole = mysqli_fetch_array(RunQuery($sSQL)); extract($rsCurrentRole); -//Get all the possible roles +// Get all the possible roles $sSQL = "SELECT * FROM list_lst WHERE lst_ID = $grp_RoleListID ORDER BY lst_OptionSequence"; $rsAllRoles = RunQuery($sSQL); -//Include the header require 'Include/Header.php' ?> @@ -92,17 +80,16 @@ - @@ -424,4 +410,3 @@ } else { include 'Include/Footer.php'; } -?> diff --git a/src/OptionManagerRowOps.php b/src/OptionManagerRowOps.php index 67fe654286..baacb45da9 100644 --- a/src/OptionManagerRowOps.php +++ b/src/OptionManagerRowOps.php @@ -1,15 +1,5 @@
    -
    -
    - - - - - - - -
    - - - isAddRecordsEnabled()) { - echo '\n"; - } ?> - -
    - - - - - - - -
    - + +
    +
    - - + - - +
    : + + + isAddRecordsEnabled()) { + echo '\n"; + } ?> + +
    : - - - + + + + + + + +
    + + + + + + + + + + +
    :
    : + + +
    +     		+ + + + + + + + +
    +
    -     		- - - - - - - - -
    -
    -
    +
    +
    - - - + 0) { //Get the paddlenum records for this fundraiser $sSQL = "SELECT pn_ID, pn_fr_ID, pn_Num, pn_per_ID, - a.per_FirstName as buyerFirstName, a.per_LastName as buyerLastName - FROM paddlenum_pn - LEFT JOIN person_per a ON pn_per_ID=a.per_ID - WHERE pn_FR_ID = '" . $iFundRaiserID . "' ORDER BY pn_Num"; + a.per_FirstName as buyerFirstName, a.per_LastName as buyerLastName + FROM paddlenum_pn + LEFT JOIN person_per a ON pn_per_ID=a.per_ID + WHERE pn_FR_ID = '" . $iFundRaiserID . "' ORDER BY pn_Num"; $rsPaddleNums = RunQuery($sSQL); } else { $rsPaddleNums = 0; @@ -35,42 +25,42 @@ require 'Include/Header.php'; ?>
    -\n"; -if ($iFundRaiserID > 0) { - echo '\n"; -} + \n"; + if ($iFundRaiserID > 0) { + echo '\n"; + } echo '\n"; echo '\n"; echo '\n"; -?> + ?>
    - +
    - - - - - - + + + + + + - - - + - + Delete + + + } // while + } // if + ?> -
    - > + $sRowClass = 'RowColorA'; ?> +
    + > $pn_Num\n" ?> @@ -80,16 +70,16 @@   - Delete -
    -
    + + - - +
    -
    -

    -
    -
    - - -
    - -
    - - - -
    +
    +

    +
    +
    + + +
    + +
    + + + +
    - isEmailEnabled()) { // Does user have permission to email groups - // Display link - ?> -
    - - - -
    -
    - - - -
    - +
    + + + +
    +
    + + + +
    + -
    +
    -
    - -
    -
    -

    - -

    +
    + +
    +
    +

    + +

    -

    - -

    -
    -
    - -
    - - - +

    + +

    +
    +
    + +
    + + + +
    -
    - -
    - -
    -
    -

    - -

    + +
    + +
    +
    +

    + +

    -

    - -

    -
    -
    - -
    - - - +

    + +

    +
    +
    + +
    + + + +
    -
    - - -
    - -
    -
    -

    - -

    + + +
    + +
    +
    +

    + +

    -

    - -

    -
    -
    - -
    - - - -
    -
    - - -
    - -
    -
    -

    - -

    +

    + +

    +
    +
    + +
    + + + +
    +
    + + +
    + +
    +
    +

    + +

    -

    - -

    -
    -
    - -
    - - - +

    + +

    +
    +
    + +
    + + + +
    -
    - +
    -
    -
    -
    -

    -
    - - -
    -
    -
    -

    -
    - -

    - -
    - -

    - isCreateDirectoryEnabled()) { - ?> -


    -

    - - -
    -

    -
    +
    +
    +
    +

    +
    + + +
    +
    +
    +

    +
    + +

    + +
    + +

    + isCreateDirectoryEnabled()) { + ?> +


    +

    + + +
    +

    +
    +
    -
    -
    -
    -
    -

    -
    - - +
    +
    +
    +

    +
    + + +
    +
    +
    + + + + + + + $value) { + ?> + + + + + + +
    %
    +
    +
    +
    +
    + +
    -
    -
    - - - - - - - $value) { - ?> - - - - - - -
    %
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -

    -
    - - -
    -
    -
    - - - - - - - filterByFmrId($demStat->getOptionID())->filterByGender(1)->count(); - $countFemale = PersonQuery::create()->filterByFmrId($demStat->getOptionID())->filterByGender(2)->count(); - $countUnknown = PersonQuery::create()->filterByFmrId($demStat->getOptionID())->filterByGender(0)->count(); - $demStatId = $demStat->getOptionID(); - $demStatName = $demStat->getOptionName(); - $genPop = PersonQuery::create()->count(); - if ($countMale != 0) { +
    +
    +
    +

    +
    + + +
    +
    +
    +
    %
    + + + + + + filterByFmrId($demStat->getOptionID())->filterByGender(1)->count(); + $countFemale = PersonQuery::create()->filterByFmrId($demStat->getOptionID())->filterByGender(2)->count(); + $countUnknown = PersonQuery::create()->filterByFmrId($demStat->getOptionID())->filterByGender(0)->count(); + $demStatId = $demStat->getOptionID(); + $demStatName = $demStat->getOptionName(); + $genPop = PersonQuery::create()->count(); + if ($countMale != 0) { ?> - - - - - + + + + + + + + + + + + + + + + + + filterByFmrId(0)->filterByGender(1)->count(); + $countUnknownFemale = PersonQuery::create()->filterByFmrId(0)->filterByGender(2)->count(); + $countUnknownRoleUnknownGender = PersonQuery::create()->filterByFmrId(0)->filterByGender(0)->count(); + + $genPop = PersonQuery::create()->count(); + if ($countUnknownMale != 0) { + ?> + + + + + - - - - - + + + + + - - - - - + + + + + filterByFmrId(0)->filterByGender(1)->count(); - $countUnknownFemale = PersonQuery::create()->filterByFmrId(0)->filterByGender(2)->count(); - $countUnknownRoleUnknownGender = PersonQuery::create()->filterByFmrId(0)->filterByGender(0)->count(); - - $genPop = PersonQuery::create()->count(); - if ($countUnknownMale != 0) { - ?> - - - - - - - - - - - - - - - - - - -
    %
    - -
    -
    -
    -
    - +
    +
    +
    +
    - +
    +
    +
    +
    - +
    +
    +
    +
    - +
    +
    +
    +
    - -
    -
    -
    -
    - +
    +
    +
    +
    - -
    -
    -
    -
    - +
    +
    +
    +
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    + } + ?> + +
    +
    -
    -
    +
    -
    -
    -

    -
    - -
    - -
    -
    -
    -
    -

    -
    - -
    - -
    +
    +
    +

    +
    + +
    + +
    +
    +
    +
    +

    +
    + +
    + +
    +
    -
    - - + -
    - - - - -
    - - -
    -
    -
    - - - -

    - - - - - - - - - - - - - - - - - - + + + + + - +
    -
    ' . gettext('Invalid fields or selections. Changes not saved! Please correct and try again!') . ''; - } ?> -
    - - - -
    ' . gettext('You must enter a name') . ' '; - } ?> -     		- '; - echo ''; - - $sSQL = 'SELECT grp_ID,grp_Name FROM group_grp ORDER BY grp_Name'; - $rsGroupList = RunQuery($sSQL); - - while ($aRow = mysqli_fetch_array($rsGroupList)) { - extract($aRow); - - echo ''; - } + - echo ''; - if ($aSpecialErrors[$row]) { - echo '
    ' . gettext('You must select a group.') . '    '; - } - } elseif ($aTypeFields[$row] == 12) { - echo "" . gettext('Edit List Options') . ''; - } else { - echo ' '; - } ?> +
    + + +
    + +
    + - - - - - - - - - - - - - - - - - -
    - - - );" )"> - - '; - } - if ($row < $numRows) { - echo "'; - } ?> - -
    - - - - - - -
    - -
    -     		-
    -
    -
    - - - - + + + + + + + + + + + + + + + + + + + + + - for ($iOptionID = 1; $iOptionID <= count($aPropTypes); $iOptionID++) { - echo ''; - } - echo ''; - ?>
    - - - + +
    ' . gettext('You must enter a name') . '    '; - } - if ($bDuplicateNameError) { - echo '

    ' . gettext('That field name already exists.') . '
    '; - } - ?> -   - - - - - -
    -
    :
    + if ($numRows == 0) { + ?> +

    '; + } else { + ?> +
    +
    ' . gettext('Invalid fields or selections. Changes not saved! Please correct and try again!') . ''; + } ?> +
    + + + +
    ' . gettext('You must enter a name') . ' '; + } ?> +     		+ '; + echo ''; + + $sSQL = 'SELECT grp_ID,grp_Name FROM group_grp ORDER BY grp_Name'; + $rsGroupList = RunQuery($sSQL); + + while ($aRow = mysqli_fetch_array($rsGroupList)) { + extract($aRow); + + echo ''; + } + + echo ''; + if ($aSpecialErrors[$row]) { + echo '
    ' . gettext('You must select a group.') . '    '; + } + } elseif ($aTypeFields[$row] == 12) { + echo "" . gettext('Edit List Options') . ''; + } else { + echo ' '; + } ?> + +     		+ + + );" )"> + + '; + } + if ($row < $numRows) { + echo "'; + } ?> + +
    -
    :
    - +
    + + + + + + +
    + +
    +     		+
    -
    - -     		- -
    -
    -
    - + } ?> +
    +
    +
    + + + + + + + + + +
    +
    :
    + '; + + for ($iOptionID = 1; $iOptionID <= count($aPropTypes); $iOptionID++) { + echo ''; + } + echo ''; + ?>
    + +     		+
    :
    + +
    ' . gettext('You must enter a name') . '    '; + } + if ($bDuplicateNameError) { + echo '

    ' . gettext('That field name already exists.') . '
    '; + } + ?> +   +     		+
    + +     		+ +
    +
    +
    + - +
    +setEnvelope($iEnvelope); } - $person->save(); $person->reload(); @@ -921,7 +908,6 @@ class="form-control"> $("#familyId").select2(); }); - - +getId() . '/thumbnail' ?>" class="initials-image profile-user-img img-responsive img-circle no-border"> getFullName() ?> - getFamilyRoleName() ?> @@ -509,7 +492,6 @@ } ?>
    -
      @@ -917,7 +899,6 @@ window.CRM.currentPersonID = ; window.CRM.plugin.mailchimp = isActive() ? "true" : "false" ?>; - $("#deletePhoto").click(function() { window.CRM.APIRequest({ method: "DELETE", @@ -941,7 +922,6 @@ window.CRM.photoUploader.show(); }); - $(document).ready(function() { $("#input-volunteer-opportunities").select2(); $("#input-person-properties").select2(); @@ -949,7 +929,6 @@ $("#assigned-volunteer-opps-table").DataTable(window.CRM.plugin.dataTable); $("#assigned-properties-table").DataTable(window.CRM.plugin.dataTable); - contentExists(window.CRM.root + "/api/person/" + window.CRM.currentPersonID + "/photo", function(success) { if (success) { $("#view-larger-image-btn").removeClass('hide'); @@ -966,5 +945,5 @@ }); - - +isDeleteRecordsEnabled()); -//Is this the second pass? +// Is this the second pass? if (isset($_POST['Delete'])) { $sSQL = "DELETE FROM `pledge_plg` WHERE `plg_GroupKey` = '" . $sGroupKey . "';"; RunQuery($sSQL); @@ -54,5 +43,5 @@ - - +isFinanceEnabled()); -//Is this the second pass? +// Is this the second pass? if (isset($_POST['Back'])) { RedirectUtils::redirect($linkBack); } @@ -58,5 +49,5 @@ - - +save(); } -//Set the page title if ($PledgeOrPayment === 'Pledge') { $sPageTitle = gettext('Pledge Editor'); } elseif ($iCurrentDeposit) { @@ -506,299 +492,293 @@
      +
      +
      +
      +
      +

      +
      +
      + + + +
      + + +
      + +
      + + + + + + + + + + + + -
      -
      -
      -
      -

      -
      -
      - - + -
      - - -
      + -
      - - - - - - - - - - - - - - - - - - - - - - -
      - - -
      - - - - - - -
      - - -
      - - - - - + + -
      + + +
      + +
      + + + + +
      + + +
      + -
      - - - - -
      + + -
      - - - - -
      +
      -
      - -
      - - isAddRecordsEnabled()) { - echo ''; - } ?> - - - -
      -
      -
      -
      -
      -
      -
      -
      -
      -

      -
      -
      - - - - - - - - - - - - - - - $fun_name) { - ?> - - - - + + + + + +
      + + + + +
      + +
      + -
      +
      + + isAddRecordsEnabled()) { + echo ''; + } ?> - - - - -
      - ">
      - -       		+ + - " /> -
      - -       		- -
      + } ?> + + +
      +
      +
      +
      +
      +
      +
      +
      +
      +

      +
      +
      + + + + + + + + + + + + + + + $fun_name) { + ?> + + + + + + + + + + +
      + ">
      + +       		+ " /> +
      + +       		+ +
      +
      +
      -
      -
      - - - - - + 0 && $per_BirthDay > 0) -//{ -// $dBirthDate = $per_BirthMonth . "/" . $per_BirthDay; -// if (is_numeric($per_BirthYear)) -// { -// $dBirthDate .= "/" . $per_BirthYear; -// } -//} -//elseif (is_numeric($per_BirthYear)) -//{ -// $dBirthDate = $per_BirthYear; -//} -//else -//{ -// $dBirthDate = ""; -//} // Assign the values locally, after selecting whether to display the family or person information - SelectWhichAddress($sAddress1, $sAddress2, $per_Address1, $per_Address2, $fam_Address1, $fam_Address2, false); $sCity = SelectWhichInfo($per_City, $fam_City, false); $sState = SelectWhichInfo($per_State, $fam_State, false); @@ -133,391 +102,393 @@ $sUnformattedEmail = SelectWhichInfo($per_Email, $fam_Email, false); -// Set the page title and include HTML header $sPageTitle = gettext('Printable View'); $iTableSpacerWidth = 10; require 'Include/Header-Short.php'; ?> - + +
      -

      + + +
      +

      -findPk($per_ID); - -if ($personSheet) { - echo ""; - echo " "; - echo "
      "; - $imgName = SystemURLs::getRootPath() . "/api/person/" . $personSheet->getId() . "/photo"; - echo ""; - echo ""; - echo '' . $personSheet->getFullName() . '
      '; - echo "
      "; -} else { - echo '' . $personSheet->getFullName() . '
      '; -} + $personSheet = PersonQuery::create()->findPk($per_ID); + + if ($personSheet) { + echo ""; + echo " "; + echo "
      "; + $imgName = SystemURLs::getRootPath() . "/api/person/" . $personSheet->getId() . "/photo"; + echo ""; + echo ""; + echo '' . $personSheet->getFullName() . '
      '; + echo "
      "; + } else { + echo '' . $personSheet->getFullName() . '
      '; + } -// Print the name and address header -echo ''; -if ($sAddress1 != '') { - echo $sAddress1 . '
      '; -} -if ($sAddress2 != '') { - echo $sAddress2 . '
      '; -} -if ($sCity != '') { - echo $sCity . ', '; -} -if ($sState != '') { - echo $sState; -} + // Print the name and address header + echo ''; + if ($sAddress1 != '') { + echo $sAddress1 . '
      '; + } + if ($sAddress2 != '') { + echo $sAddress2 . '
      '; + } + if ($sCity != '') { + echo $sCity . ', '; + } + if ($sState != '') { + echo $sState; + } -// bevand10 2012-04-28 Replace space with   in zip/postcodes, to ensure they do not wrap on output. if ($sZip != '') { echo ' ' . str_replace(' ', ' ', trim($sZip)); } -if ($sCountry != '') { - echo '
      ' . $sCountry; -} -echo '      '; - -$iFamilyID = $fam_ID; - -if ($fam_ID) { - //Get the family members for this family - $sSQL = 'SELECT per_ID, per_Title, per_FirstName, per_LastName, per_Suffix, per_Gender, - per_BirthMonth, per_BirthDay, per_BirthYear, per_Flags, cls.lst_OptionName AS sClassName, - fmr.lst_OptionName AS sFamRole - FROM person_per - LEFT JOIN list_lst cls ON per_cls_ID = cls.lst_OptionID AND cls.lst_ID = 1 - LEFT JOIN list_lst fmr ON per_fmr_ID = fmr.lst_OptionID AND fmr.lst_ID = 2 - WHERE per_fam_ID = ' . $iFamilyID . ' ORDER BY fmr.lst_OptionSequence'; - $rsFamilyMembers = RunQuery($sSQL); -} -?> + if ($sCountry != '') { + echo '
      ' . $sCountry; + } + echo '      '; + + $iFamilyID = $fam_ID; + + if ($fam_ID) { + //Get the family members for this family + $sSQL = 'SELECT per_ID, per_Title, per_FirstName, per_LastName, per_Suffix, per_Gender, + per_BirthMonth, per_BirthDay, per_BirthYear, per_Flags, cls.lst_OptionName AS sClassName, + fmr.lst_OptionName AS sFamRole + FROM person_per + LEFT JOIN list_lst cls ON per_cls_ID = cls.lst_OptionID AND cls.lst_ID = 1 + LEFT JOIN list_lst fmr ON per_fmr_ID = fmr.lst_OptionID AND fmr.lst_ID = 2 + WHERE per_fam_ID = ' . $iFamilyID . ' ORDER BY fmr.lst_OptionSequence'; + $rsFamilyMembers = RunQuery($sSQL); + } + ?> -

      +

      +

      - - + +
      - - - - - - - - - - - - - - - - - + - - + + - - + for ($i = 1; $i <= $numColumn2Fields; $i++) { + $Row = mysqli_fetch_array($rsCustomFields); + extract($Row); + $currentData = trim($aCustomData[$custom_Field]); + if ($type_ID == 11) { + $custom_Special = $sCountry; + } + echo ''; + echo ''; + } + ?> +
      : 
      : 
      : 
      + + + + + + + + + + + + + + + + + '; + echo ''; + } } - echo ''; - echo ''; - } - } - ?> -
      : 
      : 
      : 
      ' . $custom_Name . '' . displayCustomField($type_ID, $currentData, $custom_Special) . '
      ' . $custom_Name . '' . displayCustomField($type_ID, $currentData, $custom_Special) . '
      -       		- - - - -
      : + ?> +
      +       		+ + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - '; - echo ''; - } - ?> -
      : + +
      : 
      : + +  
      : 
      : 
      : - -  
      : 
      ' . $custom_Name . '' . displayCustomField($type_ID, $currentData, $custom_Special) . '
      -       		- - - - - - - - - - - - - - - - - - - - - - '; - echo ''; - } - ?> -
      : 
      : 
      : 
      : 
      ' . $custom_Name . '' . displayCustomField($type_ID, $currentData, $custom_Special) . '
      -
      ' . $custom_Name . '' . displayCustomField($type_ID, $currentData, $custom_Special) . '
      +       		+ + + + + + + + + + + + + + + + + + + + + + '; + echo ''; + } + ?> +
      : 
      : 
      : 
      : 
      ' . $custom_Name . '' . displayCustomField($type_ID, $currentData, $custom_Special) . '
      +

      +?> -: - - - - - - - - : +
      + + + + + + + - - - - - - - "> + + + + + + '; } - echo '
      - -
      -       		-   - -   -
      + +
      +       		+   + +   +
      '; -} -?> -
      -: - - +
      + : -//Was anything returned? -if (mysqli_num_rows($rsAssignedGroups) == 0) { - echo '

      ' . gettext('No group assignments.') . '

      '; -} else { - echo ''; - echo ''; - echo ''; - echo ''; + '; - echo ' '; - echo ' '; + //Was anything returned? + if (mysqli_num_rows($rsAssignedGroups) == 0) { + echo '

      ' . gettext('No group assignments.') . '

      '; + } else { + echo '
      ' . gettext('Group Name') . ''; - echo '' . gettext('Role') . '
      ' . $grp_Name . '' . gettext($roleName) . '
      '; + echo ''; + echo ''; echo ''; - // If this group has associated special properties, display those with values and prop_PersonDisplay flag set. - if ($grp_hasSpecialProps) { - $firstRow = true; - // Get the special properties for this group - $sSQL = 'SELECT groupprop_master.* FROM groupprop_master - WHERE grp_ID = ' . $grp_ID . " AND prop_PersonDisplay = 'true' ORDER BY prop_ID"; - $rsPropList = RunQuery($sSQL); - - $sSQL = 'SELECT * FROM groupprop_' . $grp_ID . ' WHERE per_ID = ' . $iPersonID; - $rsPersonProps = RunQuery($sSQL); - $aPersonProps = mysqli_fetch_array($rsPersonProps, MYSQLI_BOTH); - - while ($aProps = mysqli_fetch_array($rsPropList)) { - extract($aProps); - $currentData = trim($aPersonProps[$prop_Field]); - if (strlen($currentData) > 0) { - // only create the properties table if it's actually going to be used - if ($firstRow) { - echo ''; - } - } - $sAssignedGroups .= $grp_ID . ','; + $sAssignedGroups .= $grp_ID . ','; + } + echo '
      ' . gettext('Group Name') . ''; + echo '' . gettext('Role') . '
      '; - echo ''; - $firstRow = false; - } - $sRowClass = AlternateRowStyle($sRowClass); - if ($type_ID == 11) { - $prop_Special = $sCountry; + //Loop through the rows + while ($aRow = mysqli_fetch_array($rsAssignedGroups)) { + extract($aRow); + + //Alternate the row style + $sRowClass = AlternateRowStyle($sRowClass); + + // DISPLAY THE ROW + echo ''; + echo ' '; + echo ' '; + echo ''; + + // If this group has associated special properties, display those with values and prop_PersonDisplay flag set. + if ($grp_hasSpecialProps) { + $firstRow = true; + // Get the special properties for this group + $sSQL = 'SELECT groupprop_master.* FROM groupprop_master + WHERE grp_ID = ' . $grp_ID . " AND prop_PersonDisplay = 'true' ORDER BY prop_ID"; + $rsPropList = RunQuery($sSQL); + + $sSQL = 'SELECT * FROM groupprop_' . $grp_ID . ' WHERE per_ID = ' . $iPersonID; + $rsPersonProps = RunQuery($sSQL); + $aPersonProps = mysqli_fetch_array($rsPersonProps, MYSQLI_BOTH); + + while ($aProps = mysqli_fetch_array($rsPropList)) { + extract($aProps); + $currentData = trim($aPersonProps[$prop_Field]); + if (strlen($currentData) > 0) { + // only create the properties table if it's actually going to be used + if ($firstRow) { + echo ''; } } - if (!$firstRow) { - echo '
      PropertyValue
      ' . $grp_Name . '' . gettext($roleName) . '
      '; + echo ''; + $firstRow = false; + } + $sRowClass = AlternateRowStyle($sRowClass); + if ($type_ID == 11) { + $prop_Special = $sCountry; + } + echo "'; } - echo "'; + } + if (!$firstRow) { + echo '
      PropertyValue
      " . $prop_Name . '' . displayCustomField($type_ID, $currentData, $prop_Special) . '
      " . $prop_Name . '' . displayCustomField($type_ID, $currentData, $prop_Special) . '
      '; } - echo ''; -} -?> -
      -: + ?> +
      + : -' . gettext('No property assignments.') . '

      '; -} else { - echo ''; - echo ''; - echo ''; - echo ''; + //Was anything returned? + if (mysqli_num_rows($rsAssignedProperties) == 0) { + echo '

      ' . gettext('No property assignments.') . '

      '; + } else { + echo '
      ' . gettext('Name') . ''; - echo '' . gettext('Value') . '
      '; + echo ''; + echo ''; + echo ''; - while ($aRow = mysqli_fetch_array($rsAssignedProperties)) { - $pro_Prompt = ''; - $r2p_Value = ''; - extract($aRow); + while ($aRow = mysqli_fetch_array($rsAssignedProperties)) { + $pro_Prompt = ''; + $r2p_Value = ''; + extract($aRow); - //Alternate the row style - $sRowClass = AlternateRowStyle($sRowClass); + //Alternate the row style + $sRowClass = AlternateRowStyle($sRowClass); - //Display the row - echo ''; - echo ''; - echo ''; + //Display the row + echo ''; + echo ''; + echo ''; - echo ''; + echo ''; - $sAssignedProperties .= $pro_ID . ','; + $sAssignedProperties .= $pro_ID . ','; + } + echo '
      ' . gettext('Name') . ''; + echo '' . gettext('Value') . '
      ' . gettext($pro_Name) . ' ' . $r2p_Value . ' 
      ' . gettext($pro_Name) . ' ' . $r2p_Value . ' 
      '; } - echo ''; -} -if (AuthenticationManager::getCurrentUser()->isNotesEnabled()) { - echo '

      ' . gettext('Notes:') . '

      '; + if (AuthenticationManager::getCurrentUser()->isNotesEnabled()) { + echo '

      ' . gettext('Notes:') . '

      '; - // Loop through all the notes - while ($aRow = mysqli_fetch_array($rsNotes)) { - extract($aRow); - echo '

      ' . $nte_Text . '

      '; - echo '' . gettext('Entered:') . FormatDate($nte_DateEntered, true) . '
      '; + // Loop through all the notes + while ($aRow = mysqli_fetch_array($rsNotes)) { + extract($aRow); + echo '

      ' . $nte_Text . '

      '; + echo '' . gettext('Entered:') . FormatDate($nte_DateEntered, true) . '
      '; - if (strlen($nte_DateLastEdited)) { - echo '' . gettext('Last Edited') . FormatDate($nte_DateLastEdited, true) . ' ' . gettext('by') . ' ' . $EditedFirstName . ' ' . $EditedLastName . '
      '; + if (strlen($nte_DateLastEdited)) { + echo '' . gettext('Last Edited') . FormatDate($nte_DateLastEdited, true) . ' ' . gettext('by') . ' ' . $EditedFirstName . ' ' . $EditedLastName . '
      '; + } } } -} -require 'Include/Footer-Short.php'; -?> + require 'Include/Footer-Short.php'; diff --git a/src/PropertyAssign.php b/src/PropertyAssign.php index a0dfdf2a41..f30d096516 100644 --- a/src/PropertyAssign.php +++ b/src/PropertyAssign.php @@ -1,17 +1,5 @@ @@ -189,5 +176,5 @@ function UpdateProperty($iRecordID, $sValue, $iPropertyID, $sAction) } echo '"' ?> name="Submit">

      - - +isMenuOptionsEnabled()); -//Set the page title $sPageTitle = gettext('Property Delete Confirmation'); // Get the Type and Property $sType = $_GET['Type']; $iPropertyID = InputUtils::legacyFilterInput($_GET['PropertyID'], 'int'); -//Do we have deletion confirmation? +// Do we have deletion confirmation? if (isset($_GET['Confirmed'])) { $sSQL = 'DELETE FROM property_pro WHERE pro_ID = ' . $iPropertyID; RunQuery($sSQL); @@ -37,7 +26,7 @@ RedirectUtils::redirect('PropertyList.php?Type=' . $sType); } -//Get the family record in question +// Get the family record in question $sSQL = 'SELECT * FROM property_pro WHERE pro_ID = ' . $iPropertyID; $rsProperty = RunQuery($sSQL); extract(mysqli_fetch_array($rsProperty)); @@ -65,5 +54,5 @@

      - - +' . gettext('You must enter a name') . ''; $bError = true; } - //Did they select a Type + // Did they select a Type if (strlen($iClass) < 1) { $sClassError = '
      ' . gettext('You must select a type') . ''; $bError = true; } - //If no errors, let's update + // If no errors, let's update if (!$bError) { - //Vary the SQL depending on if we're adding or editing + // Vary the SQL depending on if we're adding or editing if ($iPropertyID == 0) { $property = new Property(); $property @@ -100,17 +89,17 @@ $property->save(); } - //Route back to the list + // Route back to the list RedirectUtils::redirect('PropertyList.php?Type=' . $sType); } } else { if ($iPropertyID != 0) { - //Get the data on this property + // Get the data on this property $sSQL = 'SELECT * FROM property_pro WHERE pro_ID = ' . $iPropertyID; $rsProperty = mysqli_fetch_array(RunQuery($sSQL)); extract($rsProperty); - //Assign values locally + // Assign values locally $sName = $pro_Name; $sDescription = $pro_Description; $iType = $pro_prt_ID; @@ -123,7 +112,7 @@ } } -//Get the Property Types +// Get the Property Types $sSQL = "SELECT * FROM propertytype_prt WHERE prt_Class = '" . $sType . "' ORDER BY prt_Name"; $rsPropertyTypes = RunQuery($sSQL); @@ -181,5 +170,5 @@
    - - +' . gettext('Add a New') . ' ' . $sTypeName . ' ' . gettext('Property') . '

    '; } -//Start the table +// Start the table echo ""; echo ''; echo ''; @@ -69,18 +58,18 @@ echo ''; -//Initialize the row shading +// Initialize the row shading $sRowClass = 'RowColorA'; $iPreviousPropertyType = -1; $sBlankLine = ''; -//Loop through the records +// Loop through the records while ($aRow = mysqli_fetch_array($rsProperties)) { $pro_Prompt = ''; $pro_Description = ''; extract($aRow); - //Did the Type change? + // Did the Type change? if ($iPreviousPropertyType != $prt_ID) { //Write the header row echo $sBlankLine; @@ -107,13 +96,10 @@ } echo ''; - //Store the PropertyType + // Store the PropertyType $iPreviousPropertyType = $prt_ID; } -//End the table echo '
    ' . gettext('Name') . '
     
    '; require 'Include/Footer.php'; - -?> diff --git a/src/PropertyTypeDelete.php b/src/PropertyTypeDelete.php index 70e119bc90..11d43337c5 100644 --- a/src/PropertyTypeDelete.php +++ b/src/PropertyTypeDelete.php @@ -1,15 +1,5 @@ isMenuOptionsEnabled()); -//Set the page title $sPageTitle = gettext('Property Type Delete Confirmation'); -//Get the PersonID from the querystring +// Get the PersonID from the querystring $iPropertyTypeID = InputUtils::legacyFilterInput($_GET['PropertyTypeID'], 'int'); -//Do we have deletion confirmation? +// Do we have deletion confirmation? if (isset($_GET['Confirmed'])) { $sSQL = 'DELETE FROM propertytype_prt WHERE prt_ID = ' . $iPropertyTypeID; RunQuery($sSQL); @@ -69,5 +58,5 @@

    - - +isMenuOptionsEnabled()); -//Set the page title $sPageTitle = gettext('Property Type Editor'); -//Get the PropertyID +// Get the PropertyID $iPropertyTypeID = 0; if (array_key_exists('PropertyTypeID', $_GET)) { $iPropertyTypeID = InputUtils::legacyFilterInput($_GET['PropertyTypeID'], 'int'); @@ -33,40 +22,39 @@ $sNameError = ''; $bError = false; -//Was the form submitted? if (isset($_POST['Submit'])) { $sName = InputUtils::legacyFilterInput($_POST['Name']); $sDescription = InputUtils::legacyFilterInput($_POST['Description']); $sClass = InputUtils::legacyFilterInput($_POST['Class'], 'char', 1); - //Did they enter a name? + // Did they enter a name? if (strlen($sName) < 1) { $sNameError = '' . gettext('You must enter a name') . ''; $bError = true; } - //If no errors, let's update + // If no errors, let's update if (!$bError) { - //Vary the SQL depending on if we're adding or editing + // Vary the SQL depending on if we're adding or editing if ($iPropertyTypeID == '') { $sSQL = "INSERT INTO propertytype_prt (prt_Class,prt_Name,prt_Description) VALUES ('" . $sClass . "','" . $sName . "','" . $sDescription . "')"; } else { $sSQL = "UPDATE propertytype_prt SET prt_Class = '" . $sClass . "', prt_Name = '" . $sName . "', prt_Description = '" . $sDescription . "' WHERE prt_ID = " . $iPropertyTypeID; } - //Execute the SQL + // Execute the SQL RunQuery($sSQL); - //Route back to the list + // Route back to the list RedirectUtils::redirect('PropertyTypeList.php'); } } elseif ($iPropertyTypeID > 0) { - //Get the data on this property + // Get the data on this property $sSQL = 'SELECT * FROM propertytype_prt WHERE prt_ID = ' . $iPropertyTypeID; $rsProperty = mysqli_fetch_array(RunQuery($sSQL)); extract($rsProperty); - //Assign values locally + // Assign values locally $sName = $prt_Name; $sDescription = $prt_Description; $sClass = $prt_Class; @@ -116,5 +104,5 @@
    - - +" . gettext('Add a New Property Type') . '

    '; } -//Start the table +// Start the table echo ""; echo ''; echo ''; @@ -48,10 +37,10 @@ } echo ''; -//Initialize the row shading +// Initialize the row shading $sRowClass = 'RowColorA'; -//Loop through the records +// Loop through the records while ($aRow = mysqli_fetch_array($rsPropertyTypes)) { extract($aRow); @@ -83,9 +72,6 @@ echo ''; } -//End the table echo '
    ' . gettext('Name') . '
    '; require 'Include/Footer.php'; - -?> diff --git a/src/PropertyUnassign.php b/src/PropertyUnassign.php index 0d31055744..0f09a4c63b 100644 --- a/src/PropertyUnassign.php +++ b/src/PropertyUnassign.php @@ -1,15 +1,5 @@ : - @@ -110,5 +98,5 @@ - - + - -
    :
    - - -
    - -

    - -

    -

    - -

    +
    + + + + + +
    +
    + +

    + +

    +

    + +

    name != 'AddToCart') { echo ' - ' . $fieldInfo->name . ' - '; + ' . $fieldInfo->name . ' + '; } } @@ -165,14 +155,17 @@ function RunFreeQuery(string $sSQL, &$rsQueryResults) echo ''; echo '

    '; - if ($aHiddenFormField && count($aHiddenFormField) > 0) { // TODO Don't post to CartView.php?> -

    - -   -   - -

    - 0) { // TODO Don't post to CartView.php +?> +
    +

    + +   +   + +

    +
    +' . gettext('Return to Query Menu') . '

    '; @@ -181,5 +174,3 @@ function RunFreeQuery(string $sSQL, &$rsQueryResults) } require 'Include/Footer.php'; - -?> diff --git a/src/QueryView.php b/src/QueryView.php index 610f8d409d..c51c1c511a 100644 --- a/src/QueryView.php +++ b/src/QueryView.php @@ -1,16 +1,5 @@ $qrp_NumericMax) { - //Is it less than the maximum? + // Is it less than the maximum? $bError = true; $aErrorText[$qrp_Alias] = gettext('This value cannot be more than ') . $qrp_NumericMax; } @@ -116,14 +103,14 @@ function ValidateInput() $vPOST[$qrp_Alias] = InputUtils::legacyFilterInput($_POST[$qrp_Alias], 'int'); break; - //Alpha validation + // Alpha validation case 'a': - //Is the length less than the maximum? + // Is the length less than the maximum? if (strlen($_POST[$qrp_Alias]) > $qrp_AlphaMaxLength) { $bError = true; $aErrorText[$qrp_Alias] = gettext('This value cannot be more than ') . $qrp_AlphaMaxLength . gettext(' characters long'); } elseif (strlen($_POST[$qrp_Alias]) < $qrp_AlphaMinLength) { - //is the length more than the minimum? + // Is the length more than the minimum? $bError = true; $aErrorText[$qrp_Alias] = gettext('This value cannot be less than ') . $qrp_AlphaMinLength . gettext(' characters long'); } @@ -139,36 +126,36 @@ function ValidateInput() } } -//Loops through the list of parameters and replaces their alias in the SQL with the value given for the parameter +// Loops through the list of parameters and replaces their alias in the SQL with the value given for the parameter function ProcessSQL() { global $vPOST; global $qry_SQL; global $rsParameters; - //Loop through the list of parameters + // Loop through the list of parameters if (mysqli_num_rows($rsParameters)) { mysqli_data_seek($rsParameters, 0); } while ($aRow = mysqli_fetch_array($rsParameters)) { extract($aRow); - //Debugging code - //echo "--" . $qry_SQL . "
    --" . "~" . $qrp_Alias . "~" . "
    --" . $vPOST[$qrp_Alias] . "

    "; + // Debugging code + // echo "--" . $qry_SQL . "
    --" . "~" . $qrp_Alias . "~" . "
    --" . $vPOST[$qrp_Alias] . "

    "; - //Replace the placeholder with the parameter value + // Replace the placeholder with the parameter value $qrp_Value = is_array($vPOST[$qrp_Alias]) ? implode(',', $vPOST[$qrp_Alias]) : $vPOST[$qrp_Alias]; $qry_SQL = str_replace('~' . $qrp_Alias . '~', $qrp_Value, $qry_SQL); } } -//Checks if a count is to be displayed, and displays it if required +// Checks if a count is to be displayed, and displays it if required function DisplayRecordCount() { global $qry_Count; global $rsQueryResults; - //Are we supposed to display a count for this query? + // Are we supposed to display a count for this query? if ($qry_Count == 1) { //Display the count of the recordset echo '

    '; @@ -177,7 +164,7 @@ function DisplayRecordCount() } } -//Runs the parameterized SQL and display the results +// Runs the parameterized SQL and display the results function DoQuery() { global $cnInfoCentral; @@ -188,7 +175,7 @@ function DoQuery() global $qry_Name; global $qry_Count; - //Run the SQL + // Run the SQL $rsQueryResults = RunQuery($qry_SQL); ?>

    @@ -201,9 +188,9 @@ function DoQuery() name != 'AddToCart') { echo ''; @@ -217,12 +204,12 @@ function DoQuery() $aAddToCartIDs = []; while ($aRow = mysqli_fetch_array($rsQueryResults)) { - //Alternate the background color of the row + // Alternate the background color of the row $sRowClass = AlternateRowStyle($sRowClass); echo ''; - //Loop through the fields and write each one + // Loop through the fields and write each one for ($iCount = 0; $iCount < mysqli_num_fields($rsQueryResults); $iCount++) { // If this field is called "AddToCart", add a cart button to the form $fieldInfo = mysqli_fetch_field_direct($rsQueryResults, $iCount); @@ -240,8 +227,8 @@ function DoQuery() $aAddToCartIDs[] = $aRow[$iCount]; } else { - //...otherwise just render the field - //Write the actual value of this row + // ...otherwise just render the field + // Write the actual value of this row echo ''; } } @@ -296,8 +283,7 @@ function DoQuery() ' . gettext($qrp_Description) . ''; switch ($qrp_Type) { - //Standard INPUT box + // Standard INPUT box case 0: $input = ''; break; - //SELECT box with OPTION tags supplied in the queryparameteroptions_qpo table + // SELECT box with OPTION tags supplied in the queryparameteroptions_qpo table case 1: - //Get the query parameter options for this parameter + // Get the query parameter options for this parameter $sSQL = 'SELECT * FROM queryparameteroptions_qpo WHERE qpo_qrp_ID = ' . $qrp_ID; $rsParameterOptions = RunQuery($sSQL); $input = ''; break; - //SELECT box with OPTION tags provided via a SQL query + // SELECT box with OPTION tags provided via a SQL query case 2: - //Run the SQL to get the options + // Run the SQL to get the options $rsParameterOptions = RunQuery($qrp_OptionSQL); $input .= ''; @@ -389,7 +374,7 @@ function getQueryFormInput($queryParameters) return '
    ' . $label . $input . $helpBlock . '
    '; } -//Displays a form to enter values for each parameter, creating INPUT boxes and SELECT drop-downs as necessary +// Displays a form to enter values for each parameter, creating INPUT boxes and SELECT drop-downs as necessary function DisplayParameterForm() { global $rsParameters; @@ -403,7 +388,7 @@ function DisplayParameterForm() diff --git a/src/ReminderReport.php b/src/ReminderReport.php index d47406fa0a..6a567e16b3 100644 --- a/src/ReminderReport.php +++ b/src/ReminderReport.php @@ -1,14 +1,5 @@ diff --git a/src/Reports/AdvancedDeposit.php b/src/Reports/AdvancedDeposit.php index 9c456e7319..160867980f 100644 --- a/src/Reports/AdvancedDeposit.php +++ b/src/Reports/AdvancedDeposit.php @@ -1,13 +1,5 @@ headings($curY); @@ -512,10 +500,7 @@ public function finishPage($page): void $curY += 2 * $summaryIntervalY; $page = $pdf->pageBreak($page); } elseif ($sort === 'fund') { - // ********************** // Sort by Fund Report - // ********************** - if ($detail_level === 'detail') { $curY = $pdf->headings($curY); } @@ -676,10 +661,7 @@ public function finishPage($page): void } $page = $pdf->pageBreak($page); } elseif ($sort === 'family') { - // ********************** // Sort by Family Report - // ********************** - while ($aRow = mysqli_fetch_array($rsReport)) { extract($aRow); if (!$fun_ID) { diff --git a/src/Reports/ConfirmReport.php b/src/Reports/ConfirmReport.php index e39f6b8002..3b33e47cd0 100644 --- a/src/Reports/ConfirmReport.php +++ b/src/Reports/ConfirmReport.php @@ -1,14 +1,5 @@ getId() . ' ORDER BY per_fmr_ID'; + LEFT JOIN list_lst cls ON per_cls_ID = cls.lst_OptionID AND cls.lst_ID = 1 + LEFT JOIN list_lst fmr ON per_fmr_ID = fmr.lst_OptionID AND fmr.lst_ID = 2 + WHERE per_fam_ID = ' . $family->getId() . ' ORDER BY per_fmr_ID'; $rsFamilyMembers = RunQuery($sSQL); $XName = 10; @@ -318,11 +309,11 @@ public function finishPage($curY): void // Get the Groups this Person is assigned to $sSQL = 'SELECT grp_ID, grp_Name, grp_hasSpecialProps, role.lst_OptionName AS roleName - FROM group_grp - LEFT JOIN person2group2role_p2g2r ON p2g2r_grp_ID = grp_ID - LEFT JOIN list_lst role ON lst_OptionID = p2g2r_rle_ID AND lst_ID = grp_RoleListID - WHERE person2group2role_p2g2r.p2g2r_per_ID = ' . $per_ID . ' - ORDER BY grp_Name'; + FROM group_grp + LEFT JOIN person2group2role_p2g2r ON p2g2r_grp_ID = grp_ID + LEFT JOIN list_lst role ON lst_OptionID = p2g2r_rle_ID AND lst_ID = grp_RoleListID + WHERE person2group2role_p2g2r.p2g2r_per_ID = ' . $per_ID . ' + ORDER BY grp_Name'; $rsAssignedGroups = RunQuery($sSQL); if (mysqli_num_rows($rsAssignedGroups) > 0) { $groupStr = 'Assigned groups for ' . $per_FirstName . ' ' . $per_LastName . ': '; diff --git a/src/Reports/ConfirmReportEmail.php b/src/Reports/ConfirmReportEmail.php index c7d115a558..06173d276b 100644 --- a/src/Reports/ConfirmReportEmail.php +++ b/src/Reports/ConfirmReportEmail.php @@ -1,14 +1,5 @@ 0) { $groupStr = 'Assigned groups for ' . $per_FirstName . ' ' . $per_LastName . ': '; diff --git a/src/Reports/FRCatalog.php b/src/Reports/FRCatalog.php index 40044b69ec..4d02f9ad63 100644 --- a/src/Reports/FRCatalog.php +++ b/src/Reports/FRCatalog.php @@ -1,14 +1,5 @@ 0) { $selectOneCrit = ' AND pn_ID=' . $iPaddleNumID . ' '; } else { @@ -29,7 +20,7 @@ $sSQL = 'SELECT pn_ID, pn_fr_ID, pn_Num, pn_per_ID, a.per_FirstName as paddleFirstName, a.per_LastName as paddleLastName, a.per_Email as paddleEmail, - b.fam_ID, b.fam_Name, b.fam_Address1, b.fam_Address2, b.fam_City, b.fam_State, b.fam_Zip, b.fam_Country + b.fam_ID, b.fam_Name, b.fam_Address1, b.fam_Address2, b.fam_City, b.fam_State, b.fam_Zip, b.fam_Country FROM paddlenum_pn LEFT JOIN person_per a ON pn_per_ID=a.per_ID LEFT JOIN family_fam b ON fam_ID = a.per_fam_ID @@ -104,13 +95,13 @@ public function cellWithWrap($curY, $curNewY, $ItemWid, $tableCellY, $txt, $bdr, // Get donated items and make the table $sSQL = 'SELECT di_item, di_title, di_buyer_id, di_sellprice, - a.per_FirstName as buyerFirstName, - a.per_LastName as buyerLastName, - a.per_Email as buyerEmail, - b.fam_homephone as buyerPhone - FROM donateditem_di LEFT JOIN person_per a on a.per_ID = di_buyer_id - LEFT JOIN family_fam b on a.per_fam_id = b.fam_id - WHERE di_FR_ID = ' . $iFundRaiserID . ' AND di_donor_id = ' . $pn_per_ID; + a.per_FirstName as buyerFirstName, + a.per_LastName as buyerLastName, + a.per_Email as buyerEmail, + b.fam_homephone as buyerPhone + FROM donateditem_di LEFT JOIN person_per a on a.per_ID = di_buyer_id + LEFT JOIN family_fam b on a.per_fam_id = b.fam_id + WHERE di_FR_ID = ' . $iFundRaiserID . ' AND di_donor_id = ' . $pn_per_ID; $rsDonatedItems = RunQuery($sSQL); $pdf->SetXY(SystemConfig::getValue('leftX'), $curY); @@ -148,13 +139,13 @@ public function cellWithWrap($curY, $curNewY, $ItemWid, $tableCellY, $txt, $bdr, // Get individual auction items first $sSQL = 'SELECT di_item, di_title, di_donor_id, di_sellprice, - a.per_FirstName as donorFirstName, - a.per_LastName as donorLastName, - a.per_Email as donorEmail, - b.fam_homePhone as donorPhone - FROM donateditem_di LEFT JOIN person_per a on a.per_ID = di_donor_id - LEFT JOIN family_fam b on a.per_fam_id=b.fam_id - WHERE di_FR_ID = ' . $iFundRaiserID . ' AND di_buyer_id = ' . $pn_per_ID; + a.per_FirstName as donorFirstName, + a.per_LastName as donorLastName, + a.per_Email as donorEmail, + b.fam_homePhone as donorPhone + FROM donateditem_di LEFT JOIN person_per a on a.per_ID = di_donor_id + LEFT JOIN family_fam b on a.per_fam_id=b.fam_id + WHERE di_FR_ID = ' . $iFundRaiserID . ' AND di_buyer_id = ' . $pn_per_ID; $rsPurchasedItems = RunQuery($sSQL); $pdf->SetXY(SystemConfig::getValue('leftX'), $curY); diff --git a/src/Reports/GroupReport.php b/src/Reports/GroupReport.php index 159cde612d..60443502ee 100644 --- a/src/Reports/GroupReport.php +++ b/src/Reports/GroupReport.php @@ -47,14 +47,14 @@ $bHasProps = (mysqli_num_rows($rsProps) > 0); $sSQL = 'SELECT * FROM person_per - LEFT JOIN family_fam ON per_fam_ID = fam_ID '; + LEFT JOIN family_fam ON per_fam_ID = fam_ID '; if ($bHasProps) { $sSQL .= 'LEFT JOIN groupprop_' . $iGroupID . ' ON groupprop_' . $iGroupID . '.per_ID = person_per.per_ID '; } $sSQL .= 'LEFT JOIN person2group2role_p2g2r ON p2g2r_per_ID = person_per.per_ID - WHERE p2g2r_grp_ID = ' . $iGroupID; + WHERE p2g2r_grp_ID = ' . $iGroupID; if ($iRoleID > 0) { $sSQL .= ' AND p2g2r_rle_ID = ' . $iRoleID; diff --git a/src/Reports/PledgeSummary.php b/src/Reports/PledgeSummary.php index 72c8783c3c..ae1a383652 100644 --- a/src/Reports/PledgeSummary.php +++ b/src/Reports/PledgeSummary.php @@ -52,8 +52,8 @@ // Get pledges and payments for this fiscal year $sSQL = 'SELECT plg_plgID, plg_FYID, plg_amount, plg_PledgeOrPayment, plg_fundID, plg_famID, b.fun_Name AS fundName, b.fun_Active AS fundActive FROM pledge_plg - LEFT JOIN donationfund_fun b ON plg_fundID = b.fun_ID - WHERE plg_FYID = ' . $iFYID; + LEFT JOIN donationfund_fun b ON plg_fundID = b.fun_ID + WHERE plg_FYID = ' . $iFYID; // Filter by Fund if (!empty($_POST['funds'])) { diff --git a/src/Reports/PrintDeposit.php b/src/Reports/PrintDeposit.php index 62e45df98b..5f6a60cecd 100644 --- a/src/Reports/PrintDeposit.php +++ b/src/Reports/PrintDeposit.php @@ -1,18 +1,5 @@ = '$startdate' AND plg_date < '$enddate'"; + WHERE plg_FamID = ' . $fam_ID . " AND plg_PledgeOrPayment = 'Payment' AND + plg_date >= '$startdate' AND plg_date < '$enddate'"; $rsPledges = RunQuery($sSQL); [$count] = mysqli_fetch_row($rsPledges); if ($count > 0) { @@ -79,9 +79,9 @@ public function __construct() //Get the family members for this family $sSQL = 'SELECT per_FirstName, per_LastName, cls.lst_OptionName AS sClassName - FROM person_per - INNER JOIN list_lst cls ON per_cls_ID = cls.lst_OptionID AND cls.lst_ID = 1 - WHERE per_fam_ID = ' . $fam_ID . " AND cls.lst_OptionName='" . gettext('Member') . "'"; + FROM person_per + INNER JOIN list_lst cls ON per_cls_ID = cls.lst_OptionID AND cls.lst_ID = 1 + WHERE per_fam_ID = ' . $fam_ID . " AND cls.lst_OptionName='" . gettext('Member') . "'"; $rsFamilyMembers = RunQuery($sSQL); diff --git a/src/RestoreDatabase.php b/src/RestoreDatabase.php index 2dfc6ec459..6d5ea19bf5 100644 --- a/src/RestoreDatabase.php +++ b/src/RestoreDatabase.php @@ -1,18 +1,5 @@ @@ -94,7 +80,5 @@ return false; }); - diff --git a/src/SelectDelete.php b/src/SelectDelete.php index fc61ad4007..34254790d5 100644 --- a/src/SelectDelete.php +++ b/src/SelectDelete.php @@ -1,20 +1,5 @@ isDeleteRecordsEnabled()); -// default values to make the newer versions of php happy $iFamilyID = 0; $iDonationFamilyID = 0; $sMode = 'family'; @@ -39,9 +21,11 @@ if (!empty($_GET['FamilyID'])) { $iFamilyID = InputUtils::legacyFilterInput($_GET['FamilyID'], 'int'); } + if (!empty($_GET['DonationFamilyID'])) { $iDonationFamilyID = InputUtils::legacyFilterInput($_GET['DonationFamilyID'], 'int'); } + if (!empty($_GET['mode'])) { $sMode = $_GET['mode']; } @@ -56,12 +40,12 @@ if (AuthenticationManager::getCurrentUser()->isFinanceEnabled() && isset($_GET['MoveDonations']) && $iFamilyID && $iDonationFamilyID && $iFamilyID != $iDonationFamilyID) { $today = date('Y-m-d'); $sSQL = "UPDATE pledge_plg SET plg_FamID='$iDonationFamilyID', - plg_DateLastEdited ='$today', plg_EditedBy='" . AuthenticationManager::getCurrentUser()->getId() + plg_DateLastEdited ='$today', plg_EditedBy='" . AuthenticationManager::getCurrentUser()->getId() . "' WHERE plg_FamID='$iFamilyID'"; RunQuery($sSQL); $sSQL = "UPDATE egive_egv SET egv_famID='$iDonationFamilyID', - egv_DateLastEdited ='$today', egv_EditedBy='" . AuthenticationManager::getCurrentUser()->getId() + egv_DateLastEdited ='$today', egv_EditedBy='" . AuthenticationManager::getCurrentUser()->getId() . "' WHERE egv_famID='$iFamilyID'"; RunQuery($sSQL); @@ -122,7 +106,6 @@ RedirectUtils::redirect(SystemURLs::getRootPath() . '/v2/family'); } - //Get the family record in question $sSQL = 'SELECT * FROM family_fam WHERE fam_ID = ' . $iFamilyID; $rsFamily = RunQuery($sSQL); @@ -205,96 +188,96 @@ echo '

    '; //Get the pledges for this family $sSQL = 'SELECT plg_plgID, plg_FYID, plg_date, plg_amount, plg_schedule, plg_method, - plg_comment, plg_DateLastEdited, plg_PledgeOrPayment, a.per_FirstName AS EnteredFirstName, a.Per_LastName AS EnteredLastName, b.fun_Name AS fundName - FROM pledge_plg - LEFT JOIN person_per a ON plg_EditedBy = a.per_ID - LEFT JOIN donationfund_fun b ON plg_fundID = b.fun_ID - WHERE plg_famID = ' . $iFamilyID . ' ORDER BY pledge_plg.plg_date'; + plg_comment, plg_DateLastEdited, plg_PledgeOrPayment, a.per_FirstName AS EnteredFirstName, a.Per_LastName AS EnteredLastName, b.fun_Name AS fundName + FROM pledge_plg + LEFT JOIN person_per a ON plg_EditedBy = a.per_ID + LEFT JOIN donationfund_fun b ON plg_fundID = b.fun_ID + WHERE plg_famID = ' . $iFamilyID . ' ORDER BY pledge_plg.plg_date'; $rsPledges = RunQuery($sSQL); ?> -
    ' . $fieldInfo->name . '
    ' . $aRow[$iCount] . '
    - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - '; - } else { - // No Donations from family. Normal delete confirmation - echo $DonationMessage; - echo "

    " . gettext('Please confirm deletion of this family record:') . '
    '; - 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 ' ' . $fam_Name; - echo '

    '; - echo '
    ' . gettext('Family Members:') . '
      '; - //List Family Members - $sSQL = 'SELECT * FROM person_per WHERE per_fam_ID = ' . $iFamilyID; - $rsPerson = RunQuery($sSQL); - while ($aRow = mysqli_fetch_array($rsPerson)) { - extract($aRow); - echo '
    • ' . $per_FirstName . ' ' . $per_LastName . '
      • '; - RunQuery($sSQL); + + if ($plg_PledgeOrPayment === 'Payment') { + if ($tog) { + $sRowClass = 'PaymentRowColorA'; + } else { + $sRowClass = 'PaymentRowColorB'; + } + } ?> +
    + + + + + + + + + + + + '; + } else { + // No Donations from family. Normal delete confirmation + echo $DonationMessage; + echo "

    " . gettext('Please confirm deletion of this family record:') . '
    '; + 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 ' ' . $fam_Name; + echo '

    '; + echo '
    ' . gettext('Family Members:') . '
      '; + //List Family Members + $sSQL = 'SELECT * FROM person_per WHERE per_fam_ID = ' . $iFamilyID; + $rsPerson = RunQuery($sSQL); + while ($aRow = mysqli_fetch_array($rsPerson)) { + extract($aRow); + echo '
    • ' . $per_FirstName . ' ' . $per_LastName . '
      • '; + RunQuery($sSQL); + } + echo '
    '; + echo "

    ' . gettext('Delete Family Record ONLY') . ' '; + echo "' . gettext('Delete Family Record AND Family Members') . ' '; + echo "' . gettext('No, cancel this deletion') . '

    '; } - echo ''; - echo "

    ' . gettext('Delete Family Record ONLY') . ' '; - echo "' . gettext('Delete Family Record AND Family Members') . ' '; - echo "' . gettext('No, cancel this deletion') . '

    '; - } - ?> + ?> - - +
    - -
    -
              
              
    - - - - -isAdmin())) { - continue; - } // Don't show rows that can't be changed : BUG, you must continue the loop, and not break it PL - - // Cancel, Save Buttons every 13 rows - if ($r == 13) { - echo " - "; - $r = 1; - } - - // Variable Name & Type - echo ''; - - // Current Value - if ($ucfg_type == 'text') { - echo ""; - } elseif ($ucfg_type == 'textarea') { - echo "'; - } elseif ($ucfg_type == 'number' || $ucfg_type == 'date') { - echo '"; - } elseif ($ucfg_type == 'boolean') { - if ($ucfg_value) { - $sel2 = 'SELECTED'; - $sel1 = ''; - } else { - $sel1 = 'SELECTED'; - $sel2 = ''; - } - echo "'; - } - - // Notes - echo ''; - $r++; -} -?> - - - - - - -
      - -
    ' . $ucfg_name; - echo ' - - ' . gettext($ucfg_tooltip) . '
      - - -
    -
    - +
    +
    + + + + + + + isAdmin())) { + continue; + } // Don't show rows that can't be changed : BUG, you must continue the loop, and not break it PL + + // Cancel, Save Buttons every 13 rows + if ($r == 13) { + echo " + "; + $r = 1; + } + + // Variable Name & Type + echo ''; + + // Current Value + if ($ucfg_type == 'text') { + echo ""; + } elseif ($ucfg_type == 'textarea') { + echo "'; + } elseif ($ucfg_type == 'number' || $ucfg_type == 'date') { + echo '"; + } elseif ($ucfg_type == 'boolean') { + if ($ucfg_value) { + $sel2 = 'SELECTED'; + $sel1 = ''; + } else { + $sel1 = 'SELECTED'; + $sel2 = ''; + } + echo "'; + } + + // Notes + echo ''; + $r++; + } + ?> + + + + + +
    +
      + +
    ' . $ucfg_name; + echo ' + + ' . gettext($ucfg_tooltip) . '
      + + +
    +
    +
    diff --git a/src/SettingsUser.php b/src/SettingsUser.php index adb99994b5..4ca7b345fb 100644 --- a/src/SettingsUser.php +++ b/src/SettingsUser.php @@ -1,19 +1,5 @@
    -
    -
    '); ?>
    -
    - - - - - - - - - '; - $r = 1; - } - - // Default Permissions - if ($ucfg_permission == 'TRUE') { - $sel2 = 'SELECTED '; - $sel1 = ''; - } else { - $sel1 = 'SELECTED '; - $sel2 = ''; - } - echo " + + +
      - -
    + + + + + + + + '; + $r = 1; + } + + // Default Permissions + if ($ucfg_permission == 'TRUE') { + $sel2 = 'SELECTED '; + $sel1 = ''; + } else { + $sel1 = 'SELECTED '; + $sel2 = ''; + } + echo "'; - // Variable Name & Type - echo ""; + // Variable Name & Type + echo ""; - // Current Value - if ($ucfg_type == 'text') { - echo "'; - } elseif ($ucfg_type == 'textarea') { - echo "'; - } elseif ($ucfg_type == 'number' || $ucfg_type == 'date') { - echo "'; + } elseif ($ucfg_type == 'number' || $ucfg_type == 'date') { + echo ""; - } elseif ($ucfg_type == 'boolean') { - if ($ucfg_value) { - $sel2 = 'SELECTED '; - $sel1 = ''; - } else { - $sel1 = 'SELECTED '; - $sel2 = ''; - } - echo "'; - } + } - // Notes - echo "'; - $r++; -} - -?> - - - -
      + +
    $ucfg_name$ucfg_name + // Current Value + if ($ucfg_type == 'text') { + echo " - + } elseif ($ucfg_type == 'textarea') { + echo " + + } elseif ($ucfg_type == 'boolean') { + if ($ucfg_value) { + $sel2 = 'SELECTED '; + $sel1 = ''; + } else { + $sel1 = 'SELECTED '; + $sel2 = ''; + } + echo " + // Notes + echo " " . gettext($ucfg_tooltip) . '
    - - -
    - - - - + $r++; + } + + ?> +
    + + +
    +
    + + +
    - diff --git a/src/SystemDBUpdate.php b/src/SystemDBUpdate.php index 405567d2ce..26b20ca06a 100644 --- a/src/SystemDBUpdate.php +++ b/src/SystemDBUpdate.php @@ -29,7 +29,6 @@ } } -// Set the page title and include HTML header $sPageTitle = gettext('System Upgrade'); require 'Include/HeaderNotLoggedIn.php'; ?> @@ -37,10 +36,8 @@
    -

    426

    -

    diff --git a/src/SystemSettings.php b/src/SystemSettings.php index bc38a2fcaf..81c21512cb 100644 --- a/src/SystemSettings.php +++ b/src/SystemSettings.php @@ -1,16 +1,5 @@ - - - - +isAdmin() && SystemConfig::getValue('bCSVAdminOnly')); -// Set the page title and include HTML header $sPageTitle = gettext('Tax Report'); require 'Include/Header.php'; @@ -54,4 +43,5 @@
    - + +require 'Include/Footer.php'; diff --git a/src/UpgradeCRM.php b/src/UpgradeCRM.php index 458e1341ca..d1d0f79bd1 100644 --- a/src/UpgradeCRM.php +++ b/src/UpgradeCRM.php @@ -1,6 +1,5 @@ isAdmin()) { @@ -261,7 +259,6 @@ function downloadbutton(filename) { - - +find(); -// Set the page title and include HTML header $sPageTitle = gettext('System Users'); require 'Include/Header.php'; @@ -270,4 +251,5 @@ - + + require 'Include/Header.php'; +?>
    -
    :
    - - - - - - - - - - -
     
    +
    :
    + + + + + + + + + + + +
     
    findOneById($vol_ID); $volunteerOpp->setOrder($orderCounter); $volunteerOpp->save(); @@ -231,7 +225,7 @@ if (strlen($newFieldName) == 0) { $bNewNameError = true; } else { // Insert into table - // there must be an easier way to get the number of rows in order to generate the last order number. + // There must be an easier way to get the number of rows in order to generate the last order number. $sSQL = 'SELECT * FROM `volunteeropportunity_vol`'; $rsOpps = RunQuery($sSQL); $numRows = mysqli_num_rows($rsOpps); @@ -247,17 +241,17 @@ $bNewNameError = false; } } - // Get data for the form as it now exists.. + // Get data for the form as it now exists $sSQL = 'SELECT * FROM `volunteeropportunity_vol`'; $rsOpps = RunQuery($sSQL); $numRows = mysqli_num_rows($rsOpps); - // Create arrays of Vol Opps. + // Create arrays of Volunteer Opportunities for ($row = 1; $row <= $numRows; $row++) { $aRow = mysqli_fetch_array($rsOpps, MYSQLI_BOTH); extract($aRow); - $rowIndex = $vol_Order; // is this dangerous? the vol_Order field had better be correct. + $rowIndex = $vol_Order; // Is this dangerous? The vol_Order field had better be correct. $aIDFields[$rowIndex] = $vol_ID; $aNameFields[$rowIndex] = $vol_Name; $aDescFields[$rowIndex] = $vol_Description; @@ -265,174 +259,175 @@ } // Construct the form - ?> -
    -
    - - - - -
    - findOneById($aIDFields[$swapRow]); - $volunteerOpp->setOrder($newRow); - $volunteerOpp->save(); - } - - if (array_key_exists($newRow, $aIDFields)) { - $volunteerOpp = VolunteerOpportunityQuery::create()->findOneById($aIDFields[$newRow]); - $volunteerOpp->setOrder($swapRow); - $volunteerOpp->save(); - } - - // now update internal data to match - if (array_key_exists($swapRow, $aIDFields)) { - $saveID = $aIDFields[$swapRow]; - $saveName = $aNameFields[$swapRow]; - $saveDesc = $aDescFields[$swapRow]; - $aIDFields[$newRow] = $saveID; - $aNameFields[$newRow] = $saveName; - $aDescFields[$newRow] = $saveDesc; - } - - if (array_key_exists($newRow, $aIDFields)) { - $aIDFields[$swapRow] = $aIDFields[$newRow]; - $aNameFields[$swapRow] = $aNameFields[$newRow]; - $aDescFields[$swapRow] = $aDescFields[$newRow]; - } - } -} // end if GET - -?> - - - - - - - - - - - - - +
    + + +
    -
    -
    - '; - echo gettext('Invalid fields or selections. Changes not saved! Please correct and try again!'); - echo ''; - } - if (strlen($sDeleteError) > 0) { - echo '
    '; - echo $sDeleteError; - echo '
    '; - } - ?> -
    + + +
    + findOneById($aIDFields[$swapRow]); + $volunteerOpp->setOrder($newRow); + $volunteerOpp->save(); + } + + if (array_key_exists($newRow, $aIDFields)) { + $volunteerOpp = VolunteerOpportunityQuery::create()->findOneById($aIDFields[$newRow]); + $volunteerOpp->setOrder($swapRow); + $volunteerOpp->save(); + } + + // now update internal data to match + if (array_key_exists($swapRow, $aIDFields)) { + $saveID = $aIDFields[$swapRow]; + $saveName = $aNameFields[$swapRow]; + $saveDesc = $aDescFields[$swapRow]; + $aIDFields[$newRow] = $saveID; + $aNameFields[$newRow] = $saveName; + $aDescFields[$newRow] = $saveDesc; + } + + if (array_key_exists($newRow, $aIDFields)) { + $aIDFields[$swapRow] = $aIDFields[$newRow]; + $aNameFields[$swapRow] = $aNameFields[$newRow]; + $aDescFields[$swapRow] = $aDescFields[$newRow]; + } + } + } + ?> + + + + + + + + + + + + + + '; + echo ''; + echo '"; ?> + + + + + + + + + + + + + + + + + + +
    +
    +
    + '; + echo gettext('Invalid fields or selections. Changes not saved! Please correct and try again!'); + echo ''; + } + if (strlen($sDeleteError) > 0) { + echo '
    '; + echo $sDeleteError; + echo '
    '; + } + ?> +
    ' . $row . ''; + if ($row == 1) { + echo '"; + } else { + echo ' "; + } + if ($row != $numRows) { + echo ' "; + } else { + echo ' "; + } + + echo ' + +
    ' . gettext('You must enter a name') . ' '; + } ?> +     		+ +
    + + + + + + +
    + +   + +
    +     		+
    +
    +
    + + + + + + + + +
    +
    :
    + +
    ' . gettext('You must enter a name') . '    '; + } ?> +   +     		+
    :
    + +   +     		+ +
    +
    +
    +
    '; - echo '' . $row . ''; - echo ''; - if ($row == 1) { - echo '"; - } else { - echo ' "; - } - if ($row != $numRows) { - echo ' "; - } else { - echo ' "; - } - - echo ' "; ?> - - - -
    ' . gettext('You must enter a name') . ' '; - } ?> - - - - - - - - - - - - - - - - - -
    - -  - -
    - - - - -
    - - - - - - - - - - -
    -
    :
    - -
    ' . gettext('You must enter a name') . '    '; -} ?> -  -    		 -
    :
    - -  -    		 - -
    - - - - -
    - - +require 'Include/Footer.php'; diff --git a/src/WhyCameEditor.php b/src/WhyCameEditor.php index 3f7d8938e7..832e0e3d61 100644 --- a/src/WhyCameEditor.php +++ b/src/WhyCameEditor.php @@ -1,20 +1,5 @@
    - + $infoWindowAnchorY, ]; if ($iconShadowImage) { - $icon_info = array_merge($icon_info, ['shadow' => $iconShadowImage, - 'shadowWidth' => $_shadow_info[0], - 'shadowHeight' => $_shadow_info[1], ]); + $icon_info = array_merge($icon_info, [ + 'shadow' => $iconShadowImage, + 'shadowWidth' => $_shadow_info[0], + 'shadowHeight' => $_shadow_info[1], + ]); } return $icon_info; @@ -1755,16 +1758,16 @@ public function getHeaderJS() $_headerJS = ''; if ($this->mobile == true) { $_headerJS .= " - - "; + + "; } if (!empty($this->_elevation_polylines) || (!empty($this->_directions) && $this->elevation_directions)) { $_headerJS .= ""; $_headerJS .= " - "; + "; } $scriptUrl = 'https://maps.google.com/maps/api/js?sensor=' . (($this->mobile == true) ? 'true' : 'false'); if (is_array($this->api_options)) { @@ -1844,35 +1847,35 @@ public function getMapJS() $_output .= " * Original Link http://www.phpinsider.com/php/code/GoogleMapAPI/\n"; $_output .= " *************************************************/\n"; - // create global info window ( so we can auto close it ) + // Create global info window ( so we can auto close it ) $_script .= 'var infowindow = new google.maps.InfoWindow();'; if ($this->street_view_dom_id != '') { $_script .= ' - var panorama' . $this->street_view_dom_id . "$_key = ''; - "; + var panorama' . $this->street_view_dom_id . "$_key = ''; + "; if (!empty($this->_markers)) { $_script .= ' - var panorama' . $this->street_view_dom_id . "markers$_key = []; - "; + var panorama' . $this->street_view_dom_id . "markers$_key = []; + "; } } if (!empty($this->_markers)) { $_script .= " - var markers$_key = []; - "; + var markers$_key = []; + "; if ($this->sidebar) { $_script .= " - var sidebar_html$_key = ''; - var marker_html$_key = []; - "; + var sidebar_html$_key = ''; + var marker_html$_key = []; + "; } } if ($this->marker_clusterer) { $_script .= " - var markerClusterer$_key = null; - "; + var markerClusterer$_key = null; + "; } if ($this->directions) { $_script .= " @@ -1882,39 +1885,39 @@ public function getMapJS() } if (!empty($this->_directions)) { $_script .= " - var directions$_key = []; - "; + var directions$_key = []; + "; } //Polylines if (!empty($this->_polylines)) { $_script .= " - var polylines$_key = []; - var polylineCoords$_key = []; - "; + var polylines$_key = []; + var polylineCoords$_key = []; + "; if (!empty($this->_elevation_polylines)) { $_script .= " - var elevationPolylines$_key = []; - "; + var elevationPolylines$_key = []; + "; } } //Polygons if (!empty($this->_polygons)) { $_script .= " - var polygon$_key = []; - var polygonCoords$_key = []; - "; + var polygon$_key = []; + var polygonCoords$_key = []; + "; } //Elevation stuff if (!empty($this->_elevation_polylines) || (!empty($this->_directions) && $this->elevation_directions)) { $_script .= " - var elevationCharts$_key = []; - "; + var elevationCharts$_key = []; + "; } //Overlays if (!empty($this->_overlays)) { $_script .= " - var overlays$_key = []; - "; + var overlays$_key = []; + "; } //KML Overlays if (!empty($this->_kml_overlays)) { @@ -1928,16 +1931,16 @@ public function getMapJS() foreach ($this->_marker_icons as $icon_key => $icon_info) { //no need to check icon key here since that's already done with setters $_script .= ' - icon' . $_key . "['$icon_key'] = {}; - icon" . $_key . "['$icon_key'].image = new google.maps.MarkerImage('" . $icon_info['image'] . "', - // The size - new google.maps.Size(" . $icon_info['iconWidth'] . ', ' . $icon_info['iconHeight'] . '), - // The origin(sprite) - new google.maps.Point(0,0), - // The anchor - new google.maps.Point(' . $icon_info['iconAnchorX'] . ', ' . $icon_info['iconAnchorY'] . ') + icon' . $_key . "['$icon_key'] = {}; + icon" . $_key . "['$icon_key'].image = new google.maps.MarkerImage('" . $icon_info['image'] . "', + // The size + new google.maps.Size(" . $icon_info['iconWidth'] . ', ' . $icon_info['iconHeight'] . '), + // The origin(sprite) + new google.maps.Point(0,0), + // The anchor + new google.maps.Point(' . $icon_info['iconAnchorX'] . ', ' . $icon_info['iconAnchorY'] . ') ); - '; + '; if (isset($icon_info['shadow']) && $icon_info['shadow'] != '') { $_script .= ' icon' . $_key . "['$icon_key'].shadow = new google.maps.MarkerImage('" . $icon_info['shadow'] . "', @@ -1989,51 +1992,51 @@ public function getMapJS() $_script .= "if (mapObj$_key != 'undefined' && mapObj$_key != null) {\n"; $_script .= " - var mapOptions$_key = { - scrollwheel: " . ($this->scrollwheel ? 'true' : 'false') . ', - zoom: ' . $this->zoom . ', - mapTypeId: google.maps.MapTypeId.' . $this->map_type . ', - mapTypeControl: ' . ($this->type_controls ? 'true' : 'false') . ', - mapTypeControlOptions: {style: google.maps.MapTypeControlStyle.' . $this->type_controls_style . '} - }; - '; + var mapOptions$_key = { + scrollwheel: " . ($this->scrollwheel ? 'true' : 'false') . ', + zoom: ' . $this->zoom . ', + mapTypeId: google.maps.MapTypeId.' . $this->map_type . ', + mapTypeControl: ' . ($this->type_controls ? 'true' : 'false') . ', + mapTypeControlOptions: {style: google.maps.MapTypeControlStyle.' . $this->type_controls_style . '} + }; + '; if (isset($this->center_lat) && isset($this->center_lon)) { // Special care for decimal point in lon and lat, would get lost if "wrong" locale is set; applies to (s)printf only $_script .= ' - mapOptions' . $_key . '.center = new google.maps.LatLng( - ' . number_format($this->center_lat, 6, '.', '') . ', - ' . number_format($this->center_lon, 6, '.', '') . ' - ); - '; + mapOptions' . $_key . '.center = new google.maps.LatLng( + ' . number_format($this->center_lat, 6, '.', '') . ', + ' . number_format($this->center_lon, 6, '.', '') . ' + ); + '; } if ($this->street_view_controls) { $_script .= ' - mapOptions' . $_key . '.streetViewControl= true; + mapOptions' . $_key . '.streetViewControl= true; - '; + '; } // Add any map styles if they are present if (isset($this->map_styles)) { $_script .= " - var styles$_key = " . $this->map_styles . '; - '; + var styles$_key = " . $this->map_styles . '; + '; } $_script .= " - map$_key = new google.maps.Map(mapObj$_key,mapOptions$_key); - "; + map$_key = new google.maps.Map(mapObj$_key,mapOptions$_key); + "; $_script .= " - map$_key.setOptions({styles: styles$_key}); - "; + map$_key.setOptions({styles: styles$_key}); + "; if ($this->street_view_dom_id != '') { $_script .= ' - panorama' . $this->street_view_dom_id . "$_key = new google.maps.StreetViewPanorama(document.getElementById('" . $this->street_view_dom_id . "')); - map$_key.setStreetView(panorama" . $this->street_view_dom_id . "$_key); - "; + panorama' . $this->street_view_dom_id . "$_key = new google.maps.StreetViewPanorama(document.getElementById('" . $this->street_view_dom_id . "')); + map$_key.setStreetView(panorama" . $this->street_view_dom_id . "$_key); + "; if (!empty($this->_markers)) { //Add markers to the street view @@ -2044,12 +2047,12 @@ public function getMapJS() $last_id = count($this->_markers) - 1; $_script .= ' - panorama' . $this->street_view_dom_id . "$_key.setPosition(new google.maps.LatLng( - " . $this->_markers[$last_id]['lat'] . ', - ' . $this->_markers[$last_id]['lon'] . ' - )); - panorama' . $this->street_view_dom_id . "$_key.setVisible(true); - "; + panorama' . $this->street_view_dom_id . "$_key.setPosition(new google.maps.LatLng( + " . $this->_markers[$last_id]['lat'] . ', + ' . $this->_markers[$last_id]['lon'] . ' + )); + panorama' . $this->street_view_dom_id . "$_key.setVisible(true); + "; } } @@ -2117,16 +2120,16 @@ public function getMapJS() if ($this->traffic_overlay) { $_script .= " - var trafficLayer = new google.maps.TrafficLayer(); - trafficLayer.setMap(map$_key); - "; + var trafficLayer = new google.maps.TrafficLayer(); + trafficLayer.setMap(map$_key); + "; } if ($this->biking_overlay) { $_script .= " - var bikingLayer = new google.maps.BicyclingLayer(); - bikingLayer.setMap(map$_key); - "; + var bikingLayer = new google.maps.BicyclingLayer(); + bikingLayer.setMap(map$_key); + "; } $_script .= $this->getAddMarkersJS(); @@ -2138,18 +2141,18 @@ public function getMapJS() if ($this->_kml_overlays !== '') { foreach ($this->_kml_overlays as $_kml_key => $_kml_file) { $_script .= " - kml_overlays$_key[$_kml_key]= new google.maps.KmlLayer('$_kml_file'); - kml_overlays$_key[$_kml_key].setMap(map$_key); - "; + kml_overlays$_key[$_kml_key]= new google.maps.KmlLayer('$_kml_file'); + kml_overlays$_key[$_kml_key].setMap(map$_key); + "; } $_script .= ' - '; + '; } //end JS if mapObj != "undefined" block $_script .= '}' . "\n"; - }//end if $this->display_map==true + } //end if $this->display_map==true if (!empty($this->browser_alert)) { //TODO:Update with new browser catch SEE ABOVE @@ -2243,15 +2246,15 @@ public function getAddMarkersJS($map_id = '', $pano = false) ) . "\n"; } - if ($this->marker_clusterer && $pano == false) {//only do marker clusterer for map, not streetview + if ($this->marker_clusterer && $pano == false) { //only do marker clusterer for map, not streetview $_output .= ' - markerClusterer' . $map_id . ' = new MarkerClusterer(' . $_prefix . $map_id . ', markers' . $map_id . ', { - maxZoom: ' . $this->marker_clusterer_options['maxZoom'] . ', - gridSize: ' . $this->marker_clusterer_options['gridSize'] . ', - styles: ' . $this->marker_clusterer_options['styles'] . ' - }); + markerClusterer' . $map_id . ' = new MarkerClusterer(' . $_prefix . $map_id . ', markers' . $map_id . ', { + maxZoom: ' . $this->marker_clusterer_options['maxZoom'] . ', + gridSize: ' . $this->marker_clusterer_options['gridSize'] . ', + styles: ' . $this->marker_clusterer_options['styles'] . ' + }); - '; + '; } return $_output; @@ -2270,19 +2273,19 @@ public function getPolylineJS() $_coords_output .= ','; } $_coords_output .= ' - new google.maps.LatLng(' . $_coords['lat'] . ', ' . $_coords['long'] . ') - '; + new google.maps.LatLng(' . $_coords['lat'] . ', ' . $_coords['long'] . ') + '; } $_output .= ' - polylineCoords' . $this->map_id . "[$polyline_id] = [" . $_coords_output . ']; - polylines' . $this->map_id . "[$polyline_id] = new google.maps.Polyline({ - path: polylineCoords" . $this->map_id . "[$polyline_id] - " . (($_polyline['color'] != '') ? ", strokeColor: '" . $_polyline['color'] . "'" : '') . ' - ' . (($_polyline['opacity'] != 0) ? ', strokeOpacity: ' . $_polyline['opacity'] . '' : '') . ' - ' . (($_polyline['weight'] != 0) ? ', strokeWeight: ' . $_polyline['weight'] . '' : '') . ' - }); - polylines' . $this->map_id . "[$polyline_id].setMap(map" . $this->map_id . '); - '; + polylineCoords' . $this->map_id . "[$polyline_id] = [" . $_coords_output . ']; + polylines' . $this->map_id . "[$polyline_id] = new google.maps.Polyline({ + path: polylineCoords" . $this->map_id . "[$polyline_id] + " . (($_polyline['color'] != '') ? ", strokeColor: '" . $_polyline['color'] . "'" : '') . ' + ' . (($_polyline['opacity'] != 0) ? ', strokeOpacity: ' . $_polyline['opacity'] . '' : '') . ' + ' . (($_polyline['weight'] != 0) ? ', strokeWeight: ' . $_polyline['weight'] . '' : '') . ' + }); + polylines' . $this->map_id . "[$polyline_id].setMap(map" . $this->map_id . '); + '; //Elevation profiles if (!empty($this->_elevation_polylines) && isset($this->_elevation_polylines[$polyline_id])) { @@ -2292,20 +2295,20 @@ public function getPolylineJS() $samples = $this->_elevation_polylines[$polyline_id]['samples']; $focus_color = $this->_elevation_polylines[$polyline_id]['focus_color']; $_output .= ' - elevationPolylines' . $this->map_id . "[$polyline_id] = { - 'selector':'$elevation_dom_id', - 'chart': new google.visualization.ColumnChart(document.getElementById('$elevation_dom_id')), - 'service': new google.maps.ElevationService(), - 'width':$width, - 'height':$height, - 'focusColor':'$focus_color', - 'marker':null - }; - elevationPolylines" . $this->map_id . "[$polyline_id]['service'].getElevationAlongPath({ - path: polylineCoords" . $this->map_id . "[$polyline_id], - samples: $samples - }, function(results,status){plotElevation(results,status, elevationPolylines" . $this->map_id . "[$polyline_id], map" . $this->map_id . ', elevationCharts' . $this->map_id . ');}); - '; + elevationPolylines' . $this->map_id . "[$polyline_id] = { + 'selector':'$elevation_dom_id', + 'chart': new google.visualization.ColumnChart(document.getElementById('$elevation_dom_id')), + 'service': new google.maps.ElevationService(), + 'width':$width, + 'height':$height, + 'focusColor':'$focus_color', + 'marker':null + }; + elevationPolylines" . $this->map_id . "[$polyline_id]['service'].getElevationAlongPath({ + path: polylineCoords" . $this->map_id . "[$polyline_id], + samples: $samples + }, function(results,status){plotElevation(results,status, elevationPolylines" . $this->map_id . "[$polyline_id], map" . $this->map_id . ', elevationCharts' . $this->map_id . ');}); + '; } } @@ -2347,39 +2350,39 @@ public function getAddDirectionsJS() } $_output .= ' - directions' . $this->map_id . "['$dom_id'] = { - displayRenderer:new google.maps.DirectionsRenderer(), - directionService:new google.maps.DirectionsService(), - request:{ - waypoints: [{$this->_waypoints_string}], - origin: '" . $directions['start'] . "', - destination: '" . $directions['dest'] . "' - $directionsParams - } - " . (($this->elevation_directions) ? ", - selector: '" . $directions['elevation_dom_id'] . "', - chart: new google.visualization.ColumnChart(document.getElementById('" . $directions['elevation_dom_id'] . "')), - service: new google.maps.ElevationService(), - width:" . $directions['width'] . ', - height:' . $directions['height'] . ", - focusColor:'#00FF00', - marker:null - " : '') . ' - }; - directions' . $this->map_id . "['$dom_id'].displayRenderer.setMap(map" . $this->map_id . '); - directions' . $this->map_id . "['$dom_id'].displayRenderer.setPanel(document.getElementById('$dom_id')); - directions" . $this->map_id . "['$dom_id'].directionService.route(directions" . $this->map_id . "['$dom_id'].request, function(response, status) { - if (status == google.maps.DirectionsStatus.OK) { - directions" . $this->map_id . "['$dom_id'].displayRenderer.setDirections(response); - " . (($this->elevation_directions) ? ' - directions' . $this->map_id . "['$dom_id'].service.getElevationAlongPath({ - path: response.routes[0].overview_path, - samples: " . $directions['elevation_samples'] . ' - }, function(results,status){plotElevation(results,status, directions' . $this->map_id . "['$dom_id'], map" . $this->map_id . ', elevationCharts' . $this->map_id . ');}); - ' : '') . ' - } - }); - '; + directions' . $this->map_id . "['$dom_id'] = { + displayRenderer:new google.maps.DirectionsRenderer(), + directionService:new google.maps.DirectionsService(), + request:{ + waypoints: [{$this->_waypoints_string}], + origin: '" . $directions['start'] . "', + destination: '" . $directions['dest'] . "' + $directionsParams + } + " . (($this->elevation_directions) ? ", + selector: '" . $directions['elevation_dom_id'] . "', + chart: new google.visualization.ColumnChart(document.getElementById('" . $directions['elevation_dom_id'] . "')), + service: new google.maps.ElevationService(), + width:" . $directions['width'] . ', + height:' . $directions['height'] . ", + focusColor:'#00FF00', + marker:null + " : '') . ' + }; + directions' . $this->map_id . "['$dom_id'].displayRenderer.setMap(map" . $this->map_id . '); + directions' . $this->map_id . "['$dom_id'].displayRenderer.setPanel(document.getElementById('$dom_id')); + directions" . $this->map_id . "['$dom_id'].directionService.route(directions" . $this->map_id . "['$dom_id'].request, function(response, status) { + if (status == google.maps.DirectionsStatus.OK) { + directions" . $this->map_id . "['$dom_id'].displayRenderer.setDirections(response); + " . (($this->elevation_directions) ? ' + directions' . $this->map_id . "['$dom_id'].service.getElevationAlongPath({ + path: response.routes[0].overview_path, + samples: " . $directions['elevation_samples'] . ' + }, function(results,status){plotElevation(results,status, directions' . $this->map_id . "['$dom_id'], map" . $this->map_id . ', elevationCharts' . $this->map_id . ');}); + ' : '') . ' + } + }); + '; } return $_output; @@ -2393,10 +2396,10 @@ public function getAddOverlayJS() $_output = ''; foreach ($this->_overlays as $_key => $_overlay) { $_output .= ' - var bounds = new google.maps.LatLngBounds(new google.maps.LatLng(' . $_overlay['bounds']['ne']['lat'] . ', ' . $_overlay['bounds']['ne']['long'] . '), new google.maps.LatLng(' . $_overlay['bounds']['sw']['lat'] . ', ' . $_overlay['bounds']['sw']['long'] . ")); - var image = '" . $_overlay['img'] . "'; - overlays" . $this->map_id . "[$_key] = new CustomOverlay(bounds, image, map" . $this->map_id . ', ' . $_overlay['opacity'] . '); - '; + var bounds = new google.maps.LatLngBounds(new google.maps.LatLng(' . $_overlay['bounds']['ne']['lat'] . ', ' . $_overlay['bounds']['ne']['long'] . '), new google.maps.LatLng(' . $_overlay['bounds']['sw']['lat'] . ', ' . $_overlay['bounds']['sw']['long'] . ")); + var image = '" . $_overlay['img'] . "'; + overlays" . $this->map_id . "[$_key] = new CustomOverlay(bounds, image, map" . $this->map_id . ', ' . $_overlay['opacity'] . '); + '; } return $_output; @@ -2408,56 +2411,56 @@ public function getAddOverlayJS() public function getCreateMarkerJS() { $_output = " - function createMarker(map, point, title, html, icon, icon_shadow, sidebar_id, openers){ - var marker_options = { - position: point, - map: map, - title: title}; - if(icon!=''){marker_options.icon = icon;} - if(icon_shadow!=''){marker_options.shadow = icon_shadow;} - - //create marker - var new_marker = new google.maps.Marker(marker_options); - if(html!=''){ - " . (($this->info_window) ? " - - google.maps.event.addListener(new_marker, '" . $this->window_trigger . "', function() { - infowindow.close(); - infowindow.setContent(html); - infowindow.open(map,new_marker); - }); - - if(openers != ''&&!isEmpty(openers)){ - for(var i in openers){ - var opener = document.getElementById(openers[i]); - opener.on" . $this->window_trigger . ' = function() { - - infowindow.close(); - infowindow.setContent(html); - infowindow.open(map,new_marker); - - return false; - }; - } - } - ' : '') . " - if(sidebar_id != ''){ - var sidebar = document.getElementById(sidebar_id); - if(sidebar!=null && sidebar!=undefined && title!=null && title!=''){ - var newlink = document.createElement('a'); - " . (($this->info_window) ? ' - newlink.onclick=function(){infowindow.open(map,new_marker); return false}; - ' : ' - newlink.onclick=function(){map.setCenter(point); return false}; - ') . ' - newlink.innerHTML = title; - sidebar.appendChild(newlink); - } - } + function createMarker(map, point, title, html, icon, icon_shadow, sidebar_id, openers){ + var marker_options = { + position: point, + map: map, + title: title}; + if(icon!=''){marker_options.icon = icon;} + if(icon_shadow!=''){marker_options.shadow = icon_shadow;} + + //create marker + var new_marker = new google.maps.Marker(marker_options); + if(html!=''){ + " . (($this->info_window) ? " + + google.maps.event.addListener(new_marker, '" . $this->window_trigger . "', function() { + infowindow.close(); + infowindow.setContent(html); + infowindow.open(map,new_marker); + }); + + if(openers != ''&&!isEmpty(openers)){ + for(var i in openers){ + var opener = document.getElementById(openers[i]); + opener.on" . $this->window_trigger . ' = function() { + + infowindow.close(); + infowindow.setContent(html); + infowindow.open(map,new_marker); + + return false; + }; + } + } + ' : '') . " + if(sidebar_id != ''){ + var sidebar = document.getElementById(sidebar_id); + if(sidebar!=null && sidebar!=undefined && title!=null && title!=''){ + var newlink = document.createElement('a'); + " . (($this->info_window) ? ' + newlink.onclick=function(){infowindow.open(map,new_marker); return false}; + ' : ' + newlink.onclick=function(){map.setCenter(point); return false}; + ') . ' + newlink.innerHTML = title; + sidebar.appendChild(newlink); + } + } } - return new_marker; - } - '; + return new_marker; + } + '; return $_output; } @@ -2468,46 +2471,46 @@ function createMarker(map, point, title, html, icon, icon_shadow, sidebar_id, op public function getCreateOverlayJS() { $_output = " - CustomOverlay.prototype = new google.maps.OverlayView(); - function CustomOverlay(bounds, image, map, opacity){ - this.bounds_ = bounds; - this.image_ = image; - this.map_ = map; - this.div_ = null; - this.opacity = (opacity!='')?opacity:10; - this.setMap(map); - } - CustomOverlay.prototype.onAdd = function() { - var div = document.createElement('DIV'); - div.style.borderStyle = 'none'; - div.style.borderWidth = '0px'; - div.style.position = 'absolute'; - var img = document.createElement('img'); - img.src = this.image_; - img.style.width = '100%'; - img.style.height = '100%'; - img.style.opacity = this.opacity/10; - img.style.filter = 'alpha(opacity='+this.opacity*10+')'; - div.appendChild(img); - this.div_ = div; - var panes = this.getPanes(); - panes.overlayImage.appendChild(div); - } - CustomOverlay.prototype.draw = function() { - var overlayProjection = this.getProjection(); - var sw = overlayProjection.fromLatLngToDivPixel(this.bounds_.getSouthWest()); - var ne = overlayProjection.fromLatLngToDivPixel(this.bounds_.getNorthEast()); - var div = this.div_; - div.style.left = sw.x + 'px'; - div.style.top = ne.y + 'px'; - div.style.width = (ne.x - sw.x) + 'px'; - div.style.height = (sw.y - ne.y) + 'px'; - } - CustomOverlay.prototype.onRemove = function() { - this.div_.parentNode.removeChild(this.div_); - this.div_ = null; - } - "; + CustomOverlay.prototype = new google.maps.OverlayView(); + function CustomOverlay(bounds, image, map, opacity){ + this.bounds_ = bounds; + this.image_ = image; + this.map_ = map; + this.div_ = null; + this.opacity = (opacity!='')?opacity:10; + this.setMap(map); + } + CustomOverlay.prototype.onAdd = function() { + var div = document.createElement('DIV'); + div.style.borderStyle = 'none'; + div.style.borderWidth = '0px'; + div.style.position = 'absolute'; + var img = document.createElement('img'); + img.src = this.image_; + img.style.width = '100%'; + img.style.height = '100%'; + img.style.opacity = this.opacity/10; + img.style.filter = 'alpha(opacity='+this.opacity*10+')'; + div.appendChild(img); + this.div_ = div; + var panes = this.getPanes(); + panes.overlayImage.appendChild(div); + } + CustomOverlay.prototype.draw = function() { + var overlayProjection = this.getProjection(); + var sw = overlayProjection.fromLatLngToDivPixel(this.bounds_.getSouthWest()); + var ne = overlayProjection.fromLatLngToDivPixel(this.bounds_.getNorthEast()); + var div = this.div_; + div.style.left = sw.x + 'px'; + div.style.top = ne.y + 'px'; + div.style.width = (ne.x - sw.x) + 'px'; + div.style.height = (sw.y - ne.y) + 'px'; + } + CustomOverlay.prototype.onRemove = function() { + this.div_.parentNode.removeChild(this.div_); + this.div_ = null; + } + "; return $_output; } @@ -2518,25 +2521,25 @@ function CustomOverlay(bounds, image, map, opacity){ public function getPlotElevationJS() { $_output = " - function plotElevation(results, status, elevation_data, map, charts_array) { - charts_array[elevation_data.selector] = { - results:results, - data:new google.visualization.DataTable() - }; - charts_array[elevation_data.selector].data.addColumn('string', 'Sample'); - charts_array[elevation_data.selector].data.addColumn('number', 'Elevation'); - for (var i = 0; i < charts_array[elevation_data.selector].results.length; i++) { - charts_array[elevation_data.selector].data.addRow(['', charts_array[elevation_data.selector].results[i].elevation]); - } - document.getElementById(elevation_data.selector).style.display = 'block'; - elevation_data.chart.draw(charts_array[elevation_data.selector].data, { - width: elevation_data.width, - height: elevation_data.height, - legend: 'none', - titleY: 'Elevation (m)', - focusBorderColor: elevation_data.focusColor - }); - "; + function plotElevation(results, status, elevation_data, map, charts_array) { + charts_array[elevation_data.selector] = { + results:results, + data:new google.visualization.DataTable() + }; + charts_array[elevation_data.selector].data.addColumn('string', 'Sample'); + charts_array[elevation_data.selector].data.addColumn('number', 'Elevation'); + for (var i = 0; i < charts_array[elevation_data.selector].results.length; i++) { + charts_array[elevation_data.selector].data.addRow(['', charts_array[elevation_data.selector].results[i].elevation]); + } + document.getElementById(elevation_data.selector).style.display = 'block'; + elevation_data.chart.draw(charts_array[elevation_data.selector].data, { + width: elevation_data.width, + height: elevation_data.height, + legend: 'none', + titleY: 'Elevation (m)', + focusBorderColor: elevation_data.focusColor + }); + "; if ($this->elevation_markers) { $_output .= $this->getElevationMarkerJS(); } @@ -2551,28 +2554,28 @@ function plotElevation(results, status, elevation_data, map, charts_array) { public function getElevationMarkerJS() { $_output = " - google.visualization.events.addListener(elevation_data.chart, 'onmouseover', function(e) { - if(elevation_data.marker==null){ - elevation_data.marker = new google.maps.Marker({ - position: charts_array[elevation_data.selector].results[e.row].location, - map: map, - icon: 'https://maps.google.com/mapfiles/ms/icons/green-dot.png' - }); - }else{ - elevation_data.marker.setPosition(charts_array[elevation_data.selector].results[e.row].location); - } - map.setCenter(charts_array[elevation_data.selector].results[e.row].location); - }); - document.getElementById(elevation_data.selector).onmouseout = function(){ - elevation_data.marker = clearElevationMarker(elevation_data.marker); - }; - function clearElevationMarker(marker){ - if(marker!=null){ - marker.setMap(null); - return null; - } - } - "; + google.visualization.events.addListener(elevation_data.chart, 'onmouseover', function(e) { + if(elevation_data.marker==null){ + elevation_data.marker = new google.maps.Marker({ + position: charts_array[elevation_data.selector].results[e.row].location, + map: map, + icon: 'https://maps.google.com/mapfiles/ms/icons/green-dot.png' + }); + }else{ + elevation_data.marker.setPosition(charts_array[elevation_data.selector].results[e.row].location); + } + map.setCenter(charts_array[elevation_data.selector].results[e.row].location); + }); + document.getElementById(elevation_data.selector).onmouseout = function(){ + elevation_data.marker = clearElevationMarker(elevation_data.marker); + }; + function clearElevationMarker(marker){ + if(marker!=null){ + marker.setMap(null); + return null; + } + } + "; return $_output; } @@ -2600,9 +2603,9 @@ public function getMap() //$_output .= '}'; //if(!empty($this->js_alert)) { - // $_output .= ' else {' . "\n"; - // $_output .= sprintf('document.write(\'%s\');', str_replace('/','\/',$this->js_alert)) . "\n"; - // $_output .= '}' . "\n"; + // $_output .= ' else {' . "\n"; + // $_output .= sprintf('document.write(\'%s\');', str_replace('/','\/',$this->js_alert)) . "\n"; + // $_output .= '}' . "\n"; //} $_output .= '//]]>' . "\n" . '' . "\n"; @@ -2849,21 +2852,21 @@ public function getPolygonJS() $_coords_output .= ','; } $_coords_output .= ' - new google.maps.LatLng(' . $_coords['lat'] . ', ' . $_coords['long'] . ') - '; + new google.maps.LatLng(' . $_coords['lat'] . ', ' . $_coords['long'] . ') + '; } $_output .= ' - polygonCoords' . $this->map_id . "[$polygon_id] = [" . $_coords_output . ']; - polygon' . $this->map_id . "[$polygon_id] = new google.maps.Polygon({ - paths: polygonCoords" . $this->map_id . "[$polygon_id] - " . (($_polygon['color'] != '') ? ", strokeColor: '" . $_polygon['color'] . "'" : '') . ' - ' . (($_polygon['opacity'] != 0) ? ', strokeOpacity: ' . $_polygon['opacity'] . '' : '') . ' - ' . (($_polygon['weight'] != 0) ? ', strokeWeight: ' . $_polygon['weight'] . '' : '') . ' - ' . (($_polygon['fill_color'] != '') ? ", fillColor: '" . $_polygon['fill_color'] . "'" : '') . ' - ' . (($_polygon['fill_opacity'] != 0) ? ', fillOpacity: ' . $_polygon['fill_opacity'] . '' : '') . ' - }); - polygon' . $this->map_id . "[$polygon_id].setMap(map" . $this->map_id . '); - '; + polygonCoords' . $this->map_id . "[$polygon_id] = [" . $_coords_output . ']; + polygon' . $this->map_id . "[$polygon_id] = new google.maps.Polygon({ + paths: polygonCoords" . $this->map_id . "[$polygon_id] + " . (($_polygon['color'] != '') ? ", strokeColor: '" . $_polygon['color'] . "'" : '') . ' + ' . (($_polygon['opacity'] != 0) ? ', strokeOpacity: ' . $_polygon['opacity'] . '' : '') . ' + ' . (($_polygon['weight'] != 0) ? ', strokeWeight: ' . $_polygon['weight'] . '' : '') . ' + ' . (($_polygon['fill_color'] != '') ? ", fillColor: '" . $_polygon['fill_color'] . "'" : '') . ' + ' . (($_polygon['fill_opacity'] != 0) ? ', fillOpacity: ' . $_polygon['fill_opacity'] . '' : '') . ' + }); + polygon' . $this->map_id . "[$polygon_id].setMap(map" . $this->map_id . '); + '; } return $_output; @@ -2926,17 +2929,17 @@ public function addPolygonByCoords($lon1, $lat1, $lon2, $lat2, $id = false, $col } /**#)MS - * adds polyline by passed array - * if color, weight and opacity are not defined, use the google maps defaults - * @param array $polyline_array array of lat/long coords - * @param string $id An array id to use to append coordinates to a line - * @param string $color the color of the line (format: #000000) - * @param string $weight the weight of the line in pixels - * @param string $opacity the line opacity (percentage) - * @param string $fill_color the polygon color (format: #000000) - * @param string $fill_opacity the polygon opacity (percentage) - * @return bool|int Array id of newly added point or false - */ + * adds polyline by passed array + * if color, weight and opacity are not defined, use the google maps defaults + * @param array $polyline_array array of lat/long coords + * @param string $id An array id to use to append coordinates to a line + * @param string $color the color of the line (format: #000000) + * @param string $weight the weight of the line in pixels + * @param string $opacity the line opacity (percentage) + * @param string $fill_color the polygon color (format: #000000) + * @param string $fill_opacity the polygon opacity (percentage) + * @return bool|int Array id of newly added point or false + */ public function addPolygonByCoordsArray($polygon_array, $id = false, $color = '', $weight = 0, $opacity = 0, $fill_color = '', $fill_opacity = 0) { if (!is_array($polygon_array) || count($polygon_array) < 3) { diff --git a/src/eGive.php b/src/eGive.php index cfacf5a80c..6994dd425d 100644 --- a/src/eGive.php +++ b/src/eGive.php @@ -1,14 +1,5 @@ getId() . ",'Payment'," . $fundId . ",'" . $iDepositSlipID . "','" . $transId . "','0','" . $groupKey . "')"; ++$importCreated; RunQuery($sSQL); @@ -324,7 +312,7 @@ function importDoneFixOrContinue() global $familySelectHtml; ?>
    + 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.?>

    New eGive Name(s) and ID(s) have been imported and must be associated with the appropriate Family. Use the pulldown in the Family column to select the Family, based on the eGive name, and then press the Re-Import button.

    If you cannot make the assignment now, you can safely go Back to the Deposit Slip, and Re-import this data at a later time. Its possible you may need to view eGive data using the Web View in order to make an accurate Family assignment.

    @@ -395,7 +383,7 @@ function get_api_data($json) function yearFirstDate($date) { - $dateArray = explode('/', $date); // this date is in mm/dd/yy format. churchCRM needs it in yyyy-mm-dd format + $dateArray = explode('/', $date); // This date is in mm/dd/yy format. churchCRM needs it in yyyy-mm-dd format if (strlen($dateArray[2]) == 2) { $dateArray[2] += 2000; } @@ -412,5 +400,3 @@ function eGiveExistingKey($transId, $famID, $date, $fundId, $comment) return $key; } - -?> diff --git a/src/external/templates/404.php b/src/external/templates/404.php index c1ce4a25d1..6d255607a9 100644 --- a/src/external/templates/404.php +++ b/src/external/templates/404.php @@ -21,5 +21,4 @@ @@ -50,5 +49,4 @@ /skin/js/FamilyRegister.js"> @@ -46,5 +45,4 @@ isMale() ? "male" : "female") ?>"> - run(); diff --git a/src/kiosk/templates/404.php b/src/kiosk/templates/404.php index c1ce4a25d1..6d255607a9 100644 --- a/src/kiosk/templates/404.php +++ b/src/kiosk/templates/404.php @@ -21,5 +21,4 @@ @@ -31,8 +30,5 @@ - diff --git a/src/locale/states/lc.json b/src/locale/states/lc.json index c18931cc7c..bd159b086b 100644 --- a/src/locale/states/lc.json +++ b/src/locale/states/lc.json @@ -8,4 +8,4 @@ "07": "Micoud", "08": "Soufriere", "09": "Vieux Fort" -} +} diff --git a/src/locale/states/nl.json b/src/locale/states/nl.json index 0a8d0f78da..bc4363b21a 100644 --- a/src/locale/states/nl.json +++ b/src/locale/states/nl.json @@ -1,7 +1,7 @@ { "01": "Drenthe", "02": "Flevoland", - "03": "Fryslan", + "03": "Fryslan", "04": "Gelderland", "05": "Groningen", "06": "Limburg", diff --git a/src/locale/states/tc.json b/src/locale/states/tc.json index bea8954f20..1c147d3819 100644 --- a/src/locale/states/tc.json +++ b/src/locale/states/tc.json @@ -1,3 +1,3 @@ { "TCI": "Turks and Caicos Islands" -} +} diff --git a/src/members/self-register.php b/src/members/self-register.php index d4d24da6bf..188ce1c83a 100644 --- a/src/members/self-register.php +++ b/src/members/self-register.php @@ -1,16 +1,8 @@ - - diff --git a/src/mysql/install/Install.sql b/src/mysql/install/Install.sql index 2c814c0ffc..499119fcd6 100644 --- a/src/mysql/install/Install.sql +++ b/src/mysql/install/Install.sql @@ -11,15 +11,12 @@ CREATE TABLE `version_ver` ( UNIQUE KEY `ver_version` (`ver_version`) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_unicode_ci AUTO_INCREMENT=1 ; - -- -------------------------------------------------------- -- -- Table structure for table `config_cfg` -- - - CREATE TABLE `config_cfg` ( `cfg_id` int(11) NOT NULL default '0', `cfg_name` varchar(50) NOT NULL default '', @@ -46,7 +43,6 @@ CREATE TABLE `deposit_dep` ( -- Dumping data for table `deposit_dep` -- - -- -------------------------------------------------------- -- @@ -87,7 +83,6 @@ CREATE TABLE `email_message_pending_emp` ( -- Dumping data for table `email_message_pending_emp` -- - -- -------------------------------------------------------- -- @@ -106,7 +101,6 @@ CREATE TABLE `email_recipient_pending_erp` ( -- Dumping data for table `email_recipient_pending_erp` -- - -- -------------------------------------------------------- -- @@ -153,7 +147,6 @@ CREATE TABLE `eventcounts_evtcnt` ( -- Dumping data for table `eventcounts_evtcnt` -- - -- -------------------------------------------------------- -- @@ -180,7 +173,6 @@ CREATE TABLE `events_event` ( -- Dumping data for table `events_event` -- - -- -------------------------------------------------------- -- @@ -213,7 +205,6 @@ CREATE TABLE `event_attend` ( -- Dumping data for table `event_attend` -- - -- -------------------------------------------------------- -- @@ -244,7 +235,6 @@ INSERT INTO `event_types` (`type_id`, `type_name`, `type_defstarttime`, `type_de -- -------------------------------------------------------- - CREATE TABLE `calendars` ( `calendar_id` INT NOT NULL auto_increment, `name` VARCHAR(128) NOT NULL, @@ -279,7 +269,6 @@ CREATE TABLE `family_custom` ( -- Dumping data for table `family_custom` -- - -- -------------------------------------------------------- -- @@ -299,7 +288,6 @@ CREATE TABLE `family_custom_master` ( -- Dumping data for table `family_custom_master` -- - -- -------------------------------------------------------- -- @@ -338,7 +326,6 @@ CREATE TABLE `family_fam` ( -- Dumping data for table `family_fam` -- - -- -------------------------------------------------------- -- @@ -360,7 +347,6 @@ CREATE TABLE `groupprop_master` ( -- Dumping data for table `groupprop_master` -- - -- -------------------------------------------------------- -- @@ -384,7 +370,6 @@ CREATE TABLE `group_grp` ( -- Dumping data for table `group_grp` -- - -- -------------------------------------------------------- -- @@ -416,7 +401,6 @@ CREATE TABLE `istlookup_lu` ( -- Dumping data for table `istlookup_lu` -- - -- -------------------------------------------------------- -- @@ -499,7 +483,6 @@ CREATE TABLE `note_nte` ( -- Dumping data for table `note_nte` -- - -- -------------------------------------------------------- -- @@ -518,7 +501,6 @@ CREATE TABLE `person2group2role_p2g2r` ( -- Dumping data for table `person2group2role_p2g2r` -- - -- -------------------------------------------------------- -- @@ -536,7 +518,6 @@ CREATE TABLE `person2volunteeropp_p2vo` ( -- Dumping data for table `person2volunteeropp_p2vo` -- - -- -------------------------------------------------------- -- @@ -552,7 +533,6 @@ CREATE TABLE `person_custom` ( -- Dumping data for table `person_custom` -- - -- -------------------------------------------------------- -- @@ -573,7 +553,6 @@ CREATE TABLE `person_custom_master` ( -- Dumping data for table `person_custom_master` -- - -- -------------------------------------------------------- -- @@ -661,7 +640,6 @@ CREATE TABLE `pledge_plg` ( -- Dumping data for table `pledge_plg` -- - -- -------------------------------------------------------- -- @@ -919,7 +897,6 @@ CREATE TABLE `record2property_r2p` ( -- Dumping data for table `record2property_r2p` -- - -- -------------------------------------------------------- -- @@ -950,7 +927,6 @@ CREATE TABLE `result_res` ( -- Dumping data for table `result_res` -- - -- -------------------------------------------------------- -- @@ -985,7 +961,6 @@ INSERT INTO `userconfig_ucfg` (`ucfg_per_id`, `ucfg_id`, `ucfg_name`, `ucfg_valu (1, 5, 'bCreateDirectory', '1', 'boolean', 'User permission to create directories', 'TRUE', ''), (1, 6, 'bExportCSV', '1', 'boolean', 'User permission to export CSV files', 'TRUE', ''); - -- -------------------------------------------------------- -- @@ -1050,7 +1025,6 @@ INSERT INTO `user_usr` (`usr_per_ID`, `usr_Password`, `usr_NeedPasswordChange`, VALUES (1, '4bdf3fba58c956fc3991a1fde84929223f968e2853de596e49ae80a91499609b', 1, '2016-01-01 00:00:00', 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 'skin-red', 0, 0, '2016-01-01', 10, 0, 'Admin', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0); - -- -- Table structure for table `user_settings` -- @@ -1071,7 +1045,6 @@ CREATE TABLE `user_settings` ( ALTER TABLE `user_settings` ADD PRIMARY KEY (`user_id`,`setting_name`); - -- -------------------------------------------------------- -- @@ -1091,7 +1064,6 @@ CREATE TABLE `volunteeropportunity_vol` ( -- Dumping data for table `volunteeropportunity_vol` -- - -- -------------------------------------------------------- -- @@ -1189,8 +1161,6 @@ CREATE TABLE `kioskassginment_kasm` ( UNIQUE KEY `kasm_ID` (`kasm_ID`) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_unicode_ci; - - CREATE TABLE `tokens` ( `token` VARCHAR(99) NOT NULL, `type` VARCHAR(50) NOT NULL, @@ -1215,7 +1185,6 @@ CREATE TABLE `locations` ( PRIMARY KEY (`location_id`) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_unicode_ci; - CREATE TABLE `church_location_person` ( `location_id` INT NOT NULL, `person_id` INT NOT NULL, diff --git a/src/mysql/upgrade/2.2.0.sql b/src/mysql/upgrade/2.2.0.sql index 8113331440..6f7168bd0e 100644 --- a/src/mysql/upgrade/2.2.0.sql +++ b/src/mysql/upgrade/2.2.0.sql @@ -1,15 +1,14 @@ ALTER TABLE config_cfg CHANGE cfg_type cfg_type ENUM('text','number','date','boolean','textarea','json'); - SET @JSONV = '{"date1":{"x":"12","y":"42"},"date2X":"185","leftX":"64","topY":"7","perforationY":"97","amountOffsetX":"35","lineItemInterval":{"x":"49","y":"7"},"max":{"x":"200","y":"140"},"numberOfItems":{"x":"136","y":"68"},"subTotal":{"x":"197","y":"42"},"topTotal":{"x":"197","y":"68"},"titleX":"85"}'; INSERT IGNORE INTO `config_cfg` (`cfg_id`, `cfg_name`, `cfg_value`, `cfg_type`, `cfg_default`, `cfg_tooltip`, `cfg_section`, `cfg_category`) VALUES (1043, 'sQBDTSettings', @JSONV , 'json', @JSONV , 'QuickBooks Deposit Ticket Settings', 'ChurchInfoReport', 'Step7'); DELETE FROM `config_cfg` WHERE cfg_id = 3; -/*Convert the Group Special Properties Field from an ENUM("true","false") - to a proper BOOLEAN field without losing data. -*/ +/* Convert the Group Special Properties Field from an ENUM("true","false") + * to a proper BOOLEAN field without losing data. + */ ALTER TABLE group_grp MODIFY grp_hasSpecialProps INT(1); diff --git a/src/mysql/upgrade/2.8.0.sql b/src/mysql/upgrade/2.8.0.sql index d73c5a7847..9eaf29e562 100644 --- a/src/mysql/upgrade/2.8.0.sql +++ b/src/mysql/upgrade/2.8.0.sql @@ -29,7 +29,6 @@ ALTER TABLE event_types ADD COLUMN type_grpid mediumint(9) AFTER type_active; ALTER TABLE `tokens` CHANGE COLUMN `type` `type` VARCHAR(50); - /** This remove default values if it was set so that we can remove if checks */ delete from config_cfg WHERE cfg_name = 'sToEmailAddress' and cfg_value = 'myReceiveEmailAddress'; diff --git a/src/mysql/upgrade/3.0.0.sql b/src/mysql/upgrade/3.0.0.sql index 979e90e0e8..4b4570e069 100644 --- a/src/mysql/upgrade/3.0.0.sql +++ b/src/mysql/upgrade/3.0.0.sql @@ -22,7 +22,6 @@ CREATE TABLE `calendars` ( UNIQUE KEY `accesstoken` (`accesstoken`) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_unicode_ci; - DROP TABLE IF EXISTS `calendar_events`; # This is a join-table to link an event with a calendar CREATE TABLE `calendar_events` ( diff --git a/src/mysql/upgrade/3.4.0.sql b/src/mysql/upgrade/3.4.0.sql index bcd0ecb0f9..933bb1365a 100644 --- a/src/mysql/upgrade/3.4.0.sql +++ b/src/mysql/upgrade/3.4.0.sql @@ -7,7 +7,6 @@ DELETE FROM query_qry WHERE qry_ID=1; INSERT IGNORE INTO `query_qry` (`qry_ID`, `qry_SQL`, `qry_Name`, `qry_Description`, `qry_Count`) VALUES (201, 'SELECT per_ID as AddToCart, CONCAT('''',per_FirstName,'',per_LastName,'''') AS Name, per_LastName AS Lastname FROM person_per LEFT OUTER JOIN (SELECT event_attend.attend_id, event_attend.person_id FROM event_attend WHERE event_attend.event_id IN (~event~)) a ON person_per.per_ID = a.person_id WHERE a.attend_id is NULL ORDER BY person_per.per_LastName, person_per.per_FirstName', 'Missing people', 'Find people who didn''t attend an event', 1); - INSERT IGNORE INTO `queryparameters_qrp` (`qrp_ID`, `qrp_qry_ID`, `qrp_Type`, `qrp_OptionSQL`, `qrp_Name`, `qrp_Description`, `qrp_Alias`, `qrp_Default`, `qrp_Required`, `qrp_InputBoxSize`, `qrp_Validation`, `qrp_NumericMax`, `qrp_NumericMin`, `qrp_AlphaMinLength`, `qrp_AlphaMaxLength`) VALUES (202, 201, 3, 'SELECT event_id as Value, event_title as Display FROM events_event ORDER BY event_start DESC', 'Event', 'Select the desired event', 'event', '', 1, 0, '', 0, 0, 0, 0); diff --git a/src/mysql/upgrade/4.3.0-usersettings.sql b/src/mysql/upgrade/4.3.0-usersettings.sql index 32a9562016..069a82dff9 100644 --- a/src/mysql/upgrade/4.3.0-usersettings.sql +++ b/src/mysql/upgrade/4.3.0-usersettings.sql @@ -1,4 +1,3 @@ - -- -- Table structure for table `user_settings` -- @@ -10,10 +9,6 @@ CREATE TABLE `user_settings` ( `setting_value` varchar(50) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- --- Indexes for dumped tables --- - -- -- Indexes for table `user_settings` -- @@ -34,5 +29,3 @@ insert ignore into user_settings select usr_per_ID as user_id, "finance.FY" as /** move items from user config table **/ insert ignore into user_settings select ucfg_per_id as user_id, "ui.email.delimiter" as setting_name, ucfg_value as setting_value from userconfig_ucfg where ucfg_name = 'sMailtoDelimiter'; - - diff --git a/src/mysql/upgrade/rebuild_views.sql b/src/mysql/upgrade/rebuild_views.sql index f2221863e8..96721894d1 100644 --- a/src/mysql/upgrade/rebuild_views.sql +++ b/src/mysql/upgrade/rebuild_views.sql @@ -1,12 +1,11 @@ DROP VIEW IF EXISTS email_list; CREATE VIEW email_list AS - SELECT fam_Email AS email, 'family' AS type, fam_id AS id FROM family_fam WHERE fam_email IS NOT NULL AND fam_email != '' - UNION - SELECT per_email AS email, 'person_home' AS type, per_id AS id FROM person_per WHERE per_email IS NOT NULL AND per_email != '' - UNION + SELECT fam_Email AS email, 'family' AS type, fam_id AS id FROM family_fam WHERE fam_email IS NOT NULL AND fam_email != '' + UNION + SELECT per_email AS email, 'person_home' AS type, per_id AS id FROM person_per WHERE per_email IS NOT NULL AND per_email != '' + UNION SELECT per_WorkEmail AS email, 'person_work' AS type, per_id AS id FROM person_per WHERE per_WorkEmail IS NOT NULL AND per_WorkEmail != ''; - - -DROP VIEW IF EXISTS email_count; -CREATE VIEW email_count AS - SELECT email, COUNT(*) AS total FROM email_list group by email; \ No newline at end of file + +DROP VIEW IF EXISTS email_count; +CREATE VIEW email_count AS + SELECT email, COUNT(*) AS total FROM email_list group by email; diff --git a/src/phpcs.xml.dist b/src/phpcs.xml.dist index 3745fbf5a9..f2af067730 100644 --- a/src/phpcs.xml.dist +++ b/src/phpcs.xml.dist @@ -18,6 +18,7 @@ + @@ -37,4 +38,11 @@ + + + + + + + diff --git a/src/propel/schema.xml b/src/propel/schema.xml index 70b9375b38..376c055486 100644 --- a/src/propel/schema.xml +++ b/src/propel/schema.xml @@ -623,7 +623,6 @@
    eGive NameeGive IDFamilySet eGive ID into Family
    - @@ -657,7 +656,6 @@
    - @@ -715,7 +713,6 @@
    - @@ -734,8 +731,6 @@
    - - @@ -840,7 +835,6 @@ - @@ -957,9 +951,6 @@
    - - - diff --git a/src/rector.php b/src/rector.php index 756af79816..ba04e967b8 100644 --- a/src/rector.php +++ b/src/rector.php @@ -28,10 +28,10 @@ __DIR__ . '/ChurchCRM/model/ChurchCRM/Map', ]); - // register a single rule + // Register a single rule $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class); - // define sets of rules + // Define sets of rules $rectorConfig->sets([ LevelSetList::UP_TO_PHP_74, SetList::GMAGICK_TO_IMAGICK, diff --git a/src/session/index.php b/src/session/index.php index ac4b44af14..5bf27ffae3 100644 --- a/src/session/index.php +++ b/src/session/index.php @@ -22,7 +22,6 @@ $app = AppFactory::create(); $app->setBasePath($rootPath . '/session'); - require __DIR__ . '/../Include/slim/error-handler.php'; $app->addRoutingMiddleware(); diff --git a/src/session/templates/begin-session.php b/src/session/templates/begin-session.php index 2eb59ad4fc..eccae3b0f9 100644 --- a/src/session/templates/begin-session.php +++ b/src/session/templates/begin-session.php @@ -4,7 +4,6 @@ use ChurchCRM\dto\SystemConfig; use ChurchCRM\dto\SystemURLs; -// Set the page title and include HTML header $sPageTitle = gettext('Login'); require SystemURLs::getDocumentRoot() . '/Include/HeaderNotLoggedIn.php'; @@ -69,7 +68,6 @@ -

    diff --git a/src/session/templates/error.php b/src/session/templates/error.php index 11f5a6eb15..927859ff30 100644 --- a/src/session/templates/error.php +++ b/src/session/templates/error.php @@ -21,5 +21,4 @@ @@ -71,5 +70,4 @@ function () { }); @@ -28,5 +27,4 @@ @@ -11,11 +10,9 @@ padding: 15px; position: relative; } -

    Welcome to ChurchCRM Setup Error


    -

    500

    @@ -26,7 +23,5 @@
    - diff --git a/src/setup/templates/setup-steps.php b/src/setup/templates/setup-steps.php index 8697249a4e..6daacdd520 100644 --- a/src/setup/templates/setup-steps.php +++ b/src/setup/templates/setup-steps.php @@ -233,7 +233,5 @@ - diff --git a/src/skin/Kiosk.css b/src/skin/Kiosk.css index f226878281..3e7ac93be4 100644 --- a/src/skin/Kiosk.css +++ b/src/skin/Kiosk.css @@ -1,48 +1,45 @@ .widget-user-2 .widget-user-header { - padding: 5px; - } - - #eventDetails { - display:block; - width: 100%; - background-color:rgb(60,141,188); - min-height:50px; - } - - #eventDetails span { - font-size: 15px; - text-align: center; - color: white; - display:block; - } - - #eventTitle { - font-size: 30px !important; - font-weight: bold; - } - - #newStudent { - position: fixed; - left: 20px; - bottom: 80px; - width:30px; - height:30px; - z-index: 10000; - font-size:48pt; - color: green; - } - - #event { - display:none; - } - - #noEvent { - display:none; + padding: 5px; +} - position: fixed; /* or absolute */ - top: 50%; - left: 50%; - /* bring your own prefixes */ - transform: translate(-50%, -50%); +#eventDetails { + display: block; + width: 100%; + background-color: rgb(60, 141, 188); + min-height: 50px; +} - } \ No newline at end of file +#eventDetails span { + font-size: 15px; + text-align: center; + color: white; + display: block; +} + +#eventTitle { + font-size: 30px !important; + font-weight: bold; +} + +#newStudent { + position: fixed; + left: 20px; + bottom: 80px; + width: 30px; + height: 30px; + z-index: 10000; + font-size: 48pt; + color: green; +} + +#event { + display: none; +} + +#noEvent { + display: none; + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} diff --git a/src/skin/churchcrm.scss b/src/skin/churchcrm.scss index 10035f68ec..ab80ccc052 100644 --- a/src/skin/churchcrm.scss +++ b/src/skin/churchcrm.scss @@ -6,7 +6,6 @@ */ - // Import Libraries // The only library we do not embed is Bootstrap, because it's very big diff --git a/src/skin/scss/_calendars.scss b/src/skin/scss/_calendars.scss index c15979425a..1866fb68f6 100644 --- a/src/skin/scss/_calendars.scss +++ b/src/skin/scss/_calendars.scss @@ -1,36 +1,41 @@ -.modal-table{ - table-layout:fixed; - width:100% +.modal-table { + table-layout: fixed; + width: 100% } .modal-table td { - word-wrap: break-word; + word-wrap: break-word; } -.modal-table select, .modal-table input, .modal-table textarea { - width:100%; +.modal-table select, +.modal-table input, +.modal-table textarea { + width: 100%; } -.calendar-filter-row .col-xs-1, .calendar-filter-row .col-xs-7, .calendar-filter-row .col-xs-4 { - padding-left:5px; padding-right:5px; +.calendar-filter-row .col-xs-1, +.calendar-filter-row .col-xs-7, +.calendar-filter-row .col-xs-4 { + padding-left: 5px; + padding-right: 5px; } .calendar-filter-text { - display:inline-block; - padding-left:5px; - padding-right:5px; + display: inline-block; + padding-left: 5px; + padding-right: 5px; } -.form-field-error { - color: red; +.form-field-error { + color: red; } .RequiredFormFieldUnsatisfied { - color: red; - display: inline-block; - margin-left: 10px; + color: red; + display: inline-block; + margin-left: 10px; } .RequiredFormFieldSatisfied { - visibility: hidden; -} \ No newline at end of file + visibility: hidden; +} diff --git a/src/skin/scss/_dropdowns.scss b/src/skin/scss/_dropdowns.scss index 8b7fd03af9..f223ca7c0a 100644 --- a/src/skin/scss/_dropdowns.scss +++ b/src/skin/scss/_dropdowns.scss @@ -1,28 +1,27 @@ - @media (max-width: 767px) { .skin-blue .main-header .navbar .dropdown-menu li a { color: #000000; } } -.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#222D32} - +.select2-container--default .select2-selection--multiple .select2-selection__choice { + background-color: #222D32 +} -/* Philippe Logel : file in Header.php */ .user-header a.item_link { - color: #FFF !important ; - cursor:pointer; - cursor:hand; + color: #FFF !important; + cursor: pointer; + cursor: hand; } .user-header a.item_link:link { - color: #FFF !important; - cursor:pointer; - cursor:hand; + color: #FFF !important; + cursor: pointer; + cursor: hand; } .user-header a.item_link:hover { - color: #CCCCCC !important ; - cursor:pointer; - cursor:hand; + color: #CCCCCC !important; + cursor: pointer; + cursor: hand; } diff --git a/src/skin/scss/_maps.scss b/src/skin/scss/_maps.scss index cfa07a3400..96b7dec50f 100644 --- a/src/skin/scss/_maps.scss +++ b/src/skin/scss/_maps.scss @@ -39,7 +39,6 @@ img.legendicon { float: left; } - @media screen and (max-device-width: 600px) { #maplegend { visibility: hidden; diff --git a/src/skin/scss/_profileImage.scss b/src/skin/scss/_profileImage.scss index fdebdff9ce..ae43ce74f7 100644 --- a/src/skin/scss/_profileImage.scss +++ b/src/skin/scss/_profileImage.scss @@ -1,17 +1,18 @@ .profile-user-img { - height:100px; + height: 100px; } -.profile-family-img, .profile-user-img-md { - height:200px; - width:200px; - border:0; +.profile-family-img, +.profile-user-img-md { + height: 200px; + width: 200px; + border: 0; } -.user-image{ -border-radius:50%; +.user-image { + border-radius: 50%; } -.users-list > li:nth-child(4n+1) { - clear: both; +.users-list>li:nth-child(4n+1) { + clear: both; } diff --git a/src/skin/scss/_react-datepicker.scss b/src/skin/scss/_react-datepicker.scss index 71b9b4bb79..55446adc6c 100644 --- a/src/skin/scss/_react-datepicker.scss +++ b/src/skin/scss/_react-datepicker.scss @@ -1,11 +1,11 @@ .react-datepicker__time-container { width: 90px; - } - - .react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box { +} + +.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box { width: 90px; - } +} - .react-datepicker__navigation--next--with-time:not(.react-datepicker__navigation--next--with-today-button) { - right: 100px; - } \ No newline at end of file +.react-datepicker__navigation--next--with-time:not(.react-datepicker__navigation--next--with-today-button) { + right: 100px; +} diff --git a/src/skin/scss/_spacing.scss b/src/skin/scss/_spacing.scss index 196f56a7e9..2648c2a604 100644 --- a/src/skin/scss/_spacing.scss +++ b/src/skin/scss/_spacing.scss @@ -5,8 +5,7 @@ $grid-breakpoints: ( sm: 576px, md: 768px, lg: 992px, - xl: 1200px -) !default; + xl: 1200px) !default; $spacer: 1rem !default; $spacers: ( @@ -15,8 +14,7 @@ $spacers: ( 2: ($spacer * .5), 3: $spacer, 4: ($spacer * 1.5), - 5: ($spacer * 3) -) !default; + 5: ($spacer * 3)) !default; // from: https://github.com/twbs/bootstrap/blob/v4-dev/scss/mixins/_breakpoints.scss // Minimum breakpoint width. Null for the smallest (first) breakpoint. @@ -24,8 +22,9 @@ $spacers: ( // >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // 576px @function breakpoint-min($name, $breakpoints: $grid-breakpoints) { - $min: map-get($breakpoints, $name); - @return if($min != 0, $min, null); + $min: map-get($breakpoints, $name + ); +@return if($min !=0, $min, null); } // Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front. @@ -36,74 +35,110 @@ $spacers: ( // >> breakpoint-infix(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // "-sm" @function breakpoint-infix($name, $breakpoints: $grid-breakpoints) { - @return if(breakpoint-min($name, $breakpoints) == null, "", "-#{$name}"); + @return if(breakpoint-min($name, $breakpoints)==null, "", "-#{$name}"); } // Media of at least the minimum breakpoint width. No query for the smallest breakpoint. // Makes the @content apply to the given breakpoint and wider. @mixin media-breakpoint-up($name, $breakpoints: $grid-breakpoints) { $min: breakpoint-min($name, $breakpoints); + @if $min { @media (min-width: $min) { @content; } - } @else { + } + + @else { @content; } } // from: https://github.com/twbs/bootstrap/blob/v4-dev/scss/utilities/_spacing.scss @each $breakpoint in map-keys($grid-breakpoints) { - @include media-breakpoint-up($breakpoint) { - $infix: breakpoint-infix($breakpoint, $grid-breakpoints); - - @each $prop, $abbrev in (margin: m, padding: p) { - @each $size, $length in $spacers { - - .#{$abbrev}#{$infix}-#{$size} { #{$prop}: $length !important; } - .#{$abbrev}t#{$infix}-#{$size} { #{$prop}-top: $length !important; } - .#{$abbrev}r#{$infix}-#{$size} { #{$prop}-right: $length !important; } - .#{$abbrev}b#{$infix}-#{$size} { #{$prop}-bottom: $length !important; } - .#{$abbrev}l#{$infix}-#{$size} { #{$prop}-left: $length !important; } - .#{$abbrev}x#{$infix}-#{$size} { - #{$prop}-right: $length !important; - #{$prop}-left: $length !important; + @include media-breakpoint-up($breakpoint) { + $infix: breakpoint-infix($breakpoint, $grid-breakpoints); + + @each $prop, $abbrev in (margin: m, padding: p) { + @each $size, $length in $spacers { + + .#{$abbrev}#{$infix}-#{$size} { + #{$prop}: $length !important; + } + + .#{$abbrev}t#{$infix}-#{$size} { + #{$prop}-top: $length !important; + } + + .#{$abbrev}r#{$infix}-#{$size} { + #{$prop}-right: $length !important; + } + + .#{$abbrev}b#{$infix}-#{$size} { + #{$prop}-bottom: $length !important; + } + + .#{$abbrev}l#{$infix}-#{$size} { + #{$prop}-left: $length !important; + } + + .#{$abbrev}x#{$infix}-#{$size} { + #{$prop}-right: $length !important; + #{$prop}-left: $length !important; + } + + .#{$abbrev}y#{$infix}-#{$size} { + #{$prop}-top: $length !important; + #{$prop}-bottom: $length !important; + } + } } - .#{$abbrev}y#{$infix}-#{$size} { - #{$prop}-top: $length !important; - #{$prop}-bottom: $length !important; + + // Some special margin utils + .m#{$infix}-auto { + margin: auto !important; } - } - } - // Some special margin utils - .m#{$infix}-auto { margin: auto !important; } - .mt#{$infix}-auto { margin-top: auto !important; } - .mr#{$infix}-auto { margin-right: auto !important; } - .mb#{$infix}-auto { margin-bottom: auto !important; } - .ml#{$infix}-auto { margin-left: auto !important; } - .mx#{$infix}-auto { - margin-right: auto !important; - margin-left: auto !important; - } - .my#{$infix}-auto { - margin-top: auto !important; - margin-bottom: auto !important; + .mt#{$infix}-auto { + margin-top: auto !important; + } + + .mr#{$infix}-auto { + margin-right: auto !important; + } + + .mb#{$infix}-auto { + margin-bottom: auto !important; + } + + .ml#{$infix}-auto { + margin-left: auto !important; + } + + .mx#{$infix}-auto { + margin-right: auto !important; + margin-left: auto !important; + } + + .my#{$infix}-auto { + margin-top: auto !important; + margin-bottom: auto !important; + } } - } } -.row-flex, .row-flex > div[class*='col-'] { +.row-flex, +.row-flex>div[class*='col-'] { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; - flex:1 1 auto; + flex: 1 1 auto; } .row-flex-wrap { - -webkit-flex-flow: row wrap; + -webkit-flex-flow: row wrap; align-content: flex-start; - flex:0; + flex: 0; } diff --git a/src/skin/scss/_strike.scss b/src/skin/scss/_strike.scss index c3e9192637..2637c93fb8 100644 --- a/src/skin/scss/_strike.scss +++ b/src/skin/scss/_strike.scss @@ -2,21 +2,21 @@ display: block; text-align: center; overflow: hidden; - white-space: nowrap; + white-space: nowrap; } -.strike > span { +.strike>span { position: relative; display: inline-block; } .strike:hover { - font-size: 22px; - color: lime; + font-size: 22px; + color: lime; } -.strike > span:before, -.strike > span:after { +.strike>span:before, +.strike>span:after { content: ""; position: absolute; top: 50%; @@ -25,12 +25,12 @@ background: grey; } -.strike > span:before { +.strike>span:before { right: 100%; margin-right: 15px; } -.strike > span:after { +.strike>span:after { left: 100%; margin-left: 15px; -} \ No newline at end of file +} diff --git a/src/sundayschool/SundaySchoolClassView.php b/src/sundayschool/SundaySchoolClassView.php index 171af9ab08..24e2b7bed4 100644 --- a/src/sundayschool/SundaySchoolClassView.php +++ b/src/sundayschool/SundaySchoolClassView.php @@ -483,4 +483,3 @@ function labelFormatter(label, series) { diff --git a/src/sundayschool/SundaySchoolDashboard.php b/src/sundayschool/SundaySchoolDashboard.php index 662baf0673..31962984f4 100644 --- a/src/sundayschool/SundaySchoolDashboard.php +++ b/src/sundayschool/SundaySchoolDashboard.php @@ -37,7 +37,6 @@ } } -// Set the page title and include HTML header $sPageTitle = gettext('Sunday School Dashboard'); require '../Include/Header.php'; @@ -179,7 +178,6 @@ class="fa fa-file-csv">
    -

    @@ -301,4 +299,4 @@ class="fa fa-file-csv">
    +require '../Include/Footer.php'; diff --git a/src/sundayschool/SundaySchoolReports.php b/src/sundayschool/SundaySchoolReports.php index 375213a95f..22628724e6 100644 --- a/src/sundayschool/SundaySchoolReports.php +++ b/src/sundayschool/SundaySchoolReports.php @@ -1,17 +1,5 @@ filterByType(4) ->find(); -// Set the page title and include HTML header $sPageTitle = gettext('Sunday School Reports'); require '../Include/Header.php'; @@ -297,4 +284,3 @@ diff --git a/src/v2/templates/admin/adminchangepassword.php b/src/v2/templates/admin/adminchangepassword.php index c81af602a3..a2a1f17472 100644 --- a/src/v2/templates/admin/adminchangepassword.php +++ b/src/v2/templates/admin/adminchangepassword.php @@ -2,7 +2,6 @@ use ChurchCRM\dto\SystemURLs; -//Set the page title $sPageTitle = gettext("Change Password") . ": " . $user->getFullName(); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?> @@ -38,4 +37,5 @@
    - +
    @@ -99,5 +98,5 @@ className: 'btn-danger' }); }); - - +
    @@ -252,5 +251,5 @@ document.addEventListener("DOMContentLoaded", callback); } - - +
    @@ -48,7 +47,6 @@
    - - - - +/skin/js-react/calendar-event-editor-app.js"> - diff --git a/src/v2/templates/cart/cartempty.php b/src/v2/templates/cart/cartempty.php index 979a9ad434..b070a4072a 100644 --- a/src/v2/templates/cart/cartempty.php +++ b/src/v2/templates/cart/cartempty.php @@ -23,5 +23,4 @@

    - diff --git a/src/v2/templates/common/not-found-view.php b/src/v2/templates/common/not-found-view.php index 72a419e1e3..2778a31e8d 100644 --- a/src/v2/templates/common/not-found-view.php +++ b/src/v2/templates/common/not-found-view.php @@ -2,7 +2,6 @@ use ChurchCRM\dto\SystemURLs; -//Set the page title $sPageTitle = gettext("Not Found") . ": " . gettext($memberType); require SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?> @@ -19,5 +18,5 @@

    - - +getFullName(); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?> Password Change Successful - +getFullName(); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?> @@ -10,4 +9,5 @@ Please contact your system administrator for instructions on changing your password - + diff --git a/src/v2/templates/email/debug.php b/src/v2/templates/email/debug.php index 3151aee703..036a88462a 100644 --- a/src/v2/templates/email/debug.php +++ b/src/v2/templates/email/debug.php @@ -16,4 +16,3 @@ diff --git a/src/v2/templates/email/duplicate.php b/src/v2/templates/email/duplicate.php index 2eb8aac7ed..acbde19ca5 100644 --- a/src/v2/templates/email/duplicate.php +++ b/src/v2/templates/email/duplicate.php @@ -21,7 +21,6 @@ - - diff --git a/src/v2/templates/email/mailchimp-missing.php b/src/v2/templates/email/mailchimp-missing.php index 6a7fa68876..196336e490 100644 --- a/src/v2/templates/email/mailchimp-missing.php +++ b/src/v2/templates/email/mailchimp-missing.php @@ -18,7 +18,6 @@ - - diff --git a/src/v2/templates/email/mailchimp-unsubscribers.php b/src/v2/templates/email/mailchimp-unsubscribers.php index 88bdf01c2a..75e8356b44 100644 --- a/src/v2/templates/email/mailchimp-unsubscribers.php +++ b/src/v2/templates/email/mailchimp-unsubscribers.php @@ -18,7 +18,6 @@ - - diff --git a/src/v2/templates/email/without.php b/src/v2/templates/email/without.php index 0341c04724..6688e1eb51 100644 --- a/src/v2/templates/email/without.php +++ b/src/v2/templates/email/without.php @@ -21,7 +21,6 @@ - - diff --git a/src/v2/templates/people/family-list.php b/src/v2/templates/people/family-list.php index 0e7fdadcf0..0fca4bbb61 100644 --- a/src/v2/templates/people/family-list.php +++ b/src/v2/templates/people/family-list.php @@ -4,71 +4,67 @@ use ChurchCRM\dto\SystemURLs; use ChurchCRM\model\ChurchCRM\Family; -//Set the page title $sPageTitle = gettext(ucfirst($sMode)) . ' ' . gettext('Family List'); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; /* @var $families ObjectCollection */ ?>
    - - - + + +
    -



    +



    - - - - - - - - - - + + + + + + + + + + - - - + - - - - - - - - - - - - + + + + + + + + + + +
    - - - - - getName() ?> getAddress() ?>getHomePhone() ?>getCellPhone() ?>getEmail() ?>getDateEntered(), SystemConfig::getValue('sDateFormatLong')) ?> - getDateLastEdited()) { - echo date_format($family->getDateLastEdited(), SystemConfig::getValue('sDateFormatLong')); - } ?> -
    + + + + + + getName() ?> getAddress() ?>getHomePhone() ?>getCellPhone() ?>getEmail() ?>getDateEntered(), SystemConfig::getValue('sDateFormatLong')) ?> + getDateLastEdited()) { + echo date_format($family->getDateLastEdited(), SystemConfig::getValue('sDateFormatLong')); + } ?> +
    - - diff --git a/src/v2/templates/people/family-view.php b/src/v2/templates/people/family-view.php index 856620b524..0cfad56dcc 100644 --- a/src/v2/templates/people/family-view.php +++ b/src/v2/templates/people/family-view.php @@ -6,7 +6,6 @@ use ChurchCRM\dto\SystemURLs; use ChurchCRM\Service\MailChimpService; -//Set the page title $sPageTitle = $family->getName() . " - " . gettext("Family"); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; @@ -28,7 +27,6 @@ window.CRM.plugin.mailchimp = isActive() ? "true" : "false" ?>; -
    @@ -440,8 +438,6 @@ class="fa fa-fw fa-isMale() ? "male" : "female") ?>"> - - @@ -483,13 +479,9 @@ class="fa fa-fw fa-isMale() ? "male" : "female") ?>"> - - - -
    @@ -510,7 +502,6 @@ class="fa fa-fw fa-isMale() ? "male" : "female") ?>">

    -
    @@ -582,5 +573,5 @@ class="btn btn-success">
    - - + @@ -32,7 +31,6 @@ -
    @@ -48,7 +46,6 @@
    - - diff --git a/src/v2/templates/people/person-list.php b/src/v2/templates/people/person-list.php index 8171eb9ec8..17edf865b5 100644 --- a/src/v2/templates/people/person-list.php +++ b/src/v2/templates/people/person-list.php @@ -1,13 +1,5 @@ select('OptionName')->filterById(1)->find()->toArray(); $ClassificationList[] = "Unassigned"; foreach ($ListItem as $element) { $ClassificationList[] = $element; } -// role list +// Role list $ListItem = ListOptionQuery::create()->select('OptionName')->filterById(2)->find()->toArray(); $RoleList[] = "Unassigned"; foreach ($ListItem as $element) { $RoleList[] = $element; } -// person properties list +// Person properties list $ListItem = PropertyQuery::create()->filterByProClass("p")->find(); $PropertyList[] = "Unassigned"; foreach ($ListItem as $element) { @@ -61,12 +52,9 @@ function emptyOrUnassignedJSON($stuff): string $option_name = fn (string $t1, string $t2) => $t1 . ':' . $t2; - $allPersonCustomFields = PersonCustomMasterQuery::create()->find(); - - -// person custom list +// Person custom list $ListItem = PersonCustomMasterQuery::create()->select(['Name', 'FieldSecurity', 'Id', 'TypeId', 'Special'])->find(); // CREATE A MAPPING FOR CUSTOMS LIKE THIS @@ -74,7 +62,7 @@ function emptyOrUnassignedJSON($stuff): string // allowing not only for search if has a custom set but also if is set to a given value. $CustomMapping = []; -//setting unassigned to 1 so is not deleted +// Setting unassigned to 1 so it is not deleted $CustomList["Unassigned"] = 1; foreach ($ListItem as $element) { @@ -91,7 +79,7 @@ function emptyOrUnassignedJSON($stuff): string } } -// get person group list +// Get person group list $ListItem = GroupQuery::create()->find(); $GroupList[] = "Unassigned"; foreach ($ListItem as $element) { @@ -275,7 +263,6 @@ function emptyOrUnassignedJSON($stuff): string oTable = $('#members').DataTable(dataTableConfig); - $('.filter-Gender').select2({ multiple: true, placeholder: i18next.t('Select') + " " + i18next.t('Gender') @@ -435,7 +422,5 @@ function filterColumn(col, search, regEx) { }); - diff --git a/src/v2/templates/root/dashboard.php b/src/v2/templates/root/dashboard.php index 75a1c4f47e..063f9eca0d 100644 --- a/src/v2/templates/root/dashboard.php +++ b/src/v2/templates/root/dashboard.php @@ -2,11 +2,9 @@ use ChurchCRM\dto\SystemURLs; -//Set the page title include SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?> -
    @@ -198,5 +196,5 @@
    - - +getFullName(); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?> @@ -43,4 +42,5 @@
    - +getFullName() . gettext("2 Factor Authentication enrollment"); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?>
    - + @@ -20,5 +19,5 @@ - - +getFullName(); include SystemURLs::getDocumentRoot() . '/Include/Header.php'; ?> @@ -104,5 +103,5 @@ window.CRM.viewUserId = getId() ?>; - - +