From f8911c2a7f9d41e2197d0c3e1aa49aea62e320fa Mon Sep 17 00:00:00 2001
From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Thu, 14 Jan 2016 06:47:49 -0500
Subject: [PATCH] Enable use of TLSv1.1 and TLSv1.2 for IMAP.
---
program/lib/Roundcube/rcube_utils.php | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index f4c0e90..7b6e7ba 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -985,6 +985,34 @@
}
/**
+ * 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));
+ $valid = strlen($_haystack) > 0;
+ $hits = 0;
+
+ foreach ($a_needle as $w) {
+ if ($valid) {
+ if (stripos($_haystack, $w) !== false) {
+ $hits++;
+ }
+ }
+ else if (stripos($haystack, $w) !== false) {
+ $hits++;
+ }
+ }
+
+ return $hits >= count($a_needle);
+ }
+
+ /**
* Parse commandline arguments into a hash array
*
* @param array $aliases Argument alias names
@@ -1116,4 +1144,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;
+ }
}
--
Gitblit v1.9.1