diff --git a/client.php b/client.php index f2d895e2..8318da8c 100644 --- a/client.php +++ b/client.php @@ -123,6 +123,14 @@ if(isset($_GET['client_id'])){ + +
diff --git a/client_contacts.php b/client_contacts.php index 95fc45a8..cd3d2217 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -101,14 +101,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); }else{ $contact_title_display = $contact_title; } - $contact_phone = $row['contact_phone']; + $contact_phone = formatPhoneNumber($row['contact_phone']); if(empty($contact_phone)){ $contact_phone_display = "-"; }else{ $contact_phone_display = "$contact_phone"; } $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; + $contact_mobile = formatPhoneNumber($row['contact_mobile']); if(empty($contact_mobile)){ $contact_mobile_display = "-"; }else{ diff --git a/client_locations.php b/client_locations.php index f8a7d12e..32bdda26 100644 --- a/client_locations.php +++ b/client_locations.php @@ -102,7 +102,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $location_city = $row['location_city']; $location_state = $row['location_state']; $location_zip = $row['location_zip']; - $location_phone = $row['location_phone']; + $location_phone = formatPhoneNumber($row['location_phone']); if(empty($location_phone)){ $location_phone_display = "-"; }else{ diff --git a/client_vendors.php b/client_vendors.php index 849c7040..c7942238 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -114,7 +114,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); }else{ $vendor_contact_name_display = $vendor_contact_name; } - $vendor_phone = $row['vendor_phone']; + $vendor_phone = formatPhoneNumber($row['vendor_phone']); $vendor_extension = $row['vendor_extension']; $vendor_email = $row['vendor_email']; $vendor_website = $row['vendor_website']; diff --git a/clients.php b/clients.php index 63e2a049..3a63d346 100644 --- a/clients.php +++ b/clients.php @@ -181,9 +181,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $contact_id = $row['contact_id']; $contact_name = $row['contact_name']; $contact_title = $row['contact_title']; - $contact_phone = $row['contact_phone']; + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $contact_email = $row['contact_email']; $client_website = $row['client_website']; $client_currency_code = $row['client_currency_code']; diff --git a/companies.php b/companies.php index cb4b400c..72fe7a01 100644 --- a/companies.php +++ b/companies.php @@ -88,10 +88,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_website = $row['company_website']; $company_logo = $row['company_logo']; @@ -101,6 +98,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $company_currency_code = $row['config_default_currency']; ?> + diff --git a/cron.php b/cron.php index 1fd9ca67..5cfc93f7 100644 --- a/cron.php +++ b/cron.php @@ -17,10 +17,7 @@ $sql_companies = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE c while($row = mysqli_fetch_array($sql_companies)){ $company_id = $row['company_id']; $company_name = $row['company_name']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_website = $row['company_website']; $config_enable_cron = $row['config_enable_cron']; diff --git a/functions.php b/functions.php index e2ea2ee7..32cba49f 100644 --- a/functions.php +++ b/functions.php @@ -48,8 +48,9 @@ function removeDirectory($path) { } function get_user_agent() { - return $_SERVER['HTTP_USER_AGENT']; + return $_SERVER['HTTP_USER_AGENT']; } + function get_ip() { $mainIp = ''; if (getenv('HTTP_CLIENT_IP')) @@ -183,8 +184,7 @@ function truncate($text, $chars = 25) { return $text; } -function get_currency_symbol($cc = 'USD') -{ +function get_currency_symbol($cc = 'USD'){ $cc = strtoupper($cc); $currency = array( "USD" => "$" , //U.S. Dollar diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 9b1fc929..27dc463b 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -37,15 +37,9 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ $location_state = $row['location_state']; $location_zip = $row['location_zip']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $client_website = $row['client_website']; $client_currency_code = $row['client_currency_code']; $client_currency_symbol = get_currency_symbol($client_currency_code); @@ -59,10 +53,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_logo = $row['company_logo']; if(!empty($company_logo)){ diff --git a/guest_view_quote.php b/guest_view_quote.php index 68aa6d75..0e59ba19 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -36,15 +36,9 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $location_state = $row['location_state']; $location_zip = $row['location_zip']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $client_website = $row['client_website']; $client_currency_code = $row['client_currency_code']; $client_currency_symbol = get_currency_symbol($client_currency_code); @@ -58,10 +52,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_logo = $row['company_logo']; if(!empty($company_logo)){ diff --git a/invoice.php b/invoice.php index 9bbc64f7..fac8e135 100644 --- a/invoice.php +++ b/invoice.php @@ -39,9 +39,9 @@ if(isset($_GET['invoice_id'])){ $location_state = $row['location_state']; $location_zip = $row['location_zip']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $client_website = $row['client_website']; $client_currency_code = $row['client_currency_code']; $client_currency_symbol = get_currency_symbol($client_currency_code); @@ -55,10 +55,7 @@ if(isset($_GET['invoice_id'])){ $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_website = $row['company_website']; $company_logo = $row['company_logo']; diff --git a/post.php b/post.php index 4e43867d..633f25d2 100644 --- a/post.php +++ b/post.php @@ -2296,15 +2296,9 @@ if(isset($_GET['email_quote'])){ $client_name = $row['client_name']; $contact_name = $row['contact_name']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $client_website = $row['client_website']; $base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']); $company_name = $row['company_name']; @@ -2313,10 +2307,7 @@ if(isset($_GET['email_quote'])){ $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_website = $row['company_website']; $company_logo = $row['company_logo']; @@ -3006,15 +2997,9 @@ if(isset($_GET['email_invoice'])){ $client_name = $row['client_name']; $contact_name = $row['contact_name']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $client_website = $row['client_website']; $base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']); $company_name = $row['company_name']; @@ -3023,10 +3008,7 @@ if(isset($_GET['email_invoice'])){ $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_website = $row['company_website']; $company_logo = $row['company_logo']; @@ -4802,7 +4784,7 @@ if(isset($_GET['export_client_pdf'])){ $location_state = $row['location_state']; $location_zip = $row['location_zip']; $contact_name = $row['contact_name']; - $contact_phone = $row['contact_phone']; + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_email = $row['contact_email']; $client_website = $row['client_website']; @@ -4941,18 +4923,12 @@ if(isset($_GET['export_client_pdf'])){ while($row = mysqli_fetch_array($sql_contacts)){ $contact_name = $row['contact_name']; $contact_title = $row['contact_title']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; if(!empty($contact_extension)){ $contact_extension = "x$contact_extension"; } - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $contact_email = $row['contact_email']; ?> @@ -5018,10 +4994,7 @@ if(isset($_GET['export_client_pdf'])){ $location_city = $row['location_city']; $location_state = $row['location_state']; $location_zip = $row['location_zip']; - $location_phone = $row['location_phone']; - if(strlen($location_phone)>2){ - $location_phone = substr($row['location_phone'],0,3)."-".substr($row['location_phone'],3,3)."-".substr($row['location_phone'],6,4); - } + $location_phone = formatPhoneNumber($row['location_phone']); ?> [ @@ -5085,10 +5058,7 @@ if(isset($_GET['export_client_pdf'])){ $vendor_description = $row['vendor_description']; $vendor_account_number = $row['vendor_account_number']; $vendor_contact_name = $row['vendor_contact_name']; - $vendor_phone = $row['vendor_phone']; - if(strlen($vendor_phone)>2){ - $vendor_phone = substr($row['vendor_phone'],0,3)."-".substr($row['vendor_phone'],3,3)."-".substr($row['vendor_phone'],6,4); - } + $vendor_phone = formatPhoneNumber($row['vendor_phone']); $vendor_email = $row['vendor_email']; $vendor_website = $row['vendor_website']; ?> diff --git a/quote.php b/quote.php index 80b138d3..2b2b915f 100644 --- a/quote.php +++ b/quote.php @@ -34,15 +34,9 @@ if(isset($_GET['quote_id'])){ $location_state = $row['location_state']; $location_zip = $row['location_zip']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $client_website = $row['client_website']; $client_currency_code = $row['client_currency_code']; $client_currency_symbol = get_currency_symbol($client_currency_code); @@ -56,10 +50,7 @@ if(isset($_GET['quote_id'])){ $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_website = $row['company_website']; $company_logo = $row['company_logo']; diff --git a/recurring_invoice.php b/recurring_invoice.php index 000a41df..57745856 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -39,15 +39,9 @@ if(isset($_GET['recurring_id'])){ $location_state = $row['location_state']; $location_zip = $row['location_zip']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $client_website = $row['client_website']; $client_currency_code = $row['client_currency_code']; $client_net_terms = $row['client_net_terms']; @@ -65,10 +59,7 @@ if(isset($_GET['recurring_id'])){ $company_city = $row['company_city']; $company_state = $row['company_state']; $company_zip = $row['company_zip']; - $company_phone = $row['company_phone']; - if(strlen($company_phone)>2){ - $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4); - } + $company_phone = formatPhoneNumber($row['company_phone']); $company_email = $row['company_email']; $company_website = $row['company_website']; $company_logo = $row['company_logo']; diff --git a/ticket.php b/ticket.php index 22aad78f..b40b999d 100644 --- a/ticket.php +++ b/ticket.php @@ -58,24 +58,15 @@ if(isset($_GET['ticket_id'])){ $contact_name = $row['contact_name']; $contact_title = $row['contact_title']; $contact_email = $row['contact_email']; - $contact_phone = $row['contact_phone']; - if(strlen($contact_phone)>2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } + $contact_phone = formatPhoneNumber($row['contact_phone']); $contact_extension = $row['contact_extension']; - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } + $contact_mobile = formatPhoneNumber($row['contact_mobile']); $location_name = $row['location_name']; $location_address = $row['location_address']; $location_city = $row['location_city']; $location_state = $row['location_state']; $location_zip = $row['location_zip']; - $location_phone = $row['location_phone']; - if(strlen($location_phone)>2){ - $location_phone = substr($row['location_phone'],0,3)."-".substr($row['location_phone'],3,3)."-".substr($row['location_phone'],6,4); - } + $location_phone = formatPhoneNumber($row['location_phone']); $ticket_assigned_to = $row['ticket_assigned_to']; if(empty($ticket_assigned_to)){ diff --git a/vendors.php b/vendors.php index 994428a1..56b66f3f 100644 --- a/vendors.php +++ b/vendors.php @@ -135,7 +135,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); }else{ $vendor_contact_name_display = $vendor_contact_name; } - $vendor_phone = $row['vendor_phone']; + $vendor_phone = formatPhoneNumber($row['vendor_phone']); $vendor_extension = $row['vendor_extension']; $vendor_email = $row['vendor_email']; $vendor_website = $row['vendor_website'];