define('ERROR_INVALID_EMAIL', 3);
define('ERROR_LOOP_EMAIL', 4);
-function add_to_list_alias(User $user, $local_part, $domain, $type = 'alias')
+function format_email_alias($email)
{
- Platal::assert($user !== null);
+ if ($user = User::getSilent($email)) {
+ return $user->forlifeEmail();
+ }
+ if (isvalid_email($email)) {
+ return $email;
+ }
+ return null;
+}
+
+function add_to_list_alias($email, $local_part, $domain, $type = 'alias')
+{
+ $email = format_email_alias($email);
+ if (is_null($email)) {
+ return false;
+ }
XDB::execute('INSERT IGNORE INTO email_virtual (email, domain, redirect, type)
SELECT {?}, id, {?}, {?}
FROM email_virtual_domains
WHERE name = {?}',
- $local_part, $user->forlifeEmail(), $type, $domain);
+ $local_part, $email, $type, $domain);
+ return true;
}
-function delete_from_list_alias(User $user, $local_part, $domain, $type = 'alias')
+function delete_from_list_alias($email, $local_part, $domain, $type = 'alias')
{
- Platal::assert($user !== null);
+ $email = format_email_alias($email);
+ if (is_null($email)) {
+ return false;
+ }
XDB::execute('DELETE v
FROM email_virtual AS v
INNER JOIN email_virtual_domains AS m ON (v.domain = m.id)
INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id)
WHERE v.email = {?} AND d.name = {?} AND v.redirect = {?} AND type = {?}',
- $local_part, $domain, $user->forlifeEmail(), $type);
+ $local_part, $domain, $email, $type);
+ return true;
}
-function update_list_alias(User $user, $former_email, $local_part, $domain, $type = 'alias')
+function update_list_alias($email, $former_email, $local_part, $domain, $type = 'alias')
{
- Platal::assert($user !== null);
+ $email = format_email_alias($email);
+ if (is_null($email)) {
+ return false;
+ }
XDB::execute('UPDATE email_virtual AS v
INNER JOIN email_virtual_domains AS d ON (v.domain = d.id)
SET v.redirect = {?}
WHERE v.redirect = {?} AND d.name = {?} AND v.email = {?} AND v.type = {?}',
- $user->forlifeEmail(), $former_email, $domain, $local_part, $type);
+ $email, $former_email, $domain, $local_part, $type);
+ return true;
}
function list_alias_members($local_part, $domain)
WHERE v.email = {?} AND d.name = {?} AND type = \'alias\'',
$local_part, $domain);
- $members = array();
+ $users = array();
+ $nonusers = array();
foreach ($emails as $email) {
- $members[] = User::getSilent($email);
+ if ($user = User::getSilent($email)) {
+ $users[] = $user;
+ } else {
+ $nonusers[] = $email;
+ }
}
- return $members;
+ return array(
+ 'users' => $users,
+ 'nonusers' => $nonusers
+ );
}
function delete_list_alias($local_part, $domain)
$redirect = $domain . '_' . $local_part . '+';
foreach(array('post', 'owner', 'admin', 'bounces', 'unsubscribe') as $suffix) {
- XDB::execute('DELETE email_virtual
- WHERE redirect = {?} AND type = \'list\'',
+ XDB::execute('DELETE FROM email_virtual
+ WHERE redirect = {?} AND type = \'list\'',
$redirect . $suffix . '@' . $globals->lists->redirect_domain);
}
}
// Google Apps storage is available for users with valid Google Apps account.
require_once 'googleapps.inc.php';
- if ($globals->mailstorage->googleapps_domain &&
+ if ($user->checkPerms('gapps') &&
+ $globals->mailstorage->googleapps_domain &&
GoogleAppsAccount::account_status($user->id()) == 'active') {
$storages[] = 'googleapps';
}
static public function activate_storage(User $user, $storage)
{
- Platal::assert(in_array($storage, self::get_allowed_storages($user)));
+ Platal::assert(in_array($storage, self::get_allowed_storages($user)), 'Unknown storage.');
if (!self::is_active_storage($user, $storage)) {
global $globals;