projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handles canceled payment transactions.
[platal.git]
/
include
/
emails.combobox.inc.php
diff --git
a/include/emails.combobox.inc.php
b/include/emails.combobox.inc.php
index
0e53f1b
..
05525c5
100644
(file)
--- a/
include/emails.combobox.inc.php
+++ b/
include/emails.combobox.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
1
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-44,7
+44,7
@@
function fill_email_combobox(PlPage $page, array $retrieve, $user = null)
$emails['Redirections'] = array();
foreach ($redirect->emails as $redirect_it) {
if ($redirect_it->is_redirection()) {
$emails['Redirections'] = array();
foreach ($redirect->emails as $redirect_it) {
if ($redirect_it->is_redirection()) {
- $emails['Redirections'] = $redirect_it->email;
+ $emails['Redirections']
[]
= $redirect_it->email;
}
}
}
}
}
}
@@
-69,7
+69,7
@@
function fill_email_combobox(PlPage $page, array $retrieve, $user = null)
$emails['Email annuaire AX'] = array($profile->email_directory);
} elseif (in_array('stripped_directory', $retrieve)) {
if (User::isForeignEmailAddress($profile->email_directory)) {
$emails['Email annuaire AX'] = array($profile->email_directory);
} elseif (in_array('stripped_directory', $retrieve)) {
if (User::isForeignEmailAddress($profile->email_directory)) {
- $is_redirect = XDB::fe
ct
hOneCell('SELECT COUNT(*)
+ $is_redirect = XDB::fe
tc
hOneCell('SELECT COUNT(*)
FROM email_redirect_account
WHERE uid = {?} AND redirect = {?}',
$user->id(), $profile->email_directory);
FROM email_redirect_account
WHERE uid = {?} AND redirect = {?}',
$user->id(), $profile->email_directory);
@@
-96,5
+96,5
@@
function fill_email_combobox(PlPage $page, array $retrieve, $user = null)
$page->assign('email_lists', $emails);
}
$page->assign('email_lists', $emails);
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
f
enc=utf-8:
?>
?>