require_once("xorg.misc.inc.php");
-// {{{ defines
-
define("SUCCESS", 1);
define("ERROR_INACTIVE_REDIRECTION", 2);
define("ERROR_INVALID_EMAIL", 3);
define("ERROR_LOOP_EMAIL", 4);
-// }}}
-// {{{ function fix_bestalias()
+// function fix_bestalias() {{{1
function fix_bestalias($uid)
{
LIMIT 1", $uid);
}
-// }}}
-// {{{ function valide_email()
+// function valide_email() {{{1
function valide_email($str)
{
return $ident . '@' . $dom;
}
-// }}}
-// {{{ class Bogo
+// class Bogo {{{1
class Bogo
{
- // {{{ properties
+ // properties {{{2
private $state;
private $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams');
- // }}}
- // {{{ constructor
+ // constructor {{{2
public function __construct($uid)
{
}
}
- // }}}
- // {{{ function change()
+ // public function change() {{{2
public function change($uid, $state)
{
$this->state, $uid);
}
- // }}}
- // {{{ function level()
+ // pubic function level() {{{2
public function level()
{
return array_search($this->state, $this->_states);
}
-
- // }}}
}
-// }}}
-// {{{ class Email
+// class Email {{{1
class Email
{
- // {{{ properties
+ // properties {{{2
public $email;
public $active;
public $broken;
+ public $disabled;
public $rewrite;
public $panne;
public $last;
public $panne_level;
- // }}}
- // {{{ constructor
+ // constructor {{{2
public function __construct($row)
{
list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row;
- $this->active = ($flags == 'active');
- $this->broken = ($flags == 'panne');
+ $this->active = ($flags == 'active');
+ $this->broken = ($flags == 'panne');
+ $this->disabled = ($flags == 'disable');
}
- // }}}
- // {{{ function activate()
+ // public function activate() {{{2
public function activate($uid)
{
}
}
- // }}}
- // {{{ function deactivate()
+ // public function deactivate() {{{2
public function deactivate($uid)
{
}
}
- // }}}
- // {{{ function rewrite()
+ // public function rewrite() {{{2
public function rewrite($rew, $uid)
{
return;
}
- // }}}
+ // function cleanErrors() {{{2
+
+ public function cleanErrors($uid)
+ {
+ if (!S::has_perms()) {
+ return false;
+ }
+ $this->panne = 0;
+ $this->panne_level = 0;
+ $this->last = 0;
+ return XDB::execute("UPDATE emails
+ SET panne_level = 0, panne = 0, last = 0
+ WHERE uid = {?} AND email = {?}",
+ $uid, $this->email);
+ }
}
-// }}}
-// {{{ class Redirect
+// class Redirect {{{1
class Redirect
{
- // {{{ properties
+ // properties {{{2
private $flag_active = 'active';
private $uid;
public $emails;
public $bogo;
- // }}}
- // {{{ function Redirect()
+ // constructor {{{2
public function __construct($_uid)
{
$this->bogo = new Bogo($_uid);
}
- // }}}
- // {{{ function other_active()
+ // public function other_active() {{{2
public function other_active($email)
{
return false;
}
- // }}}
- // {{{ function delete_email()
+ // public function delete_email() {{{2
public function delete_email($email)
{
return SUCCESS;
}
- // }}}
- // {{{ function add_email()
+ // public function add_email() {{{2
public function add_email($email)
{
return SUCCESS;
}
- // }}}
- // {{{ function modify_email()
+ // public function modify_email() {{{2
public function modify_email($emails_actifs, $emails_rewrite)
{
- foreach ($this->emails as $i=>$mail) {
- if (in_array($mail->email,$emails_actifs)) {
- $this->emails[$i]->activate($this->uid);
+ foreach ($this->emails as &$mail) {
+ if (in_array($mail->email, $emails_actifs)) {
+ $mail->activate($this->uid);
} else {
- $this->emails[$i]->deactivate($this->uid);
+ $mail->deactivate($this->uid);
}
- $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid);
+ $mail->rewrite($emails_rewrite[$mail->email], $this->uid);
}
check_redirect($this);
}
+ // public function modify_one_email() {{{2
+
public function modify_one_email($email, $activate)
{
$allinactive = true;
}
}
+ // public function modify_one_email_redirect() {{{2
+
public function modify_one_email_redirect($email, $redirect)
{
- foreach ($this->emails as $i=>$mail) {
+ foreach ($this->emails as &$mail) {
if ($mail->email == $email) {
- $this->emails[$i]->rewrite($redirect, $this->uid);
+ $mail->rewrite($redirect, $this->uid);
check_redirect($this);
return;
}
}
}
- // }}}
- // {{{ function get_broken_mx()
+
+ // function cleanErrors() {{{2
+
+ public function cleanErrors($email)
+ {
+ foreach ($this->emails as &$mail) {
+ if ($mail->email == $email) {
+ return $mail->cleanErrors($this->uid);
+ }
+ }
+ return false;
+ }
+
+ // function disable() {{{2
+
+ public function disable()
+ {
+ XDB::execute("UPDATE emails
+ SET flags = 'disable'
+ WHERE flags = 'active' AND uid = {?}", $this->uid);
+ foreach ($this->emails as &$mail) {
+ if ($mail->active) {
+ $mail->disabled = true;
+ $mail->active = false;
+ }
+ }
+ }
+
+ // function enable() {{{2
+
+ public function enable()
+ {
+ XDB::execute("UPDATE emails
+ SET flags = 'active'
+ WHERE flags = 'disable' AND uid = {?}", $this->uid);
+ foreach ($this->emails as &$mail) {
+ if ($mail->disabled) {
+ $mail->active = true;
+ $mail->disabled = false;
+ }
+ }
+ }
+
+ // function get_broken_mx() {{{2
public function get_broken_mx()
{
}
return $mails;
}
-
- // }}}
}
-// }}}
-
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>
'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_MDP, 'admin'),
'admin/wiki' => $this->make_hook('wiki', AUTH_MDP, 'admin'),
'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_MDP, 'admin'),
- 'admin/icons' => $this->make_hook('icons', AUTH_MDP, 'admin'),
+ 'admin/icons' => $this->make_hook('icons', AUTH_MDP, 'admin'),
);
}
$page->trig($val." a été supprimé");
}
break;
- case "activate_fwd":
- if (!empty($val)) {
- $redirect->modify_one_email($val, true);
- }
- break;
- case "deactivate_fwd":
- if (!empty($val)) {
- $redirect->modify_one_email($val, false);
- }
- break;
+ case "activate_fwd":
+ if (!empty($val)) {
+ $redirect->modify_one_email($val, true);
+ }
+ break;
+ case "deactivate_fwd":
+ if (!empty($val)) {
+ $redirect->modify_one_email($val, false);
+ }
+ break;
+ case "disable_fwd":
+ $redirect->disable();
+ break;
+ case "enable_fwd":
+ $redirect->enable();
+ break;
+ case "clean_fwd":
+ if (!empty($val)) {
+ $redirect->cleanErrors($val);
+ }
+ break;
case "add_alias":
XDB::execute("INSERT INTO aliases (id,alias,type) VALUES ({?}, {?}, 'alias')",
$mr['user_id'], Env::v('email'));
// Editer un profil
case "u_edit":
- require_once('secure_hash.inc.php');
- $pass_encrypted = Env::v('newpass_clair') != "********" ? hash_encrypt(Env::v('newpass_clair')) : Env::v('passw');
- $naiss = Env::v('naissanceN');
- $deces = Env::v('decesN');
- $perms = Env::v('permsN');
- $prenm = Env::v('prenomN');
- $nom = Env::v('nomN');
- $promo = Env::i('promoN');
- $sexe = Env::v('sexeN');
- $comm = trim(Env::v('commentN'));
- $watch = Env::v('watchN');
- $flags = '';
- if ($sexe) {
- $flags = 'femme';
- }
- if ($watch) {
- if ($flags) {
- $flags .= ',';
+ require_once('secure_hash.inc.php');
+ $pass_encrypted = Env::v('newpass_clair') != "********" ? hash_encrypt(Env::v('newpass_clair')) : Env::v('passw');
+ $naiss = Env::v('naissanceN');
+ $deces = Env::v('decesN');
+ $perms = Env::v('permsN');
+ $prenm = Env::v('prenomN');
+ $nom = Env::v('nomN');
+ $promo = Env::i('promoN');
+ $sexe = Env::v('sexeN');
+ $comm = trim(Env::v('commentN'));
+ $watch = Env::v('watchN');
+ $flags = '';
+ if ($sexe) {
+ $flags = 'femme';
+ }
+ if ($watch) {
+ if ($flags) {
+ $flags .= ',';
+ }
+ $flags .= 'watch';
}
- $flags .= 'watch';
- }
- if ($watch && !$comm) {
- $page->trig("Il est nécessaire de mettre un commentaire pour surveiller un compte");
- break;
- }
+ if ($watch && !$comm) {
+ $page->trig("Il est nécessaire de mettre un commentaire pour surveiller un compte");
+ break;
+ }
- $query = "UPDATE auth_user_md5 SET
- naissance = '$naiss',
- deces = '$deces',
- password = '$pass_encrypted',
- perms = '$perms',
- prenom = '".addslashes($prenm)."',
- nom = '".addslashes($nom)."',
- flags = '$flags',
- promo = $promo,
- comment = '".addslashes($comm)."'
- WHERE user_id = '{$mr['user_id']}'";
- if (XDB::execute($query)) {
+ $query = "UPDATE auth_user_md5 SET
+ naissance = '$naiss',
+ deces = '$deces',
+ password = '$pass_encrypted',
+ perms = '$perms',
+ prenom = '".addslashes($prenm)."',
+ nom = '".addslashes($nom)."',
+ flags = '$flags',
+ promo = $promo,
+ comment = '".addslashes($comm)."'
+ WHERE user_id = '{$mr['user_id']}'";
+ if (XDB::execute($query)) {
user_reindex($mr['user_id']);
$mailer = new PlMailer("admin/mail_intervention.tpl");
$page->assign('lastlogin', $lastlogin);
$page->assign('host', $host);
- $res = XDB::query("SELECT alias
- FROM virtual
- INNER JOIN virtual_redirect USING(vid)
- WHERE type = 'user' AND redirect LIKE '" . $login . "@%'");
- if ($res->numRows()) {
- $page->assign('virtual', $res->fetchOneCell());
- }
+ $res = XDB::iterator("SELECT alias
+ FROM virtual
+ INNER JOIN virtual_redirect USING(vid)
+ WHERE type = 'user' AND redirect LIKE '" . $login . "@%'");
+ $page->assign('virtuals', $res);
$page->assign('aliases', XDB::iterator(
"SELECT alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire
{
$page->changeTpl('admin/valider.tpl');
$page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande');
- $page->addCssLink('nl.css');
+ $page->addCssLink('nl.css');
$page->addJsLink('ajax.js');
require_once("validations.inc.php");
}
function handler_icons(&$page)
- {
- $page->changeTpl('admin/icons.tpl');
- $dh = opendir('../htdocs/images/icons');
- if (!$dh) {
- $page->trig('Dossier des icones introuvables.');
- }
- $icons = array();
- while (($file = readdir($dh)) !== false) {
- if (strlen($file) > 4 && substr($file,-4) == '.gif') {
- array_push($icons, substr($file, 0, -4));
- }
- }
- sort($icons);
- $page->assign('icons', $icons);
+ {
+ $page->changeTpl('admin/icons.tpl');
+ $dh = opendir('../htdocs/images/icons');
+ if (!$dh) {
+ $page->trig('Dossier des icones introuvables.');
+ }
+ $icons = array();
+ while (($file = readdir($dh)) !== false) {
+ if (strlen($file) > 4 && substr($file,-4) == '.gif') {
+ array_push($icons, substr($file, 0, -4));
+ }
+ }
+ sort($icons);
+ $page->assign('icons', $icons);
}
}
document.forms.fwds.deactivate_fwd.value = fwd;
document.forms.fwds.submit();
}
+function clean_fwd(fwd) {
+ document.forms.fwds.clean_fwd.value = fwd;
+ document.forms.fwds.submit();
+}
// ]]>
</script>
{/literal}
{/if}
</tr>
{/iterate}
- {if $virtual}
+ {iterate from=$virtuals item=virtual}
<tr class="{cycle values="impair,pair"}">
<td></td>
- <td>{$virtual}</td>
+ <td>{$virtual.alias}</td>
<td></td>
</tr>
- {/if}
+ {/iterate}
<tr class="{cycle values="impair,pair"}">
<td colspan="2" class="detail">
<input type="text" name="email" size="29" maxlength="60" value="" />
Redirections
</th>
</tr>
+ {assign var=actives value=false}
+ {assign var=disabled value=false}
{foreach item=mail from=$emails}
{cycle assign=class values="impair,pair"}
<tr class="{$class}">
+ {if $mail->active}
+ {assign var=actives value=true}
+ {elseif $mail->disabled}
+ {assign var=disabled value=true}
+ {/if}
<td class="titre">
- {if $mail->active}active{/if}
+ {if $mail->active}active{elseif $mail->disabled}suspendue{/if}
</td>
<td>
- <span class="smaller"><a href="javascript:act_fwd('{$mail->email}',{if $mail->active}false{else}true{/if})">{if $mail->active}des{elseif $mail->broken}ré{/if}activer</a></span>
+ <span class="smaller">
+ {if !$mail->disabled}
+ <a href="javascript:act_fwd('{$mail->email}',{if $mail->active}false{else}true{/if})">
+ {if $mail->active}des{elseif $mail->broken}ré{/if}activer
+ </a>
+ {/if}
+ </span>
</td>
<td>
{if $mail->broken}<span style="color: #f00">{/if}
</tr>
{if $mail->panne && $mail->panne neq "0000-00-00"}
<tr class="{$class}">
- <td colspan="4" class="smaller" style="color: #f00">
+ <td colspan="3" class="smaller" style="color: #f00">
{icon name=error title="Panne"}
Panne de {$mail->email} le {$mail->panne|date_format}
{if $mail->panne neq $mail->last}confirmée le {$mail->last|date_format}{/if}
</td>
+ <td class="action">
+ <a href="javascript:clean_fwd('{$mail->email}')">effacer les pannes</a>
+ </td>
</tr>
{/if}
{/foreach}
- <tr class="{cycle values="impair,pair"}">
+ {cycle assign=class values="impair,pair"}
+ <tr class="{$class}">
<td class="titre" colspan="2">
Ajouter un email
</td>
<td class="action">
<input type="hidden" name="user_id" value="{$mr.user_id}" />
<input type="hidden" name="del_fwd" value="" />
+ <input type="hidden" name="clean_fwd" value="" />
<input type="hidden" name="activate_fwd" value="" />
<input type="hidden" name="deactivate_fwd" value="" />
<input type="submit" name="add_fwd" value="Ajouter" />
</td>
</tr>
+ <tr class="{$class}">
+ <td colspan="4" class="center">
+ {if $actives}
+ <input type="submit" name="disable_fwd" value="Désactiver la redirection mail" />
+ {/if}
+ {if $disabled}
+ <input type="submit" name="enable_fwd" value="Réactiver la redirection mail" />
+ {/if}
+ </td>
+ </tr>
</table>
</form>
{/literal}
<p class="center">
- {icon name=magnifier
"} <a href="Site/AllRecentChanges">Voir les changements récents</a>
+ {icon name=magnifier} <a href="Site/AllRecentChanges">Voir les changements récents</a>
</p>
<form action="admin/wiki/update" method="post" id="update_pages">
--- /dev/null
+alter table emails change column flags flags enum('active','filter','panne','disable') not null default 'active';
+
+# vim:set syntax=mysql:
projects / platal.git / commitdiff