From acff900c5a3a7c89faaf1141eff706ec221a4dd3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 08 Oct 2008 04:42:59 -0400
Subject: [PATCH] #1485294: Add recipients address small validation
---
index.php | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/index.php b/index.php
index aa6bf12..adab411 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
/*
+-------------------------------------------------------------------------+
| RoundCube Webmail IMAP Client |
- | Version 0.2-20080620 |
+ | Version 0.2-20080829 |
| |
| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| |
@@ -29,9 +29,6 @@
// include environment
require_once 'program/include/iniset.php';
-
-// define global vars
-$OUTPUT_TYPE = 'html';
// init application and start session with requested task
$RCMAIL = rcmail::get_instance();
@@ -94,11 +91,12 @@
$RCMAIL->authenticate_session();
// log successful login
- if ($RCMAIL->config->get('log_logins') && $RCMAIL->config->get('debug_level') & 1)
- console(sprintf('Successful login for %s (id %d) from %s',
- trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
- $_SESSION['user_id'],
- $_SERVER['REMOTE_ADDR']));
+ if ($RCMAIL->config->get('log_logins')) {
+ write_log('userlogins', sprintf('Successful login for %s (id %d) from %s',
+ $RCMAIL->user->get_username(),
+ $RCMAIL->user->ID,
+ $_SERVER['REMOTE_ADDR']));
+ }
// send redirect
$OUTPUT->redirect();
@@ -135,7 +133,7 @@
// check client X-header to verify request origin
if ($OUTPUT->ajax_call) {
- if ($RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
+ if (!$RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
header('HTTP/1.1 404 Not Found');
die("Invalid Request");
}
@@ -166,7 +164,13 @@
// handle keep-alive signal
-if ($RCMAIL->action=='keep-alive') {
+if ($RCMAIL->action == 'keep-alive') {
+ $OUTPUT->reset();
+ $OUTPUT->send();
+}
+// save preference value
+else if ($RCMAIL->action == 'save-pref') {
+ $RCMAIL->user->save_prefs(array(get_input_value('_name', RCUBE_INPUT_POST) => get_input_value('_value', RCUBE_INPUT_POST)));
$OUTPUT->reset();
$OUTPUT->send();
}
@@ -200,14 +204,6 @@
'add-identity' => 'edit_identity.inc',
)
);
-
-// save preference value
-if ($RCMAIL->action=='save-pref')
- {
- $USER->save_prefs(array(get_input_value('_name', RCUBE_INPUT_POST) => get_input_value('_value', RCUBE_INPUT_POST)));
- $OUTPUT->reset();
- $OUTPUT->send();
- }
// include task specific functions
include_once 'program/steps/'.$RCMAIL->task.'/func.inc';
--
Gitblit v1.9.1