Index: link.drush.inc IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- link.drush.inc (revision ) +++ link.drush.inc (revision ) @@ -0,0 +1,370 @@ + dt('Load all the TLDs from IANA.'), + 'aliases' => array('led'), + ); + return $items; +} + +/** + * Retrieve list of domains from IANA. + */ +function drush_link_extra_domains() { + $punycode = new Punycode(); + $string = strtolower(file_get_contents('https://data.iana.org/TLD/tlds-alpha-by-domain.txt')); + $tlds = explode("\n", $string); + foreach ($tlds as $k => $tld) { + if ($tld && $tld[0] !== '#') { + $decoded = $punycode->decode($tld); + if ($decoded != $tld) { + $tlds[] = $tld; + } + } + else { + unset($tlds[$k]); + } + } + variable_set('link_iana_domains', $tlds); +} + +if (!class_exists('Punycode')) { +/** + * Punycode implementation as described in RFC 3492 + * + * @link http://tools.ietf.org/html/rfc3492 + */ +class Punycode +{ + + /** + * Bootstring parameter values + * + */ + const BASE = 36; + const TMIN = 1; + const TMAX = 26; + const SKEW = 38; + const DAMP = 700; + const INITIAL_BIAS = 72; + const INITIAL_N = 128; + const PREFIX = 'xn--'; + const DELIMITER = '-'; + + /** + * Encode table + * + * @param array + */ + protected static $_encodeTable = array( + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', + 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', + 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + ); + + /** + * Decode table + * + * @param array + */ + protected static $_decodeTable = array( + 'a' => 0, 'b' => 1, 'c' => 2, 'd' => 3, 'e' => 4, 'f' => 5, + 'g' => 6, 'h' => 7, 'i' => 8, 'j' => 9, 'k' => 10, 'l' => 11, + 'm' => 12, 'n' => 13, 'o' => 14, 'p' => 15, 'q' => 16, 'r' => 17, + 's' => 18, 't' => 19, 'u' => 20, 'v' => 21, 'w' => 22, 'x' => 23, + 'y' => 24, 'z' => 25, '0' => 26, '1' => 27, '2' => 28, '3' => 29, + '4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35 + ); + + /** + * Character encoding + * + * @param string + */ + protected $encoding; + + /** + * Constructor + * + * @param string $encoding Character encoding + */ + public function __construct($encoding = 'UTF-8') + { + $this->encoding = $encoding; + } + + /** + * Encode a domain to its Punycode version + * + * @param string $input Domain name in Unicde to be encoded + * @return string Punycode representation in ASCII + */ + public function encode($input) + { + $parts = explode('.', $input); + foreach ($parts as &$part) { + $part = $this->_encodePart($part); + } + + return implode('.', $parts); + } + + /** + * Encode a part of a domain name, such as tld, to its Punycode version + * + * @param string $input Part of a domain name + * @return string Punycode representation of a domain part + */ + protected function _encodePart($input) + { + $codePoints = $this->_codePoints($input); + + $n = self::INITIAL_N; + $bias = self::INITIAL_BIAS; + $delta = 0; + $h = $b = count($codePoints['basic']); + + $output = ''; + foreach ($codePoints['basic'] as $code) { + $output .= $this->_codePointToChar($code); + } + if ($input === $output) { + return $output; + } + if ($b > 0) { + $output .= self::DELIMITER; + } + + $codePoints['nonBasic'] = array_unique($codePoints['nonBasic']); + sort($codePoints['nonBasic']); + + $i = 0; + $length = mb_strlen($input, $this->encoding); + while ($h < $length) { + $m = $codePoints['nonBasic'][$i++]; + $delta = $delta + ($m - $n) * ($h + 1); + $n = $m; + + foreach ($codePoints['all'] as $c) { + if ($c < $n || $c < self::INITIAL_N) { + $delta++; + } + if ($c === $n) { + $q = $delta; + for ($k = self::BASE;; $k += self::BASE) { + $t = $this->_calculateThreshold($k, $bias); + if ($q < $t) { + break; + } + + $code = $t + (($q - $t) % (self::BASE - $t)); + $output .= self::$_encodeTable[$code]; + + $q = ($q - $t) / (self::BASE - $t); + } + + $output .= self::$_encodeTable[$q]; + $bias = $this->_adapt($delta, $h + 1, ($h === $b)); + $delta = 0; + $h++; + } + } + + $delta++; + $n++; + } + + return self::PREFIX . $output; + } + + /** + * Decode a Punycode domain name to its Unicode counterpart + * + * @param string $input Domain name in Punycode + * @return string Unicode domain name + */ + public function decode($input) + { + $parts = explode('.', $input); + foreach ($parts as &$part) { + if (strpos($part, self::PREFIX) !== 0) { + continue; + } + + $part = substr($part, strlen(self::PREFIX)); + $part = $this->_decodePart($part); + } + + return implode('.', $parts); + } + + /** + * Decode a part of domain name, such as tld + * + * @param string $input Part of a domain name + * @return string Unicode domain part + */ + protected function _decodePart($input) + { + $n = self::INITIAL_N; + $i = 0; + $bias = self::INITIAL_BIAS; + $output = ''; + + $pos = strrpos($input, self::DELIMITER); + if ($pos !== false) { + $output = substr($input, 0, $pos++); + } else { + $pos = 0; + } + + $outputLength = strlen($output); + $inputLength = strlen($input); + while ($pos < $inputLength) { + $oldi = $i; + $w = 1; + + for ($k = self::BASE;; $k += self::BASE) { + $digit = self::$_decodeTable[$input[$pos++]]; + $i = $i + ($digit * $w); + $t = $this->_calculateThreshold($k, $bias); + + if ($digit < $t) { + break; + } + + $w = $w * (self::BASE - $t); + } + + $bias = $this->_adapt($i - $oldi, ++$outputLength, ($oldi === 0)); + $n = $n + (int) ($i / $outputLength); + $i = $i % ($outputLength); + $output = mb_substr($output, 0, $i, $this->encoding) . $this->_codePointToChar($n) . mb_substr($output, $i, $outputLength - 1, $this->encoding); + + $i++; + } + + return $output; + } + + /** + * Calculate the bias threshold to fall between TMIN and TMAX + * + * @param integer $k + * @param integer $bias + * @return integer + */ + protected function _calculateThreshold($k, $bias) + { + if ($k <= $bias + self::TMIN) { + return self::TMIN; + } elseif ($k >= $bias + self::TMAX) { + return self::TMAX; + } + return $k - $bias; + } + + /** + * Bias adaptation + * + * @param integer $delta + * @param integer $numPoints + * @param boolean $firstTime + * @return integer + */ + protected function _adapt($delta, $numPoints, $firstTime) + { + $delta = (int) ( + ($firstTime) + ? $delta / self::DAMP + : $delta / 2 + ); + $delta += (int) ($delta / $numPoints); + + $k = 0; + while ($delta > ((self::BASE - self::TMIN) * self::TMAX) / 2) { + $delta = (int) ($delta / (self::BASE - self::TMIN)); + $k = $k + self::BASE; + } + $k = $k + (int) (((self::BASE - self::TMIN + 1) * $delta) / ($delta + self::SKEW)); + + return $k; + } + + /** + * List code points for a given input + * + * @param string $input + * @return array Multi-dimension array with basic, non-basic and aggregated code points + */ + protected function _codePoints($input) + { + $codePoints = array( + 'all' => array(), + 'basic' => array(), + 'nonBasic' => array(), + ); + + $length = mb_strlen($input, $this->encoding); + for ($i = 0; $i < $length; $i++) { + $char = mb_substr($input, $i, 1, $this->encoding); + $code = $this->_charToCodePoint($char); + if ($code < 128) { + $codePoints['all'][] = $codePoints['basic'][] = $code; + } else { + $codePoints['all'][] = $codePoints['nonBasic'][] = $code; + } + } + + return $codePoints; + } + + /** + * Convert a single or multi-byte character to its code point + * + * @param string $char + * @return integer + */ + protected function _charToCodePoint($char) + { + $code = ord($char[0]); + if ($code < 128) { + return $code; + } elseif ($code < 224) { + return (($code - 192) * 64) + (ord($char[1]) - 128); + } elseif ($code < 240) { + return (($code - 224) * 4096) + ((ord($char[1]) - 128) * 64) + (ord($char[2]) - 128); + } else { + return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128); + } + } + + /** + * Convert a code point to its single or multi-byte character + * + * @param integer $code + * @return string + */ + protected function _codePointToChar($code) + { + if ($code <= 0x7F) { + return chr($code); + } elseif ($code <= 0x7FF) { + return chr(($code >> 6) + 192) . chr(($code & 63) + 128); + } elseif ($code <= 0xFFFF) { + return chr(($code >> 12) + 224) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128); + } else { + return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128); + } + } +} +} Index: link.module IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- link.module (date 1445435744000) +++ link.module (revision ) @@ -1304,9 +1304,15 @@ * Returns the list of allowed domains, including domains added by admins via variable_set/$config. */ function _link_domains() { - $link_extra_domains = variable_get('link_extra_domains', array()); - return empty($link_extra_domains) ? LINK_DOMAINS : LINK_DOMAINS . '|' . implode('|', $link_extra_domains); + $return = LINK_DOMAINS; + if ($link_extra_domains = variable_get('link_extra_domains', array())) { + $return .= '|' . implode('|', $link_extra_domains); -} + } + if ($link_extra_domains = variable_get('link_iana_domains', array())) { + $return .= '|' . implode('|', $link_extra_domains); + } + return $return; +} /** * Implements hook_migrate_field_alter(). @@ -1357,7 +1363,7 @@ /** * Additional callback to adapt the property info of link fields. - * + * * @see entity_metadata_field_entity_property_info() */ function link_field_property_info_callback(&$info, $entity_type, $field, $instance, $field_type) { @@ -1437,5 +1443,22 @@ } if ($object['widget']['type'] == 'link_field' && isset($object['settings']['title_value'])) { $strings['field'][$object['field_name']][$object['bundle']]['title_value']['string'] = $object['settings']['title_value']; + } +} + +/** + * Implements hook_cron(). + * + * Check one project/language at a time, download and import if update available + */ +function link_cron() { + $last = variable_get('link_iana_domains_last_check', 0); + + if ($last < REQUEST_TIME - 3600*24*30) { + module_load_include('drush.inc', 'link'); + + drush_link_extra_domains(); + + variable_set('link_iana_domains_last_check', REQUEST_TIME); } -} +} \ No newline at end of file Index: link.install IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- link.install (date 1445435744000) +++ link.install (revision ) @@ -115,3 +115,21 @@ } } } + +/** + * Implements hook_install(). + */ +function link_install() { + module_load_include('drush.inc', 'link'); + + drush_link_extra_domains(); +} + +/** + * Update TLD extra list + */ +function link_update_7002() { + module_load_include('drush.inc', 'link'); + + drush_link_extra_domains(); +}