diff --git a/.htaccess b/.htaccess

index f21cf34..d0efd31 100644

--- a/.htaccess

+++ b/.htaccess

@@ -31,7 +31,7 @@ RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico

 # security rules:

 # - deny access to files not containing a dot or starting with a dot

 #   in all locations except installer directory

-RewriteRule ^(?!installer)(\.?[^\.]+)$ - [F]

+RewriteRule ^(?!installer|[a-f0-9]{16})(\.?[^\.]+)$ - [F]

 # - deny access to some locations

 RewriteRule ^/?(\.git|\.tx|SQL|bin|config|logs|temp|tests|program\/(include|lib|localization|steps)) - [F]

 # - deny access to some documentation files

diff --git a/config/defaults.inc.php b/config/defaults.inc.php

index 56791fb..3297dc2 100644

--- a/config/defaults.inc.php

+++ b/config/defaults.inc.php

@@ -532,6 +532,23 @@ $config['email_dns_check'] = false;

 // Note: useful when SMTP server stores sent mail in user mailbox

 $config['no_save_sent_messages'] = false;

+// Improve system security by using special URL with security token.

+// This can be set to a number defining token length. Default: 16.

+// Warning: This requires http server configuration. Sample:

+//    RewriteRule ^/roundcubemail/[a-f0-9]{16}/(.*) /roundcubemail/$1 [PT]

+//    Alias /roundcubemail /var/www/roundcubemail/

+// Note: Use assets_path to not prevent the browser from caching assets

+$config['use_secure_urls'] = false;

+

+// Allows to define separate server/path for image/js/css files

+// Warning: If the domain is different cross-domain access to some

+// resources need to be allowed

+// Sample:

+//    <FilesMatch ".(eot|ttf|woff)">

+//    Header set Access-Control-Allow-Origin "*"

+//    </FilesMatch>

+$config['assets_path'] = '';

+

 // ----------------------------------

 // PLUGINS

 // ----------------------------------

diff --git a/index.php b/index.php

index 3154daf..7001918 100644

--- a/index.php

+++ b/index.php

