diff --git a/package-lock.json b/package-lock.json index 7220b1fbe6..7d210d54c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "flag-icons": "^7.2.3", "fullcalendar": "^6.1.15", "i18n": "^0.15.1", - "i18next": "^23.14.0", + "i18next": "^23.15.1", "icheck-bootstrap": "^3.0.1", "inputmask": "^5.0.9", "jquery": "^3.7.1", @@ -35,14 +35,14 @@ "pace-js": "^1.2.4", "react-bootstrap": "^2.10.4", "react-datepicker": "^7.3.0", - "react-select": "^5.7.7", + "react-select": "^5.8.1", "select2": "^4.0.13" }, "devDependencies": { "@types/jquery": "^3.5.30", "babel-cli": "^6.26.0", "babel-core": "^6.26.3", - "babel-loader": "^9.1.0", + "babel-loader": "^9.2.1", "babel-preset-react": "^6.24.1", "grunt": "^1.6.1", "grunt-cli": "^1.5.0", @@ -61,10 +61,10 @@ "node-sha1": "^1.0.1", "npm-run-all": "^4.1.5", "prettier": "^3.3.3", - "sass": "^1.78.0", + "sass": "^1.79.3", "tar": "^7.4.3", "ts-loader": "^9.5.1", - "typescript": "^5.5.4", + "typescript": "^5.6.2", "webpack": "^5.94.0", "webpack-cli": "^5.0.0" }, @@ -1286,11 +1286,10 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -2830,11 +2829,10 @@ } }, "node_modules/babel-loader": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", - "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz", + "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==", "dev": true, - "license": "MIT", "dependencies": { "find-cache-dir": "^4.0.0", "schema-utils": "^4.0.0" @@ -8186,9 +8184,9 @@ } }, "node_modules/i18next": { - "version": "23.14.0", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", - "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", + "version": "23.15.1", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.15.1.tgz", + "integrity": "sha512-wB4abZ3uK7EWodYisHl/asf8UYEhrI/vj/8aoSsrj/ZDxj4/UXPOa1KvFt1Fq5hkUHquNqwFlDprmjZ8iySgYA==", "funding": [ { "type": "individual", @@ -11993,10 +11991,9 @@ } }, "node_modules/react-select": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz", - "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==", - "license": "MIT", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.1.tgz", + "integrity": "sha512-RT1CJmuc+ejqm5MPgzyZujqDskdvB9a9ZqrdnVLsvAHjJ3Tj0hELnLeVPQlmYdVKCdCpxanepl6z7R5KhXhWzg==", "dependencies": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", @@ -13021,12 +13018,12 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.78.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz", - "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==", + "version": "1.79.3", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz", + "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==", "dev": true, "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", + "chokidar": "^4.0.0", "immutable": "^4.0.0", "source-map-js": ">=0.6.2 <2.0.0" }, @@ -13037,169 +13034,32 @@ "node": ">=14.0.0" } }, - "node_modules/sass/node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/sass/node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/sass/node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/sass/node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.0.tgz", + "integrity": "sha512-mxIojEAQcuEvT/lyXq+jf/3cO/KoA6z4CeNDGGevTybECPOMFCnQy3OPahluUkbqgPNGw5Bi78UC7Po6Lhy+NA==", "dev": true, - "license": "MIT", "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^4.0.1" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 14.16.0" }, "funding": { "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/sass/node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/sass/node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/sass/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/sass/node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "license": "MIT", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/sass/node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sass/node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sass/node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" } }, "node_modules/sass/node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz", + "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==", "dev": true, - "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, "engines": { - "node": ">=8.10.0" + "node": ">= 14.16.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/sax": { @@ -14892,9 +14752,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 7df8db63bd..48a22c9473 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "flag-icons": "^7.2.3", "fullcalendar": "^6.1.15", "i18n": "^0.15.1", - "i18next": "^23.14.0", + "i18next": "^23.15.1", "icheck-bootstrap": "^3.0.1", "inputmask": "^5.0.9", "jquery": "^3.7.1", @@ -81,14 +81,14 @@ "pace-js": "^1.2.4", "react-bootstrap": "^2.10.4", "react-datepicker": "^7.3.0", - "react-select": "^5.7.7", + "react-select": "^5.8.1", "select2": "^4.0.13" }, "devDependencies": { "@types/jquery": "^3.5.30", "babel-cli": "^6.26.0", "babel-core": "^6.26.3", - "babel-loader": "^9.1.0", + "babel-loader": "^9.2.1", "babel-preset-react": "^6.24.1", "grunt": "^1.6.1", "grunt-cli": "^1.5.0", @@ -107,10 +107,10 @@ "node-sha1": "^1.0.1", "npm-run-all": "^4.1.5", "prettier": "^3.3.3", - "sass": "^1.78.0", + "sass": "^1.79.3", "tar": "^7.4.3", "ts-loader": "^9.5.1", - "typescript": "^5.5.4", + "typescript": "^5.6.2", "webpack": "^5.94.0", "webpack-cli": "^5.0.0" }, diff --git a/src/ChurchCRM/Reports/PDF_AddressReport.php b/src/ChurchCRM/Reports/PdfAddressReport.php similarity index 100% rename from src/ChurchCRM/Reports/PDF_AddressReport.php rename to src/ChurchCRM/Reports/PdfAddressReport.php diff --git a/src/ChurchCRM/Reports/PDF_Attendance.php b/src/ChurchCRM/Reports/PdfAttendance.php similarity index 100% rename from src/ChurchCRM/Reports/PDF_Attendance.php rename to src/ChurchCRM/Reports/PdfAttendance.php diff --git a/src/ChurchCRM/Reports/PDF_CertificatesReport.php b/src/ChurchCRM/Reports/PdfCertificatesReport.php similarity index 100% rename from src/ChurchCRM/Reports/PDF_CertificatesReport.php rename to src/ChurchCRM/Reports/PdfCertificatesReport.php diff --git a/src/ChurchCRM/Reports/PDF_DepositReport.php b/src/ChurchCRM/Reports/PdfDepositReport.php similarity index 100% rename from src/ChurchCRM/Reports/PDF_DepositReport.php rename to src/ChurchCRM/Reports/PdfDepositReport.php diff --git a/src/ChurchCRM/Reports/PDF_Directory.php b/src/ChurchCRM/Reports/PdfDirectory.php similarity index 98% rename from src/ChurchCRM/Reports/PDF_Directory.php rename to src/ChurchCRM/Reports/PdfDirectory.php index 2d69eb4138..2e9d8816cc 100644 --- a/src/ChurchCRM/Reports/PDF_Directory.php +++ b/src/ChurchCRM/Reports/PdfDirectory.php @@ -326,13 +326,13 @@ public function sGetFamilyString($aRow): string } if ($bDirFamilyPhone && strlen($fam_HomePhone)) { - $sFamilyStr .= ' ' . gettext('Phone') . ': ' . ExpandPhoneNumber($fam_HomePhone, $fam_Country, $bWierd) . "\n"; + $sFamilyStr .= ' ' . gettext('Phone') . ': ' . ExpandPhoneNumber($fam_HomePhone, $fam_Country, $bWeird) . "\n"; } if ($bDirFamilyWork && strlen($fam_WorkPhone)) { - $sFamilyStr .= ' ' . gettext('Work') . ': ' . ExpandPhoneNumber($fam_WorkPhone, $fam_Country, $bWierd) . "\n"; + $sFamilyStr .= ' ' . gettext('Work') . ': ' . ExpandPhoneNumber($fam_WorkPhone, $fam_Country, $bWeird) . "\n"; } if ($bDirFamilyCell && strlen($fam_CellPhone)) { - $sFamilyStr .= ' ' . gettext('Cell') . ': ' . ExpandPhoneNumber($fam_CellPhone, $fam_Country, $bWierd) . "\n"; + $sFamilyStr .= ' ' . gettext('Cell') . ': ' . ExpandPhoneNumber($fam_CellPhone, $fam_Country, $bWeird) . "\n"; } if ($bDirFamilyEmail && strlen($fam_Email)) { $sFamilyStr .= ' ' . gettext('Email') . ': ' . $fam_Email . "\n"; @@ -399,15 +399,15 @@ public function sGetHeadString($rsCustomFields, $aHead): string $sCountry = SelectWhichInfo($per_Country, $fam_Country, false); if ($bDirPersonalPhone && strlen($per_HomePhone)) { - $TempStr = ExpandPhoneNumber($per_HomePhone, $sCountry, $bWierd); + $TempStr = ExpandPhoneNumber($per_HomePhone, $sCountry, $bWeird); $sHeadStr .= ' ' . gettext('Phone') . ': ' . $TempStr .= "\n"; } if ($bDirPersonalWork && strlen($per_WorkPhone)) { - $TempStr = ExpandPhoneNumber($per_WorkPhone, $sCountry, $bWierd); + $TempStr = ExpandPhoneNumber($per_WorkPhone, $sCountry, $bWeird); $sHeadStr .= ' ' . gettext('Work') . ': ' . $TempStr .= "\n"; } if ($bDirPersonalCell && strlen($per_CellPhone)) { - $TempStr = ExpandPhoneNumber($per_CellPhone, $sCountry, $bWierd); + $TempStr = ExpandPhoneNumber($per_CellPhone, $sCountry, $bWeird); $sHeadStr .= ' ' . gettext('Cell') . ': ' . $TempStr .= "\n"; } if ($bDirPersonalEmail && strlen($per_Email)) { @@ -456,15 +456,15 @@ public function sGetMemberString($aRow): string $sCountry = SelectWhichInfo($per_Country, $fam_Country, false); if ($bDirPersonalPhone && strlen($per_HomePhone)) { - $TempStr = ExpandPhoneNumber($per_HomePhone, $sCountry, $bWierd); + $TempStr = ExpandPhoneNumber($per_HomePhone, $sCountry, $bWeird); $sMemberStr .= ' ' . gettext('Phone') . ': ' . $TempStr .= "\n"; } if ($bDirPersonalWork && strlen($per_WorkPhone)) { - $TempStr = ExpandPhoneNumber($per_WorkPhone, $sCountry, $bWierd); + $TempStr = ExpandPhoneNumber($per_WorkPhone, $sCountry, $bWeird); $sMemberStr .= ' ' . gettext('Work') . ': ' . $TempStr .= "\n"; } if ($bDirPersonalCell && strlen($per_CellPhone)) { - $TempStr = ExpandPhoneNumber($per_CellPhone, $sCountry, $bWierd); + $TempStr = ExpandPhoneNumber($per_CellPhone, $sCountry, $bWeird); $sMemberStr .= ' ' . gettext('Cell') . ': ' . $TempStr .= "\n"; } if ($bDirPersonalEmail && strlen($per_Email)) { diff --git a/src/ChurchCRM/Reports/PDF_GroupDirectory.php b/src/ChurchCRM/Reports/PdfGroupDirectory.php similarity index 100% rename from src/ChurchCRM/Reports/PDF_GroupDirectory.php rename to src/ChurchCRM/Reports/PdfGroupDirectory.php diff --git a/src/ChurchCRM/Reports/PDF_Label.php b/src/ChurchCRM/Reports/PdfLabel.php similarity index 100% rename from src/ChurchCRM/Reports/PDF_Label.php rename to src/ChurchCRM/Reports/PdfLabel.php diff --git a/src/ChurchCRM/Reports/PDF_NewsletterLabels.php b/src/ChurchCRM/Reports/PdfNewsletterLabels.php similarity index 100% rename from src/ChurchCRM/Reports/PDF_NewsletterLabels.php rename to src/ChurchCRM/Reports/PdfNewsletterLabels.php diff --git a/src/Reports/DirectoryReport.php b/src/Reports/DirectoryReport.php index 2072523f9f..fad8997315 100644 --- a/src/Reports/DirectoryReport.php +++ b/src/Reports/DirectoryReport.php @@ -269,15 +269,15 @@ } } if (($bDirFamilyPhone || $bDirPersonalPhone) && strlen($sHomePhone)) { - $TempStr = ExpandPhoneNumber($sHomePhone, SystemConfig::getValue('sDefaultCountry'), $bWierd); + $TempStr = ExpandPhoneNumber($sHomePhone, SystemConfig::getValue('sDefaultCountry'), $bWeird); $OutStr .= ' ' . gettext('Phone') . ': ' . $TempStr . "\n"; } if (($bDirFamilyWork || $bDirPersonalWork) && strlen($sWorkPhone)) { - $TempStr = ExpandPhoneNumber($sWorkPhone, SystemConfig::getValue('sDefaultCountry'), $bWierd); + $TempStr = ExpandPhoneNumber($sWorkPhone, SystemConfig::getValue('sDefaultCountry'), $bWeird); $OutStr .= ' ' . gettext('Work') . ': ' . $TempStr . "\n"; } if (($bDirFamilyCell || $bDirPersonalCell) && strlen($sCellPhone)) { - $TempStr = ExpandPhoneNumber($sCellPhone, SystemConfig::getValue('sDefaultCountry'), $bWierd); + $TempStr = ExpandPhoneNumber($sCellPhone, SystemConfig::getValue('sDefaultCountry'), $bWeird); $OutStr .= ' ' . gettext('Cell') . ': ' . $TempStr . "\n"; } if (($bDirFamilyEmail || $bDirPersonalEmail) && strlen($sEmail)) { diff --git a/src/Reports/GroupReport.php b/src/Reports/GroupReport.php index 60443502ee..bbd14fc4cd 100644 --- a/src/Reports/GroupReport.php +++ b/src/Reports/GroupReport.php @@ -100,17 +100,17 @@ } if (isset($_POST['HomePhoneEnable']) && strlen($sHomePhone)) { - $TempStr = ExpandPhoneNumber($sHomePhone, SystemConfig::getValue('sDefaultCountry'), $bWierd); + $TempStr = ExpandPhoneNumber($sHomePhone, SystemConfig::getValue('sDefaultCountry'), $bWeird); $OutStr .= ' ' . gettext('Phone') . ': ' . $TempStr . "\n"; } if (isset($_POST['WorkPhoneEnable']) && strlen($sWorkPhone)) { - $TempStr = ExpandPhoneNumber($sWorkPhone, SystemConfig::getValue('sDefaultCountry'), $bWierd); + $TempStr = ExpandPhoneNumber($sWorkPhone, SystemConfig::getValue('sDefaultCountry'), $bWeird); $OutStr .= ' ' . gettext('Work') . ': ' . $TempStr . "\n"; } if (isset($_POST['CellPhoneEnable']) && strlen($sCellPhone)) { - $TempStr = ExpandPhoneNumber($sCellPhone, SystemConfig::getValue('sDefaultCountry'), $bWierd); + $TempStr = ExpandPhoneNumber($sCellPhone, SystemConfig::getValue('sDefaultCountry'), $bWeird); $OutStr .= ' ' . gettext('Cell') . ': ' . $TempStr . "\n"; } diff --git a/src/skin/js/PersonView.js b/src/skin/js/PersonView.js index 39faa2d5a0..52d7f9a951 100644 --- a/src/skin/js/PersonView.js +++ b/src/skin/js/PersonView.js @@ -202,10 +202,10 @@ $(document).ready(function () { "/api/mailchimp/person/" + window.CRM.currentPersonID, success: function (data, status, xmlHttpReq) { - for (emailData of data) { + for (const emailData of data) { let htmlVal = ""; - let eamilMD5 = emailData["emailMD5"]; - for (list of emailData["list"]) { + let emailMD5 = emailData["emailMD5"]; + for (const list of emailData["list"]) { let listName = list["name"]; let listStatus = list["status"]; if (listStatus != 404) { @@ -227,7 +227,7 @@ $(document).ready(function () { if (htmlVal === "") { htmlVal = i18next.t("Not Subscribed "); } - $("#" + eamilMD5).html(htmlVal); + $("#" + emailMD5).html(htmlVal); } }, });