Fix random "access to this resource is secured against CSRF" message at log...

Aleksander Machniak

2016-01-16 3f6fbdcc6d2ed2e5ad17f9ae4f7d2f4bb8a3104b

 program/lib/Roundcube/rcube_utils.php

@@ -993,12 +993,18 @@
     */
    public static function words_match($haystack, $needle)
    {
        $a_needle = self::tokenize_string($needle, 1);
        $haystack = join(" ", self::tokenize_string($haystack, 1));
        $a_needle  = self::tokenize_string($needle, 1);
        $_haystack = join(" ", self::tokenize_string($haystack, 1));
        $valid     = strlen($_haystack) > 0;
        $hits      = 0;

        $hits = 0;
        foreach ($a_needle as $w) {
            if (stripos($haystack, $w) !== false) {
            if ($valid) {
                if (stripos($_haystack, $w) !== false) {
                    $hits++;
                }
            }
            else if (stripos($haystack, $w) !== false) {
                $hits++;
            }
        }
@@ -1158,7 +1164,7 @@
            }
        }
        else {
            $alpha  = 'ABCDEFGHIJKLMNOPQERSTUVXYZabcdefghijklmnopqrtsuvwxyz0123456789+*%&?!$-_=';
            $alpha  = 'ABCDEFGHIJKLMNOPQERSTUVXYZabcdefghijklmnopqrtsuvwxyz0123456789,*.:?!$-_=';
            $random = '';

            for ($i = 0; $i < $length; $i++) {