@@ -90,9 +90,9 @@ $RCMAIL->action = $startup['action'];

 // try to log in

 if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {

-    $request_valid = $_SESSION['temp'] && $RCMAIL->check_request(rcube_utils::INPUT_POST, 'login');

+    $request_valid = $_SESSION['temp'] && $RCMAIL->check_request();

-    // purge the session in case of new login when a session already exists 

+    // purge the session in case of new login when a session already exists

     $RCMAIL->kill_session();

     $auth = $RCMAIL->plugins->exec_hook('authenticate', array(

@@ -140,7 +140,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {

         unset($redir['abort'], $redir['_err']);

         // send redirect

-        $OUTPUT->redirect($redir);

+        $OUTPUT->redirect($redir, 0, true);

     }

     else {

         if (!$auth['valid']) {

@@ -171,10 +171,10 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {

     }

 }

-// end session (after optional referer check)

-else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])

-    && (!$RCMAIL->config->get('referer_check') || rcube_utils::check_referer())

-) {

+// end session

+else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])) {

+    $RCMAIL->request_security_check($mode = rcube_utils::INPUT_GET);

+

     $userdata = array(

         'user' => $_SESSION['username'],

         'host' => $_SESSION['storage_host'],

@@ -234,32 +234,9 @@ if (empty($RCMAIL->user->ID)) {

     $OUTPUT->send($plugin['task']);

 }

-// CSRF prevention

 else {

-    // don't check for valid request tokens in these actions

-    $request_check_whitelist = array('login'=>1, 'spell'=>1, 'spell_html'=>1);

-

-    if (!$request_check_whitelist[$RCMAIL->action]) {

-        // check client X-header to verify request origin

-        if ($OUTPUT->ajax_call) {

-            if (rcube_utils::request_header('X-Roundcube-Request') != $RCMAIL->get_request_token()) {

-                header('HTTP/1.1 403 Forbidden');

-                die("Invalid Request");

-            }

-        }

-        // check request token in POST form submissions

-        else if (!empty($_POST) && !$RCMAIL->check_request()) {

-            $OUTPUT->show_message('invalidrequest', 'error');

-            $OUTPUT->send($RCMAIL->task);

-        }

-

-        // check referer if configured

-        if ($RCMAIL->config->get('referer_check') && !rcube_utils::check_referer()) {

-            raise_error(array(

-                'code' => 403, 'type' => 'php',

-                'message' => "Referer check failed"), true, true);

-        }

-    }

+    // CSRF prevention

+    $RCMAIL->request_security_check();

     // check access to disabled actions

     $disabled_actions = (array) $RCMAIL->config->get('disabled_actions');

diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js

index e59ac72..1463453 100644

--- a/plugins/acl/acl.js

+++ b/plugins/acl/acl.js

@@ -58,8 +58,11 @@ rcube_webmail.prototype.acl_delete = function()

     var users = this.acl_get_usernames();

     if (users && users.length && confirm(this.get_label('acl.deleteconfirm'))) {

-        this.http_request('settings/plugin.acl', '_act=delete&_user='+urlencode(users.join(','))

-            + '&_mbox='+urlencode(this.env.mailbox),

+        this.http_post('settings/plugin.acl', {

+                _act: 'delete',

+                _user: users.join(','),

+                _mbox: this.env.mailbox

+            },

             this.set_busy(true, 'acl.deleting'));

     }

 }

@@ -67,7 +70,7 @@ rcube_webmail.prototype.acl_delete = function()

 // Save ACL data

 rcube_webmail.prototype.acl_save = function()

 {

-    var user = $('#acluser', this.acl_form).val(), rights = '', type;

+    var data, type, rights = '', user = $('#acluser', this.acl_form).val();

     $((this.env.acl_advanced ? '#advancedrights :checkbox' : '#simplerights :checkbox'), this.acl_form).map(function() {

         if (this.checked)

@@ -88,12 +91,18 @@ rcube_webmail.prototype.acl_save = function()

         return;

     }

-    this.http_request('settings/plugin.acl', '_act=save'

-        + '&_user='+urlencode(user)

-        + '&_acl=' +rights

-        + '&_mbox='+urlencode(this.env.mailbox)

-        + (this.acl_id ? '&_old='+this.acl_id : ''),

-        this.set_busy(true, 'acl.saving'));

+    data = {

+        _act: 'save',

+        _user: user,

+        _acl: rights,

+        _mbox: this.env.mailbox

+    }

+

+    if (this.acl_id) {

+        data._old = this.acl_id;

+    }

+

+    this.http_post('settings/plugin.acl', data, this.set_busy(true, 'acl.saving'));

 }

 // Cancel/Hide form

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php

index 33bd91e..cb1a720 100644

--- a/plugins/acl/acl.php

+++ b/plugins/acl/acl.php

@@ -452,10 +452,10 @@ class acl extends rcube_plugin

      */

     private function action_save()

     {

-        $mbox  = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP

-        $user  = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));

-        $acl   = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_GPC));

-        $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_GPC));

+        $mbox  = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); // UTF7-IMAP

+        $user  = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));

+        $acl   = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_POST));

+        $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_POST));

         $acl    = array_intersect(str_split($acl), $this->rights_supported());

         $users  = $oldid ? array($user) : explode(',', $user);

@@ -508,8 +508,8 @@ class acl extends rcube_plugin

      */

     private function action_delete()

     {

-        $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); //UTF7-IMAP

-        $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));

+        $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); //UTF7-IMAP

+        $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));

         $user = explode(',', $user);

diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

index 59e116f..8fba018 100644

--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

@@ -312,7 +312,7 @@ class rcube_sieve_engine

                 }

             }

             else if ($action == 'setact' && !$error) {

-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);

+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);

                 $result = $this->activate_script($script_name);

                 $kep14  = $this->rc->config->get('managesieve_kolab_master');

