githubFork/roundcubemail.git

			@@ -1,6 +1,6 @@
			<?php

			/*
			/**
			+-----------------------------------------------------------------------+
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2008-2012, The Roundcube Dev Team \|
			@@ -134,7 +134,6 @@
			return false;
			}


			/**
			* Validates IPv4 or IPv6 address
			*
			@@ -179,7 +178,6 @@
			return @inet_pton($ip) !== false;
			}


			/**
			* Check whether the HTTP referer matches the current request
			*
			@@ -191,7 +189,6 @@
			$referer = parse_url(self::request_header('Referer'));
			return $referer['host'] == self::request_header('Host') && $referer['path'] == $uri['path'];
			}


			/**
			* Replacing specials characters to a specific encoding type
			@@ -283,7 +280,6 @@
			return $str;
			}


			/**
			* Read input value and convert it for internal use
			* Performs stripslashes() and charset conversion if necessary
			@@ -323,7 +319,6 @@

			return self::parse_input_value($value, $allow_html, $charset);
			}


			/**
			* Parse/validate input value. See self::get_input_value()
			@@ -375,7 +370,6 @@
			return $value;
			}


			/**
			* Convert array of request parameters (prefixed with _)
			* to a regular array with non-prefixed keys.
			@@ -401,7 +395,6 @@
			return $out;
			}


			/**
			* Convert the given string into a valid HTML identifier
			* Same functionality as done in app.js with rcube_webmail.html_identifier()
			@@ -415,7 +408,6 @@
			return asciiwords($str, true, '_');
			}
			}


			/**
			* Replace all css definitions with #container [def]
			@@ -493,7 +485,6 @@
			return $source;
			}


			/**
			* Generate CSS classes from mimetype and filename extension
			*
			@@ -524,7 +515,6 @@
			return join(" ", $classes);
			}


			/**
			* Decode escaped entities used by known XSS exploits.
			* See http://downloads.securityfocus.com/vulnerabilities/exploits/26800.eml for examples
			@@ -543,7 +533,6 @@
			return $out;
			}


			/**
			* preg_replace_callback callback for xss_entity_decode
			*
			@@ -555,7 +544,6 @@
			{
			return chr(hexdec($matches[1]));
			}


			/**
			* Check if we can process not exceeding memory_limit
			@@ -571,7 +559,6 @@

			return $mem_limit > 0 && $memory + $need > $mem_limit ? false : true;
			}


			/**
			* Check if working in SSL mode
			@@ -600,7 +587,6 @@

			return false;
			}


			/**
			* Replaces hostname variables.
			@@ -639,7 +625,6 @@
			return str_replace(array('%n', '%t', '%d', '%h', '%z', '%s'), array($n, $t, $d, $h, $z, $s[2]), $name);
			}


			/**
			* Returns remote IP address and forwarded addresses if found
			*
			@@ -664,7 +649,6 @@

			return $address;
			}


			/**
			* Returns the real remote IP address
			@@ -747,17 +731,18 @@
			return $result;
			}


			/**
			* Improved equivalent to strtotime()
			*
			* @param string $date Date string
			* @param object DateTimeZone to use for DateTime object
			*
			* @return int Unix timestamp
			*/
			public static function strtotime($date)
			public static function strtotime($date, $timezone = null)
			{
			$date = self::clean_datestr($date);
			$tzname = $timezone ? ' ' . $timezone->getName() : '';

			// unix timestamp
			if (is_numeric($date)) {
			@@ -766,7 +751,7 @@

			// if date parsing fails, we have a date in non-rfc format.
			// remove token from the end and try again
			while ((($ts = @strtotime($date)) === false) \|\| ($ts < 0)) {
			while ((($ts = @strtotime($date . $tzname)) === false) \|\| ($ts < 0)) {
			$d = explode(' ', $date);
			array_pop($d);
			if (!$d) {
			@@ -782,6 +767,7 @@
			* Date parsing function that turns the given value into a DateTime object
			*
			* @param string $date Date string
			* @param object DateTimeZone to use for DateTime object
			*
			* @return object DateTime instance or false on failure
			*/
			@@ -797,7 +783,7 @@
			// try to parse string with DateTime first
			if (!empty($date)) {
			try {
			$dt = new DateTime($date, $timezone);
			$dt = $timezone ? new DateTime($date, $timezone) : new DateTime($date);
			}
			catch (Exception $e) {
			// ignore
			@@ -805,9 +791,12 @@
			}

			// try our advanced strtotime() method
			if (!$dt && ($timestamp = self::strtotime($date))) {
			if (!$dt && ($timestamp = self::strtotime($date, $timezone))) {
			try {
			$dt = new DateTime("@".$timestamp);
			if ($timezone) {
			$dt->setTimezone($timezone);
			}
			}
			catch (Exception $e) {
			// ignore
			@@ -872,7 +861,6 @@
			return self::idn_convert($str, true);
			}


			/*
			* Idn_to_ascii wrapper.
			* Intl/Idn modules version of this function doesn't work with e-mail address
			@@ -882,8 +870,7 @@
			return self::idn_convert($str, false);
			}


			public static function idn_convert($input, $is_utf=false)
			public static function idn_convert($input, $is_utf = false)
			{
			if ($at = strpos($input, '@')) {
			$user = substr($input, 0, $at);
			@@ -906,14 +893,21 @@
			* Split the given string into word tokens
			*
			* @param string Input to tokenize
			* @param integer Minimum length of a single token
			* @return array List of tokens
			*/
			public static function tokenize_string($str)
			public static function tokenize_string($str, $minlen = 2)
			{
			return explode(" ", preg_replace(
			array('/[\s;\/+-]+/i', '/(\d)[-.\s]+(\d)/', '/\s\w{1,3}\s/u'),
			array(' ', '\\1\\2', ' '),
			$str));
			$expr = array('/[\s;,"\'\/+-]+/ui', '/(\d)[-.\s]+(\d)/u');
			$repl = array(' ', '\\1\\2');

			if ($minlen > 1) {
			$minlen--;
			$expr[] = "/(^\|\s+)\w{1,$minlen}(\s+\|$)/u";
			$repl[] = ' ';
			}

			return array_filter(explode(" ", preg_replace($expr, $repl, $str)));
			}

			/**
			@@ -922,10 +916,11 @@
			*
			* @param string Input string (UTF-8)
			* @param boolean True to return list of words as array
			* @param integer Minimum length of tokens
			*
			* @return mixed Normalized string or a list of normalized tokens
			*/
			public static function normalize_string($str, $as_array = false)
			public static function normalize_string($str, $as_array = false, $minlen = 2)
			{
			// replace 4-byte unicode characters with '?' character,
			// these are not supported in default utf-8 charset on mysql,
			@@ -937,7 +932,7 @@
			. ')/', '?', $str);

			// split by words
			$arr = self::tokenize_string($str);
			$arr = self::tokenize_string($str, $minlen);

			// detect character set
			if (utf8_encode(utf8_decode($str)) == $str) {
			@@ -968,6 +963,28 @@
			}

			return $as_array ? $arr : join(" ", $arr);
			}

			/**
			* Compare two strings for matching words (order not relevant)
			*
			* @param string Haystack
			* @param string Needle
			* @return boolen True if match, False otherwise
			*/
			public static function words_match($haystack, $needle)
			{
			$a_needle = self::tokenize_string($needle, 1);
			$haystack = join(" ", self::tokenize_string($haystack, 1));

			$hits = 0;
			foreach ($a_needle as $w) {
			if (stripos($haystack, $w) !== false) {
			$hits++;
			}
			}

			return $hits >= count($a_needle);
			}

			/**
			@@ -1102,4 +1119,34 @@

			return $url;
			}

			/**
			* Generate a ramdom string
			*
			* @param int String length
			*
			* @return string The generated random string
			*/
			public static function random_bytes($length)
			{
			if (function_exists('openssl_random_pseudo_bytes')) {
			$random = openssl_random_pseudo_bytes(ceil($length / 2));
			$random = bin2hex($random);

			// if the length wasn't even...
			if ($length < strlen($random)) {
			$random = substr($random, 0, $length);
			}
			}
			else {
			$alpha = 'ABCDEFGHIJKLMNOPQERSTUVXYZabcdefghijklmnopqrtsuvwxyz0123456789+*%&?!$-_=';
			$random = '';

			for ($i = 0; $i < $length; $i++) {
			$random .= $alpha[rand(0, strlen($alpha)-1)];
			}
			}

			return $random;
			}
			}