Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typos and inaccurate filenames #7160

Merged
merged 4 commits into from
Sep 21, 2024
Merged

fix typos and inaccurate filenames #7160

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c738615
fix typo bWierd -> bWeird
DAcodedBEAT Sep 21, 2024
e2fbc21
rename files to match php classnames
DAcodedBEAT Sep 21, 2024
1afd1eb
fix typo eamilMD5 -> emailMD5
DAcodedBEAT Sep 21, 2024
287f7ef
update npm deps
DAcodedBEAT Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 src/ChurchCRM/Reports/PDF_AddressReport.php → src/ChurchCRM/Reports/PdfAddressReport.php
View file
Open in desktop
File renamed without changes.
0 src/ChurchCRM/Reports/PDF_Attendance.php → src/ChurchCRM/Reports/PdfAttendance.php
View file
Open in desktop
File renamed without changes.
0 ...rchCRM/Reports/PDF_CertificatesReport.php → ...urchCRM/Reports/PdfCertificatesReport.php
View file
Open in desktop
File renamed without changes.
0 src/ChurchCRM/Reports/PDF_DepositReport.php → src/ChurchCRM/Reports/PdfDepositReport.php
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions src/ChurchCRM/Reports/PDF_Directory.php → src/ChurchCRM/Reports/PdfDirectory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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)) {
Expand Down
0 src/ChurchCRM/Reports/PDF_GroupDirectory.php → src/ChurchCRM/Reports/PdfGroupDirectory.php
View file
Open in desktop
File renamed without changes.
0 src/ChurchCRM/Reports/PDF_Label.php → src/ChurchCRM/Reports/PdfLabel.php
View file
Open in desktop
File renamed without changes.
0 ...hurchCRM/Reports/PDF_NewsletterLabels.php → ...ChurchCRM/Reports/PdfNewsletterLabels.php
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/Reports/DirectoryReport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
6 changes: 3 additions & 3 deletions src/Reports/GroupReport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

Expand Down
8 changes: 4 additions & 4 deletions src/skin/js/PersonView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@
"/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"];

Check failure

Code scanning / devskim

A weak or broken hash algorithm was detected. Error

Weak/Broken Hash Algorithm
for (const list of emailData["list"]) {
let listName = list["name"];
let listStatus = list["status"];
if (listStatus != 404) {
Expand All @@ -227,7 +227,7 @@
if (htmlVal === "") {
htmlVal = i18next.t("Not Subscribed ");
}
$("#" + eamilMD5).html(htmlVal);
$("#" + emailMD5).html(htmlVal);
}
},
});
Expand Down
Loading