diff -Nurp ../phone.orig/phone.module ./phone.module --- ../phone.orig/phone.module 2010-04-16 11:30:06.000000000 -0500 +++ ./phone.module 2010-04-16 11:32:33.000000000 -0500 @@ -1,12 +1,12 @@ array('label' => t('French Phone Numbers')), - 'it_phone' => array('label' => t('Italian Phone Numbers')), - 'ch_phone' => array('label' => t('Swiss Phone Numbers')), + 'it_phone' => array('label' => t('Italian Phone Numbers')), + 'ch_phone' => array('label' => t('Swiss Phone Numbers')), 'ca_phone' => array('label' => t('US & Canadian Phone Numbers')), 'cr_phone' => array('label' => t('Costa Rican Phone Numbers')), - 'pa_phone' => array('label' => t('Panamanian Phone Numbers')), + 'pa_phone' => array('label' => t('Panamanian Phone Numbers')), 'uk_phone' => array('label' => t('British (UK) Phone Numbers')), 'ru_phone' => array('label' => t('Russian Phone Numbers')), 'es_phone' => array('label' => t('Spanish Phone Numbers')), 'au_phone' => array('label' => t('Australian Phone Numbers')), - 'cs_phone' => array('label' => t('Czech Phone Numbers')), + 'cs_phone' => array('label' => t('Czech Phone Numbers')), 'hu_phone' => array('label' => t('Hungarian Phone Numbers')), 'nl_phone' => array('label' => t('Dutch Phone Numbers')), 'il_phone' => array('label' => t('Israelian Phone Numbers')), - 'nz_phone' => array('label' => t('New Zealand Phone Numbers')), + 'nz_phone' => array('label' => t('New Zealand Phone Numbers')), 'br_phone' => array('label' => t('Brazilian Phone Numbers')), 'hk_phone' => array('label' => t('Hong-Kong Phone Numbers')), 'mo_phone' => array('label' => t('Macao Phone Numbers')), @@ -103,10 +103,10 @@ function phone_theme() { * (see Views Documentation). * When providing several filters, it is recommended to use the 'name' * attribute in order to let the user distinguish between them. If no 'name' - * is specified for a filter, the key of the filter will be used instead. + * is specified for a filter, the key of the filter will be used instead. */ -function phone_field_settings($op, $field) { - switch ($op) { +function phone_field_settings($op, $field) { + switch ($op) { case 'form': $form = array(); $form['phone_country_code'] = array( @@ -129,7 +129,7 @@ function phone_field_settings($op, $fiel '#title' => t('Maximum length of international numbers, according to the ITU this is 15'), '#default_value' => isset($field['phone_int_max_length']) ? $field['phone_int_max_length'] : '15', ); - } + } if ($field['type'] == 'ca_phone') { $form['ca_phone_separator'] = array( '#type' => 'textfield', @@ -142,7 +142,7 @@ function phone_field_settings($op, $fiel '#title' => t('Use parentheses around area code'), '#default_value' => isset($field['ca_phone_parentheses']) ? $field['ca_phone_parentheses'] : 1, ); - } + } return $form; case 'save': @@ -152,16 +152,16 @@ function phone_field_settings($op, $fiel } if ($field['type'] == 'int_phone') { array_push($settings, 'phone_int_help', 'phone_default_country_code', 'phone_int_max_length'); - } - return $settings; + } + return $settings; case 'database columns': if ($field['type'] == 'fr_phone' || $field['type'] == 'it_phone' || $field['type'] == 'ch_phone' || $field['type'] == 'ca_phone' || $field['type'] == 'cr_phone' - || $field['type'] == 'pa_phone' - || $field['type'] == 'pa_phone' + || $field['type'] == 'pa_phone' + || $field['type'] == 'pa_phone' || $field['type'] == 'uk_phone' || $field['type'] == 'ru_phone' || $field['type'] == 'es_phone' @@ -178,12 +178,12 @@ function phone_field_settings($op, $fiel || $field['type'] == 'jo_phone' || $field['type'] == 'eg_phone' || $field['type'] == 'int_phone' - ) { - $columns = array( - 'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE), - ); - } - return $columns; + ) { + $columns = array( + 'value' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE), + ); + } + return $columns; } } @@ -220,7 +220,7 @@ function phone_field_settings($op, $fiel * have no return value. * * In most cases, only "validate" operations is relevant ; the rest - * have default implementations in content_field() that usually suffice. + * have default implementations in content_field() that usually suffice. */ function phone_field($op, &$node, $field, &$node_field, $teaser, $page) { switch ($op) { @@ -235,16 +235,16 @@ function phone_field($op, &$node, $field } if ($field['type'] == 'ch_phone' && !valid_phone_number('ch', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Swiss phone number
Swiss phone numbers should only contain numbers and spaces and be like 099 999 99 99', array('%value' => $item['value']))); - } + } if ($field['type'] == 'ca_phone' && !valid_phone_number('ca', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid North American phone number
North American Phone numbers should only contain numbers and + and - and ( and ) and spaces and be like 999-999-9999. Please enter a valid ten-digit phone number with optional extension.', array('%value' => $item['value']))); } - if ($field['type'] == 'cr_phone' && !valid_phone_number('cr', $item['value'])) { + if ($field['type'] == 'cr_phone' && !valid_phone_number('cr', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Costa Rican phone number!
Costa Rican phone numbers should contain only numbers and spaces be like 99 99 99 99 with an optional prefix of "+506" or "00506".', array('%value' => $item['value']))); - } - if ($field['type'] == 'pa_phone' && !valid_phone_number('pa', $item['value'])) { + } + if ($field['type'] == 'pa_phone' && !valid_phone_number('pa', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Panamanian phone number!
Panamanian phone numbers should contain only numbers, spaces and dashes be like 9999-999, 9999 999 or 9999999 with an optional prefix of "+507" or "00507".', array('%value' => $item['value']))); - } + } if ($field['type'] == 'uk_phone' && !valid_phone_number('uk', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid British phone number
British Phone numbers should .... ', array('%value' => $item['value']))); } @@ -262,34 +262,34 @@ function phone_field($op, &$node, $field } if ($field['type'] == 'hu_phone' && !valid_phone_number('hu', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Hungarian phone number!
Hungarian phone numbers should contain only numbers and spaces be like 70 999 9999 with an optional prefix of "+36" or "06".', array('%value' => $item['value']))); - } + } if ($field['type'] == 'nl_phone' && !valid_phone_number('nl', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Dutch phone number!
Dutch phone numbers should contain only numbers and spaces and - and be like 099-9999999 with an optional prefix of "+31".', array('%value' => $item['value']))); - } + } if ($field['type'] == 'il_phone' && !valid_phone_number('il', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Israelian phone number!
Israelian phone numbers should .....', array('%value' => $item['value']))); - } + } if ($field['type'] == 'nz_phone' && !valid_phone_number('nz', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid New Zealand phone number!
New Zealand phone numbers should contain only numbers, spaces, brackets and "-". They should look like 04 123 4567 or can optionally omit the leading 0 and have a prefix of "+64".', array('%value' => $item['value']))); - } + } if ($field['type'] == 'br_phone' && !valid_phone_number('br', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Brazilian phone number!
Brazilian phone numbers should contain only numbers and spaces and - and be like 099 9999-9999 or 99 9999-9999 with an optional prefix of "+55".', array('%value' => $item['value']))); - } + } if ($field['type'] == 'hk_phone' && !valid_phone_number('hk', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Hong Kong phone number!
Hong Kong phone numbers should contain only numbers and spaces and be like 9999 9999 with an optional prefix of "+852" or "852".', array('%value' => $item['value']))); - } + } if ($field['type'] == 'mo_phone' && !valid_phone_number('mo', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Macau phone number!
Macau phone numbers should contain only numbers and spaces and be like 9999 9999 with an optional prefix of "+853" or "853".', array('%value' => $item['value']))); - } + } if ($field['type'] == 'ph_phone' && !valid_phone_number('ph', $item['value'])) { - form_set_error($field['field_name'], t('"%value" is not a valid Philippine phone number
Example of valid Philippine phone numbers: +63 (2) 123-4567 or +63 (2) 123-4567 loc. 123 or mobile +63 (919) 123-4567', array('%value' => $item['value']))); - } + form_set_error($field['field_name'], t('"%value" is not a valid Philippine phone number
Example of valid Philippine phone numbers: +63 (2) 123-4567 or +63 (2) 123-4567 loc. 123 or mobile +63 (919) 123-4567', array('%value' => $item['value']))); + } if ($field['type'] == 'jo_phone' && !valid_phone_number('jo', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Jordanian phone number!
Please check the spaces and dashes in your number ...', array('%value' => $item['value']))); - } + } if ($field['type'] == 'eg_phone' && !valid_phone_number('eg', $item['value'])) { form_set_error($field['field_name'], t('"%value" is not a valid Egyptian phone number!
Telephone numbers in Egypt have the format +20 (#[#]) 1234567[8], where the digts between ( ) is the area or network code, without a leading zero; and digits between [ ] are optional', array('%value' => $item['value']))); - } + } if ($field['type'] == 'int_phone' && !valid_phone_number('int', $item['value'])) { form_set_error($field['field_name'],t('"%value" is not a valid international phone number
International phone numbers should contain a country code prefixed by a plus sign followed by the local number.', array('%value' => $item['value']))); } @@ -309,7 +309,7 @@ function phone_field($op, &$node, $field } if ($field['type'] == 'ch_phone') { $node_field[$delta]['value'] = format_phone_number('ch', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'ca_phone') { $node_field[$delta]['value'] = format_phone_number('ca', $node_field[$delta]['value'], $field); } @@ -318,7 +318,7 @@ function phone_field($op, &$node, $field } if ($field['type'] == 'pa_phone') { $node_field[$delta]['value'] = format_phone_number('pa', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'uk_phone') { $node_field[$delta]['value'] = format_phone_number('uk', $node_field[$delta]['value'], $field); } @@ -336,37 +336,37 @@ function phone_field($op, &$node, $field } if ($field['type'] == 'hu_phone') { $node_field[$delta]['value'] = format_phone_number('hu', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'nl_phone') { $node_field[$delta]['value'] = format_phone_number('nl', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'il_phone') { $node_field[$delta]['value'] = format_phone_number('il', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'nz_phone') { $node_field[$delta]['value'] = format_phone_number('nz', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'br_phone') { $node_field[$delta]['value'] = format_phone_number('br', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'hk_phone') { $node_field[$delta]['value'] = format_phone_number('hk', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'mo_phone') { $node_field[$delta]['value'] = format_phone_number('mo', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'ph_phone') { $node_field[$delta]['value'] = format_phone_number('ph', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'jo_phone') { $node_field[$delta]['value'] = format_phone_number('jo', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'eg_phone') { $node_field[$delta]['value'] = format_phone_number('eg', $node_field[$delta]['value'], $field); - } + } if ($field['type'] == 'int_phone') { $node_field[$delta]['value'] = format_phone_number('int', $node_field[$delta]['value'], $field); - } + } } } break; @@ -383,7 +383,7 @@ function phone_field_view_item($field, $ return $phonenumber; } */ - + /** *Implementation of hook_field_formatter_info(). * @@ -450,41 +450,41 @@ function phone_field_view_item($field, $ * 1 => array( * '#item' => $items[1], * ), - * ), + * ), * ); */ function phone_field_formatter_info() { return array( 'default' => array( 'label' => 'Default', - 'field types' => array('fr_phone', - 'it_phone', - 'ch_phone', - 'ca_phone', - 'cr_phone', - 'pa_phone', - 'uk_phone', - 'ru_phone', - 'es_phone', - 'au_phone', - 'cs_phone', - 'hu_phone', - 'nl_phone', - 'il_phone', - 'nz_phone', - 'br_phone', - 'hk_phone', - 'mo_phone', - 'ph_phone', - 'jo_phone', - 'eg_phone', - 'int_phone' - ), - 'multiple values' => CONTENT_HANDLE_CORE, + 'field types' => array('fr_phone', + 'it_phone', + 'ch_phone', + 'ca_phone', + 'cr_phone', + 'pa_phone', + 'uk_phone', + 'ru_phone', + 'es_phone', + 'au_phone', + 'cs_phone', + 'hu_phone', + 'nl_phone', + 'il_phone', + 'nz_phone', + 'br_phone', + 'hk_phone', + 'mo_phone', + 'ph_phone', + 'jo_phone', + 'eg_phone', + 'int_phone' + ), + 'multiple values' => CONTENT_HANDLE_CORE, ), ); - } - + } + /** * Implementation of hook_field_formatter(). * @@ -521,10 +521,10 @@ function phone_field_formatter($field, $ else { $text = check_plain($item['value']); } - // iPhone Support + // iPhone Support if (strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') !== FALSE) { $text = '' . $text . ''; - } + } return $text; } @@ -540,39 +540,39 @@ function phone_field_formatter($field, $ * differently. * * IMPORTANT! - field and widget names will be truncated to 32 characters in - * the database and in internal arrays, like content_fields(). + * the database and in internal arrays, like content_fields(). */ function phone_widget_info() { return array( 'phone_textfield' => array( 'label' => t('Textfield'), - 'field types' => array('fr_phone', - 'it_phone', - 'ch_phone', - 'ca_phone', - 'cr_phone', - 'pa_phone', - 'uk_phone', - 'ru_phone', - 'es_phone', - 'au_phone', - 'cs_phone', - 'hu_phone', - 'nl_phone', - 'il_phone', - 'nz_phone', - 'br_phone', - 'hk_phone', - 'mo_phone', - 'ph_phone', - 'jo_phone', - 'eg_phone', - 'int_phone' - ), + 'field types' => array('fr_phone', + 'it_phone', + 'ch_phone', + 'ca_phone', + 'cr_phone', + 'pa_phone', + 'uk_phone', + 'ru_phone', + 'es_phone', + 'au_phone', + 'cs_phone', + 'hu_phone', + 'nl_phone', + 'il_phone', + 'nz_phone', + 'br_phone', + 'hk_phone', + 'mo_phone', + 'ph_phone', + 'jo_phone', + 'eg_phone', + 'int_phone' + ), 'multiple values' => CONTENT_HANDLE_CORE, 'callbacks' => array( 'default value' => CONTENT_CALLBACK_DEFAULT, - ), + ), ), ); } @@ -593,17 +593,29 @@ function phone_widget_info() { * This varies depending on the operation. * - "form": an array of form elements to add to the settings page. * - "validate": no return value. Use form_set_error(). - * - "save": an array of names of form elements to be saved in the database. + * - "save": an array of names of form elements to be saved in the database. */ function phone_widget_settings($op, $widget) { switch ($op) { case 'form': + $form = array(); + + $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60; + + $form['input']['size'] = array( + '#type' => 'textfield', + '#title' => t('Size of textfield'), + '#default_value' => $size, + '#element_validate' => array('_element_validate_integer_positive'), + '#required' => TRUE, + ); + return $form; case 'validate': - break; //do nothing + break; //do nothing case 'save': - return array(); + return array('size'); } } @@ -636,7 +648,7 @@ function phone_widget_settings($op, $wid * the order of this item in the array of subelements (0, 1, 2, etc) * * @return - * the form item for a single element for this field + * the form item for a single element for this field */ function phone_widget(&$form, &$form_state, $field, $items, $delta = 0) { $element = array( @@ -718,6 +730,7 @@ function phone_textfield_process($elemen $element[$field_key] = array( '#type' => 'textfield', '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL, + '#size' => !empty($field['widget']['size']) ? $field['widget']['size'] : 60, '#autocomplete_path' => FALSE, // The following values were set by the content module and need // to be passed down to the nested element. @@ -757,112 +770,112 @@ function theme_phone_formatter_default($ } /** - * Verification for Phone Numbers. + * Verification for Phone Numbers. * * @param string $countrycode * @param string $phonenumber - * @return boolean Returns boolean FALSE if the phone number is not valid. + * @return boolean Returns boolean FALSE if the phone number is not valid. */ function valid_phone_number($countrycode, $phonenumber) { - $countrycode = trim($countrycode); + $countrycode = trim($countrycode); $phonenumber = trim($phonenumber); - if ($countrycode == 'fr' - || $countrycode == 'it' - || $countrycode == 'ch' - || $countrycode == 'ca' - || $countrycode == 'cr' - || $countrycode == 'pa' - || $countrycode == 'uk' - || $countrycode == 'ru' - || $countrycode == 'es' - || $countrycode == 'au' - || $countrycode == 'cs' - || $countrycode == 'hu' - || $countrycode == 'nl' - || $countrycode == 'il' - || $countrycode == 'nz' - || $countrycode == 'br' - || $countrycode == 'hk' - || $countrycode == 'mo' - || $countrycode == 'ph' - || $countrycode == 'jo' - || $countrycode == 'eg' - || $countrycode == 'int' - ) { - + if ($countrycode == 'fr' + || $countrycode == 'it' + || $countrycode == 'ch' + || $countrycode == 'ca' + || $countrycode == 'cr' + || $countrycode == 'pa' + || $countrycode == 'uk' + || $countrycode == 'ru' + || $countrycode == 'es' + || $countrycode == 'au' + || $countrycode == 'cs' + || $countrycode == 'hu' + || $countrycode == 'nl' + || $countrycode == 'il' + || $countrycode == 'nz' + || $countrycode == 'br' + || $countrycode == 'hk' + || $countrycode == 'mo' + || $countrycode == 'ph' + || $countrycode == 'jo' + || $countrycode == 'eg' + || $countrycode == 'int' + ) { + //drupal_set_message('langue = ' . $countrycode, 'error'); - $valid_phone_function = 'valid_'. $countrycode . '_phone_number'; - module_load_include('inc', 'phone', 'phone.'. $countrycode); - - if (function_exists($valid_phone_function)) { - return $valid_phone_function($phonenumber); - } - else { - return FALSE; - } + $valid_phone_function = 'valid_'. $countrycode . '_phone_number'; + module_load_include('inc', 'phone', 'phone.'. $countrycode); + + if (function_exists($valid_phone_function)) { + return $valid_phone_function($phonenumber); + } + else { + return FALSE; + } } else { - //Country not taken into account yet - return FALSE; + //Country not taken into account yet + return FALSE; } -} +} /** - * Verification for Phone Numbers. + * Verification for Phone Numbers. * * @param string $countrycode * @param string $phonenumber - * @return boolean Returns boolean FALSE if the phone number is not valid. + * @return boolean Returns boolean FALSE if the phone number is not valid. */ function format_phone_number($countrycode, $phonenumber, $field) { - $countrycode = trim($countrycode); + $countrycode = trim($countrycode); $phonenumber = trim($phonenumber); - if ($countrycode == 'fr' - || $countrycode == 'it' - || $countrycode == 'ch' - || $countrycode == 'ca' - || $countrycode == 'cr' - || $countrycode == 'pa' - || $countrycode == 'uk' - || $countrycode == 'ru' - || $countrycode == 'es' - || $countrycode == 'au' - || $countrycode == 'cs' - || $countrycode == 'hu' - || $countrycode == 'nl' - || $countrycode == 'il' - || $countrycode == 'nz' - || $countrycode == 'br' - || $countrycode == 'hk' - || $countrycode == 'mo' - || $countrycode == 'ph' - || $countrycode == 'jo' - || $countrycode == 'eg' - || $countrycode == 'int' - ) { - - //drupal_set_message('langue = ' . $countrycode, 'error'); - - $format_phone_function = 'format_'. $countrycode . '_phone_number'; - module_load_include('inc', 'phone', 'phone.'. $countrycode); - - if (function_exists($format_phone_function)) { - return $format_phone_function($phonenumber, $field); - } - else { - return FALSE; - } + if ($countrycode == 'fr' + || $countrycode == 'it' + || $countrycode == 'ch' + || $countrycode == 'ca' + || $countrycode == 'cr' + || $countrycode == 'pa' + || $countrycode == 'uk' + || $countrycode == 'ru' + || $countrycode == 'es' + || $countrycode == 'au' + || $countrycode == 'cs' + || $countrycode == 'hu' + || $countrycode == 'nl' + || $countrycode == 'il' + || $countrycode == 'nz' + || $countrycode == 'br' + || $countrycode == 'hk' + || $countrycode == 'mo' + || $countrycode == 'ph' + || $countrycode == 'jo' + || $countrycode == 'eg' + || $countrycode == 'int' + ) { + + //drupal_set_message('langue = ' . $countrycode, 'error'); + + $format_phone_function = 'format_'. $countrycode . '_phone_number'; + module_load_include('inc', 'phone', 'phone.'. $countrycode); + + if (function_exists($format_phone_function)) { + return $format_phone_function($phonenumber, $field); } else { - //Country not taken into account yet - return FALSE; + return FALSE; + } } -} + else { + //Country not taken into account yet + return FALSE; + } +} /** * Implementation of hook token_list