@@ -326,7 +326,7 @@ class rcube_sieve_engine

                 }

             }

             else if ($action == 'deact' && !$error) {

-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);

+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);

                 $result = $this->deactivate_script($script_name);

                 if ($result === true) {

@@ -339,7 +339,7 @@ class rcube_sieve_engine

                 }

             }

             else if ($action == 'setdel' && !$error) {

-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);

+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);

                 $result = $this->remove_script($script_name);

                 if ($result === true) {

@@ -382,14 +382,14 @@ class rcube_sieve_engine

                 $this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));

             }

             else if ($action == 'ruleadd') {

-                $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_GPC);

+                $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_POST);

                 $id = $this->genid();

                 $content = $this->rule_div($fid, $id, false);

                 $this->rc->output->command('managesieve_rulefill', $content, $id, $rid);

             }

             else if ($action == 'actionadd') {

-                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_GPC);

+                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_POST);

                 $id = $this->genid();

                 $content = $this->action_div($fid, $id, false);

diff --git a/program/include/rcmail.php b/program/include/rcmail.php

index ceb369a..fba537e 100644

--- a/program/include/rcmail.php

+++ b/program/include/rcmail.php

@@ -753,47 +753,14 @@ class rcmail extends rcube

     }

     /**

-     * Generate a unique token to be used in a form request

-     *

-     * @return string The request token

-     */

-    public function get_request_token()

-    {

-        $sess_id = $_COOKIE[ini_get('session.name')];

-

-        if (!$sess_id) {

-            $sess_id = session_id();

-        }

-

-        $plugin = $this->plugins->exec_hook('request_token', array(

-            'value' => md5('RT' . $this->get_user_id() . $this->config->get('des_key') . $sess_id)));

-

-        return $plugin['value'];

-    }

-

-    /**

-     * Check if the current request contains a valid token

-     *

-     * @param int Request method

-     *

-     * @return boolean True if request token is valid false if not

-     */

-    public function check_request($mode = rcube_utils::INPUT_POST)

-    {

-        $token   = rcube_utils::get_input_value('_token', $mode);

-        $sess_id = $_COOKIE[ini_get('session.name')];

-

-        return !empty($sess_id) && $token == $this->get_request_token();

-    }

-

-    /**

      * Build a valid URL to this instance of Roundcube

      *

      * @param mixed Either a string with the action or url parameters as key-value pairs

+     * @param bool  Return absolute URL to secure location

      *

      * @return string Valid application URL

      */

-    public function url($p)

