diff --git a/css/two_factor_authentication.css b/css/two_factor_authentication.css index aa443df..61db231 100644 --- a/css/two_factor_authentication.css +++ b/css/two_factor_authentication.css @@ -155,7 +155,7 @@ html.js #user-login li.tfa-link { #two-factor-authentication-form .form-submit, .page-admin-config ul.tabs.secondary { display: none; } -#edit-country-code option[value="in"] { +select[id*='edit-country-code'] option[value="in"] { background-color: transparent; background: url(../images/flags.png) no-repeat 0 0; padding:4px; @@ -171,7 +171,7 @@ html.js #user-login li.tfa-link { float: left; margin-top: 18px; } -#edit-country-code { +select[id*='edit-country-code'] { width: 50px; } #edit-register .form-item-phone { @@ -883,6 +883,27 @@ button.close { padding-right: 20px; } +#edit-support .form-item-country-code { + float: left; + margin-top: 23px; +} + +#edit-support .form-item-phone { + position: relative; +} + +#edit-support .form-item-phone label { + left: 0px; + position: absolute; +} + +#edit-support #edit-phone--2, #edit-support #edit-phone { + top: 33px; + position: absolute; + width: 85%; + left: 65px; +} + #displayQrCode { margin-bottom: 60px; margin-top: 60px; diff --git a/js/two_factor_authentication.js b/js/two_factor_authentication.js index e5691f7..19c540b 100644 --- a/js/two_factor_authentication.js +++ b/js/two_factor_authentication.js @@ -42,16 +42,29 @@ // Phone country code. $("#edit-country-code option").filter( function() { - return $(this).val() == $("#tfa-user-profile .form-item-phone #edit-phone").val(); + return $(this).val() == $(".form-item-phone #edit-phone").val(); } ).attr('selected', true); $("#edit-country-code").change( function() { - $("#tfa-user-profile .form-item-phone #edit-phone").val($(this).find("option:selected").attr("value")); + $(".form-item-phone #edit-phone").val($(this).find("option:selected").attr("value")); } ); - $("#tfa-user-profile .form-item-phone #edit-phone").val($('#edit-country-code').find("option:selected").attr("value")); + $(".form-item-phone #edit-phone").val($('#edit-country-code').find("option:selected").attr("value")); + // Phone country code for support block + $("#edit-country-code--2 option").filter( + function() { + return $(this).val() == $("#tfa-user-contact-us .form-item-phone #edit-phone--2").val(); + } + ).attr('selected', true); + $("#edit-country-code--2").change( + function() { + + $("#tfa-user-contact-us .form-item-phone #edit-phone--2").val($(this).find("option:selected").attr("value")); + } + ); + $("#tfa-user-contact-us .form-item-phone #edit-phone--2").val($('#edit-country-code--2').find("option:selected").attr("value")); // Disabled button of login settings page // $('#tfa-user-settings input[type="submit"]').attr('disabled','disabled');. diff --git a/tfa_login_customer_setup.inc b/tfa_login_customer_setup.inc index 747a9ac..7bd9047 100644 --- a/tfa_login_customer_setup.inc +++ b/tfa_login_customer_setup.inc @@ -6,6 +6,238 @@ */ /** + * TFA Country code array + */ + +function phone_country_codes() { + return array( + "+91" => "India +91", + "+1" => "United States +1", + "+93" => "Afghanistan +93", + "+355" => "Albania +355", + "+213" => "Algeria +213", + "+1684" => "American Samoa +1684", + "+376" => "Andorra +376", + "+244" => "Angola +244", + "+1264" => "Anguilla +1264", + "+1268" => "Antigua and Barbuda +1268", + "+54" => "Argentina +54", + "+374" => "Armenia +374", + "+297" => "Aruba +297", + "+61" => "Australia +61", + "+43" => "Austria +43", + "+994" => "Azerbaijan +994", + "+1242" => "Bahamas +1242", + "+973" => "Bahrain +973", + "+880" => "Bangladesh +880", + "+1246" => "Barbados +1246", + "+375" => "Belarus +375", + "+32" => "Belgium +32", + "+501" => "Belize +501", + "+229" => "Benin +229", + "+1441" => "Bermuda +1441", + "+975" => "Bhutan +975", + "+591" => "Bolivia +591", + "+387" => "Bosnia and Herzegovina +387", + "+267" => "Botswana +267", + "+55" => "Brazil +55", + "+673" => "Brunei Darussalam +673", + "+359" => "Bulgaria +359", + "+226" => "Burkina Faso +226", + "+257" => "Burundi +257", + "+855" => "Cambodia +855", + "+237" => "Cameroon +237", + "+1" => "Canada +1", + "+238" => "Cape Verde +238", + "+1345" => "Cayman Islands +1345", + "+236" => "Central African Republic +236", + "+235" => "Chad +235", + "+56" => "Chile +56", + "+86" => "China +86", + "+57" => "Colombia +57", + "+269" => "Comoros +269", + "+243" => "Congo (DRC) +243", + "+242" => "Congo (Republic) +242", + "+682" => "Cook Islands +682", + "+506" => "Costa Rica +506", + "+225" => "Côte d'Ivoire +225", + "+385" => "Croatia +385", + "+53" => "Cuba +53", + "+357" => "Cyprus +357", + "+420" => "Czech Republic +420", + "+45" => "Denmark +45", + "+253" => "Djibouti +253", + "+1767" => "Dominica +1767", + "+1809" => "Dominican Republic +1809", + "+593" => "Ecuador +593", + "+20" => "Egypt +20", + "+503" => "El Salvador +503", + "+240" => "Equatorial Guinea +240", + "+291" => "Eritrea +291", + "+372" => "Estonia +372", + "+251" => "Ethiopia +251", + "+298" => "Faroe Islands +298", + "+679" => "Fiji +679", + "+358" => "Finland +358", + "+33" => "France +33", + "+689" => "French Polynesia +689", + "+241" => "Gabon +241", + "+220" => "Gambia +220", + "+995" => "Georgia +995", + "+49" => "Germany +49", + "+233" => "Ghana +233", + "+350" => "Gibraltar +350", + "+30" => "Greece +30", + "+299" => "Greenland +299", + "+1473" => "Grenada +1473", + "+590" => "Guadeloupe +590", + "+1671" => "Guam +1671", + "+502" => "Guatemala +502", + "+44" => "Guernsey +44", + "+224" => "Guinea +224", + "+245" => "Guinea-Bissau +245", + "+592" => "Guyana +592", + "+509" => "Haiti +509", + "+504" => "Honduras +504", + "+852" => "Hong Kong +852", + "+36" => "Hungary +36", + "+354" => "Iceland +354", + "+91" => "India +91", + "+62" => "Indonesia +62", + "+98" => "Iran +98", + "+964" => "Iraq +964", + "+353" => "Ireland +353", + "+44" => "Isle of Man +44", + "+972" => "Israel +972", + "+39" => "Italy +39", + "+1876" => "Jamaica +1876", + "+81" => "Japan +81", + "+44" => "Jersey +44", + "+962" => "Jordan +962", + "+7" => "Kazakhstan +7", + "+254" => "Kenya +254", + "+686" => "Kiribati +686", + "+965" => "Kuwait +965", + "+996" => "Kyrgyzstan +996", + "+856" => "Laos +856", + "+371" => "Latvia +371", + "+961" => "Lebanon +961", + "+266" => "Lesotho +266", + "+231" => "Liberia +231", + "+218" => "Libya +218", + "+423" => "Liechtenstein +423", + "+370" => "Lithuania +370", + "+352" => "Luxembourg +352", + "+853" => "Macao +853", + "+389" => "Macedonia +389", + "+261" => "Madagascar +261", + "+265" => "Malawi +265", + "+60" => "Malaysia +60", + "+960" => "Maldives +960", + "+223" => "Mali +223", + "+356" => "Malta +356", + "+692" => "Marshall Islands +692", + "+596" => "Martinique +596", + "+222" => "Mauritania +222", + "+230" => "Mauritius +230", + "+52" => "Mexico +52", + "+691" => "Micronesia +691", + "+373" => "Moldova +373", + "+377" => "Monaco +377", + "+976" => "Mongolia +976", + "+382" => "Montenegro +382", + "+1664" => "Montserrat +1664", + "+212" => "Morocco +212", + "+258" => "Mozambique +258", + "+95" => "Myanmar (Burma) +95", + "+264" => "Namibia +264", + "+674" => "Nauru +674", + "+977" => "Nepal +977", + "+31" => "Netherlands +31", + "+687" => "New Caledonia +687", + "+64" => "New Zealand +64", + "+505" => "Nicaragua +505", + "+227" => "Niger +227", + "+234" => "Nigeria +234", + "+850" => "North Korea +850", + "+47" => "Norway +47", + "+968" => "Oman +968", + "+92" => "Pakistan +92", + "+680" => "Palau +680", + "+970" => "Palestinian Territory +970", + "+507" => "Panama +507", + "+675" => "Papua New Guinea +675", + "+595" => "Paraguay +595", + "+51" => "Peru +51", + "+63" => "Philippines +63", + "+48" => "Poland +48", + "+351" => "Portugal +351", + "+1787" => "Puerto Rico +1787", + "+974" => "Qatar +974", + "+262" => "Réunion +262", + "+40" => "Romania +40", + "+7" => "Russian Federation +7", + "+250" => "Rwanda +250", + "+1869" => "Saint Kitts and Nevis +1869", + "+1758" => "Saint Lucia +1758", + "+1784" => "Saint Vincent and the Grenadines +1784", + "+685" => "Samoa +685", + "+378" => "San Marino +378", + "+239" => "São Tomé and Príncipe +239", + "+966" => "Saudi Arabia +966", + "+221" => "Senegal +221", + "+381" => "Serbia +381", + "+248" => "Seychelles +248", + "+232" => "Sierra Leone +232", + "+65" => "Singapore +65", + "+421" => "Slovakia +421", + "+386" => "Slovenia +386", + "+677" => "Solomon Islands +677", + "+252" => "Somalia +252", + "+27" => "South Africa +27", + "+82" => "South Korea +82", + "+34" => "Spain +34", + "+94" => "Sri Lanka +94", + "+249" => "Sudan +249", + "+597" => "Suriname +597", + "+268" => "Swaziland +268", + "+46" => "Sweden +46", + "+41" => "Switzerland +41", + "+963" => "Syrian Arab Republic +963", + "+886" => "Taiwan, Province of China +886", + "+992" => "Tajikistan +992", + "+255" => "Tanzania +255", + "+66" => "Thailand +66", + "+670" => "Timor-Leste +670", + "+228" => "Togo +228", + "+676" => "Tonga +676", + "+1868" => "Trinidad and Tobago +1868", + "+216" => "Tunisia +216", + "+90" => "Turkey +90", + "+993" => "Turkmenistan +993", + "+1649" => "Turks and Caicos Islands +1649", + "+688" => "Tuvalu +688", + "+256" => "Uganda +256", + "+380" => "Ukraine +380", + "+971" => "United Arab Emirates +971", + "+44" => "United Kingdom +44", + "+1" => "United States +1", + "+598" => "Uruguay +598", + "+998" => "Uzbekistan +998", + "+678" => "Vanuatu +678", + "+379" => "Vatican City +379", + "+58" => "Venezuela +58", + "+84" => "Viet Nam +84", + "+1284" => "Virgin Islands (British) +1284", + "+1340" => "Virgin Islands (U.S.) +1340", + "+212" => "Western Sahara +212", + "+967" => "Yemen +967", + "+260" => "Zambia +260", + "+263" => "Zimbabwe +263", + ); +} + +/** * TFA Setting page for profile. */ function tfa_user_profile($form, &$form_state) { @@ -96,13 +328,18 @@ function tfa_user_profile($form, &$form_state) { $rows[] = array( 'title' => '2 Factor Registered Email', + 'value' => !empty($user_obj->mail) ? $user_obj->mail . ' (admin)' : '', + ); + + $rows[] = array( + 'title' => 'miniOrange Customer Email', 'value' => !empty($user_obj->field_miniorange_email[LANGUAGE_NONE][0]['value']) ? $user_obj->field_miniorange_email[LANGUAGE_NONE][0]['value'] : '', ); $active_method_key = $user_obj->field_active_methods[LANGUAGE_NONE][0]['value']; $users_active_method_name = $users_active_methods[$active_method_key]; $rows[] = array( - 'title' => '2 Factor Registered Email', + 'title' => 'Activated 2nd Factor', 'value' => !empty($user_obj->field_active_methods[LANGUAGE_NONE][0]['value']) ? $users_active_method_name : '', ); @@ -143,231 +380,6 @@ function tfa_user_profile($form, &$form_state) { // Dispaly registration form for authenticated user. if (in_array('authenticated user', $user_obj->roles)) { - $country_codes = array( - "+91" => "India +91", - "+1" => "United States +1", - "+93" => "Afghanistan +93", - "+355" => "Albania +355", - "+213" => "Algeria +213", - "+1684" => "American Samoa +1684", - "+376" => "Andorra +376", - "+244" => "Angola +244", - "+1264" => "Anguilla +1264", - "+1268" => "Antigua and Barbuda +1268", - "+54" => "Argentina +54", - "+374" => "Armenia +374", - "+297" => "Aruba +297", - "+61" => "Australia +61", - "+43" => "Austria +43", - "+994" => "Azerbaijan +994", - "+1242" => "Bahamas +1242", - "+973" => "Bahrain +973", - "+880" => "Bangladesh +880", - "+1246" => "Barbados +1246", - "+375" => "Belarus +375", - "+32" => "Belgium +32", - "+501" => "Belize +501", - "+229" => "Benin +229", - "+1441" => "Bermuda +1441", - "+975" => "Bhutan +975", - "+591" => "Bolivia +591", - "+387" => "Bosnia and Herzegovina +387", - "+267" => "Botswana +267", - "+55" => "Brazil +55", - "+673" => "Brunei Darussalam +673", - "+359" => "Bulgaria +359", - "+226" => "Burkina Faso +226", - "+257" => "Burundi +257", - "+855" => "Cambodia +855", - "+237" => "Cameroon +237", - "+1" => "Canada +1", - "+238" => "Cape Verde +238", - "+1345" => "Cayman Islands +1345", - "+236" => "Central African Republic +236", - "+235" => "Chad +235", - "+56" => "Chile +56", - "+86" => "China +86", - "+57" => "Colombia +57", - "+269" => "Comoros +269", - "+243" => "Congo (DRC) +243", - "+242" => "Congo (Republic) +242", - "+682" => "Cook Islands +682", - "+506" => "Costa Rica +506", - "+225" => "Côte d'Ivoire +225", - "+385" => "Croatia +385", - "+53" => "Cuba +53", - "+357" => "Cyprus +357", - "+420" => "Czech Republic +420", - "+45" => "Denmark +45", - "+253" => "Djibouti +253", - "+1767" => "Dominica +1767", - "+1809" => "Dominican Republic +1809", - "+593" => "Ecuador +593", - "+20" => "Egypt +20", - "+503" => "El Salvador +503", - "+240" => "Equatorial Guinea +240", - "+291" => "Eritrea +291", - "+372" => "Estonia +372", - "+251" => "Ethiopia +251", - "+298" => "Faroe Islands +298", - "+679" => "Fiji +679", - "+358" => "Finland +358", - "+33" => "France +33", - "+689" => "French Polynesia +689", - "+241" => "Gabon +241", - "+220" => "Gambia +220", - "+995" => "Georgia +995", - "+49" => "Germany +49", - "+233" => "Ghana +233", - "+350" => "Gibraltar +350", - "+30" => "Greece +30", - "+299" => "Greenland +299", - "+1473" => "Grenada +1473", - "+590" => "Guadeloupe +590", - "+1671" => "Guam +1671", - "+502" => "Guatemala +502", - "+44" => "Guernsey +44", - "+224" => "Guinea +224", - "+245" => "Guinea-Bissau +245", - "+592" => "Guyana +592", - "+509" => "Haiti +509", - "+504" => "Honduras +504", - "+852" => "Hong Kong +852", - "+36" => "Hungary +36", - "+354" => "Iceland +354", - "+91" => "India +91", - "+62" => "Indonesia +62", - "+98" => "Iran +98", - "+964" => "Iraq +964", - "+353" => "Ireland +353", - "+44" => "Isle of Man +44", - "+972" => "Israel +972", - "+39" => "Italy +39", - "+1876" => "Jamaica +1876", - "+81" => "Japan +81", - "+44" => "Jersey +44", - "+962" => "Jordan +962", - "+7" => "Kazakhstan +7", - "+254" => "Kenya +254", - "+686" => "Kiribati +686", - "+965" => "Kuwait +965", - "+996" => "Kyrgyzstan +996", - "+856" => "Laos +856", - "+371" => "Latvia +371", - "+961" => "Lebanon +961", - "+266" => "Lesotho +266", - "+231" => "Liberia +231", - "+218" => "Libya +218", - "+423" => "Liechtenstein +423", - "+370" => "Lithuania +370", - "+352" => "Luxembourg +352", - "+853" => "Macao +853", - "+389" => "Macedonia +389", - "+261" => "Madagascar +261", - "+265" => "Malawi +265", - "+60" => "Malaysia +60", - "+960" => "Maldives +960", - "+223" => "Mali +223", - "+356" => "Malta +356", - "+692" => "Marshall Islands +692", - "+596" => "Martinique +596", - "+222" => "Mauritania +222", - "+230" => "Mauritius +230", - "+52" => "Mexico +52", - "+691" => "Micronesia +691", - "+373" => "Moldova +373", - "+377" => "Monaco +377", - "+976" => "Mongolia +976", - "+382" => "Montenegro +382", - "+1664" => "Montserrat +1664", - "+212" => "Morocco +212", - "+258" => "Mozambique +258", - "+95" => "Myanmar (Burma) +95", - "+264" => "Namibia +264", - "+674" => "Nauru +674", - "+977" => "Nepal +977", - "+31" => "Netherlands +31", - "+687" => "New Caledonia +687", - "+64" => "New Zealand +64", - "+505" => "Nicaragua +505", - "+227" => "Niger +227", - "+234" => "Nigeria +234", - "+850" => "North Korea +850", - "+47" => "Norway +47", - "+968" => "Oman +968", - "+92" => "Pakistan +92", - "+680" => "Palau +680", - "+970" => "Palestinian Territory +970", - "+507" => "Panama +507", - "+675" => "Papua New Guinea +675", - "+595" => "Paraguay +595", - "+51" => "Peru +51", - "+63" => "Philippines +63", - "+48" => "Poland +48", - "+351" => "Portugal +351", - "+1787" => "Puerto Rico +1787", - "+974" => "Qatar +974", - "+262" => "Réunion +262", - "+40" => "Romania +40", - "+7" => "Russian Federation +7", - "+250" => "Rwanda +250", - "+1869" => "Saint Kitts and Nevis +1869", - "+1758" => "Saint Lucia +1758", - "+1784" => "Saint Vincent and the Grenadines +1784", - "+685" => "Samoa +685", - "+378" => "San Marino +378", - "+239" => "São Tomé and Príncipe +239", - "+966" => "Saudi Arabia +966", - "+221" => "Senegal +221", - "+381" => "Serbia +381", - "+248" => "Seychelles +248", - "+232" => "Sierra Leone +232", - "+65" => "Singapore +65", - "+421" => "Slovakia +421", - "+386" => "Slovenia +386", - "+677" => "Solomon Islands +677", - "+252" => "Somalia +252", - "+27" => "South Africa +27", - "+82" => "South Korea +82", - "+34" => "Spain +34", - "+94" => "Sri Lanka +94", - "+249" => "Sudan +249", - "+597" => "Suriname +597", - "+268" => "Swaziland +268", - "+46" => "Sweden +46", - "+41" => "Switzerland +41", - "+963" => "Syrian Arab Republic +963", - "+886" => "Taiwan, Province of China +886", - "+992" => "Tajikistan +992", - "+255" => "Tanzania +255", - "+66" => "Thailand +66", - "+670" => "Timor-Leste +670", - "+228" => "Togo +228", - "+676" => "Tonga +676", - "+1868" => "Trinidad and Tobago +1868", - "+216" => "Tunisia +216", - "+90" => "Turkey +90", - "+993" => "Turkmenistan +993", - "+1649" => "Turks and Caicos Islands +1649", - "+688" => "Tuvalu +688", - "+256" => "Uganda +256", - "+380" => "Ukraine +380", - "+971" => "United Arab Emirates +971", - "+44" => "United Kingdom +44", - "+1" => "United States +1", - "+598" => "Uruguay +598", - "+998" => "Uzbekistan +998", - "+678" => "Vanuatu +678", - "+379" => "Vatican City +379", - "+58" => "Venezuela +58", - "+84" => "Viet Nam +84", - "+1284" => "Virgin Islands (British) +1284", - "+1340" => "Virgin Islands (U.S.) +1340", - "+212" => "Western Sahara +212", - "+967" => "Yemen +967", - "+260" => "Zambia +260", - "+263" => "Zimbabwe +263", - ); $form['register'] = array( '#type' => 'fieldset', @@ -1158,12 +1170,14 @@ function tfa_user_contact_us($form, $form_state) { global $user; $current_user = user_load($user->uid); + $country_codes = phone_country_codes(); $form['support'] = array( '#type' => 'fieldset', '#title' => t('Support'), - 'collapsed' => FALSE, - 'collapsible' => FALSE, + '#description' => t('Need any help? Just send us a query so we can help you.'), + '#collapsed' => FALSE, + '#collapsible' => FALSE, ); $form['support']['email'] = array( @@ -1173,6 +1187,12 @@ function tfa_user_contact_us($form, $form_state) { '#required' => TRUE, ); + $form['support']['country_code'] = array( + '#type' => 'select', + '#options' => $country_codes, + '#default_value' => '+1', + ); + $form['support']['phone'] = array( '#type' => 'textfield', '#title' => t('Phone'), @@ -1180,6 +1200,12 @@ function tfa_user_contact_us($form, $form_state) { '#required' => TRUE, ); + $form['support']['clear'] = array( + '#type' => 'item', + '#prefix' => '
', + '#suffix' => '
', + ); + $form['support']['query'] = array( '#type' => 'textarea', '#title' => t('Query'),