Aleksander Machniak
2015-12-14 87cb24d873f27499a3d3fa2d1084e7bb9d624c95
Don't add redundant URL arguments to logged error messages
1 files modified
15 ■■■■ changed files
program/lib/Roundcube/rcube.php 15 ●●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube.php
@@ -1277,11 +1277,18 @@
        // write error to local log file
        if (($level & 1) || !empty($arg_arr['fatal'])) {
            $post_query = '';
            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                $post_query = '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']);
            }
            else {
                $post_query = '';
                foreach (array('_task', '_action') as $arg) {
                    if ($_POST[$arg] && !$_GET[$arg]) {
                        $post_query[$arg] = $_POST[$arg];
                    }
                }
                if (!empty($post_query)) {
                    $post_query = (strpos($_SERVER['REQUEST_URI'], '?') != false ? '&' : '?')
                        . http_build_query($post_query);
                }
            }
            $log_entry = sprintf("%s Error: %s%s (%s %s)",