Index: cck_phone.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/cck_phone.info,v retrieving revision 1.1 diff -u -p -r1.1 cck_phone.info --- cck_phone.info 8 Jul 2010 11:20:27 -0000 1.1 +++ cck_phone.info 11 Nov 2010 08:22:27 -0000 @@ -2,6 +2,18 @@ name = Phone Number description = "The phone module allows administrators to define a CCK field type for phone numbers." package = CCK -dependencies[] = content -core = 6.x +dependencies[] = field +core = 7.x + +files[] = cck_phone.module +files[] = includes/cck_phone_countrycodes.inc +files[] = includes/phone.ca.inc +files[] = includes/phone.gb.inc +files[] = includes/phone.my.inc +files[] = includes/phone.us.inc +files[] = tests/cck_phone.crud.test +files[] = tests/cck_phone.crud_input.test +files[] = tests/phone.gb.test +files[] = tests/phone.my.test +files[] = tests/phone.us.test Index: cck_phone.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/cck_phone.install,v retrieving revision 1.1.4.1 diff -u -p -r1.1.4.1 cck_phone.install --- cck_phone.install 6 Aug 2010 09:29:21 -0000 1.1.4.1 +++ cck_phone.install 11 Nov 2010 08:22:27 -0000 @@ -7,42 +7,58 @@ * Installation file */ +/** + * Implements hook_field_schema(). + */ +function cck_phone_field_schema($field) { + return array( + 'columns' => array( + 'number' => array( + 'type' => 'varchar', + 'length' => CCK_PHONE_PHONE_MAX_LENGTH, + 'not null' => FALSE, + ), + 'country_codes' => array( + 'type' => 'varchar', + 'length' => CCK_PHONE_CC_MAX_LENGTH, + 'not null' => FALSE, + ), + 'extension' => array( + 'type' => 'varchar', + 'length' => CCK_PHONE_EXTENSION_MAX_LENGTH, + 'not null' => FALSE, + ), + ), + ); +} /** - * Implementation of hook_install(). + * Implements hook_install(). */ function cck_phone_install() { - drupal_load('module', 'content'); - content_notify('install', 'cck_phone'); drupal_set_message(st('Phone number module installed successfully.')); } /** - * Implementation of hook_uninstall(). + * Implements hook_uninstall(). */ function cck_phone_uninstall() { - drupal_load('module', 'content'); - content_notify('uninstall', 'cck_phone'); variable_del('cck_phone_custom_cc'); } /** - * Implementation of hook_enable(). + * Implements hook_enable(). * * Notify content module when this module is enabled. */ function cck_phone_enable() { // TODO: Migration path for phone.module to cck_phone - drupal_load('module', 'content'); - content_notify('enable', 'cck_phone'); } /** - * Implementation of hook_disable(). + * Implements hook_disable(). * * Notify content module when this module is disabled. */ function cck_phone_disable() { - drupal_load('module', 'content'); - content_notify('disable', 'cck_phone'); } Index: cck_phone.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/cck_phone.js,v retrieving revision 1.2 diff -u -p -r1.2 cck_phone.js --- cck_phone.js 12 Jul 2010 09:54:52 -0000 1.2 +++ cck_phone.js 11 Nov 2010 08:22:27 -0000 @@ -1,113 +1,117 @@ // $Id: cck_phone.js,v 1.2 2010/07/12 09:54:52 ckng Exp $ -Drupal.PhoneNumber = Drupal.PhoneNumber || {}; +(function ($) { + Drupal.PhoneNumber = Drupal.PhoneNumber || {}; -/** - * Filters checkboxes based on their label. - * This code is shamelessly taken from checkbox_filter - */ -Drupal.PhoneNumber.filter = function() { - var field = $(this); - var checkboxes = $('.form-checkboxes .form-item', field.parent().parent()); - var found = false; - var label = ""; - var option = null; - for (var i = 0; i < checkboxes.length; i++) { - option = checkboxes.eq(i); - label = Drupal.PhoneNumber.trim(option.text()); - if (label.toUpperCase().indexOf(field.val().toUpperCase()) < 0) { - option.hide(); - } else { - option.show(); - } - } -} - -/** - * Trims whitespace from strings - */ -Drupal.PhoneNumber.trim = function(str) { - var str = str.replace(/^\s\s*/, ''), - ws = /\s/, - i = str.length; - while (ws.test(str.charAt(--i))); - return str.slice(0, i + 1); -} - -/** - * Check/Uncheck all checkboxes - */ -Drupal.PhoneNumber.checkall = function(e) { - var field = $(this); - var checkboxes = $('.form-checkboxes .form-item:visible .form-checkbox', field.parent().parent()); - - var checked = (field.text() == Drupal.t('Select all')); - if (checked) { - checkboxes.attr('checked', true); - field.text(Drupal.t('Deselect all')); - } - else { - checkboxes.attr('checked', false); - Drupal.PhoneNumber.checkDefault(); - field.text(Drupal.t('Select all')); - } -} - -/** - * Country selection should include default country code by default. - */ -Drupal.PhoneNumber.checkDefault = function(e) { - var defaultCC = $('#edit-default-country').val(); - var span = $('').append(Drupal.t('Default')); - - if ($('.cck-phone-default-country').find('.form-checkbox').val() == defaultCC) { - $('#edit-country-selection-' + defaultCC) - .attr('checked', 'checked'); - } - else { - $('.cck-phone-default-country') - .removeClass('cck-phone-default-country') - .find('span.default-cc').remove(); - - - $('#edit-country-selection-' + defaultCC) - .attr('checked', 'checked') - .parents('.form-item:first') - .addClass('cck-phone-default-country') - .append(span); - } -} - -/** - * Attach a filtering textfield to checkboxes. - */ -Drupal.behaviors.PhoneNumber = function (context) { - // Toggle collapsible on selection - $('#edit-all-country-codes').change(function() { - if ($(this).attr('checked')) { - $('fieldset.cck-phone-settings').addClass('collapsed'); + /** + * Filters checkboxes based on their label. + * This code is shamelessly taken from checkbox_filter + */ + Drupal.PhoneNumber.filter = function() { + var field = $(this); + var checkboxes = $('.form-checkboxes .form-item', field.parent().parent()); + var found = false; + var label = ""; + var option = null; + for (var i = 0; i < checkboxes.length; i++) { + option = checkboxes.eq(i); + label = Drupal.PhoneNumber.trim(option.text()); + if (label.toUpperCase().indexOf(field.val().toUpperCase()) < 0) { + option.hide(); + } else { + option.show(); + } + } + }; + + /** + * Trims whitespace from strings + */ + Drupal.PhoneNumber.trim = function(str) { + var str = str.replace(/^\s\s*/, ''), + ws = /\s/, + i = str.length; + while (ws.test(str.charAt(--i))); + return str.slice(0, i + 1); + }; + + /** + * Check/Uncheck all checkboxes + */ + Drupal.PhoneNumber.checkall = function(e) { + var field = $(this); + var checkboxes = $('.form-checkboxes .form-item:visible .form-checkbox', field.parent().parent()); + + var checked = (field.text() == Drupal.t('Select all')); + if (checked) { + checkboxes.attr('checked', true); + field.text(Drupal.t('Deselect all')); } else { - $('fieldset.cck-phone-settings').removeClass('collapsed'); + checkboxes.attr('checked', false); + Drupal.PhoneNumber.checkDefault(); + field.text(Drupal.t('Select all')); } - }); - $('#edit-all-country-codes').trigger('change'); + }; + + /** + * Country selection should include default country code by default. + */ + Drupal.PhoneNumber.checkDefault = function(e) { + var defaultCC = $('#edit-default-country').val(); + var span = $('').append(Drupal.t('Default')); + + if ($('.cck-phone-default-country').find('.form-checkbox').val() == defaultCC) { + $('#edit-country-selection-' + defaultCC) + .attr('checked', 'checked'); + } + else { + $('.cck-phone-default-country') + .removeClass('cck-phone-default-country') + .find('span.default-cc').remove(); - // Ensure the new default country is checked - $('#edit-default-country, .cck-phone-settings .form-checkboxes').bind('change', Drupal.PhoneNumber.checkDefault); - $('#edit-default-country').trigger('change'); - $('form#content-field-edit-form').submit(Drupal.PhoneNumber.checkDefault); - - - // Filter for countries - var form = '
' - + ' ' - + ' ' - + '
' - + '
' - + ' ' + Drupal.t('Select all') + '' - + '
'; - $('.cck-phone-settings .form-checkboxes', context).before(form); - $('input.cck-phone-filter').bind('keyup', Drupal.PhoneNumber.filter); - $('a.cck-phone-check').bind('click', Drupal.PhoneNumber.checkall); -} \ No newline at end of file + + $('#edit-country-selection-' + defaultCC) + .attr('checked', 'checked') + .parents('.form-item:first') + .addClass('cck-phone-default-country') + .append(span); + } + }; + + /** + * Attach a filtering textfield to checkboxes. + */ + Drupal.behaviors.PhoneNumber = { + attach: function (context) { + // Toggle collapsible on selection + $('#edit-all-country-codes').change(function() { + if ($(this).attr('checked')) { + $('fieldset.cck-phone-settings').addClass('collapsed'); + } + else { + $('fieldset.cck-phone-settings').removeClass('collapsed'); + } + }); + $('#edit-all-country-codes').trigger('change'); + + // Ensure the new default country is checked + $('#edit-default-country, .cck-phone-settings .form-checkboxes').bind('change', Drupal.PhoneNumber.checkDefault); + $('#edit-default-country').trigger('change'); + $('form#content-field-edit-form').submit(Drupal.PhoneNumber.checkDefault); + + + // Filter for countries + var form = '
' + + ' ' + + ' ' + + '
' + + '
' + + ' ' + Drupal.t('Select all') + '' + + '
'; + $('.cck-phone-settings .form-checkboxes', context).before(form); + $('input.cck-phone-filter').bind('keyup', Drupal.PhoneNumber.filter); + $('a.cck-phone-check').bind('click', Drupal.PhoneNumber.checkall); + } + }; +})(jQuery); \ No newline at end of file Index: cck_phone.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/cck_phone.module,v retrieving revision 1.3.2.2 diff -u -p -r1.3.2.2 cck_phone.module --- cck_phone.module 13 Aug 2010 03:20:29 -0000 1.3.2.2 +++ cck_phone.module 11 Nov 2010 08:22:28 -0000 @@ -14,7 +14,7 @@ define('CCK_PHONE_CC_MAX_LENGTH', 2); define('CCK_PHONE_MOBILE_AGENT', '/(ipod|iphone|android|blackberry|palm|nokia|opera\s+mobi|opera\s+mini|windows\s+ce|iemobile)/i'); /** - * Implementation of hook_init(). + * Implements hook_init(). * This hook is called on module initialization. */ function cck_phone_init() { @@ -22,13 +22,13 @@ function cck_phone_init() { module_load_include('inc', 'cck_phone', 'cck_phone_countrycodes'); // load custom country codes phone number includes - $path = drupal_get_path('module', 'cck_phone') .'/includes'; + $path = drupal_get_path('module', 'cck_phone') . '/includes'; // scan include phone numbers directory - $files = file_scan_directory($path, '^phone\..*\.inc$'); + $files = file_scan_directory($path, '/^phone\..*\.inc$/'); $countrycodes = array(); foreach ($files as $file) { - module_load_include('inc', 'cck_phone', '/includes/'. $file->name); + module_load_include('inc', 'cck_phone', '/includes/' . $file->name); list ($dummy, $countrycode) = explode('.', $file->name); // faster using array key $countrycodes[$countrycode] = $countrycode; @@ -39,272 +39,242 @@ function cck_phone_init() { } /** - * Implementation of hook_theme(). + * Implements hook_theme(). */ function cck_phone_theme() { return array( - 'phone_number' => array( - 'arguments' => array('element' => NULL), + 'cck_phone_phone_number' => array( + 'render element' => 'element', ), 'phone_number_extension' => array( - 'arguments' => array('extension' => ''), - ), - 'cck_phone_formatter_default' => array( - 'arguments' => array('element' => NULL), + 'render element' => 'element', ), - 'cck_phone_formatter_local' => array( - 'arguments' => array('element' => NULL), + 'cck_phone_formatter_global_phone_number' => array( + 'variables' => array('element' => NULL), ), - 'cck_phone_mobile_tel' => array( - 'arguments' => array('element' => NULL, 'phone' => ''), + 'cck_phone_formatter_local_phone_number' => array( + 'variables' => array('element' => NULL), ), ); } - /** - * Implementation of hook_field_info(). + * Implements hook_field_info(). */ function cck_phone_field_info() { return array( 'phone_number' => array( 'label' => t('Phone number'), 'description' => t('Store a number and country code in the database to assemble a phone number.'), + 'settings' => array('size' => CCK_PHONE_PHONE_MAX_LENGTH), + 'instance_settings' => array( + 'default_country' => NULL, + 'all_country_codes' => TRUE, + 'country_codes' => array('country_selection' => array()), + 'enable_country_level_validation' => TRUE, + 'enable_extension' => FALSE, + 'enable_mobile' => FALSE, + ), + 'default_widget' => 'phone_number', + 'default_formatter' => 'global_phone_number', ), ); } /** - * Implementation of hook_field_settings(). + * Implements hook_field_instance_settings_form(). */ -function cck_phone_field_settings($op, $field) { - switch ($op) { - case 'form': - drupal_add_css(drupal_get_path('module', 'cck_phone') . '/cck_phone.css'); - drupal_add_js(drupal_get_path('module', 'cck_phone') . '/cck_phone.js'); - - $form = array(); - $form['default_country'] = array( - '#type' => 'select', - '#title' => t('Default country code'), - '#default_value' => isset($field['default_country']) && ($field['default_country'] !== '') ? $field['default_country'] : NULL, - '#options' => _cck_phone_cc_options(TRUE), - ); - - $form['all_country_codes'] = array( - '#type' => 'checkbox', - '#title' => t('Show all country codes.'), - '#default_value' => isset($field['all_country_codes']) && ($field['all_country_codes'] !== '') ? $field['all_country_codes'] : TRUE, - '#description' => t('Uncheck this to select the country to be displayed.'), - ); - - // Country codes settings - $form['country_codes'] = array( - '#title' => 'Country selection', - '#type' => 'fieldset', - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#attributes' => array('class' => 'cck-phone-settings'), - ); - - $form['country_codes']['country_selection'] = array( - '#type' => 'checkboxes', - '#title' => t('Select country codes to be included'), - '#default_value' => isset($field['country_selection']) && !empty($field['country_selection']) ? $field['country_selection'] : array($field['default_country'] => $field['default_country']), - '#options' => _cck_phone_cc_options(TRUE), - '#description' => t('Country marks with * has custom country code settings and/or validation.'), - ); - - $form['enable_custom_country'] = array( - '#type' => 'checkbox', - '#title' => t('Enable country level validation'), - '#default_value' => isset($field['enable_custom_country']) && ($field['enable_custom_country'] !== '') ? $field['enable_custom_country'] : TRUE, - '#description' => t('Uncheck this to disable stringent country phone number validation.'), - ); - - $form['enable_extension'] = array( - '#type' => 'checkbox', - '#title' => t('Enable phone extension support'), - '#default_value' => isset($field['enable_extension']) && ($field['enable_extension'] !== '') ? $field['enable_extension'] : FALSE, - '#description' => t('Check this to enable phone number extension field.'), - ); - - $form['enable_mobile'] = array( - '#type' => 'checkbox', - '#title' => t('Enable mobile device detection'), - '#default_value' => isset($field['enable_mobile']) && ($field['enable_mobile'] !== '') ? $field['enable_mobile'] : FALSE, - '#description' => t('Check this to enable phone number link on mobile browsers (RFC3966).'), - ); - - // Display country specific settings - foreach (_cck_phone_custom_cc() as $cc) { - $function = $cc . '_phone_field_settings'; - if (function_exists($function)) { - $country_settings = $function($op, $field); - if (isset($country_settings) && !empty($country_settings)) { - $country_codes = cck_phone_countrycodes($cc); - // Wrap with fieldset - $wrapper = array( - '#title' => $country_codes['country'] . ' specific settings', - '#type' => 'fieldset', - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#attributes' => array('class' => 'cck-phone-settings cck-phone-settings-' . $cc), - ); - $wrapper[] = $country_settings; - array_push($form, $wrapper); - } - } - } +function cck_phone_field_instance_settings_form($field, $instance) { + drupal_add_css(drupal_get_path('module', 'cck_phone') . '/cck_phone.css'); + drupal_add_js(drupal_get_path('module', 'cck_phone') . '/cck_phone.js'); - return $form; + $defaults = field_info_instance_settings($field['type']); + $settings = array_merge($defaults, $instance['settings']); - case 'validate': - // Validate country specific settings - foreach (_cck_phone_custom_cc() as $cc) { - $function = $cc . '_phone_field_settings'; - if (function_exists($function)) { - $function($op, $field); - } - } - break; + $form = array(); + $form['default_country'] = array( + '#type' => 'select', + '#title' => t('Default country code'), + '#default_value' => $settings['default_country'], + '#options' => _cck_phone_cc_options(TRUE), + ); - case 'save': - $settings = array('default_country', 'all_country_codes', 'country_selection', 'enable_custom_country', 'enable_extension', 'enable_mobile'); + $form['all_country_codes'] = array( + '#type' => 'checkbox', + '#title' => t('Show all country codes.'), + '#default_value' => $settings['all_country_codes'], + '#description' => t('Uncheck this to select the country to be displayed.'), + ); - // Save country specific settings - foreach (_cck_phone_custom_cc() as $cc) { - $function = $cc . '_phone_field_settings'; - if (function_exists($function)) { - array_push($settings, $function($op, $field)); - } - } - return $settings; + // Country codes settings + $form['country_codes'] = array( + '#title' => 'Country selection', + '#type' => 'fieldset', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#attributes' => array('class' => array('cck-phone-settings')), + ); - // TODO: filters for phone number? -// case 'filters': -// break; - - case 'database columns': - return array( - 'number' => array( - 'type' => 'varchar', - 'length' => CCK_PHONE_PHONE_MAX_LENGTH, - 'not null' => FALSE, - ), - 'country_codes' => array( - 'type' => 'varchar', - 'length' => CCK_PHONE_CC_MAX_LENGTH, - 'not null' => FALSE, - ), - 'extension' => array( - 'type' => 'varchar', - 'length' => CCK_PHONE_EXTENSION_MAX_LENGTH, - 'not null' => FALSE, - ), - ); - } -} + $form['country_codes']['country_selection'] = array( + '#type' => 'checkboxes', + '#title' => t('Select country codes to be included'), + '#default_value' => isset($settings['country_codes']['country_selection']) && !empty($settings['country_codes']['country_selection']) ? $settings['country_codes']['country_selection'] : array($settings['default_country'] => $settings['default_country']), + '#options' => _cck_phone_cc_options(TRUE), + '#description' => t('Country marks with * has custom country code settings and/or validation.'), + ); -/** - * Implementation of hook_field(). - */ -function cck_phone_field($op, &$node, $field, &$items, $teaser, $page) { - switch ($op) { - case 'validate': - foreach ($items as $delta => $value) { - _cck_phone_validate($items[$delta], $delta, $field, $node); - } + $form['enable_country_level_validation'] = array( + '#type' => 'checkbox', + '#title' => t('Enable country level validation'), + '#default_value' => $settings['enable_country_level_validation'], + '#description' => t('Uncheck this to disable stringent country phone number validation.'), + ); - return $items; - break; + $form['enable_extension'] = array( + '#type' => 'checkbox', + '#title' => t('Enable phone extension support'), + '#default_value' => $settings['enable_extension'], + '#description' => t('Check this to enable phone number extension field.'), + ); - case 'presave': - foreach ($items as $delta => $value) { - _cck_phone_process($items[$delta], $delta, $field, $node); - } - break; + $form['enable_mobile'] = array( + '#type' => 'checkbox', + '#title' => t('Enable mobile device detection'), + '#default_value' => $settings['enable_mobile'], + '#description' => t('Check this to enable phone number link on mobile browsers (RFC3966).'), + ); - // Do country level code need to modify the output? - case 'sanitize': - foreach ($items as $delta => $value) { - _cck_phone_sanitize($items[$delta], $delta, $field, $node); + // Display country specific settings + foreach (_cck_phone_custom_cc() as $cc) { + $function = $cc . '_phone_field_settings'; + if (function_exists($function)) { + $country_settings = $function($op, $field); + if (isset($country_settings) && !empty($country_settings)) { + $country_codes = cck_phone_countrycodes($cc); + // Wrap with fieldset + $wrapper = array( + '#title' => t('%country specific settings', array('%country' => $country_codes['country'])), + '#type' => 'fieldset', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#attributes' => array('class' => 'cck-phone-settings cck-phone-settings-' . $cc), + ); + $wrapper[] = $country_settings; + array_push($form, $wrapper); } - break; + } + } + + return $form; +} +/** + * Implements hook_field_validate(). + */ +function cck_phone_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { + foreach ($items as $delta => $value) { + _cck_phone_validate($items[$delta], $delta, $field, $instance, $langcode, $errors); } +} +/** + * Implements hook_field_presave(). + */ +function cck_phone_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) { + foreach ($items as $delta => $value) { + _cck_phone_sanitize($items[$delta], $delta, $field, $instance, $langcode); + _cck_phone_process($items[$delta], $delta, $field, $instance, $langcode); + } } /** - * Implementation of hook_field_formatter_info(). + * Implements hook_field_load(). + * + * Where possible, generate the sanitized version of each field early so that + * it is cached in the field cache. This avoids looking up from the filter cache + * separately. + * + * @see cck_phone_field_formatter_view() + */ +/*function cck_phone_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) { + foreach ($entities as $id => $entity) { + foreach ($items[$id] as $delta => $item) { + _cck_phone_sanitize($items[$id][$delta], $instances[$id], $langcode); + } + } +}*/ + +/** + * Implements hook_field_formatter_info(). */ function cck_phone_field_formatter_info() { return array( - 'default' => array( - 'label' => 'Global phone number (default)', + 'global_phone_number' => array( + 'label' => t('Global phone number (default)'), 'field types' => array('phone_number'), - 'multiple values' => CONTENT_HANDLE_CORE, + 'multiple values' => FIELD_BEHAVIOR_DEFAULT, ), - 'local' => array( - 'label' => 'Local phone number', + 'local_phone_number' => array( + 'label' => t('Local phone number'), 'field types' => array('phone_number'), - 'multiple values' => CONTENT_HANDLE_CORE, + 'multiple values' => FIELD_BEHAVIOR_DEFAULT, ), ); } /** - * Theme function for phone extension. + * Implements hook_field_formatter_view(). */ -function theme_phone_number_extension($extension = '') { - return t(' ext. @extension', array('@extension' => $extension)); +function cck_phone_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { + $element = array(); + $settings = $display['settings']; + $formatter = $display['type']; + + foreach ($items as $delta => $item) { + $element[$delta] = array( + '#markup' => theme('cck_phone_formatter_' . $formatter, $item), + ); + } + + return $element; } /** - * Theme function for mobile tel. + * Implements hook_field_is_empty(). */ -function theme_cck_phone_mobile_tel($element, $phone = '') { - $item = $element['#item']; - - // Mobile browsers support - if (isset($item['mobile_output']) && $item['mobile_output'] == TRUE) { - // Always output as global phone number without separator, leave the $phone display unchanged - $cc = cck_phone_countrycodes($item['country_codes']); - $tel = $cc['code'] . $item['number']; - - $phone = '' . $phone . ''; - } +function cck_phone_field_is_empty($item, $field) { + return empty($item['number']); +} - return $phone; +/** + * Theme function for phone extension. + */ +function theme_phone_number_extension($element = '') { + return t(' ext. %extension', array('%extension' => $element['element'])); } /** * Theme function for 'default' or global phone number field formatter. */ -function theme_cck_phone_formatter_default($element) { - $item = $element['#item']; +function theme_cck_phone_formatter_global_phone_number($element) { $phone = ''; // Display a global phone number with country code. - if (!empty($item['number']) && !empty($item['country_codes'])) { + if (!empty($element['number']) && !empty($element['country_codes'])) { // Call country default formatter if exist - $function = $item['country_codes'] . '_formatter_default'; + $function = $element['country_codes'] . '_formatter_default'; if (function_exists($function)) { $phone = $function($element); } else { - $cc = cck_phone_countrycodes($item['country_codes']); - $phone = $cc['code'] .'-'. $item['number']; + $cc = cck_phone_countrycodes($element['country_codes']); + $phone = $cc['code'] . '-' . $element['number']; } // Extension - if (!empty($item['extension'])) { - $phone = $phone . theme('phone_number_extension', $item['extension']); + if (!empty($element['extension'])) { + $phone = $phone . theme('phone_number_extension', $element['extension']); } - - // Mobile browsers support - $phone = theme('cck_phone_mobile_tel', $element, $phone); } return $phone; @@ -313,28 +283,24 @@ function theme_cck_phone_formatter_defau /** * Theme function for 'local' phone number field formatter. */ -function theme_cck_phone_formatter_local($element) { - $item = $element['#item']; +function theme_cck_phone_formatter_local_phone_number($element) { $phone = ''; // Display a local phone number without country code. - if (!empty($item['number'])) { + if (!empty($element['number'])) { // Call country local formatter if exist - $function = $item['country_codes'] . '_formatter_local'; + $function = $element['country_codes'] . '_formatter_local'; if (function_exists($function)) { $phone = $function($element); } else { - $phone = $item['number']; + $phone = $element['number']; } // Extension - if (!empty($item['extension'])) { - $phone = $phone . theme('phone_number_extension', $item['extension']); + if (!empty($element['extension'])) { + $phone = $phone . theme('phone_number_extension', $element['extension']); } - - // Mobile browsers support - $phone = theme('cck_phone_mobile_tel', $element, $phone); } return $phone; @@ -357,7 +323,7 @@ function _cck_phone_cc_options($show_cus } foreach (cck_phone_countrycodes() as $cc => $value) { - $cc_name = $value['country'] .' ('. $value['code'] .')'; + $cc_name = $value['country'] . ' (' . $value['code'] . ')'; // faster using array key instead of in_array if ($show_custom && isset($custom_cc[$cc])) { @@ -396,7 +362,7 @@ function _cck_phone_valid_input($input) (?: # } \d # } 4-15 digits number [\s.()-]* # } each followed by optional separator - ){'. CCK_PHONE_PHONE_MIN_LENGTH .','. CCK_PHONE_PHONE_MAX_LENGTH .'} # } + ){' . CCK_PHONE_PHONE_MIN_LENGTH . ',' . CCK_PHONE_PHONE_MAX_LENGTH . '} # } $/x'; return preg_match($regex, $input); @@ -410,15 +376,17 @@ function _cck_phone_valid_cc_input($list return FALSE; } -function _cck_phone_validate(&$item, $delta, $field, $node) { +function _cck_phone_validate(&$item, $delta, $field, $instance, $langcode, &$errors) { $phone_input = trim($item['number']); $countrycode = trim($item['country_codes']); $ext_input = ''; - if ($field['enable_extension']) { + $settings = $instance['settings']; + + if ($settings['enable_extension']) { $ext_input = trim($item['extension']); } - if ($phone_input && !(isset($field['widget']['default_value'][$delta]['number']) && $phone_input == $field['widget']['default_value'][$delta]['number'] && !$field['required'])) { + if ($phone_input) { $error_params = array( '%phone_input' => check_plain($phone_input), // original phone input @@ -432,15 +400,15 @@ function _cck_phone_validate(&$item, $de // Only allow digit, dash, space and bracket if (!_cck_phone_valid_input($phone_input, $ext_input)) { $error = t('Phone number must be %min_length-%max_length digits only.', $error_params); - if ($field['enable_extension'] && $ext_input != '') { - $error .= '
'. t('Phone extension must be less than %ext_max_length digits.', $error_params); + if ($settings['enable_extension'] && $ext_input != '') { + $error .= '
' . t('Phone extension must be less than %ext_max_length digits.', $error_params); } form_set_error($field['field_name'], $error); } else { - if (!$field['all_country_codes']) { - if (!_cck_phone_valid_cc_input($field['country_selection'], $countrycode)) { + if (!$settings['all_country_codes']) { + if (!_cck_phone_valid_cc_input($settings['country_codes']['country_selection'], $countrycode)) { $error = t('Invalid country code "%countrycode" submitted.', $error_params); form_set_error($field['field_name'], $error); } @@ -449,13 +417,13 @@ function _cck_phone_validate(&$item, $de if (!cck_phone_validate_number($countrycode, $phone_input, $ext_input)) { $error = t('Phone number must be %min_length-%max_length digits only.', $error_params); if ($field['enable_extension'] && $ext_input != '') { - $error .= '
'. t('Phone extension must be less than %ext_max_length digits.', $error_params); + $error .= '
' . t('Phone extension must be less than %ext_max_length digits.', $error_params); } form_set_error($field['field_name'], $error); } // Country level validation if enabled - elseif ($field['enable_custom_country'] != 0 || is_null($field['enable_custom_country']) || !isset($field['enable_custom_country'])) { + elseif ($settings['enable_country_level_validation']) { $custom_cc = _cck_phone_custom_cc(); if (isset($custom_cc[$countrycode])) { @@ -473,14 +441,16 @@ function _cck_phone_validate(&$item, $de } } -function _cck_phone_process(&$item, $delta = 0, $field, $node) { - $widget = $field['widget']['default_value'][$delta]; +function _cck_phone_process(&$item, $delta = 0, $field, $instance, $langcode) { + $settings = $instance['settings']; // Clean up the phone number. $item['number'] = cck_phone_clean_number($item['number']); - $item['extension'] = cck_phone_clean_number($item['extension']); + if (isset($item['extension'])) { + $item['extension'] = cck_phone_clean_number($item['extension']); + } // Don't save an invalid default value. - if ((isset($widget['number']) && $item['number'] == $widget['number']) && (isset($widget['country_codes']) && $item['country_codes'] == $widget['country_codes']) && is_object($node)) { + if ((isset($instance['default_value']) && $item['number'] == $instance['default_value']) && (isset($settings['default_country']) && $item['country_codes'] == $settings['default_country'])) { if (!cck_phone_validate_number($item['country_codes'], $item['number'], $item['extension'])) { unset($item['number']); unset($item['country_codes']); @@ -501,7 +471,11 @@ function _cck_phone_process(&$item, $del * @param $node * The node containing this phone number. */ -function _cck_phone_sanitize(&$item, $delta, &$field, &$node) { +function _cck_phone_sanitize(&$item, $delta, $field, $instance, $langcode) { + if (empty($item)) return; + + $settings = $instance['settings']; + if (!empty($item['number'])) { $cc = $item['country_codes']; $item['number'] = cck_phone_clean_number($item['number']); @@ -516,89 +490,158 @@ function _cck_phone_sanitize(&$item, $de } } - if ($field['enable_extension']) { + if ($settings['enable_extension']) { $item['extension'] = cck_phone_clean_number($item['extension']); } else { unset($item['extension']); } - if ($field['enable_mobile'] && preg_match(CCK_PHONE_MOBILE_AGENT, drupal_strtolower($_SERVER['HTTP_USER_AGENT']))) { + if ($settings['enable_mobile'] && preg_match(CCK_PHONE_MOBILE_AGENT, drupal_strtolower($_SERVER['HTTP_USER_AGENT']))) { $item['mobile_output'] = TRUE; } } /** - * Implementation of hook_widget_info(). + * Implements hook_field_widget_info(). */ -function cck_phone_widget_info() { +function cck_phone_field_widget_info() { return array( 'phone_number' => array( 'label' => t('Phone number'), 'field types' => array('phone_number'), - 'multiple values' => CONTENT_HANDLE_CORE, + 'behaviors' => array( + 'multiple values' => FIELD_BEHAVIOR_DEFAULT, + 'default value' => FIELD_BEHAVIOR_NONE, + ), + 'settings' => array( + 'size' => CCK_PHONE_PHONE_MAX_LENGTH, + ), ), ); } /** - * Implementation of hook_widget_settings(). + * Implements hook_field_settings_form(). */ -function cck_phone_widget_settings($op, $widget) { - switch ($op) { - case 'form': - $form = array(); - $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : CCK_PHONE_PHONE_MAX_LENGTH; - $form['input']['size'] = array( - '#type' => 'textfield', - '#title' => t('Size of phone number textfield'), - '#default_value' => $size, - '#element_validate' => array('_element_validate_integer_positive'), - '#required' => TRUE, - '#description' => t('International number is maximum 15 digits with additional country code, default is %length.', array('%length' => CCK_PHONE_PHONE_MAX_LENGTH)), - ); - return $form; - - case 'save': - return array('size'); - } +function cck_phone_field_settings_form($field, $instance, $has_data) { + $settings = $field['settings']; + + $form = array(); + $form['size'] = array( + '#type' => 'textfield', + '#title' => t('Size of phone number textfield'), + '#default_value' => $settings['size'], + '#element_validate' => array('_element_validate_integer_positive'), + '#required' => TRUE, + '#description' => t('International number is maximum 15 digits with additional country code, default is %length.', array('%length' => CCK_PHONE_PHONE_MAX_LENGTH)), + ); + + return $form; } /** - * Implementation of hook_widget(). - */ -function cck_phone_widget(&$form, &$form_state, $field, $items, $delta = 0) { - $element = array( - '#type' => $field['widget']['type'], - '#default_value' => isset($items[$delta]) ? $items[$delta] : '', - '#title' => $field['widget']['label'], - '#weight' => $field['widget']['weight'], - '#description' => $field['widget']['description'], - '#required' => $field['required'], - '#field' => $field, + * Implements hook_field_widget_form(). + */ +function cck_phone_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { + // Retrieve any values set in $form_state, as will be the case during AJAX + // rebuilds of this form. + if (isset($form_state['values'][$field['field_name']][$langcode])) { + $items = $form_state['values'][$field['field_name']][$langcode]; + unset($form_state['values'][$field['field_name']][$langcode]); + } + + foreach ($items as $delta => $item) { + // Remove any items from being displayed that are not needed. + if (!isset($item['number']) || $item['number'] == '') { + unset($items[$delta]); + } + } + + // Re-index deltas after removing empty items. + $items = array_values($items); + + // Update order according to weight. + $items = _field_sort_items($field, $items); + + // Essentially we use the phone_number type, extended with some enhancements. + $element_info = element_info('phone_number'); + + $element += array( + '#type' => 'phone_number', + '#default_value' => isset($items[$delta]) ? $items[$delta] : array(), + '#process' => array_merge($element_info['#process'], array('cck_phone_field_widget_process')), + // Allows this field to return an array instead of a single value. +// '#extended' => TRUE, ); +// $elements = array($element); + return $element; } +/* + * Implements hook_field_widget_error(). + */ +function cck_phone_field_widget_error($element, $error, $form, &$form_state) { + form_error($element, $error['message'], $form, $form_state); +} + /** - * Implementation of hook_content_is_empty(). + * An element #process callback for the phone_number field type. + * + * Expands the phone_number type to include the extension and country codes. */ -function cck_phone_content_is_empty($item, $field) { - return empty($item['number']); +function cck_phone_field_widget_process($element, &$form_state, $form) { + $item = $element['#value']; + + // TODO: > D7 beta 3: http://drupal.org/node/950138#comment-3649842 +// $field = field_widget_field($element, $form_state); +// $instance = field_widget_instance($element, $form_state); + $field = $form_state['field'][$element['#field_name']][$element['#language']]['field']; + $instance = $form_state['field'][$element['#field_name']][$element['#language']]['instance']; + $settings = $instance['settings']; + + if ($settings['enable_extension']) { + $element['extension'] = array( + '#type' => 'textfield', + '#maxlength' => CCK_PHONE_EXTENSION_MAX_LENGTH, + '#size' => CCK_PHONE_EXTENSION_MAX_LENGTH, +// '#title' => t('ext'), + '#required' => FALSE, + '#default_value' => isset($item['extension']) ? $item['extension'] : NULL, + '#prefix' => '
' . t('ext') . '
', + ); + } + + if ($settings['all_country_codes']) { + $element['country_codes']['#options'] = _cck_phone_cc_options(); + } + else { + $element['country_codes']['#options'] = _cck_phone_cc_options(FALSE, $settings['country_codes']['country_selection']); + } + + return $element; } /** - * Implementation of FAPI hook_elements(). + * Implements hook_element_info(). */ -function cck_phone_elements() { - return array( - 'phone_number' => array( - '#input' => TRUE, - '#process' => array('cck_phone_process'), - '#autocomplete_path' => FALSE, + +function cck_phone_element_info() { + $path = drupal_get_path('module', 'cck_phone'); + $types['phone_number'] = array( + '#input' => TRUE, + '#process' => array('cck_phone_phone_number_process'), + '#element_validate' => array('cck_phone_phone_number_validate'), + '#theme' => 'cck_phone_phone_number', + '#theme_wrappers' => array('form_element'), + '#attached' => array( + 'css' => array($path . '/cck_phone.css'), +// 'js' => array($path . '/cck_phone.js'), ), ); + return $types; } /** @@ -614,14 +657,14 @@ function cck_phone_elements() { * $element['number] is the phone number * $element['country_codes'] is the country code */ -function theme_phone_number($element) { - drupal_add_css(drupal_get_path('module', 'cck_phone') .'/cck_phone.css'); +/*function theme_phone_number($element) { + drupal_add_css(drupal_get_path('module', 'cck_phone') . '/cck_phone.css'); // Prefix single value phone number fields with the name of the field. // if (empty($element['#field']['multiple'])) { // if (isset($element['number']) && isset($element['country_codes'])) { -// $element['number']['#title'] = $element['#title'] .' '. $element['number']['#title']; -// $element['country_codes']['#title'] = $element['#title'] .' '. $element['country_codes']['#title']; +// $element['number']['#title'] = $element['#title'] . ' ' . $element['number']['#title']; +// $element['country_codes']['#title'] = $element['#title'] . ' ' . $element['country_codes']['#title']; // } // elseif ($element['number']) { // $element['number']['#title'] = $element['#title']; @@ -632,56 +675,65 @@ function theme_phone_number($element) { $output = '
*' : ''; + $required = !empty($element['#required']) ? '*' : ''; if (!empty($element['#title'])) { $title = $element['#title']; if (!empty($element['number']['#id'])) { - $output .= ' \n"; + $output .= ' \n"; } else { - $output .= ' \n"; + $output .= ' \n"; } } $output .= '
'; if (isset($element['number'])) { - $output .= '
'. theme('textfield', $element['number']) .'
'; + $output .= '
' . theme('textfield', $element['number']) . '
'; } if (isset($element['extension'])) { $prefix = isset($element['extension']['#prefix']) ? $element['extension']['#prefix'] : ''; - $output .= '
'. $prefix . theme('textfield', $element['extension']) .'
'; + $output .= '
' . $prefix . theme('textfield', $element['extension']) . '
'; } - $output .= '
'. theme('select', $element['country_codes']) .'
'; + $output .= '
' . theme('select', $element['country_codes']) . '
'; $output .= '
'; return $output; } +*/ /** * Process an individual element. */ -function cck_phone_process($element, $edit, $form_state, $form) { - $field_name = $element['#field_name']; - $field = $form['#field_info'][$field_name]; - $field_key = $element['#columns'][0]; - $delta = $element['#delta']; +function cck_phone_phone_number_process($element, &$form_state, $form) { +// $field_name = $element['#field_name']; +// $field = $form['#field_info'][$field_name]; +// $field_key = $element['#columns'][0]; +// $delta = $element['#delta']; + $item = $element['#value']; + + // TODO: > D7 beta 3: http://drupal.org/node/950138#comment-3649842 +// $field = field_widget_field($element, $form_state); +// $instance = field_widget_instance($element, $form_state); + $field = $form_state['field'][$element['#field_name']][$element['#language']]['field']; + $instance = $form_state['field'][$element['#field_name']][$element['#language']]['instance']; + $settings = $instance['settings']; $element['number'] = array( '#type' => 'textfield', - '#maxlength' => CCK_PHONE_PHONE_MAX_LENGTH, - '#size' => CCK_PHONE_PHONE_MAX_LENGTH, + '#maxlength' => $field['settings']['size'], + '#size' => $field['settings']['size'], // '#title' => t('Number'), '#description' => $element['#description'], - '#required' => ($delta == 0 && $field['number'] !== 'optional') ? $element['#required'] : FALSE, - '#default_value' => isset($element['#value']['number']) ? $element['#value']['number'] : NULL, + '#required' => ($element['#delta'] == 0 && $element['#required']) ? $element['#required'] : FALSE, + '#default_value' => isset($item['number']) ? $item['number'] : NULL, ); - if ($field['enable_extension']) { +/* if ($field['enable_extension']) { $element['extension'] = array( '#type' => 'textfield', '#maxlength' => CCK_PHONE_EXTENSION_MAX_LENGTH, @@ -689,26 +741,122 @@ function cck_phone_process($element, $ed // '#title' => t('ext'), '#required' => FALSE, '#default_value' => isset($element['#value']['extension']) ? $element['#value']['extension'] : NULL, - '#prefix' => '
'. t('ext') .'
', + '#prefix' => '
' . t('ext') . '
', ); } - +*/ $element['country_codes'] = array( '#type' => 'select', // '#title' => 'Country code', - '#default_value' => ($element['#value']['number'] != '' && isset($element['#value']['country_codes'])) ? $element['#value']['country_codes'] : (isset($field['default_country']) ? $field['default_country'] : NULL), + '#default_value' => isset($settings['default_country']) ? $settings['default_country'] : NULL, + '#options' => _cck_phone_cc_options(), ); - if ($field['all_country_codes']) { +/* if ($field['all_country_codes']) { $element['country_codes']['#options'] = _cck_phone_cc_options(); } else { $element['country_codes']['#options'] = _cck_phone_cc_options(FALSE, $field['country_selection']); } - +*/ return $element; } /** + * An #element_validate callback for the managed_file element. + */ +function cck_phone_phone_number_validate(&$element, &$form_state) { + $item = $element['#value']; + // TODO: > D7 beta 3: http://drupal.org/node/950138#comment-3649842 +// $field = field_widget_field($element, $form_state); +// $instance = field_widget_instance($element, $form_state); + $field = $form_state['field'][$element['#field_name']][$element['#language']]['field']; + $instance = $form_state['field'][$element['#field_name']][$element['#language']]['instance']; + $settings = $instance['settings']; + + $phone_input = trim($item['number']); + $countrycode = trim($item['country_codes']); + $ext_input = ''; + + if ($settings['enable_extension']) { + $ext_input = trim($item['extension']); + } + + if ($phone_input) { + + $error_params = array( + '%phone_input' => check_plain($phone_input), // original phone input + '%countrycode' => check_plain($countrycode), + '%min_length' => CCK_PHONE_PHONE_MIN_LENGTH, + '%max_length' => CCK_PHONE_PHONE_MAX_LENGTH, + '%ext_input' => check_plain($ext_input), + '%ext_max_length' => CCK_PHONE_EXTENSION_MAX_LENGTH, + ); + + // Only allow digit, dash, space and bracket + if (!_cck_phone_valid_input($phone_input, $ext_input)) { + $error = t('Phone number must be %min_length-%max_length digits only.', $error_params); + if ($settings['enable_extension'] && $ext_input != '') { + $error .= '
' . t('Phone extension must be less than %ext_max_length digits.', $error_params); + } + + form_set_error($field['field_name'], $error); + } + else { + if (!$settings['all_country_codes']) { + if (!_cck_phone_valid_cc_input($settings['country_codes']['country_selection'], $countrycode)) { + $error = t('Invalid country code "%countrycode" submitted.', $error_params); + form_set_error($field['field_name'], $error); + } + } + // Generic number validation + if (!cck_phone_validate_number($countrycode, $phone_input, $ext_input)) { + $error = t('Phone number must be %min_length-%max_length digits only.', $error_params); + if ($settings['enable_extension'] && $ext_input != '') { + $error .= '
' . t('Phone extension must be less than %ext_max_length digits.', $error_params); + } + + form_set_error($field['field_name'], $error); + } + // Country level validation if enabled + elseif ($settings['enable_country_level_validation']) { + $custom_cc = _cck_phone_custom_cc(); + + if (isset($custom_cc[$countrycode])) { + $validate_function = $countrycode . '_validate_number'; + + if (function_exists($validate_function)) { + $error = ''; + if (!$validate_function($phone_input, $ext_input, $error)) { + form_set_error($field['field_name'], t($error, $error_params)); + } + } + } + } + } + } +} + +/** + * Returns HTML for a phone number element. + * + * @param $variables + * An associative array containing: + * - element: A render element representing the file. + * + * @ingroup themeable + */ +function theme_cck_phone_phone_number($variables) { + $element = $variables['element']; + + // This wrapper is required to apply JS behaviors and CSS styling. + $output = ''; + $output .= '
'; + $output .= drupal_render_children($element); + $output .= '
'; + return $output; +} + +/** * Strip number of space, hash, dash, bracket, etc leaving digit only. * * @param string $number @@ -747,7 +895,7 @@ function cck_phone_validate_number($coun /* ------ Token ------ */ /** - * Implementation of hook_token_list(). + * Implements hook_token_list(). */ function cck_phone_token_list($type = 'all') { if ($type == 'field' || $type == 'all') { @@ -762,7 +910,7 @@ function cck_phone_token_list($type = 'a } /** - * Implementation of hook_token_values(). + * Implements hook_token_values(). */ function cck_phone_token_values($type, $object = NULL, $options = array()) { if ($type == 'field') { Index: includes/API.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/includes/API.php,v retrieving revision 1.3 diff -u -p -r1.3 API.php --- includes/API.php 12 Jul 2010 09:54:52 -0000 1.3 +++ includes/API.php 11 Nov 2010 08:22:28 -0000 @@ -136,7 +136,7 @@ function CC_formatter_default($element) $cc = cck_phone_countrycodes($item['country_codes']); // Format the phone number however you like, this is the default - $phone = $cc['code'] .'-'. $item['number']; + $phone = $cc['code'] . '-' . $item['number']; return $phone; } Index: includes/phone.gb.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/includes/phone.gb.inc,v retrieving revision 1.1 diff -u -p -r1.1 phone.gb.inc --- includes/phone.gb.inc 8 Jul 2010 11:22:37 -0000 1.1 +++ includes/phone.gb.inc 11 Nov 2010 08:22:28 -0000 @@ -86,7 +86,7 @@ function gb_formatter_default($element) if ($result) { // output as +44 AA BBBB CCCC, +44 AAA BBB CCCC or +44 AAAA BBB CCC - $phone = $cc['code'] . $matches[1] .'-'. $matches[2] .' '. $matches[3]; + $phone = $cc['code'] . $matches[1] . '-' . $matches[2] . ' ' . $matches[3]; } return $phone; @@ -114,7 +114,7 @@ function gb_formatter_local($element) { if ($result) { // output as 0AA BBBB CCCC, 0AAA BBB CCCC or 0AAAA BBB CCC - $phone = '0'. $matches[1] .'-'. $matches[2] .' '. $matches[3]; + $phone = '0' . $matches[1] . '-' . $matches[2] . ' ' . $matches[3]; } return $phone; Index: includes/phone.my.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/includes/phone.my.inc,v retrieving revision 1.1 diff -u -p -r1.1 phone.my.inc --- includes/phone.my.inc 8 Jul 2010 11:22:37 -0000 1.1 +++ includes/phone.my.inc 11 Nov 2010 08:22:28 -0000 @@ -68,8 +68,8 @@ function my_validate_number($number, $ex // define regular expression $regex = '/^ ([0]*) # an optional 0 - ('. $rule[0] .') # area code - \d{'. $rule[1] .'} # local number within length $rule[1] & $rule[2] + (' . $rule[0] . ') # area code + \d{' . $rule[1] . '} # local number within length $rule[1] & $rule[2] $/x'; $result = preg_match($regex, $number, $matches); @@ -112,31 +112,29 @@ function my_sanitize_number(&$number) { * TRUE if it is a valid phone number for that country, FALSE otherwise. */ function my_formatter_default($element) { - $item = $element['#item']; - // Display a global phone number with country code. - $cc = cck_phone_countrycodes($item['country_codes']); + $cc = cck_phone_countrycodes($element['country_codes']); // Format the phone number however you like, this is the default foreach (_my_phone_rules() as $rule) { // define regular expression $regex = '/^ - ('. $rule[0] .') # area code + (' . $rule[0] . ') # area code (\d{3,4}) (\d{4}) $/x'; - $result = preg_match($regex, $item['number'], $matches); + $result = preg_match($regex, $element['number'], $matches); if ($result) { // output as +60A-BBB CCCC or +60A-BBBB CCCC - $phone = $cc['code'] . $matches[1] .'-'. $matches[2] .' '. $matches[3]; + $phone = $cc['code'] . $matches[1] . '-' . $matches[2] . ' ' . $matches[3]; continue; } } - return $phone . $ext; + return $phone; } /** @@ -156,12 +154,12 @@ function my_formatter_default($element) */ function my_formatter_local($element) { // Display a local phone number without country code. - $phone = $element['#item']['number']; + $phone = $element['number']; foreach (_my_phone_rules() as $rule) { // define regular expression $regex = '/^ - ('. $rule[0] .') # area code + (' . $rule[0] . ') # area code (\d{3,4}) (\d{4}) $/x'; @@ -170,7 +168,7 @@ function my_formatter_local($element) { if ($result) { // output as 0A-BBB CCCC or 0A-BBBB CCCC - $phone = '0'. $matches[1] .'-'. $matches[2] .' '. $matches[3]; + $phone = '0' . $matches[1] . '-' . $matches[2] . ' ' . $matches[3]; continue; } } Index: includes/phone.us.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/includes/phone.us.inc,v retrieving revision 1.1 diff -u -p -r1.1 phone.us.inc --- includes/phone.us.inc 8 Jul 2010 11:22:37 -0000 1.1 +++ includes/phone.us.inc 11 Nov 2010 08:22:32 -0000 @@ -99,7 +99,7 @@ function us_formatter_default($element) if ($result) { // output as +1 (AAA) BBB CCCC - $phone = $cc['code'] .' ('. $matches[1] .') '. $matches[2] .' '. $matches[3]; + $phone = $cc['code'] . ' (' . $matches[1] . ') ' . $matches[2] . ' ' . $matches[3]; } return $phone . $ext; @@ -135,7 +135,7 @@ function us_formatter_local($element) { if ($result) { // output as (AAA) BBB CCCC - $phone = '('. $matches[1] .') '. $matches[2] .' '. $matches[3]; + $phone = '(' . $matches[1] . ') ' . $matches[2] . ' ' . $matches[3]; } return $phone; Index: tests/cck_phone.crud.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/tests/cck_phone.crud.test,v retrieving revision 1.1 diff -u -p -r1.1 cck_phone.crud.test --- tests/cck_phone.crud.test 8 Jul 2010 11:22:37 -0000 1.1 +++ tests/cck_phone.crud.test 11 Nov 2010 08:22:32 -0000 @@ -7,7 +7,7 @@ */ // Need to include content.crud.test so we can inherit from it's ContentCrudTestCase. -require_once(drupal_get_path('module', 'content') .'/tests/content.crud.test'); +require_once(drupal_get_path('module', 'content') . '/tests/content.crud.test'); class PhoneNumberContentCrudTest extends ContentCrudTestCase { Index: tests/cck_phone.crud_input.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/tests/cck_phone.crud_input.test,v retrieving revision 1.1 diff -u -p -r1.1 cck_phone.crud_input.test --- tests/cck_phone.crud_input.test 8 Jul 2010 11:22:37 -0000 1.1 +++ tests/cck_phone.crud_input.test 11 Nov 2010 08:22:32 -0000 @@ -64,7 +64,7 @@ class PhoneNumberUITest extends DrupalWe $this->assertRaw(t('Added field %label.', array('%label' => $name)), 'Field added'); _content_type_info(TRUE); $fields = content_fields(); - $field = $fields['field_'. $name]; + $field = $fields['field_' . $name]; $this->assertFalse($field['required'], 'Make sure field is not required.'); $this->assertEqual($field['default_country'], 'af', 'Default country is first in list, af.'); $this->assertTrue(1 === $field['all_country_codes'], 'Make sure Show all country codes is on.'); @@ -122,19 +122,19 @@ class PhoneNumberUITest extends DrupalWe 'type' => self::PHONENUMBER_INPUT_TYPE_GOOD ), array( - 'number' => strval(mt_rand(100, 999)) .'-'. strval(mt_rand(1000, 9999)), + 'number' => strval(mt_rand(100, 999)) . '-' . strval(mt_rand(1000, 9999)), 'cc' => $cc, 'msg' => 'Number found', 'type' => self::PHONENUMBER_INPUT_TYPE_GOOD ), array( - 'number' => '('. strval(mt_rand(100, 999)) .') '. strval(mt_rand(1000, 9999)), + 'number' => '(' . strval(mt_rand(100, 999)) . ') ' . strval(mt_rand(1000, 9999)), 'cc' => $cc, 'msg' => 'Number found', 'type' => self::PHONENUMBER_INPUT_TYPE_GOOD ), array( - 'number' => strval(mt_rand(100, 999)) .' '. strval(mt_rand(1000, 9999)), + 'number' => strval(mt_rand(100, 999)) . ' ' . strval(mt_rand(1000, 9999)), 'cc' => $cc, 'msg' => 'Number found', 'type' => self::PHONENUMBER_INPUT_TYPE_GOOD @@ -177,7 +177,7 @@ class PhoneNumberUITest extends DrupalWe $this->drupalGet($url); if ($input['type'] == self::PHONENUMBER_INPUT_TYPE_GOOD) { - $phone_output = $countrycodes[$input['cc']]['code'] .'-'. cck_phone_clean_number($input['number']); + $phone_output = $countrycodes[$input['cc']]['code'] . '-' . cck_phone_clean_number($input['number']); $this->assertRaw($phone_output); } } Index: tests/phone.gb.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/tests/phone.gb.test,v retrieving revision 1.1 diff -u -p -r1.1 phone.gb.test --- tests/phone.gb.test 8 Jul 2010 11:22:37 -0000 1.1 +++ tests/phone.gb.test 11 Nov 2010 08:22:32 -0000 @@ -78,11 +78,11 @@ class GBPhoneNumberTest extends DrupalWe foreach ($test_cases as $test) { if ($test['type'] == self::PHONENUMBER_INPUT_TYPE_GOOD) { - $this->assertTrue(gb_validate_number($test['number'], '', $dummy), 'Test valid: '. $test['number']); + $this->assertTrue(gb_validate_number($test['number'], '', $dummy), 'Test valid: ' . $test['number']); } elseif ($test['type'] == self::PHONENUMBER_INPUT_TYPE_BAD) { - $this->assertFalse(gb_validate_number($test['number'], '', $dummy), 'Test invalid: '. $test['number']); + $this->assertFalse(gb_validate_number($test['number'], '', $dummy), 'Test invalid: ' . $test['number']); } } } -} \ No newline at end of file +} Index: tests/phone.my.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/tests/phone.my.test,v retrieving revision 1.1 diff -u -p -r1.1 phone.my.test --- tests/phone.my.test 8 Jul 2010 11:22:37 -0000 1.1 +++ tests/phone.my.test 11 Nov 2010 08:22:32 -0000 @@ -78,10 +78,10 @@ class MYPhoneNumberTest extends DrupalWe foreach ($test_cases as $test) { if ($test['type'] == self::PHONENUMBER_INPUT_TYPE_GOOD) { - $this->assertTrue(my_validate_number($test['number'], '', $dummy), 'Test valid: '. $test['number']); + $this->assertTrue(my_validate_number($test['number'], '', $dummy), 'Test valid: ' . $test['number']); } elseif ($test['type'] == self::PHONENUMBER_INPUT_TYPE_BAD) { - $this->assertFalse(my_validate_number($test['number'], '', $dummy), 'Test invalid: '. $test['number']); + $this->assertFalse(my_validate_number($test['number'], '', $dummy), 'Test invalid: ' . $test['number']); } } } Index: tests/phone.us.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_phone/tests/phone.us.test,v retrieving revision 1.1 diff -u -p -r1.1 phone.us.test --- tests/phone.us.test 8 Jul 2010 11:22:37 -0000 1.1 +++ tests/phone.us.test 11 Nov 2010 08:22:32 -0000 @@ -54,10 +54,10 @@ class USPhoneNumberTest extends DrupalWe foreach ($test_cases as $test) { if ($test['type'] == self::PHONENUMBER_INPUT_TYPE_GOOD) { - $this->assertTrue(us_validate_number($test['number'], '', $dummy), 'Test valid: '. $test['number']); + $this->assertTrue(us_validate_number($test['number'], '', $dummy), 'Test valid: ' . $test['number']); } elseif ($test['type'] == self::PHONENUMBER_INPUT_TYPE_BAD) { - $this->assertFalse(us_validate_number($test['number'], '', $dummy), 'Test invalid: '. $test['number']); + $this->assertFalse(us_validate_number($test['number'], '', $dummy), 'Test invalid: ' . $test['number']); } } }