* This file is part of DisOrder.
* Copyright (C) 2004-2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "disorder-server.h"
c->lo = 0;
return;
}
- /* user-* messages are restricted */
- if(!strncmp(msg, "user-", 5)) {
+ /* user_* messages are restricted */
+ if(!strncmp(msg, "user_", 5)) {
/* They are only sent to admin users */
if(!(c->rights & RIGHT_ADMIN))
return;
/* Notify any log connections */
if(d->lo)
sink_printf(ev_writer_sink(d->w),
- "%"PRIxMAX" rights-changed %s\n",
+ "%"PRIxMAX" rights_changed %s\n",
(uintmax_t)time(0),
- new_rights);
+ quoteutf8(new_rights));
}
}
}
sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n");
return 1;
}
- /* TODO use email_valid() */
if(!(email = kvp_get(k, "email"))
- || !strchr(email, '@')) {
+ || !email_valid(email)) {
error(0, "user '%s' has no valid email address", vec[0]);
sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n");
return 1;