Merge branch 'master' into techbar
This commit is contained in:
@@ -212,6 +212,16 @@ function truncate($text, $chars)
|
||||
|
||||
function formatPhoneNumber($phoneNumber)
|
||||
{
|
||||
global $mysqli;
|
||||
|
||||
// Get Phone Mask Option
|
||||
$phone_mask = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_phone_mask FROM settings WHERE company_id = 1"))[0];
|
||||
|
||||
if ($phone_mask == 0) {
|
||||
return $phoneNumber;
|
||||
}
|
||||
|
||||
|
||||
$phoneNumber = $phoneNumber ? preg_replace('/[^0-9]/', '', $phoneNumber) : "";
|
||||
|
||||
if (strlen($phoneNumber) > 10) {
|
||||
@@ -427,9 +437,18 @@ function getDomainRecords($name)
|
||||
|
||||
// Used to automatically attempt to get SSL certificates as part of adding domains
|
||||
// The logic for the fetch (sync) button on the client_certificates page is in ajax.php, and allows ports other than 443
|
||||
function getSSL($name)
|
||||
function getSSL($full_name)
|
||||
{
|
||||
|
||||
// Parse host and port
|
||||
$name = parse_url("//$full_name", PHP_URL_HOST);
|
||||
$port = parse_url("//$full_name", PHP_URL_PORT);
|
||||
|
||||
// Default port
|
||||
if (!$port) {
|
||||
$port = "443";
|
||||
}
|
||||
|
||||
$certificate = array();
|
||||
$certificate['success'] = false;
|
||||
|
||||
@@ -442,7 +461,7 @@ function getSSL($name)
|
||||
}
|
||||
|
||||
// Get SSL/TSL certificate (using verify peer false to allow for self-signed certs) for domain on default port
|
||||
$socket = "ssl://$name:443";
|
||||
$socket = "ssl://$name:$port";
|
||||
$get = stream_context_create(array("ssl" => array("capture_peer_cert" => true, "verify_peer" => false,)));
|
||||
$read = stream_socket_client($socket, $errno, $errstr, 5, STREAM_CLIENT_CONNECT, $get);
|
||||
|
||||
@@ -881,7 +900,7 @@ function getSettingValue($mysqli, $setting_name)
|
||||
function getMonthlyTax($tax_name, $month, $year, $mysqli)
|
||||
{
|
||||
// SQL to calculate monthly tax
|
||||
$sql = "SELECT SUM(item_tax) AS monthly_tax FROM invoice_items
|
||||
$sql = "SELECT SUM(item_tax) AS monthly_tax FROM invoice_items
|
||||
LEFT JOIN invoices ON invoice_items.item_invoice_id = invoices.invoice_id
|
||||
LEFT JOIN payments ON invoices.invoice_id = payments.payment_invoice_id
|
||||
WHERE YEAR(payments.payment_date) = $year AND MONTH(payments.payment_date) = $month
|
||||
@@ -898,7 +917,7 @@ function getQuarterlyTax($tax_name, $quarter, $year, $mysqli)
|
||||
$end_month = $start_month + 2;
|
||||
|
||||
// SQL to calculate quarterly tax
|
||||
$sql = "SELECT SUM(item_tax) AS quarterly_tax FROM invoice_items
|
||||
$sql = "SELECT SUM(item_tax) AS quarterly_tax FROM invoice_items
|
||||
LEFT JOIN invoices ON invoice_items.item_invoice_id = invoices.invoice_id
|
||||
LEFT JOIN payments ON invoices.invoice_id = payments.payment_invoice_id
|
||||
WHERE YEAR(payments.payment_date) = $year AND MONTH(payments.payment_date) BETWEEN $start_month AND $end_month
|
||||
@@ -911,7 +930,7 @@ function getQuarterlyTax($tax_name, $quarter, $year, $mysqli)
|
||||
function getTotalTax($tax_name, $year, $mysqli)
|
||||
{
|
||||
// SQL to calculate total tax
|
||||
$sql = "SELECT SUM(item_tax) AS total_tax FROM invoice_items
|
||||
$sql = "SELECT SUM(item_tax) AS total_tax FROM invoice_items
|
||||
LEFT JOIN invoices ON invoice_items.item_invoice_id = invoices.invoice_id
|
||||
LEFT JOIN payments ON invoices.invoice_id = payments.payment_invoice_id
|
||||
WHERE YEAR(payments.payment_date) = $year
|
||||
@@ -1172,3 +1191,34 @@ function getTicketStatusName($ticket_status) {
|
||||
return "Unknown";
|
||||
|
||||
}
|
||||
|
||||
|
||||
function fetchUpdates() {
|
||||
|
||||
global $repo_branch;
|
||||
|
||||
// Fetch the latest code changes but don't apply them
|
||||
exec("git fetch", $output, $result);
|
||||
$latest_version = exec("git rev-parse origin/$repo_branch");
|
||||
$current_version = exec("git rev-parse HEAD");
|
||||
|
||||
if ($current_version == $latest_version) {
|
||||
$update_message = "No Updates available";
|
||||
} else {
|
||||
$update_message = "New Updates are Available [$latest_version]";
|
||||
}
|
||||
|
||||
|
||||
|
||||
$updates = new stdClass();
|
||||
$updates->output = $output;
|
||||
$updates->result = $result;
|
||||
$updates->current_version = $current_version;
|
||||
$updates->latest_version = $latest_version;
|
||||
$updates->update_message = $update_message;
|
||||
|
||||
|
||||
|
||||
return $updates;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user