Compare commits
No commits in common. "b8ab352debd016a48562825b98013f921ecff1f1" and "c9993184600894d882bc6691a5817f6dbbc129c5" have entirely different histories.
b8ab352deb
...
c999318460
|
@ -160,7 +160,7 @@ namespace controllers\internals;
|
|||
continue;
|
||||
}
|
||||
|
||||
if (!isset(array_keys($line)[0], array_keys($line)[1]))
|
||||
if (!isset($line[array_keys($line)[0]], $line[array_keys($line)[1]]))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -441,12 +441,9 @@ namespace controllers\publics;
|
|||
$mms = (bool) count($media_ids);
|
||||
|
||||
// Check if we must send message to a phone or a phone_group based on if id_phone start with 'phone_' or 'phonegroup_'
|
||||
$id_phone_group = null;
|
||||
if ($id_phone)
|
||||
{
|
||||
$id_phone_group = str_starts_with($id_phone, 'phonegroup_') ? mb_substr($id_phone, mb_strlen('phonegroup_')) : null;
|
||||
$id_phone = str_starts_with($id_phone, 'phone_') ? mb_substr($id_phone, mb_strlen('phone_')) : null;
|
||||
}
|
||||
$original_id_phone = $id_phone;
|
||||
$id_phone = str_starts_with($original_id_phone, 'phone_') ? mb_substr($original_id_phone, mb_strlen('phone_')) : null;
|
||||
$id_phone_group = str_starts_with($original_id_phone, 'phonegroup_') ? mb_substr($original_id_phone, mb_strlen('phonegroup_')) : null;
|
||||
|
||||
$scheduled_id = $this->internal_scheduled->create($id_user, $at, $text, $id_phone, $id_phone_group, $flash, $mms, $tag, $numbers, $contacts, $groups, $conditional_groups, $media_ids);
|
||||
if (!$scheduled_id)
|
||||
|
@ -666,13 +663,10 @@ namespace controllers\publics;
|
|||
|
||||
$mms = (bool) count($media_ids);
|
||||
|
||||
$id_phone_group = null;
|
||||
if ($id_phone)
|
||||
{
|
||||
$id_phone_group = str_starts_with($id_phone, 'phonegroup_') ? mb_substr($id_phone, mb_strlen('phonegroup_')) : null;
|
||||
$id_phone = str_starts_with($id_phone, 'phone_') ? mb_substr($id_phone, mb_strlen('phone_')) : null;
|
||||
}
|
||||
|
||||
$original_id_phone = $id_phone;
|
||||
$id_phone = str_starts_with($original_id_phone, 'phone_') ? mb_substr($original_id_phone, mb_strlen('phone_')) : null;
|
||||
$id_phone_group = str_starts_with($original_id_phone, 'phonegroup_') ? mb_substr($original_id_phone, mb_strlen('phonegroup_')) : null;
|
||||
|
||||
$this->internal_scheduled->update_for_user($id_user, $id_scheduled, $at, $text, $id_phone, $id_phone_group, $flash, $mms, $tag, $numbers, $contacts, $groups, $conditional_groups, $media_ids);
|
||||
++$nb_update;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue