csd

Login Information.txt

@@ -1,2 +1,2 @@
 user: admin
-pass: 9ItfWrmy1f22iZfJr3w8
+pass: 9ItfWrmy1f22iZfJr3w8

sites/all/modules/transliteration/CHANGELOG.txt

@@ -1,4 +1,9 @@
 
+Transliteration 7.x-3.x, xxxx-xx-xx
+-----------------------------------
+#1058064 by msti, smk-ka and amateescu: Transliterate search string and index.
+
+
 Transliteration 7.x-3.0, 2011-10-14
 -----------------------------------
 #881644 by amateescu: Added support for the Redirect module to redirect from old filenames.

sites/all/modules/transliteration/README.txt

@@ -1,5 +1,4 @@
-/* $Id$ */
-
+
 -- SUMMARY --
 
 Provides a central transliteration service to other Drupal modules, and
@@ -105,8 +104,22 @@ Authors:
 * Stefan M. Kudwien (smk-ka) - http://drupal.org/user/48898
 * Daniel F. Kudwien (sun) - http://drupal.org/user/54136
 
+Maintainers:
+* Andrei Mateescu (amateescu) - http://drupal.org/user/729614
+
 UTF-8 normalization is based on UtfNormal.php from MediaWiki
 (http://www.mediawiki.org) and transliteration uses data from Sean M. Burke's
 Text::Unidecode CPAN module
 (http://search.cpan.org/~sburke/Text-Unidecode-0.04/lib/Text/Unidecode.pm).
 
+
+-- USEFUL RESOURCES --
+
+Unicode Code Converter:
+http://people.w3.org/rishida/tools/conversion/
+
+UTF-8 encoding table and Unicode characters:
+http://www.utf8-chartable.de/unicode-utf8-table.pl
+
+Country codes:
+http://www.loc.gov/standards/iso639-2/php/code_list.php

sites/all/modules/transliteration/data/x03.php

@@ -10,9 +10,9 @@
   0x60 => '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x70 => NULL, NULL, NULL, NULL, '\'', ',', NULL, NULL, NULL, NULL, '', NULL, NULL, NULL, '?', NULL,
   0x80 => NULL, NULL, NULL, NULL, '', '', 'A', ';', 'E', 'I', 'I', NULL, 'O', NULL, 'U', 'O',
-  0x90 => 'I', 'A', 'B', 'G', 'D', 'E', 'Z', 'I', 'Th', 'I', 'K', 'L', 'M', 'N', 'X', 'O',
+  0x90 => 'I', 'A', 'V', 'G', 'D', 'E', 'Z', 'I', 'Th', 'I', 'K', 'L', 'M', 'N', 'X', 'O',
   0xA0 => 'P', 'R', NULL, 'S', 'T', 'Y', 'F', 'H', 'Ps', 'O', 'I', 'Y', 'a', 'e', 'i', 'i',
-  0xB0 => 'y', 'a', 'b', 'g', 'd', 'e', 'z', 'i', 'th', 'i', 'k', 'l', 'm', 'n', 'x', 'o',
+  0xB0 => 'y', 'a', 'v', 'g', 'd', 'e', 'z', 'i', 'th', 'i', 'k', 'l', 'm', 'n', 'x', 'o',
   0xC0 => 'p', 'r', 's', 's', 't', 'y', 'f', 'h', 'ps', 'o', 'i', 'y', 'o', 'y', 'o', NULL,
   0xD0 => 'b', 'th', 'U', 'U', 'U', 'ph', 'p', '&', NULL, NULL, 'St', 'st', 'W', 'w', 'Q', 'q',
   0xE0 => 'Sp', 'sp', 'Sh', 'sh', 'F', 'f', 'Kh', 'kh', 'H', 'h', 'G', 'g', 'CH', 'ch', 'Ti', 'ti',

sites/all/modules/transliteration/data/x14.php

@@ -1,20 +1,20 @@
 <?php
 
 $base = array(
-  0x00 => NULL, 'e', 'aai', 'i', 'ii', 'o', 'oo', 'oo', 'ee', 'i', 'a', 'aa', 'we', 'we', 'wi', 'wi',
+  0x00 => NULL, 'ai', 'aai', 'i', 'ii', 'u', 'uu', 'oo', 'ee', 'i', 'a', 'aa', 'we', 'we', 'wi', 'wi',
   0x10 => 'wii', 'wii', 'wo', 'wo', 'woo', 'woo', 'woo', 'wa', 'wa', 'waa', 'waa', 'waa', 'ai', 'w', '\'', 't',
-  0x20 => 'k', 'sh', 's', 'n', 'w', 'n', NULL, 'w', 'c', '?', 'l', 'en', 'in', 'on', 'an', 'pe',
-  0x30 => 'paai', 'pi', 'pii', 'po', 'poo', 'poo', 'hee', 'hi', 'pa', 'paa', 'pwe', 'pwe', 'pwi', 'pwi', 'pwii', 'pwii',
-  0x40 => 'pwo', 'pwo', 'pwoo', 'pwoo', 'pwa', 'pwa', 'pwaa', 'pwaa', 'pwaa', 'p', 'p', 'h', 'te', 'taai', 'ti', 'tii',
-  0x50 => 'to', 'too', 'too', 'dee', 'di', 'ta', 'taa', 'twe', 'twe', 'twi', 'twi', 'twii', 'twii', 'two', 'two', 'twoo',
-  0x60 => 'twoo', 'twa', 'twa', 'twaa', 'twaa', 'twaa', 't', 'tte', 'tti', 'tto', 'tta', 'ke', 'kaai', 'ki', 'kii', 'ko',
-  0x70 => 'koo', 'koo', 'ka', 'kaa', 'kwe', 'kwe', 'kwi', 'kwi', 'kwii', 'kwii', 'kwo', 'kwo', 'kwoo', 'kwoo', 'kwa', 'kwa',
-  0x80 => 'kwaa', 'kwaa', 'kwaa', 'k', 'kw', 'keh', 'kih', 'koh', 'kah', 'ce', 'caai', 'ci', 'cii', 'co', 'coo', 'coo',
-  0x90 => 'ca', 'caa', 'cwe', 'cwe', 'cwi', 'cwi', 'cwii', 'cwii', 'cwo', 'cwo', 'cwoo', 'cwoo', 'cwa', 'cwa', 'cwaa', 'cwaa',
-  0xA0 => 'cwaa', 'c', 'th', 'me', 'maai', 'mi', 'mii', 'mo', 'moo', 'moo', 'ma', 'maa', 'mwe', 'mwe', 'mwi', 'mwi',
+  0x20 => 'k', 'sh', 's', 'n', 'w', 'n', NULL, 'w', 'c', '?', 'l', 'en', 'in', 'on', 'an', 'pai',
+  0x30 => 'paai', 'pi', 'pii', 'pu', 'puu', 'poo', 'hee', 'hi', 'pa', 'paa', 'pwe', 'pwe', 'pwi', 'pwi', 'pwii', 'pwii',
+  0x40 => 'pwo', 'pwo', 'pwoo', 'pwoo', 'pwa', 'pwa', 'pwaa', 'pwaa', 'pwaa', 'p', 'p', 'h', 'tai', 'taai', 'ti', 'tii',
+  0x50 => 'tu', 'tuu', 'too', 'dee', 'di', 'ta', 'taa', 'twe', 'twe', 'twi', 'twi', 'twii', 'twii', 'two', 'two', 'twoo',
+  0x60 => 'twoo', 'twa', 'twa', 'twaa', 'twaa', 'twaa', 't', 'tte', 'tti', 'tto', 'tta', 'kai', 'kaai', 'ki', 'kii', 'ku',
+  0x70 => 'kuu', 'koo', 'ka', 'kaa', 'kwe', 'kwe', 'kwi', 'kwi', 'kwii', 'kwii', 'kwo', 'kwo', 'kwoo', 'kwoo', 'kwa', 'kwa',
+  0x80 => 'kwaa', 'kwaa', 'kwaa', 'k', 'kw', 'keh', 'kih', 'koh', 'kah', 'gai', 'caai', 'gi', 'gii', 'gu', 'guu', 'coo',
+  0x90 => 'ga', 'gaa', 'cwe', 'cwe', 'cwi', 'cwi', 'cwii', 'cwii', 'cwo', 'cwo', 'cwoo', 'cwoo', 'cwa', 'cwa', 'cwaa', 'cwaa',
+  0xA0 => 'cwaa', 'g', 'th', 'mai', 'maai', 'mi', 'mii', 'mu', 'muu', 'moo', 'ma', 'maa', 'mwe', 'mwe', 'mwi', 'mwi',
   0xB0 => 'mwii', 'mwii', 'mwo', 'mwo', 'mwoo', 'mwoo', 'mwa', 'mwa', 'mwaa', 'mwaa', 'mwaa', 'm', 'm', 'mh', 'm', 'm',
-  0xC0 => 'ne', 'naai', 'ni', 'nii', 'no', 'noo', 'noo', 'na', 'naa', 'nwe', 'nwe', 'nwa', 'nwa', 'nwaa', 'nwaa', 'nwaa',
-  0xD0 => 'n', 'ng', 'nh', 'le', 'laai', 'li', 'lii', 'lo', 'loo', 'loo', 'la', 'laa', 'lwe', 'lwe', 'lwi', 'lwi',
-  0xE0 => 'lwii', 'lwii', 'lwo', 'lwo', 'lwoo', 'lwoo', 'lwa', 'lwa', 'lwaa', 'lwaa', 'l', 'l', 'l', 'se', 'saai', 'si',
-  0xF0 => 'sii', 'so', 'soo', 'soo', 'sa', 'saa', 'swe', 'swe', 'swi', 'swi', 'swii', 'swii', 'swo', 'swo', 'swoo', 'swoo',
+  0xC0 => 'nai', 'naai', 'ni', 'nii', 'nu', 'nuu', 'noo', 'na', 'naa', 'nwe', 'nwe', 'nwa', 'nwa', 'nwaa', 'nwaa', 'nwaa',
+  0xD0 => 'n', 'ng', 'nh', 'lai', 'laai', 'li', 'lii', 'lu', 'luu', 'loo', 'la', 'laa', 'lwe', 'lwe', 'lwi', 'lwi',
+  0xE0 => 'lwii', 'lwii', 'lwo', 'lwo', 'lwoo', 'lwoo', 'lwa', 'lwa', 'lwaa', 'lwaa', 'l', 'l', 'l', 'sai', 'saai', 'si',
+  0xF0 => 'sii', 'su', 'suu', 'soo', 'sa', 'saa', 'swe', 'swe', 'swi', 'swi', 'swii', 'swii', 'swo', 'swo', 'swoo', 'swoo',
 );

sites/all/modules/transliteration/data/x15.php

@@ -3,14 +3,14 @@
 $base = array(
   0x00 => 'swa', 'swa', 'swaa', 'swaa', 'swaa', 's', 's', 'sw', 's', 'sk', 'skw', 'sW', 'spwa', 'stwa', 'skwa', 'scwa',
   0x10 => 'she', 'shi', 'shii', 'sho', 'shoo', 'sha', 'shaa', 'shwe', 'shwe', 'shwi', 'shwi', 'shwii', 'shwii', 'shwo', 'shwo', 'shwoo',
-  0x20 => 'shwoo', 'shwa', 'shwa', 'shwaa', 'shwaa', 'sh', 'ye', 'yaai', 'yi', 'yii', 'yo', 'yoo', 'yoo', 'ya', 'yaa', 'ywe',
-  0x30 => 'ywe', 'ywi', 'ywi', 'ywii', 'ywii', 'ywo', 'ywo', 'ywoo', 'ywoo', 'ywa', 'ywa', 'ywaa', 'ywaa', 'ywaa', 'y', 'y',
-  0x40 => 'y', 'yi', 're', 're', 'le', 'raai', 'ri', 'rii', 'ro', 'roo', 'lo', 'ra', 'raa', 'la', 'rwaa', 'rwaa',
-  0x50 => 'r', 'r', 'r', 'fe', 'faai', 'fi', 'fii', 'fo', 'foo', 'fa', 'faa', 'fwaa', 'fwaa', 'f', 'the', 'the',
+  0x20 => 'shwoo', 'shwa', 'shwa', 'shwaa', 'shwaa', 'sh', 'jai', 'yaai', 'ji', 'jii', 'ju', 'juu', 'yoo', 'ja', 'jaa', 'ywe',
+  0x30 => 'ywe', 'ywi', 'ywi', 'ywii', 'ywii', 'ywo', 'ywo', 'ywoo', 'ywoo', 'ywa', 'ywa', 'ywaa', 'ywaa', 'ywaa', 'j', 'y',
+  0x40 => 'y', 'yi', 're', 'rai', 'le', 'raai', 'ri', 'rii', 'ru', 'ruu', 'lo', 'ra', 'raa', 'la', 'rwaa', 'rwaa',
+  0x50 => 'r', 'r', 'r', 'vai', 'faai', 'vi', 'vii', 'vu', 'vuu', 'va', 'vaa', 'fwaa', 'fwaa', 'v', 'the', 'the',
   0x60 => 'thi', 'thi', 'thii', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'thwaa', 'thwaa', 'th', 'tthe', 'tthi', 'ttho', 'ttha', 'tth',
   0x70 => 'tye', 'tyi', 'tyo', 'tya', 'he', 'hi', 'hii', 'ho', 'hoo', 'ha', 'haa', 'h', 'h', 'hk', 'qaai', 'qi',
-  0x80 => 'qii', 'qo', 'qoo', 'qa', 'qaa', 'q', 'tlhe', 'tlhi', 'tlho', 'tlha', 're', 'ri', 'ro', 'ra', 'ngaai', 'ngi',
-  0x90 => 'ngii', 'ngo', 'ngoo', 'nga', 'ngaa', 'ng', 'nng', 'she', 'shi', 'sho', 'sha', 'the', 'thi', 'tho', 'tha', 'th',
+  0x80 => 'qii', 'qu', 'quu', 'qa', 'qaa', 'q', 'tlhe', 'tlhi', 'tlho', 'tlha', 're', 'ri', 'ro', 'ra', 'ngaai', 'ngi',
+  0x90 => 'ngii', 'ngu', 'nguu', 'nga', 'ngaa', 'ng', 'nng', 'she', 'shi', 'sho', 'sha', 'the', 'thi', 'tho', 'tha', 'th',
   0xA0 => 'lhi', 'lhii', 'lho', 'lhoo', 'lha', 'lhaa', 'lh', 'the', 'thi', 'thii', 'tho', 'thoo', 'tha', 'thaa', 'th', 'b',
   0xB0 => 'e', 'i', 'o', 'a', 'we', 'wi', 'wo', 'wa', 'ne', 'ni', 'no', 'na', 'ke', 'ki', 'ko', 'ka',
   0xC0 => 'he', 'hi', 'ho', 'ha', 'ghu', 'gho', 'ghe', 'ghee', 'ghi', 'gha', 'ru', 'ro', 're', 'ree', 'ri', 'ra',

sites/all/modules/transliteration/data/x4e.php

@@ -1,7 +1,7 @@
 <?php
 
 $base = array(
-  0x00 => NULL, 'Ding ', 'Kao ', 'Qi ', 'Shang ', 'Xia ', NULL, 'Mo ', 'Zhang ', 'San ', 'Shang ', 'Xia ', 'Ji ', 'Bu ', 'Yu ', 'Mian ',
+  0x00 => 'Yi ', 'Ding ', 'Kao ', 'Qi ', 'Shang ', 'Xia ', NULL, 'Mo ', 'Zhang ', 'San ', 'Shang ', 'Xia ', 'Ji ', 'Bu ', 'Yu ', 'Mian ',
   0x10 => 'Gai ', 'Chou ', 'Chou ', 'Zhuan ', 'Qie ', 'Pi ', 'Shi ', 'Shi ', 'Qiu ', 'Bing ', 'Ye ', 'Cong ', 'Dong ', 'Si ', 'Cheng ', 'Diu ',
   0x20 => 'Qiu ', 'Liang ', 'Diu ', 'You ', 'Liang ', 'Yan ', 'Bing ', 'Sang ', 'Gun ', 'Jiu ', 'Ge ', 'Ya ', 'Qiang ', 'Zhong ', 'Ji ', 'Jie ',
   0x30 => 'Feng ', 'Guan ', 'Chuan ', 'Chan ', 'Lin ', 'Zhuo ', 'Zhu ', 'Ha ', 'Wan ', 'Dan ', 'Wei ', 'Zhu ', 'Jing ', 'Li ', 'Ju ', 'Pie ',

sites/all/modules/transliteration/transliteration.admin.inc

@@ -62,17 +62,22 @@ function transliteration_retroactive_submit($form, &$form_state) {
 
   while ($file = $result->fetchObject()) {
     $wrapper = file_stream_wrapper_get_instance_by_uri($file->uri);
+    $scheme = file_uri_scheme($file->uri);
+
+    // Missing implementation.
     if (!$wrapper) {
-      // Missing implementation.
       $errors[] = file_uri_target($file->uri);
       continue;
     }
-    if (!in_array('DrupalLocalStreamWrapper', class_parents($wrapper))) {
-      // Skip non-local files.
+
+    // Skip non-writable stream wrappers.
+    $writeable_stream_wrappers = file_get_stream_wrappers(STREAM_WRAPPERS_WRITE);
+    if (!isset($writeable_stream_wrappers[$scheme])) {
       continue;
     }
+
+    // Missing file.
     if (!file_exists($wrapper->realpath())) {
-      // Missing file.
       $errors[] = file_uri_target($file->uri);
       continue;
     }
@@ -133,6 +138,9 @@ function transliteration_file_query() {
     case 'mysql':
     case 'mysqli':
       $operator = 'NOT REGEXP';
+      if (variable_get('transliteration_file_lowercase', TRUE)) {
+        $operator .= ' BINARY';
+      }
       $regex = '/[a-z0-9_.-]+$';
       break;
 

sites/all/modules/transliteration/transliteration.info

@@ -1,10 +1,11 @@
 name = Transliteration
 description = Converts non-latin text to US-ASCII and sanitizes file names.
 core = 7.x
+configure = admin/config/media/file-system
 
-; Information added by drupal.org packaging script on 2011-10-14
-version = "7.x-3.0"
+; Information added by drupal.org packaging script on 2012-06-01
+version = "7.x-3.1"
 core = "7.x"
 project = "transliteration"
-datestamp = "1318580199"
+datestamp = "1338540713"
 

sites/all/modules/transliteration/transliteration.install

@@ -29,4 +29,5 @@ function transliteration_install() {
 function transliteration_uninstall() {
   variable_del('transliteration_file_uploads');
   variable_del('transliteration_file_lowercase');
+  variable_del('transliteration_search');
 }

sites/all/modules/transliteration/transliteration.module

@@ -27,6 +27,23 @@ function transliteration_menu() {
     'weight' => 10,
     'type' => MENU_LOCAL_TASK,
   );
+  $items['admin/config/media/file-system/transliteration'] = array(
+    'title' => 'Transliteration',
+    'description' => 'Convert existing file names to US-ASCII.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('transliteration_retroactive'),
+    'access arguments' => array('administer site configuration'),
+    'file' => 'transliteration.admin.inc',
+    'weight' => 10,
+    'type' => MENU_LOCAL_TASK,
+  );
+ $items['translit/user'] = array(
+    'title' => 'Translit user callback', 
+    'page callback' => 'translit_user', 
+	'page arguments' => array(2),
+    'access arguments' => array('access content'), 
+    'type' => MENU_CALLBACK,
+  );  
   return $items;
 }
 
@@ -56,6 +73,24 @@ function transliteration_form_system_file_system_settings_alter(&$form, &$form_s
   $form['buttons']['#weight'] = 1;
 }
 
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * Adds transliteration settings to the search settings form.
+ */
+function transliteration_form_search_admin_settings_alter(&$form, &$form_state) {
+  $form['transliteration'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Transliteration'),
+  );
+  $form['transliteration']['transliteration_search'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Transliterate search index and searched strings.'),
+    '#description' => t('Enable to allow searching and indexing using US-ASCII character set, i.e. to treat accented and unaccented letters the same.'),
+    '#default_value' => variable_get('transliteration_search', TRUE),
+  );
+}
+
 /**
  * Transliterates and sanitizes a file name.
  *
@@ -89,6 +124,8 @@ function transliteration_clean_filename($filename, $source_langcode = NULL) {
   $filename = str_replace(' ', '_', $filename);
   // Remove remaining unsafe characters.
   $filename = preg_replace('![^0-9A-Za-z_.-]!', '', $filename);
+  // Remove multiple consecutive non-alphabetical characters.
+  $filename = preg_replace('/(_)_+|(\.)\.+|(-)-+/', '\\1\\2\\3', $filename);
   // Force lowercase to prevent issues on case-insensitive file systems.
   if (variable_get('transliteration_file_lowercase', TRUE)) {
     $filename = strtolower($filename);
@@ -149,3 +186,77 @@ function transliteration_init() {
     }
   }
 }
+
+/**
+ * Implements hook_search_preprocess().
+ *
+ * Transliterates text added to the search index and user submitted search
+ * keywords.
+ */
+function transliteration_search_preprocess($text) {
+  if (variable_get('transliteration_search', TRUE)) {
+    return transliteration_get($text, '', language_default('language'));
+  }
+  return $text;
+}
+
+/**
+ * Implements hook_filter_info().
+ */
+function transliteration_filter_info() {
+  return array(
+    'transliteration' => array(
+      'title' => t('Convert all characters to US-ASCII'),
+      'process callback' => '_transliteration_filter_process',
+      'settings callback' => '_transliteration_filter_settings',
+      'default settings' => array(
+        'no_known_transliteration' => '?'
+      ),
+      'tips callback' => '_transliteration_filter_tips',
+    ),
+  );
+}
+
+/**
+ * Process callback for the transliteration filter.
+ */
+function _transliteration_filter_process($text, $filter, $format, $langcode, $cache, $cache_id) {
+  return transliteration_get($text, $filter->settings['no_known_transliteration'], $langcode);
+}
+
+/**
+ * Settings callback for the transliteration filter.
+ */
+function _transliteration_filter_settings($form, &$form_state, $filter, $format, $defaults, $filters) {
+  $filter->settings += $defaults;
+
+  return array(
+    'no_known_transliteration' => array(
+      '#type' => 'textfield',
+      '#title' => t('Placeholder for characters with no known US-ASCII equivalent'),
+      '#size' => 2,
+      // The maximum length is 5 in order to accommodate unicode multibyte input.
+      '#maxlength' => 5,
+      '#default_value' => $filter->settings['no_known_transliteration'],
+    )
+  );
+}
+
+/**
+ * Filter tips callback for the transliteration filter.
+ */
+function _transliteration_filter_tips($filter, $format, $long) {
+  return t('Non-latin text (e.g., å, ö, 漢) will be converted to US-ASCII equivalents (a, o, ?).');
+}
+
+/**
+ * Filter tips callback for the transliteration user.
+ */
+function translit_user($arg = NULL) {
+  if($arg == 'non-latin') {
+    global $user;
+    $user = user_load(1);
+	return t('non-latin flag is true');
+  }
+  return t('non-latin flag is false'); 
+}