+    public function url($p, $secure = false)

     {

         if (!is_array($p)) {

             if (strpos($p, 'http') === 0) {

@@ -807,8 +774,9 @@ class rcmail extends rcube

         $p['_task'] = $task;

         unset($p['task']);

-        $url  = './' . $this->filename;

-        $delm = '?';

+        $prefix = './';

+        $url    = $this->filename;

+        $delm   = '?';

         foreach (array_reverse($p) as $key => $val) {

             if ($val !== '' && $val !== null) {

@@ -818,7 +786,22 @@ class rcmail extends rcube

             }

         }

-        return $url;

+        // generate absolute URL if URL token exists

+        if ($secure && ($token = $this->get_secure_url_token(true))) {

+            $uri = preg_replace('/[?#&].*$/', '', $_SERVER['REQUEST_URI']);

+            if (strpos($uri, '/' . $token) === false) {

+                $uri  = rtrim($uri, '/');

+                // remove old token

+                $uri  = preg_replace('/\/[a-f0-9]{' . strlen($token) . '}$/', '', $uri);

+                // add new token

+                $uri .= '/' . $token . '/';

+

+                $prefix = (rcube_utils::https_check() ? 'https' : 'http') . '://'

+                    . $_SERVER['SERVER_NAME'] . $uri;

+            }

+        }

+

+        return $prefix . $url;

     }

     /**

@@ -853,6 +836,36 @@ class rcmail extends rcube

     }

     /**

+     * CSRF attack prevention code

+     *

+     * @param int Request mode

+     */

+    public function request_security_check($mode = rcube_utils::INPUT_POST)

+    {

+        // don't check for valid request tokens in these actions

+        // @TODO: get rid of this

+        $request_check_whitelist = array('spell'=>1, 'spell_html'=>1);

+

+        if ($request_check_whitelist[$this->action]) {

+            return;

+        }

+

+        // check request token

+        if (!$this->check_request($mode)) {

+            self::raise_error(array(

+                'code' => 403, 'type' => 'php',

+                'message' => "Request security check failed"), false, true);

+        }

+

+        // check referer if configured

+        if ($this->config->get('referer_check') && !rcube_utils::check_referer()) {

+            self::raise_error(array(

+                'code' => 403, 'type' => 'php',

+                'message' => "Referer check failed"), true, true);

+        }

+    }

+

+    /**

      * Registers action aliases for current task

      *

      * @param array $map Alias-to-filename hash array

diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php

index a848246..2d8853f 100644

--- a/program/include/rcmail_output_html.php

+++ b/program/include/rcmail_output_html.php

@@ -45,6 +45,7 @@ class rcmail_output_html extends rcmail_output

     protected $footer = '';

     protected $body = '';

     protected $base_path = '';

+    protected $assets_path;

     protected $devel_mode = false;

     // deprecated names of templates used before 0.5

@@ -80,6 +81,8 @@ class rcmail_output_html extends rcmail_output

         $this->set_skin($skin);

         $this->set_env('skin', $skin);

+        $this->set_assets_path($this->config->get('assets_path'));

+

         if (!empty($_REQUEST['_extwin']))

             $this->set_env('extwin', 1);

         if ($this->framed || $framed)

@@ -145,6 +148,50 @@ EOF;

     }

     /**

+     * Parse and set assets path

+     *

+     * @param string Assets path (relative or absolute URL)

+     */

+    public function set_assets_path($path)

+    {

+        $path = trim($path, '/') . '/';

+

+        if (empty($path)) {

+            return;

+        }

+

+        // convert to absolute URL

+        if (!preg_match('|^https?://|', $path)) {

+            $base = preg_replace('/[?#&].*$/', '', $_SERVER['REQUEST_URI']);

+            $base = rtrim($base, '/');

+

+            // remove url token if exists

+            if ($len = intval($this->config->get('use_secure_urls'))) {

+                $_base  = explode('/', $base);

+                $length = $len > 1 ? $len : 16; // as in rcube::get_secure_url_token()

+

+                // we can't use real token here because it

+                // does not exists in unauthenticated state,

+                // hope this will not produce false-positive matches

+                foreach ($_base as $idx => $token) {

+                    if (preg_match('/^[a-f0-9]{' . $length . '}$/', $token)) {

+                        unset($_base[$idx]);

+                        break;

+                    }

+                }

+

+                $base = implode('/', $_base);

+            }

+

+            $path = (rcube_utils::https_check() ? 'https' : 'http') . '://'

+                . $_SERVER['SERVER_NAME'] . $base . '/' . $path;

+        }

+

+        $this->assets_path = $path;

+        $this->set_env('assets_path', $path);

+    }

+

+    /**

      * Getter for the current page title

      *

      * @return string The page title

@@ -367,14 +414,15 @@ EOF;

     /**

      * Redirect to a certain url

      *

-     * @param mixed $p     Either a string with the action or url parameters as key-value pairs

-     * @param int   $delay Delay in seconds

+     * @param mixed $p      Either a string with the action or url parameters as key-value pairs

+     * @param int   $delay  Delay in seconds

+     * @param bool  $secure Redirect to secure location (see rcmail::url())

      */

-    public function redirect($p = array(), $delay = 1)

+    public function redirect($p = array(), $delay = 1, $secure = false)

     {

         if ($this->env['extwin'])

             $p['extwin'] = 1;

-        $location = $this->app->url($p);

+        $location = $this->app->url($p, $secure);

         header('Location: ' . $location);

         exit;

     }

@@ -659,6 +707,24 @@ EOF;

         exit;

     }

+    /**

+     * Modify path by adding URL prefix if configured

+     */

+    public function asset_url($path)

+    {

+        // iframe content can't be in a different domain

+        // @TODO: check if assests are on a different domain

+        if (!$this->assets_path || $path == $this->env['blankpage']) {

+            return $path;

+        }

+

+        if ($path[0] == '.' && $path[1] == '/') {

+            $path = substr($path, 2);

+        }

+

+        return $this->assets_path . $path;

+    }

+

     /*****  Template parsing methods  *****/

@@ -715,6 +781,8 @@ EOF;

             $file = $this->file_mod($file);

         }

