Compare commits

..

No commits in common. "ea52ad8f9933c36022c943e7db39ec145d5d820c" and "9023828c4588dc75edf6689677b9f3678e7bf7af" have entirely different histories.

View File

@ -24,14 +24,17 @@ class Mailgroups extends BaseController {
$results = $query->getResultArray();
$data['mailgroups'] = $results;
}
$sql = "SELECT email_2 as emails FROM users WHERE enddate IS NULL
UNION SELECT email FROM emails WHERE email IS NOT NULL AND email != '' AND enddate IS NULL
UNION SELECT email_1 FROM contacts WHERE email_1 IS NOT NULL AND email_1 != ''
UNION SELECT email_2 FROM contacts WHERE email_2 IS NOT NULL AND email_2 != ''";
$sql = "SELECT email_1 FROM users WHERE `enddate` IS NULL UNION SELECT email_2 FROM users WHERE `enddate` IS NULL";
$query = $db->query($sql);
$results = $query->getResultArray();
$data['emails'] = array_column($results, 'emails');
foreach($results as $email) { array_push( $data['emails'], $email['email_1']); }
$sql = "SELECT email_1 FROM contacts WHERE enddate IS NULL UNION SELECT email_2 FROM contacts WHERE enddate IS NULL;";
$query = $db->query($sql);
$results = $query->getResultArray();
foreach($results as $email) { array_push( $data['emails'], $email['email_1']); }
$data['emails'] = array_unique($data['emails']);
$data['emails'] = array_filter($data['emails']);
//print_r($data['emails']);
if ($this->request->getMethod() === 'POST') {
$rules = [
'mailgroupname' => 'required',