Skip to content

Messenger: Fixed the issue of Non-Parameterised input #2119

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

Open
ali-ichk wants to merge 3 commits into
base: v31.0.00
Choose a base branch
from
Open

Messenger: Fixed the issue of Non-Parameterised input #2119

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8694d16
Messenger: Fixed the issue of Non-Parameterised input
ali-ichk Jun 17, 2026
2f41be6
Messenger: improved the code based on code review to add the variable…
ali-ichk Jun 18, 2026
c4953ae
Messenger: Improved code after removing complexity and fixing the iss…
ali-ichk Jun 30, 2026
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
55 changes: 28 additions & 27 deletions modules/Messenger/src/MessageTargets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,11 +1902,11 @@ public function createMessageRecipientsFromTargets($gibbonMessengerID, $data, &$
$currentStudent="";
$lastStudent="";
while ($row=$result->fetch()) {
$currentStudent=$row["gibbonPersonID"] ;
if (in_array($row["type"], $choices) AND $currentStudent!=$lastStudent) {
$selectedStudents[]=$currentStudent ;
}
$lastStudent=$currentStudent ;
$currentStudent=$row["gibbonPersonID"] ;
if (in_array($row["type"], $choices) AND $currentStudent!=$lastStudent) {
$selectedStudents[]=$currentStudent ;
}
$lastStudent=$currentStudent ;
}

if (count($selectedStudents)>=1) {
Expand Down Expand Up @@ -1953,15 +1953,16 @@ public function createMessageRecipientsFromTargets($gibbonMessengerID, $data, &$
}
}
} //end get emails

//Get SMS
if ($sms=="Y" AND $countryCode!="") {
if ($parents=="Y") {
try { //Get the familyIDs for each student logged
$dataFamily=array();
$sqlFamily="SELECT DISTINCT gibbonFamilyID FROM gibbonFamilyChild WHERE gibbonPersonID IN (".implode(",",$selectedStudents).")" ;
$resultFamily=$connection2->prepare($sqlFamily);
$resultFamily->execute($dataFamily);
$resultFamilies = $resultFamily->fetchAll();
$dataFamily=array("gibbonPersonIDs"=>implode(",", $selectedStudents));
$sqlFamily="SELECT DISTINCT gibbonFamilyID FROM gibbonFamilyChild WHERE FIND_IN_SET(gibbonPersonID, :gibbonPersonIDs)" ;
$resultFamily=$connection2->prepare($sqlFamily);
$resultFamily->execute($dataFamily);
$resultFamilies = $resultFamily->fetchAll();
}
catch(\PDOException $e) { }

Expand Down Expand Up @@ -1994,25 +1995,25 @@ public function createMessageRecipientsFromTargets($gibbonMessengerID, $data, &$
}
}
if ($students=="Y") {
try { //Get the phone numbers for each student
foreach ($selectedStudents as $t) {
$dataSMS=array("gibbonPersonID"=>$t);
$sqlSMS="(SELECT phone1 AS phone, phone1CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone1='' AND phone1Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$sqlSMS.=" UNION (SELECT phone2 AS phone, phone2CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone2='' AND phone2Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$sqlSMS.=" UNION (SELECT phone3 AS phone, phone3CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone3='' AND phone3Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$sqlSMS.=" UNION (SELECT phone4 AS phone, phone4CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone4='' AND phone4Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$resultSMS=$connection2->prepare($sqlSMS);
$resultSMS->execute($dataSMS);
try { //Get the phone numbers for each student
foreach ($selectedStudents as $t) {
$dataSMS=array("gibbonPersonID"=>$t);
$sqlSMS="(SELECT phone1 AS phone, phone1CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone1='' AND phone1Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$sqlSMS.=" UNION (SELECT phone2 AS phone, phone2CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone2='' AND phone2Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$sqlSMS.=" UNION (SELECT phone3 AS phone, phone3CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone3='' AND phone3Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$sqlSMS.=" UNION (SELECT phone4 AS phone, phone4CountryCode AS countryCode, gibbonPerson.gibbonPersonID FROM gibbonPerson WHERE NOT phone4='' AND phone4Type='Mobile' AND gibbonPersonID=:gibbonPersonID AND status='Full')" ;
$resultSMS=$connection2->prepare($sqlSMS);
$resultSMS->execute($dataSMS);
}
} catch(\PDOException $e) { }

while ($rowSMS=$resultSMS->fetch()) {
$countryCodeTemp = $countryCode;
if ($rowSMS["countryCode"]=="")
$countryCodeTemp = $rowSMS["countryCode"];
$this->reportAdd($emailReceipt, $rowSMS['gibbonPersonID'], 'Attendance', $t, 'SMS', $countryCodeTemp.$rowSMS["phone"]);
}
}
catch(\PDOException $e) { }
while ($rowSMS=$resultSMS->fetch()) {
$countryCodeTemp = $countryCode;
if ($rowSMS["countryCode"]=="")
$countryCodeTemp = $rowSMS["countryCode"];
$this->reportAdd($emailReceipt, $rowSMS['gibbonPersonID'], 'Attendance', $t, 'SMS', $countryCodeTemp.$rowSMS["phone"]);
}
}
} //END SMS
}
}
Expand Down
Loading