+        $file = $this->asset_url($file);

+

         return $matches[1] . '=' . $matches[2] . $file . $matches[4];

     }

@@ -1329,6 +1397,7 @@ EOF;

     {

         if (!preg_match('|^https?://|i', $file) && $file[0] != '/') {

             $file = $this->file_mod($this->scripts_path . $file);

+            $file = $this->asset_url($file);

         }

         if (!is_array($this->script_files[$position])) {

@@ -1541,7 +1610,7 @@ EOF;

         }

         $attrib['name'] = $attrib['id'];

-        $attrib['src'] = $attrib['src'] ? $this->abs_url($attrib['src'], true) : 'program/resources/blank.gif';

+        $attrib['src']  = $this->asset_url($attrib['src'] ? $this->abs_url($attrib['src'], true) : 'program/resources/blank.gif');

         // register as 'contentframe' object

         if ($is_contentframe || $attrib['contentframe']) {

@@ -1758,9 +1827,11 @@ EOF;

     {

         $images = preg_split('/[\s\t\n,]+/', $attrib['images'], -1, PREG_SPLIT_NO_EMPTY);

         $images = array_map(array($this, 'abs_url'), $images);

+        $images = array_map(array($this, 'asset_url'), $images);

-        if (empty($images) || $this->app->task == 'logout')

+        if (empty($images) || $_REQUEST['_task'] == 'logout') {

             return;

+        }

         $this->add_script('var images = ' . self::json_serialize($images) .';

             for (var i=0; i<images.length; i++) {

diff --git a/program/include/rcmail_output_json.php b/program/include/rcmail_output_json.php

index fa35824..91262ac 100644

--- a/program/include/rcmail_output_json.php

+++ b/program/include/rcmail_output_json.php

@@ -181,6 +181,11 @@ class rcmail_output_json extends rcmail_output

      */

     public function raise_error($code, $message)

     {

+        if ($code == 403) {

+            header('HTTP/1.1 403 Forbidden');

+            die("Invalid Request");

+        }

+

         $this->show_message("Application Error ($code): $message", 'error');

         $this->remote_response();

         exit;

diff --git a/program/js/app.js b/program/js/app.js

index 5a87347..0f51331 100644

--- a/program/js/app.js

+++ b/program/js/app.js

@@ -1404,8 +1404,10 @@ function rcube_webmail()

     if (task == 'mail')

       url += '&_mbox=INBOX';

-    else if (task == 'logout' && !this.env.server_error)

+    else if (task == 'logout' && !this.env.server_error) {

+      url += '&_token=' + this.env.request_token;

       this.clear_compose_data();

+    }

     this.redirect(url);

   };

@@ -1415,7 +1417,10 @@ function rcube_webmail()

     if (!url)

       url = this.env.comm_path;

-    return url.replace(/_task=[a-z0-9_-]+/i, '_task='+task);

+    if (url.match(/[?&]_task=[a-zA-Z0-9_-]+/))

+        return url.replace(/_task=[a-zA-Z0-9_-]+/, '_task=' + task);

+    else

+        return url.replace(/\?.*$/, '') + '?_task=' + task;

   };

   this.reload = function(delay)

diff --git a/program/js/editor.js b/program/js/editor.js

index b2e96d1..74a3134 100644

--- a/program/js/editor.js

+++ b/program/js/editor.js

@@ -36,11 +36,12 @@

 function rcube_text_editor(config, id)

 {

   var ref = this,

+    abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),

     conf = {

       selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),

       theme: 'modern',

       language: config.lang,

-      content_css: 'program/js/tinymce/roundcube/content.css?v1',

+      content_css: (rcmail.env.assets_path || '') + 'program/js/tinymce/roundcube/content.css?v1',

       menubar: false,

       statusbar: false,

       toolbar_items_size: 'small',

@@ -82,7 +83,7 @@ function rcube_text_editor(config, id)

       toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify'

         + ' | bullist numlist outdent indent ltr rtl blockquote | forecolor backcolor | fontselect fontsizeselect'

         + ' | link unlink table | emoticons charmap image media | code searchreplace undo redo',

-      spellchecker_rpc_url: '../../../../../?_task=utils&_action=spell_html&_remote=1',

+      spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1',

       spellchecker_language: rcmail.env.spell_lang,

       accessibility_focus: false,

       file_browser_callback: function(name, url, type, win) { ref.file_browser_callback(name, url, type); },

diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php

index eedc46c..e557138 100644

--- a/program/lib/Roundcube/rcube.php

+++ b/program/lib/Roundcube/rcube.php

@@ -28,9 +28,15 @@

  */

 class rcube

 {

-    const INIT_WITH_DB = 1;

+    // Init options

+    const INIT_WITH_DB      = 1;

     const INIT_WITH_PLUGINS = 2;

+    // Request status

+    const REQUEST_VALID       = 0;

+    const REQUEST_ERROR_URL   = 1;

+    const REQUEST_ERROR_TOKEN = 2;

+

     /**

      * Singleton instace of rcube

      *

@@ -101,6 +107,12 @@ class rcube

      */

     public $user;

+    /**

+     * Request status

+     *

+     * @var int

+     */

+    public $request_status = 0;

     /* private/protected vars */

     protected $texts;

@@ -976,6 +988,104 @@ class rcube

     /**

+     * Returns session token for secure URLs

+     *

+     * @param bool $generate Generate token if not exists in session yet

+     *

+     * @return string|bool Token string, False when disabled

+     */

+    public function get_secure_url_token($generate = false)

+    {

+        if ($len = $this->config->get('use_secure_urls')) {

+            if (empty($_SESSION['secure_token']) && $generate) {

+                // generate x characters long token

+                $length = $len > 1 ? $len : 16;

+                $token  = openssl_random_pseudo_bytes($length / 2);

+                $token  = bin2hex($token);

+

+                $plugin = $this->plugins->exec_hook('secure_token',

+                    array('value' => $token, 'length' => $length));

+

+                $_SESSION['secure_token'] = $plugin['value'];

+            }

+

+            return $_SESSION['secure_token'];

+        }

+

+        return false;

+    }

+

+

+    /**

+     * Generate a unique token to be used in a form request

+     *

+     * @return string The request token

+     */

+    public function get_request_token()

+    {

+        $sess_id = $_COOKIE[ini_get('session.name')];

+        if (!$sess_id) {

+            $sess_id = session_id();

+        }

+

+        $plugin = $this->plugins->exec_hook('request_token', array(

+            'value' => md5('RT' . $this->get_user_id() . $this->config->get('des_key') . $sess_id)));

+

+        return $plugin['value'];

+    }

+

+

+    /**

+     * Check if the current request contains a valid token.

+     * Empty requests aren't checked until use_secure_urls is set.

+     *

+     * @param int Request method

+     *

+     * @return boolean True if request token is valid false if not

+     */

+    public function check_request($mode = rcube_utils::INPUT_POST)

+    {

+        // check secure token in URL if enabled

+        if ($token = $this->get_secure_url_token()) {

+            foreach (explode('/', preg_replace('/[?#&].*$/', '', $_SERVER['REQUEST_URI'])) as $tok) {

+                if ($tok == $token) {

+                    return true;

+                }

+            }

+

+            $this->request_status = self::REQUEST_ERROR_URL;

+

+            return false;

+        }

+

+        $sess_tok = $this->get_request_token();

+

+        // ajax requests

+        if (rcube_utils::request_header('X-Roundcube-Request') == $sess_tok) {

+            return true;

+        }

+

+        // skip empty requests

+        if (($mode == rcube_utils::INPUT_POST && empty($_POST))

+            || ($mode == rcube_utils::INPUT_GET && empty($_GET))

+        ) {

+            return true;

+        }

+

+        // default method of securing requests

+        $token   = rcube_utils::get_input_value('_token', $mode);

+        $sess_id = $_COOKIE[ini_get('session.name')];

+

+        if (empty($sess_id) || $token != $sess_tok) {

+            $this->request_status = self::REQUEST_ERROR_TOKEN;

+            return false;

+        }

+

+        return true;

+    }

+

+

+    /**

      * Build a valid URL to this instance of Roundcube

      *

      * @param mixed Either a string with the action or url parameters as key-value pairs

@@ -1263,7 +1373,7 @@ class rcube

         $cli = php_sapi_name() == 'cli';

-        if (($log || $terminate) && !$cli && $arg['message']) {

+        if ($log && !$cli && $arg['message']) {

             $arg['fatal'] = $terminate;

             self::log_bug($arg);

         }

diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc

index 3d57d70..727b597 100644

--- a/program/steps/addressbook/delete.inc

+++ b/program/steps/addressbook/delete.inc

@@ -20,10 +20,11 @@

 */

 // process ajax requests only

-if (!$OUTPUT->ajax_call)

+if (!$OUTPUT->ajax_call) {

     return;

+}

-$cids   = rcmail_get_cids();

+$cids   = rcmail_get_cids(null, rcube_utils::INPUT_POST);

 $delcnt = 0;

 // remove previous deletes

diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc

index 2c22d5a..84dff35 100644

--- a/program/steps/addressbook/func.inc

+++ b/program/steps/addressbook/func.inc

@@ -896,13 +896,13 @@ function rcmail_search_update($return = false)

  *

  * @return array List of contact IDs per-source

  */

-function rcmail_get_cids($filter = null)

+function rcmail_get_cids($filter = null, $request_type = rcube_utils::INPUT_GPC)

 {

     // contact ID (or comma-separated list of IDs) is provided in two

     // forms. If _source is an empty string then the ID is a string

     // containing contact ID and source name in form: <ID>-<SOURCE>

-    $cid    = rcube_utils::get_input_value('_cid', rcube_utils::INPUT_GPC);

+    $cid    = rcube_utils::get_input_value('_cid', $request_type);

     $source = (string) rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

     if (is_array($cid)) {

diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc

index 2a3a9a6..b7ccf92 100644

--- a/program/steps/utils/error.inc

+++ b/program/steps/utils/error.inc

@@ -50,9 +50,17 @@ else if ($ERROR_CODE == 401) {

 // forbidden due to request check

 else if ($ERROR_CODE == 403) {

+    if ($_SERVER['REQUEST_METHOD'] == 'GET' && $rcmail->request_status == rcube::REQUEST_ERROR_URL) {

+        parse_str($_SERVER['QUERY_STRING'], $url);

+        $url = $rcmail->url($url, true);

+        $add = "<br /><a href=\"$url\">Click here to try again.<a/>";

+    }

+    else {

+        $add = "Please contact your server-administrator.";

+    }

+

     $__error_title = "REQUEST CHECK FAILED";

-    $__error_text  = "Access to this service was denied due to failing security checks!<br />\n"

-        . "Please contact your server-administrator.";

+    $__error_text  = "Access to this service was denied due to failing security checks!<br />\n$add";

 }

 // failed request (wrong step in URL)

​

​