github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Issue #244 CarrierSMS 

Added carriersms procedural changes
pull/245/head
Glen 2016-01-03 20:01:47 -07:00
parent d288ff133f
commit af35872b76
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/psm/Util/Server/Updater/StatusNotifier.php
View File

@ -280,17 +280,33 @@ class StatusNotifier {
// we have to build an userlist for the log table.. // we have to build an userlist for the log table..
$userlist = array(); $userlist = array();
// add all users to the recipients list // CarrierSMS sends plain/text "email" so pass vars to CarrierSMS class.
foreach ($users as $user) { if($GLOBALS['sm_config']['sms_gateway'] == 'carriersms') {
$userlist[] = $user['user_id']; // add all users to the recipients list
$sms->addRecipients($user['mobile']); foreach ($users as $user) {
if($user['carriersms'] != ""){
// only log users configured with a mobile email address
$userlist[] = $user['user_id'];
$sms->addRecipients($user['carriersms']);
}
}
// Send sms, CarrierSMS class will handle messaging
$result = $sms->sendSMS($this->status_new, $this->server);
$message = $sms->resultmessage;
}else{
// add all users to the recipients list
foreach ($users as $user) {
$userlist[] = $user['user_id'];
$sms->addRecipients($user['mobile']);
}
$message = psm_parse_msg($this->status_new, 'sms', $this->server);
// Send sms
$result = $sms->sendSMS($message);
} }
$message = psm_parse_msg($this->status_new, 'sms', $this->server);
// Send sms
$result = $sms->sendSMS($message);
if(psm_get_conf('log_sms')) { if(psm_get_conf('log_sms')) {
// save to log // save to log
psm_add_log($this->server_id, 'sms', $message, implode(',', $userlist)); psm_add_log($this->server_id, 'sms', $message, implode(',', $userlist));
@ -306,7 +322,7 @@ class StatusNotifier {
public function getUsers($server_id) { public function getUsers($server_id) {
// find all the users with this server listed // find all the users with this server listed
$users = $this->db->query(" $users = $this->db->query("
SELECT `u`.`user_id`, `u`.`name`,`u`.`email`, `u`.`mobile`, `u`.`pushover_key`, `u`.`pushover_device` SELECT `u`.`user_id`, `u`.`name`,`u`.`email`, `u`.`mobile`, `u`.`pushover_key`, `u`.`pushover_device`, `u`.`carriersms`
FROM `".PSM_DB_PREFIX."users` AS `u` FROM `".PSM_DB_PREFIX."users` AS `u`
JOIN `".PSM_DB_PREFIX."users_servers` AS `us` ON ( JOIN `".PSM_DB_PREFIX."users_servers` AS `us` ON (
`us`.`user_id`=`u`.`user_id` `us`.`user_id`=`u`.`user_id`
@ -315,4 +331,4 @@ class StatusNotifier {
"); ");
return $users; return $users;
} }
} }