From b8c529c2eca3f67da6f771127b5e42c8626d7249 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Sat, 27 Apr 2024 09:30:41 -0300 Subject: [PATCH 01/67] Enable URL Recovery from logout --- check_login.php | 5 ++++- login.php | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/check_login.php b/check_login.php index a0fd1573..acc89d32 100644 --- a/check_login.php +++ b/check_login.php @@ -18,7 +18,10 @@ if (!isset($config_enable_setup) || $config_enable_setup == 1) { // Check user is logged in with a valid session if (!isset($_SESSION['logged']) || !$_SESSION['logged']) { - header("Location: login.php"); + if($_SERVER["REQUEST_URI"] == "/") + header("Location: login.php"); + else + header("Location: login.php?url=".urlencode($_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]) ); exit; } diff --git a/login.php b/login.php index 60538546..f3f1532a 100644 --- a/login.php +++ b/login.php @@ -218,8 +218,10 @@ if (isset($_POST['login'])) { //} } - - header("Location: $config_start_page"); + if($_GET['url']) + header("Location: ".$_GET['url']); + else + header("Location: $config_start_page"); } else { From bab66bf769184d38722db00b4df7171ce61c78dd Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Fri, 3 May 2024 09:34:50 -0300 Subject: [PATCH 02/67] updated fixed domain url from config to prevent open redirect issue and encoded uri --- check_login.php | 3 +-- login.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/check_login.php b/check_login.php index acc89d32..eeb6d4d4 100644 --- a/check_login.php +++ b/check_login.php @@ -21,7 +21,7 @@ if (!isset($_SESSION['logged']) || !$_SESSION['logged']) { if($_SERVER["REQUEST_URI"] == "/") header("Location: login.php"); else - header("Location: login.php?url=".urlencode($_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]) ); + header("Location: login.php?last_visited=" . base64_encode($_SERVER["REQUEST_URI"]) ); exit; } @@ -87,4 +87,3 @@ $num_notifications = $row['num']; //if ($session_user_config_force_mfa == 1 && $session_token == NULL) { // header("Location: force_mfa.php"); //} - diff --git a/login.php b/login.php index f3f1532a..93c564d2 100644 --- a/login.php +++ b/login.php @@ -218,8 +218,8 @@ if (isset($_POST['login'])) { //} } - if($_GET['url']) - header("Location: ".$_GET['url']); + if($_GET['last_visited']) + header("Location: ".$_SERVER["REQUEST_SCHEME"] . "://" . $config_base_url . base64_decode($_GET['last_visited']) ); else header("Location: $config_start_page"); From 43abd177ea459964d77238545090e93a07852648 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sat, 4 May 2024 18:04:24 +0100 Subject: [PATCH 03/67] Certificate checks - Allow custom ports --- ajax.php | 31 ++++++++----------------------- functions.php | 13 +++++++++++-- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/ajax.php b/ajax.php index 9476b40e..47011ac1 100644 --- a/ajax.php +++ b/ajax.php @@ -19,37 +19,22 @@ require_once "rfc6238.php"; * Fetches SSL certificates from remote hosts & returns the relevant info (issuer, expiry, public key) */ if (isset($_GET['certificate_fetch_parse_json_details'])) { + // PHP doesn't appreciate attempting SSL sockets to non-existent domains if (empty($_GET['domain'])) { exit(); } - $domain = $_GET['domain']; - // FQDNs in database shouldn't have a URL scheme, adding one - $domain = "https://".$domain; + $name = $_GET['domain']; - // Parse host and port - $url = parse_url($domain, PHP_URL_HOST); - $port = parse_url($domain, PHP_URL_PORT); - // Default port - if (!$port) { - $port = "443"; - } + // Get SSL cert for domain (if exists) + $certificate = getSSL($name); - // Get certificate (using verify peer false to allow for self-signed certs) - $socket = "ssl://$url:$port"; - $get = stream_context_create(array("ssl" => array("capture_peer_cert" => true, "verify_peer" => false,))); - $read = stream_socket_client($socket, $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $get); - $cert = stream_context_get_params($read); - $cert_public_key_obj = openssl_x509_parse($cert['options']['ssl']['peer_certificate']); - openssl_x509_export($cert['options']['ssl']['peer_certificate'], $export); - - // Process data - if ($cert_public_key_obj) { + if ($certificate['success'] == "TRUE") { $response['success'] = "TRUE"; - $response['expire'] = date('Y-m-d', $cert_public_key_obj['validTo_time_t']); - $response['issued_by'] = strip_tags($cert_public_key_obj['issuer']['O']); - $response['public_key'] = $export; //nl2br + $response['expire'] = $certificate['expire']; + $response['issued_by'] = $certificate['issued_by']; + $response['public_key'] = $certificate['public_key']; } else { $response['success'] = "FALSE"; } diff --git a/functions.php b/functions.php index c7bd7204..1fb36091 100644 --- a/functions.php +++ b/functions.php @@ -427,9 +427,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 +451,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); From cd668241a6c98c1f101a654c873ae0e3acfbfa2f Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sat, 4 May 2024 21:02:33 +0100 Subject: [PATCH 04/67] Debugging help - Mention the PHP error log on the setup & debug pages. - Restructure the debug page to include the server info before the db structure table --- admin_debug.php | 96 ++++++++++++++++++++++++------------------------- setup.php | 3 +- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/admin_debug.php b/admin_debug.php index 6caa6614..5c92c6b3 100644 --- a/admin_debug.php +++ b/admin_debug.php @@ -39,7 +39,7 @@ function countFilesInDirectory($dir) { // Function to compare two arrays recursively and return the differences function arrayDiffRecursive($array1, $array2) { $diff = array(); - + foreach ($array1 as $key => $value) { if (is_array($value)) { if (!isset($array2[$key]) || !is_array($array2[$key])) { @@ -56,7 +56,7 @@ function arrayDiffRecursive($array1, $array2) { } } } - + return $diff; } @@ -64,17 +64,17 @@ function arrayDiffRecursive($array1, $array2) { function loadTableStructuresFromSQLDumpURL($fileURL) { $context = stream_context_create(array('http' => array('header' => 'Accept: application/octet-stream'))); $fileContent = file_get_contents($fileURL, false, $context); - + if ($fileContent === false) { return null; } - + $structure = array(); $queries = explode(";", $fileContent); - + foreach ($queries as $query) { $query = trim($query); - + if (!empty($query)) { if (preg_match("/^CREATE TABLE `(.*)` \((.*)\)$/s", $query, $matches)) { $tableName = $matches[1]; @@ -83,7 +83,7 @@ function loadTableStructuresFromSQLDumpURL($fileURL) { } } } - + return $structure; } @@ -91,31 +91,31 @@ function loadTableStructuresFromSQLDumpURL($fileURL) { function fetchDatabaseStructureFromServer() { global $mysqli; - + $tables = array(); - + // Fetch table names $result = $mysqli->query("SHOW TABLES"); - + if ($result->num_rows > 0) { while ($row = $result->fetch_row()) { $tableName = $row[0]; $tables[$tableName] = array(); } } - + // Fetch table structures foreach ($tables as $tableName => &$table) { $result = $mysqli->query("SHOW CREATE TABLE `$tableName`"); - + if ($result->num_rows > 0) { $row = $result->fetch_row(); $table['structure'] = $row[1]; } } - + //$mysqli->close(); - + return $tables; } @@ -185,11 +185,12 @@ while ($row = $tablesResult->fetch_row()) { //Get loaded PHP modules $loadedModules = get_loaded_extensions(); -//Get Versions +//Get Server Info / Service versions $phpVersion = phpversion(); $mysqlVersion = $mysqli->server_version; -$operatingSystem = shell_exec('uname -a'); +$operatingSystem = php_uname(); $webServer = $_SERVER['SERVER_SOFTWARE']; +$errorLog = ini_get('error_log'); ?> @@ -198,20 +199,43 @@ $webServer = $_SERVER['SERVER_SOFTWARE'];

Debug

- -

Database Structure Check

- + +

Server Info

+ + "; + echo "MySQL Version: " . $mysqlVersion . "
"; + echo "Operating System: " . $operatingSystem . "
"; + echo "Web Server: " . $webServer . "
"; + echo "PHP Error Log: " . $errorLog + ?> +
+

File System

+ "; + echo "Total size of files in $folderPath and its subdirectories: " . $totalSizeMB . " MB"; + ?> + +
+ +

Database Structure Check

+

Database stats

- + "; echo "Total number of fields: " . $numFields . "
"; echo "Total number of rows: " . $numRows . "
"; echo "Current Database Version: " . CURRENT_DATABASE_VERSION . "
"; ?> - +

Table Stats

@@ -255,34 +279,8 @@ $webServer = $_SERVER['SERVER_SOFTWARE'];
-

Versions

- - "; - echo "MySQL Version: " . $mysqlVersion . "
"; - echo "Operating System: " . $operatingSystem . "
"; - echo "Web Server: " . $webServer; - - - ?> - -
- -

File System

- "; - echo "Total size of files in $folderPath and its subdirectories: " . $totalSizeMB . " MB"; - ?> - -
-

PHP Modules Installed

- + "; @@ -311,7 +309,7 @@ $webServer = $_SERVER['SERVER_SOFTWARE']; //Output the result echo $phpinfo; ?> - +
diff --git a/setup.php b/setup.php index 6dab7b80..3dbbdc8f 100644 --- a/setup.php +++ b/setup.php @@ -843,8 +843,9 @@ if (isset($_POST['add_telemetry'])) {
  • Please take a look over the install docs, if you haven't already
  • Don't hesitate to reach out on the forums if you need any assistance
    • +
  • Your PHP Error log is at:
-

A database must be created before proceeding - click on the button below to get started

+

A database must be created before proceeding - click on the button below to get started.


ITFlow is free software: you can redistribute and/or modify it under the terms of the GNU General Public License.
It is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose.

Date: Sat, 4 May 2024 21:32:03 +0100 Subject: [PATCH 05/67] Add total time worked to 'Tickets by client' report --- report_ticket_by_client.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/report_ticket_by_client.php b/report_ticket_by_client.php index 96b967e4..6f7879ad 100644 --- a/report_ticket_by_client.php +++ b/report_ticket_by_client.php @@ -50,7 +50,7 @@ if (isset($_GET['year'])) { $sql_ticket_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(ticket_created_at) AS ticket_year FROM tickets ORDER BY ticket_year DESC"); -$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC"); +$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC"); ?> @@ -79,6 +79,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients Client Tickets raised Tickets closed + Time worked (H:M:S) Avg time to close @@ -101,6 +102,11 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients // Used to calculate average time to close tickets that were raised in period specified $sql_tickets = mysqli_query($mysqli, "SELECT ticket_created_at, ticket_closed_at FROM tickets WHERE YEAR(ticket_created_at) = $year AND ticket_client_id = $client_id AND ticket_closed_at IS NOT NULL"); + // Calculate total time tracked towards tickets in the period + $sql_time = mysqli_query($mysqli, "SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(ticket_reply_time_worked))) as total_time FROM ticket_replies LEFT JOIN tickets ON tickets.ticket_id = ticket_replies.ticket_reply_ticket_id WHERE YEAR(ticket_created_at) = $year AND ticket_client_id = $client_id AND ticket_reply_time_worked IS NOT NULL"); + $row = mysqli_fetch_array($sql_time); + $ticket_total_time_worked = nullable_htmlentities($row['total_time']); + if ($ticket_raised_count > 0) { // Calculate average time to solve @@ -120,6 +126,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients + Date: Sat, 4 May 2024 21:36:59 +0100 Subject: [PATCH 06/67] Hide the running open ticket tracker as this feature is being removed --- top_nav.php | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/top_nav.php b/top_nav.php index d7db3424..6713fcd2 100644 --- a/top_nav.php +++ b/top_nav.php @@ -29,18 +29,6 @@ - - \ No newline at end of file + From 17eb51bd54b3310de30557284bbacdb0de90d1d4 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Sat, 4 May 2024 19:23:39 -0300 Subject: [PATCH 07/67] Update check_login.php If standard --- check_login.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/check_login.php b/check_login.php index eeb6d4d4..297208c2 100644 --- a/check_login.php +++ b/check_login.php @@ -18,10 +18,11 @@ if (!isset($config_enable_setup) || $config_enable_setup == 1) { // Check user is logged in with a valid session if (!isset($_SESSION['logged']) || !$_SESSION['logged']) { - if($_SERVER["REQUEST_URI"] == "/") + if ($_SERVER["REQUEST_URI"] == "/") { header("Location: login.php"); - else + } else { header("Location: login.php?last_visited=" . base64_encode($_SERVER["REQUEST_URI"]) ); + } exit; } From 5280620c6da18da01a203de6e9e4b90f753f3983 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Sat, 4 May 2024 19:25:10 -0300 Subject: [PATCH 08/67] Update login.php If standard --- login.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/login.php b/login.php index 93c564d2..aa8fed08 100644 --- a/login.php +++ b/login.php @@ -218,11 +218,11 @@ if (isset($_POST['login'])) { //} } - if($_GET['last_visited']) + if ($_GET['last_visited']) { header("Location: ".$_SERVER["REQUEST_SCHEME"] . "://" . $config_base_url . base64_decode($_GET['last_visited']) ); - else + } else { header("Location: $config_start_page"); - + } } else { // MFA is configured and needs to be confirmed, or was unsuccessful From 6c4235bdebd8079f42113a2b1d06d94ae74bdbb3 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 6 May 2024 10:27:47 -0300 Subject: [PATCH 09/67] phone mask config prepare phone mask config --- post/setting.php | 3 ++- settings_defaults.php | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/post/setting.php b/post/setting.php index b78bcebf..b312c194 100644 --- a/post/setting.php +++ b/post/setting.php @@ -316,8 +316,9 @@ if (isset($_POST['edit_default_settings'])) { $calendar = intval($_POST['calendar']); $net_terms = intval($_POST['net_terms']); $hourly_rate = floatval($_POST['hourly_rate']); + $phone_mask = intval($_POST['phone_mask']); - mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms, config_default_hourly_rate = $hourly_rate WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms, config_default_hourly_rate = $hourly_rate, config_phone_mask = $phone_mask WHERE company_id = 1"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified default settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); diff --git a/settings_defaults.php b/settings_defaults.php index 6cf80398..0326d351 100644 --- a/settings_defaults.php +++ b/settings_defaults.php @@ -218,6 +218,28 @@ require_once "inc_all_admin.php"; +
+ +
+
+ +
+ +
+
+
@@ -228,4 +250,3 @@ require_once "inc_all_admin.php"; Date: Mon, 6 May 2024 10:44:52 -0300 Subject: [PATCH 10/67] update db update db to store phone mask option --- database_updates.php | 58 ++++++++++++++++++++++++-------------------- database_version.php | 2 +- db.sql | 1 + 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/database_updates.php b/database_updates.php index 43f32d54..a4685591 100644 --- a/database_updates.php +++ b/database_updates.php @@ -335,7 +335,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '0.2.0') { //Insert queries here required to update to DB version 0.2.1 - mysqli_query($mysqli, "ALTER TABLE `vendors` + mysqli_query($mysqli, "ALTER TABLE `vendors` ADD `vendor_hours` VARCHAR(200) NULL DEFAULT NULL AFTER `vendor_website`, ADD `vendor_sla` VARCHAR(200) NULL DEFAULT NULL AFTER `vendor_hours`, ADD `vendor_code` VARCHAR(200) NULL DEFAULT NULL AFTER `vendor_sla`, @@ -343,11 +343,11 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { "); mysqli_query($mysqli, "ALTER TABLE `vendors` - DROP `vendor_country`, - DROP `vendor_address`, - DROP `vendor_city`, - DROP `vendor_state`, - DROP `vendor_zip`, + DROP `vendor_country`, + DROP `vendor_address`, + DROP `vendor_city`, + DROP `vendor_state`, + DROP `vendor_zip`, DROP `vendor_global` "); @@ -355,7 +355,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "CREATE TABLE `vendor_templates` (`vendor_template_id` int(11) AUTO_INCREMENT PRIMARY KEY, `vendor_template_name` varchar(200) NOT NULL, `vendor_template_description` varchar(200) NULL DEFAULT NULL, - `vendor_template_phone` varchar(200) NULL DEFAULT NULL, + `vendor_template_phone` varchar(200) NULL DEFAULT NULL, `vendor_template_email` varchar(200) NULL DEFAULT NULL, `vendor_template_website` varchar(200) NULL DEFAULT NULL, `vendor_template_hours` varchar(200) NULL DEFAULT NULL, @@ -397,7 +397,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "CREATE TABLE `interfaces` (`interface_id` int(11) AUTO_INCREMENT PRIMARY KEY, `interface_number` int(11) NULL DEFAULT NULL, `interface_description` varchar(200) NULL DEFAULT NULL, - `interface_connected_asset` varchar(200) NULL DEFAULT NULL, + `interface_connected_asset` varchar(200) NULL DEFAULT NULL, `interface_ip` varchar(200) NULL DEFAULT NULL, `interface_created_at` datetime DEFAULT CURRENT_TIMESTAMP, `interface_updated_at` datetime NULL ON UPDATE CURRENT_TIMESTAMP, @@ -1802,24 +1802,24 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#28a745' WHERE ticket_status_id = 3"); // On Hold mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#343a40' WHERE ticket_status_id = 4"); // Auto Close mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_color = '#343a40' WHERE ticket_status_id = 5"); // Closed - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.9'"); } if (CURRENT_DATABASE_VERSION == '1.1.9') { mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_login_remember_me_expire` INT(11) NOT NULL DEFAULT 3 AFTER `config_login_key_secret`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.0'"); } if (CURRENT_DATABASE_VERSION == '1.2.0') { mysqli_query($mysqli, "ALTER TABLE `ticket_templates` ADD `ticket_template_order` INT(11) NOT NULL DEFAULT 0 AFTER `ticket_template_details`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.1'"); } if (CURRENT_DATABASE_VERSION == '1.2.1') { - + // Ticket Templates can have many project templates and Project Template can have have many ticket template, so instead create a many to many table relationship mysqli_query($mysqli, "ALTER TABLE `ticket_templates` DROP `ticket_template_order`"); mysqli_query($mysqli, "ALTER TABLE `ticket_templates` DROP `ticket_template_project_template_id`"); @@ -1831,59 +1831,65 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { `ticket_template_order` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_template_id`,`project_template_id`) )"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.2'"); } if (CURRENT_DATABASE_VERSION == '1.2.2') { - + mysqli_query($mysqli, "ALTER TABLE `tasks` DROP `task_description`"); mysqli_query($mysqli, "ALTER TABLE `task_templates` DROP `task_template_description`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.3'"); } if (CURRENT_DATABASE_VERSION == '1.2.3') { - + mysqli_query($mysqli, "ALTER TABLE `projects` ADD `project_manager` INT(11) NOT NULL DEFAULT 0 AFTER `project_due`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.4'"); } if (CURRENT_DATABASE_VERSION == '1.2.4') { - + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_project_prefix` VARCHAR(200) NOT NULL DEFAULT 'PRJ-' AFTER `config_default_hourly_rate`"); mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_project_next_number` INT(11) NOT NULL DEFAULT 1 AFTER `config_project_prefix`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.5'"); } if (CURRENT_DATABASE_VERSION == '1.2.5') { - + mysqli_query($mysqli, "ALTER TABLE `projects` ADD `project_prefix` VARCHAR(200) DEFAULT NULL AFTER `project_id`"); mysqli_query($mysqli, "ALTER TABLE `projects` ADD `project_number` INT(11) NOT NULL DEFAULT 1 AFTER `project_prefix`"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.6'"); } if (CURRENT_DATABASE_VERSION == '1.2.6') { - + mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_dnshost` INT(11) NOT NULL DEFAULT 0 AFTER `domain_webhost`"); mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_mailhost` INT(11) NOT NULL DEFAULT 0 AFTER `domain_dnshost`"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.7'"); } if (CURRENT_DATABASE_VERSION == '1.2.7') { - + mysqli_query($mysqli, "ALTER TABLE `recurring` ADD `recurring_invoice_email_notify` TINYINT(1) NOT NULL DEFAULT 1 AFTER `recurring_note`"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.8'"); } - // if (CURRENT_DATABASE_VERSION == '1.2.8') { - // // Insert queries here required to update to DB version 1.2.9 + if (CURRENT_DATABASE_VERSION == '1.2.8') { + + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_phone_mask` TINYINT(1) NOT NULL DEFAULT 1 AFTER `config_destructive_deletes_enable`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.9'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.2.9') { + // // Insert queries here required to update to DB version 1.2.10 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.9"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.10"); // } } else { diff --git a/database_version.php b/database_version.php index ac7b3dd1..aa46a4ac 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.2.8"); +DEFINE("LATEST_DATABASE_VERSION", "1.2.9"); diff --git a/db.sql b/db.sql index 3b56fcd7..2e016f17 100644 --- a/db.sql +++ b/db.sql @@ -1375,6 +1375,7 @@ CREATE TABLE `settings` ( `config_telemetry` tinyint(1) DEFAULT 0, `config_timezone` varchar(200) NOT NULL DEFAULT 'America/New_York', `config_destructive_deletes_enable` tinyint(1) NOT NULL DEFAULT 0, + `config_phone_number` tinyint(1) NOT NULL DEFAULT 1, PRIMARY KEY (`company_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; From b1efb76b3b9d6aa788540a036913596e11292ba5 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 6 May 2024 11:31:38 -0300 Subject: [PATCH 11/67] Update functions.php handle phone_mask option --- functions.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/functions.php b/functions.php index 1fb36091..7bfb1deb 100644 --- a/functions.php +++ b/functions.php @@ -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) { @@ -885,7 +895,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 @@ -902,7 +912,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 @@ -915,7 +925,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 From ec94071167a0dafc1f74bd2b781ef7431a2a37c0 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 6 May 2024 13:25:30 -0300 Subject: [PATCH 12/67] num active clients on menu show number of active clients um side menu --- inc_all.php | 4 ++++ side_nav.php | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/inc_all.php b/inc_all.php index c1a7e7ea..8a2b8fbf 100644 --- a/inc_all.php +++ b/inc_all.php @@ -12,6 +12,10 @@ require_once "top_nav.php"; // Get Main Side Bar Badge Counts +// Active Clients Count +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('client_id') AS num FROM clients WHERE client_archived_at IS NULL")); +$num_active_clients = $row['num']; + // Active Ticket Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NULL AND ticket_status != 4")); $num_active_tickets = $row['num']; diff --git a/side_nav.php b/side_nav.php index f9c8dafc..9638e76e 100644 --- a/side_nav.php +++ b/side_nav.php @@ -20,7 +20,12 @@
  • "> -

    Clients

    +

    + Clients + + + +

    • = 2 && $config_module_enable_ticketing == 1) { ?> From 4779e8f923e56e0ad965f4cd8a367b4b6c193b05 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 6 May 2024 13:42:11 -0300 Subject: [PATCH 13/67] add file ext .unf https://forum.itflow.org/d/835-allow-file-type added .unf for unifi backup file --- client_file_upload_modal.php | 4 ++-- post/file.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client_file_upload_modal.php b/client_file_upload_modal.php index 68e29748..3fcb869a 100644 --- a/client_file_upload_modal.php +++ b/client_file_upload_modal.php @@ -11,7 +11,7 @@
    - +
    @@ -47,7 +47,7 @@
    - +
    Up to 20 files can be uploaded at once by holding down CTRL and selecting files diff --git a/post/file.php b/post/file.php index 8ba65ec2..dd6b28e8 100644 --- a/post/file.php +++ b/post/file.php @@ -23,7 +23,7 @@ if (isset($_POST['upload_files'])) { 'size' => $_FILES['file']['size'][$i] ]; - if ($file_reference_name = checkFileUpload($single_file, array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', 'md', 'doc', 'docx', 'odt', 'csv', 'xls', 'xlsx', 'ods', 'pptx', 'odp', 'zip', 'tar', 'gz', 'xml', 'msg', 'json', 'wav', 'mp3', 'ogg', 'mov', 'mp4', 'av1', 'ovpn', 'cfg', 'ps1', 'vsdx', 'drawio', 'pfx', 'pages', 'numbers'))) { + if ($file_reference_name = checkFileUpload($single_file, array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', 'md', 'doc', 'docx', 'odt', 'csv', 'xls', 'xlsx', 'ods', 'pptx', 'odp', 'zip', 'tar', 'gz', 'xml', 'msg', 'json', 'wav', 'mp3', 'ogg', 'mov', 'mp4', 'av1', 'ovpn', 'cfg', 'ps1', 'vsdx', 'drawio', 'pfx', 'pages', 'numbers', 'unf'))) { $file_tmp_path = $_FILES['file']['tmp_name'][$i]; From a41eede52f6dbcc9691a11cad3d340d2c494fd9e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 11:34:25 -0400 Subject: [PATCH 14/67] DB update for the upcoming user client restricted access permissions --- database_updates.php | 13 ++++++++++--- database_version.php | 2 +- db.sql | 18 ++++++++++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/database_updates.php b/database_updates.php index a4685591..f9fbdbdc 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1886,10 +1886,17 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.9'"); } - // if (CURRENT_DATABASE_VERSION == '1.2.9') { - // // Insert queries here required to update to DB version 1.2.10 + if (CURRENT_DATABASE_VERSION == '1.2.9') { + + mysqli_query($mysqli, "CREATE TABLE `user_permissions` (`user_id` int(11) NOT NULL,`client_id` int(11) NOT NULL, PRIMARY KEY (`user_id`,`client_id`))"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.0'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.3.0') { + // // Insert queries here required to update to DB version 1.3.0 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.10"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.1"); // } } else { diff --git a/database_version.php b/database_version.php index aa46a4ac..91fe0b03 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.2.9"); +DEFINE("LATEST_DATABASE_VERSION", "1.3.0"); diff --git a/db.sql b/db.sql index 2e016f17..0bd7cf94 100644 --- a/db.sql +++ b/db.sql @@ -1375,7 +1375,7 @@ CREATE TABLE `settings` ( `config_telemetry` tinyint(1) DEFAULT 0, `config_timezone` varchar(200) NOT NULL DEFAULT 'America/New_York', `config_destructive_deletes_enable` tinyint(1) NOT NULL DEFAULT 0, - `config_phone_number` tinyint(1) NOT NULL DEFAULT 1, + `config_phone_mask` tinyint(1) NOT NULL DEFAULT 1, PRIMARY KEY (`company_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1777,6 +1777,20 @@ CREATE TABLE `trips` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `user_permissions` +-- + +DROP TABLE IF EXISTS `user_permissions`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `user_permissions` ( + `user_id` int(11) NOT NULL, + `client_id` int(11) NOT NULL, + PRIMARY KEY (`user_id`,`client_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `user_settings` -- @@ -1903,4 +1917,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-04-12 19:37:23 +-- Dump completed on 2024-05-10 11:33:39 From ce0c394d3f1bcd18ffd857a11f0db30231fa95a7 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 12:25:38 -0400 Subject: [PATCH 15/67] Feature: User Client Access Permissions logic has been added, next up is the defining access via user managment --- check_login.php | 39 +++++++++++++++++++++++++++++++++++---- clients.php | 1 + 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/check_login.php b/check_login.php index 297208c2..992511b5 100644 --- a/check_login.php +++ b/check_login.php @@ -10,7 +10,8 @@ if (!isset($_SESSION)) { session_start(); } -//Check to see if setup is enabled + +// Check to see if setup is enabled if (!isset($config_enable_setup) || $config_enable_setup == 1) { header("Location: setup.php"); exit; @@ -26,9 +27,11 @@ if (!isset($_SESSION['logged']) || !$_SESSION['logged']) { exit; } + // Set Timezone require_once "inc_set_timezone.php"; + // User IP & UA $session_ip = sanitizeInput(getIP()); $session_user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT']); @@ -60,9 +63,34 @@ $session_company_country = $row['company_country']; $session_company_locale = $row['company_locale']; $session_company_currency = $row['company_currency']; -//Set Currency Format + +// Set Currency Format $currency_format = numfmt_create($session_company_locale, NumberFormatter::CURRENCY); + +// Get User Client Access Permissions +$user_client_access_sql = mysqli_query($mysqli, "SELECT client_id FROM user_permissions WHERE user_id = $session_user_id"); + +$access_client_ids = []; +if ($user_client_access_sql) { // This ensures the codes wont break if user_permissions table does not exist. This can be removed once all ITFlow instances are updated + while($row = mysqli_fetch_assoc($user_client_access_sql)) { + $access_client_ids[] = $row['client_id']; + } +} else { + // Handle error in query execution (e.g., table doesn't exist) + error_log('Error fetching client IDs: ' . mysqli_error($mysqli)); +} + +$client_access_string = implode(',', $access_client_ids); + +// Role / Client Access Permission Check +if ($session_user_role < 3 && !empty($client_access_string)) { + $access_permission_query = "AND client_id IN ($client_access_string)"; +} else { + $access_permission_query = ""; +} + +// Include the settings vars require_once "get_settings.php"; @@ -77,13 +105,16 @@ if ($iPod || $iPhone || $iPad) { $session_map_source = "google"; } -//Check if mobile device + +// Check if mobile device $session_mobile = isMobile(); -//Get Notification Count for the badge on the top nav + +// Get Notification Count for the badge on the top nav $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('notification_id') AS num FROM notifications WHERE (notification_user_id = $session_user_id OR notification_user_id = 0) AND notification_dismissed_at IS NULL")); $num_notifications = $row['num']; + // FORCE MFA Setup //if ($session_user_config_force_mfa == 1 && $session_token == NULL) { // header("Location: force_mfa.php"); diff --git a/clients.php b/clients.php index da3bd024..acf4de71 100644 --- a/clients.php +++ b/clients.php @@ -58,6 +58,7 @@ $sql = mysqli_query( AND clients.client_$archive_query AND DATE(clients.client_created_at) BETWEEN '$dtf' AND '$dtt' AND clients.client_lead = $leads + $access_permission_query $industry_query $referral_query GROUP BY clients.client_id From 2832f0eb33ccb9634044570ba9606e51255da35b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 12:28:31 -0400 Subject: [PATCH 16/67] Fix if Tables doesnt exist dont break script --- check_login.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/check_login.php b/check_login.php index 992511b5..dfff82b3 100644 --- a/check_login.php +++ b/check_login.php @@ -69,16 +69,18 @@ $currency_format = numfmt_create($session_company_locale, NumberFormatter::CURRE // Get User Client Access Permissions -$user_client_access_sql = mysqli_query($mysqli, "SELECT client_id FROM user_permissions WHERE user_id = $session_user_id"); +$user_client_access_sql = "SELECT client_id FROM user_permissions WHERE user_id = $session_user_id"; +$user_client_access_result = mysqli_query($mysqli, $user_client_access_sql); $access_client_ids = []; -if ($user_client_access_sql) { // This ensures the codes wont break if user_permissions table does not exist. This can be removed once all ITFlow instances are updated - while($row = mysqli_fetch_assoc($user_client_access_sql)) { +if ($user_client_access_result) { + while($row = mysqli_fetch_assoc($user_client_access_result)) { $access_client_ids[] = $row['client_id']; } } else { - // Handle error in query execution (e.g., table doesn't exist) + // Log the error and set access client IDs to an empty array error_log('Error fetching client IDs: ' . mysqli_error($mysqli)); + $access_client_ids = []; // Ensure the array is empty and defined } $client_access_string = implode(',', $access_client_ids); @@ -90,6 +92,7 @@ if ($session_user_role < 3 && !empty($client_access_string)) { $access_permission_query = ""; } + // Include the settings vars require_once "get_settings.php"; From 5f7ca75d1fafac51810042097db3f83957622169 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 12:32:46 -0400 Subject: [PATCH 17/67] Use try instead so script doesnt break if user_permissions table doesnt exist --- check_login.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/check_login.php b/check_login.php index dfff82b3..a1cde93f 100644 --- a/check_login.php +++ b/check_login.php @@ -68,28 +68,28 @@ $session_company_currency = $row['company_currency']; $currency_format = numfmt_create($session_company_locale, NumberFormatter::CURRENCY); -// Get User Client Access Permissions -$user_client_access_sql = "SELECT client_id FROM user_permissions WHERE user_id = $session_user_id"; -$user_client_access_result = mysqli_query($mysqli, $user_client_access_sql); +try { + // Get User Client Access Permissions + $user_client_access_sql = "SELECT client_id FROM user_permissions WHERE user_id = $session_user_id"; + $user_client_access_result = mysqli_query($mysqli, $user_client_access_sql); -$access_client_ids = []; -if ($user_client_access_result) { - while($row = mysqli_fetch_assoc($user_client_access_result)) { + $access_client_ids = []; + while ($row = mysqli_fetch_assoc($user_client_access_result)) { $access_client_ids[] = $row['client_id']; } -} else { - // Log the error and set access client IDs to an empty array - error_log('Error fetching client IDs: ' . mysqli_error($mysqli)); - $access_client_ids = []; // Ensure the array is empty and defined -} -$client_access_string = implode(',', $access_client_ids); + $client_access_string = implode(',', $access_client_ids); -// Role / Client Access Permission Check -if ($session_user_role < 3 && !empty($client_access_string)) { - $access_permission_query = "AND client_id IN ($client_access_string)"; -} else { - $access_permission_query = ""; + // Role / Client Access Permission Check + if ($session_user_role < 3 && !empty($client_access_string)) { + $access_permission_query = "AND client_id IN ($client_access_string)"; + } else { + $access_permission_query = ""; + } +} catch (Exception $e) { + // Handle exception + error_log('MySQL error: ' . $e->getMessage()); + $access_permission_query = ""; // Ensure safe default if query fails } From e16dce190f388d80d7d8bc5ec470fe5a878acb95 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 13:05:32 -0400 Subject: [PATCH 18/67] Added logic to the inc_all_client.php file to deny access to users with client access permissions set --- check_login.php | 6 +++--- inc_all_client.php | 15 ++++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/check_login.php b/check_login.php index a1cde93f..57c5bd36 100644 --- a/check_login.php +++ b/check_login.php @@ -73,12 +73,12 @@ try { $user_client_access_sql = "SELECT client_id FROM user_permissions WHERE user_id = $session_user_id"; $user_client_access_result = mysqli_query($mysqli, $user_client_access_sql); - $access_client_ids = []; + $client_access_array = []; while ($row = mysqli_fetch_assoc($user_client_access_result)) { - $access_client_ids[] = $row['client_id']; + $client_access_array[] = $row['client_id']; } - $client_access_string = implode(',', $access_client_ids); + $client_access_string = implode(',', $client_access_array); // Role / Client Access Permission Check if ($session_user_role < 3 && !empty($client_access_string)) { diff --git a/inc_all_client.php b/inc_all_client.php index 3d548b6d..0ed1b186 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -6,14 +6,15 @@ require_once "functions.php"; require_once "check_login.php"; -require_once "header.php"; - -require_once "top_nav.php"; - - if (isset($_GET['client_id'])) { $client_id = intval($_GET['client_id']); + // Check to see if the logged in user has permission to access this client (Admins have access to all no matter what perms are set) + if(!in_array($client_id, $client_access_array) AND !empty($client_access_string) AND $session_user_role < 3) { + echo "You don't have permission to access this client"; + exit(); + } + $sql = mysqli_query($mysqli, "UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id"); $sql = mysqli_query( @@ -231,6 +232,10 @@ if (isset($_GET['client_id'])) { } } +require_once "header.php"; + +require_once "top_nav.php"; + require_once "client_side_nav.php"; require_once "inc_wrapper.php"; From fa064962a9c77949150899f7d9b93a7ca37db1ae Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 13:16:42 -0400 Subject: [PATCH 19/67] Update logic denyed access to log it and redirect back with a toast indicating no access to client --- inc_all_client.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/inc_all_client.php b/inc_all_client.php index 0ed1b186..3ecda6fc 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -11,7 +11,14 @@ if (isset($_GET['client_id'])) { // Check to see if the logged in user has permission to access this client (Admins have access to all no matter what perms are set) if(!in_array($client_id, $client_access_array) AND !empty($client_access_string) AND $session_user_role < 3) { - echo "You don't have permission to access this client"; + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Access', log_description = '$session_name was denyed permission from accessing client', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $client_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "Access Denied - You do not have permission to access that client!"; + + echo ""; + exit(); } From 85bf412f533dc4c0dc80a5d53649ebbb11acf24e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 13:42:42 -0400 Subject: [PATCH 20/67] Client Access: Allow to select Client Access Restrictions for new users --- admin_user_add_modal.php | 23 +++++++++++++++++++++++ inc_all_client.php | 2 +- post/user.php | 8 ++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/admin_user_add_modal.php b/admin_user_add_modal.php index 5c035c3c..dc631f7b 100644 --- a/admin_user_add_modal.php +++ b/admin_user_add_modal.php @@ -62,6 +62,29 @@
    +
    + +
    +
    + +
    + +
    + Leave Blank for Full access to all clients, no affect on users with the admin role. +
    +
    diff --git a/inc_all_client.php b/inc_all_client.php index 3ecda6fc..21338abd 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -12,7 +12,7 @@ if (isset($_GET['client_id'])) { // Check to see if the logged in user has permission to access this client (Admins have access to all no matter what perms are set) if(!in_array($client_id, $client_access_array) AND !empty($client_access_string) AND $session_user_role < 3) { // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Access', log_description = '$session_name was denyed permission from accessing client', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Access', log_description = '$session_name was denied permission from accessing client', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $client_id"); $_SESSION['alert_type'] = "error"; $_SESSION['alert_message'] = "Access Denied - You do not have permission to access that client!"; diff --git a/post/user.php b/post/user.php index c5eecb53..c5de8549 100644 --- a/post/user.php +++ b/post/user.php @@ -18,6 +18,14 @@ if (isset($_POST['add_user'])) { $user_id = mysqli_insert_id($mysqli); + // Add Client Access Permissions if set + if (!empty($_POST['clients'])) { + foreach($_POST['clients'] as $client_id) { + $client_id = intval($client_id); + mysqli_query($mysqli,"INSERT INTO user_permissions SET user_id = $user_id, client_id = $client_id"); + } + } + if (!file_exists("uploads/users/$user_id/")) { mkdir("uploads/users/$user_id"); } From 9876c33d2e1d2cd2ab15f82526eeaeb0b07d54ec Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 14:01:20 -0400 Subject: [PATCH 21/67] Client Access: Allow to select Client Access Restrictions for existing users --- admin_user_add_modal.php | 2 +- admin_user_edit_modal.php | 23 +++++++++++++++++++++++ admin_users.php | 9 +++++++++ post/user.php | 9 +++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/admin_user_add_modal.php b/admin_user_add_modal.php index dc631f7b..be5cf3a2 100644 --- a/admin_user_add_modal.php +++ b/admin_user_add_modal.php @@ -66,7 +66,7 @@
    - +
    + + + + + +
    + Leave Blank for Full access to all clients, no affect on users with the admin role. +
    +
    diff --git a/admin_users.php b/admin_users.php index ce764ede..83464a28 100644 --- a/admin_users.php +++ b/admin_users.php @@ -125,9 +125,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $last_login = "$log_created_at
    $log_user_os
    $log_user_browser
    $log_ip
    "; } + // Get User Client Access Permissions + $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_permissions WHERE user_id = $user_id"); + $client_access_array = []; + while ($row = mysqli_fetch_assoc($user_client_access_sql)) { + $client_access_array[] = intval($row['client_id']); + } + $sql_remember_tokens = mysqli_query($mysqli, "SELECT * FROM remember_tokens WHERE remember_token_user_id = $user_id"); $remember_token_count = mysqli_num_rows($sql_remember_tokens); + + ?> diff --git a/post/user.php b/post/user.php index c5de8549..4b79ec7c 100644 --- a/post/user.php +++ b/post/user.php @@ -113,6 +113,15 @@ if (isset($_POST['edit_user'])) { $user_id = intval($_POST['user_id']); $new_password = trim($_POST['new_password']); + // Update Client Access + mysqli_query($mysqli,"DELETE FROM user_permissions WHERE user_id = $user_id"); + if (!empty($_POST['clients'])) { + foreach($_POST['clients'] as $client_id) { + $client_id = intval($client_id); + mysqli_query($mysqli,"INSERT INTO user_permissions SET user_id = $user_id, client_id = $client_id"); + } + } + // Get current Avatar $sql = mysqli_query($mysqli, "SELECT user_avatar FROM users WHERE user_id = $user_id"); $row = mysqli_fetch_array($sql); From 3e7f57f64ae35bccaabd525438a69b01d2d09a9c Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 14:27:04 -0400 Subject: [PATCH 22/67] Add contact primary to the API edit ^Cd create --- api/v1/contacts/contact_model.php | 8 ++++++++ api/v1/contacts/create.php | 2 +- api/v1/contacts/update.php | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/api/v1/contacts/contact_model.php b/api/v1/contacts/contact_model.php index 8fa13b27..7cb724b4 100644 --- a/api/v1/contacts/contact_model.php +++ b/api/v1/contacts/contact_model.php @@ -74,6 +74,14 @@ if (isset($_POST['contact_auth_method'])) { $auth_method = ''; } +if (isset($_POST['contact_primary'])) { + $primary = intval($_POST['contact_primary']); +} elseif ($contact_row) { + $primary = $contact_row['contact_primary']; +} else { + $primary = '0'; +} + if (isset($_POST['contact_important'])) { $important = intval($_POST['contact_important']); } elseif ($contact_row) { diff --git a/api/v1/contacts/create.php b/api/v1/contacts/create.php index 2599eaa2..cf51f7c9 100644 --- a/api/v1/contacts/create.php +++ b/api/v1/contacts/create.php @@ -20,7 +20,7 @@ if (!empty($name) && !empty($email) && !empty($client_id)) { if (mysqli_num_rows($email_duplication_sql) == 0) { // Insert contact - $insert_sql = mysqli_query($mysqli, "INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_notes = '$notes', contact_auth_method = '$auth_method', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id"); + $insert_sql = mysqli_query($mysqli, "INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_notes = '$notes', contact_auth_method = '$auth_method', contact_primary = '$primary', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id"); // Check insert & get insert ID if ($insert_sql) { diff --git a/api/v1/contacts/update.php b/api/v1/contacts/update.php index 19ae914a..a5049f47 100644 --- a/api/v1/contacts/update.php +++ b/api/v1/contacts/update.php @@ -19,7 +19,7 @@ if (!empty($contact_id)) { require_once 'contact_model.php'; - $update_sql = mysqli_query($mysqli, "UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_notes = '$notes', contact_auth_method = '$auth_method', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id WHERE contact_id = $contact_id LIMIT 1"); + $update_sql = mysqli_query($mysqli, "UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_notes = '$notes', contact_auth_method = '$auth_method', contact_primary = '$primary', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id WHERE contact_id = $contact_id LIMIT 1"); // Check insert & get insert ID if ($update_sql) { From d202c7684a3250add552fa72628ef327875dc725 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 21:56:13 -0400 Subject: [PATCH 23/67] Feature: Allow copying a quote from one client to another --- post/quote.php | 4 ++-- quote_copy_modal.php | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/post/quote.php b/post/quote.php index c0a4fa92..94c055d2 100644 --- a/post/quote.php +++ b/post/quote.php @@ -36,6 +36,7 @@ if (isset($_POST['add_quote'])) { if (isset($_POST['add_quote_copy'])) { $quote_id = intval($_POST['quote_id']); + $client_id = intval($_POST['client']); $date = sanitizeInput($_POST['date']); $expire = sanitizeInput($_POST['expire']); @@ -51,7 +52,6 @@ if (isset($_POST['add_quote_copy'])) { $quote_currency_code = sanitizeInput($row['quote_currency_code']); $quote_scope = sanitizeInput($row['quote_scope']); $quote_note = sanitizeInput($row['quote_note']); - $client_id = intval($row['quote_client_id']); $category_id = intval($row['quote_category_id']); //Generate a unique URL key for clients to access @@ -80,7 +80,7 @@ if (isset($_POST['add_quote_copy'])) { } //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Create', log_description = 'Copied Quote', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Create', log_description = 'Copied Quote', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); $_SESSION['alert_message'] = "Quote copied"; diff --git a/quote_copy_modal.php b/quote_copy_modal.php index 4f06976c..d2cb6f3a 100644 --- a/quote_copy_modal.php +++ b/quote_copy_modal.php @@ -11,6 +11,28 @@
    +
    + +
    +
    + +
    + +
    +
    +
    From ff4628465cdd5b324369ab6aa09a4fdb1e15e7f9 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 10 May 2024 21:57:22 -0400 Subject: [PATCH 24/67] Quote Copy, Make Client a required field --- quote_copy_modal.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quote_copy_modal.php b/quote_copy_modal.php index d2cb6f3a..59ba19ae 100644 --- a/quote_copy_modal.php +++ b/quote_copy_modal.php @@ -12,12 +12,12 @@
    - +
    - Date: Sun, 12 May 2024 13:54:34 -0400 Subject: [PATCH 25/67] Limit User access to restricted clients under global search --- global_search.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/global_search.php b/global_search.php index bc1d0984..96f653cb 100644 --- a/global_search.php +++ b/global_search.php @@ -24,6 +24,7 @@ if (isset($_GET['query'])) { LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1 WHERE client_archived_at IS NULL AND client_name LIKE '%$query%' + $access_permission_query ORDER BY client_id DESC LIMIT 5" ); @@ -35,6 +36,7 @@ if (isset($_GET['query'])) { OR contact_email LIKE '%$query%' OR contact_phone LIKE '%$phone_query%' OR contact_mobile LIKE '%$phone_query%') + $access_permission_query ORDER BY contact_id DESC LIMIT 5" ); @@ -43,6 +45,7 @@ if (isset($_GET['query'])) { WHERE vendor_archived_at IS NULL AND vendor_template = 0 AND (vendor_name LIKE '%$query%' OR vendor_phone LIKE '%$phone_query%') + $access_permission_query ORDER BY vendor_id DESC LIMIT 5" ); @@ -50,6 +53,7 @@ if (isset($_GET['query'])) { LEFT JOIN clients ON domain_client_id = client_id WHERE domain_archived_at IS NULL AND domain_name LIKE '%$query%' + $access_permission_query ORDER BY domain_id DESC LIMIT 5" ); @@ -63,6 +67,7 @@ if (isset($_GET['query'])) { LEFT JOIN clients on document_client_id = clients.client_id WHERE document_archived_at IS NULL AND MATCH(document_content_raw) AGAINST ('$query') + $access_permission_query ORDER BY document_id DESC LIMIT 5" ); @@ -72,6 +77,7 @@ if (isset($_GET['query'])) { WHERE file_archived_at IS NULL AND (file_name LIKE '%$query%' OR file_description LIKE '%$query%') + $access_permission_query ORDER BY file_id DESC LIMIT 5" ); @@ -81,6 +87,7 @@ if (isset($_GET['query'])) { WHERE ticket_archived_at IS NULL AND (ticket_subject LIKE '%$query%' OR ticket_number = '$ticket_num_query') + $access_permission_query ORDER BY ticket_id DESC LIMIT 5" ); @@ -88,6 +95,7 @@ if (isset($_GET['query'])) { LEFT JOIN clients ON scheduled_ticket_client_id = client_id WHERE scheduled_ticket_subject LIKE '%$query%' OR scheduled_ticket_details LIKE '%$query%' + $access_permission_query ORDER BY scheduled_ticket_id DESC LIMIT 5" ); @@ -96,6 +104,7 @@ if (isset($_GET['query'])) { LEFT JOIN clients ON login_client_id = client_id WHERE login_archived_at IS NULL AND (login_name LIKE '%$query%' OR login_description LIKE '%$query%') + $access_permission_query ORDER BY login_id DESC LIMIT 5" ); @@ -104,6 +113,7 @@ if (isset($_GET['query'])) { LEFT JOIN categories ON invoice_category_id = category_id WHERE invoice_archived_at IS NULL AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$query%' OR invoice_scope LIKE '%$query%') + $access_permission_query ORDER BY invoice_number DESC LIMIT 5" ); @@ -113,6 +123,7 @@ if (isset($_GET['query'])) { LEFT JOIN clients ON asset_client_id = client_id WHERE asset_archived_at IS NULL AND (asset_name LIKE '%$query%' OR asset_description LIKE '%$query%' OR asset_type LIKE '%$query%' OR asset_make LIKE '%$query%' OR asset_model LIKE '%$query%' OR asset_serial LIKE '%$query%' OR asset_os LIKE '%$query%' OR asset_ip LIKE '%$query%' OR asset_nat_ip LIKE '%$query%' OR asset_mac LIKE '%$query%' OR asset_status LIKE '%$query%') + $access_permission_query ORDER BY asset_name DESC LIMIT 5" ); @@ -121,6 +132,7 @@ if (isset($_GET['query'])) { LEFT JOIN clients ON ticket_client_id = client_id WHERE ticket_reply_archived_at IS NULL AND (ticket_reply LIKE '%$query%') + $access_permission_query ORDER BY ticket_id DESC, ticket_reply_id ASC LIMIT 20" ); From 13a45c81a08c340cb1c8324e6cc323a0d53b5aae Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 13 May 2024 11:12:52 -0300 Subject: [PATCH 26/67] Display notification when update is available --- admin_update.php | 15 ++++----------- cron.php | 13 +++++++++++++ functions.php | 31 +++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/admin_update.php b/admin_update.php index 21229d82..b97a0adc 100644 --- a/admin_update.php +++ b/admin_update.php @@ -3,19 +3,12 @@ require_once "inc_all_admin.php"; require_once "database_version.php"; -require_once "config.php"; +$updates = fetchUpdates(); -// 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]"; -} +$latest_version = $updates->latest_version; +$current_version = $updates->current_version; +$result = $updates->result; $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format:'%h%ar%s'"); diff --git a/cron.php b/cron.php index 8ea474b9..093af55b 100644 --- a/cron.php +++ b/cron.php @@ -979,6 +979,19 @@ if ($config_telemetry > 0 OR $config_telemetry = 2) { mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Telemetry', log_description = 'Cron sent telemetry results to ITFlow Developers'"); } + +// Fetch Updates +$updates = fetchUpdates(); + +$update_message = $updates->update_message; + +if ($updates->current_version !== $updates->latest_version) { + // Send Alert to inform Updates Available + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Updates', notification = '$update_message', notification_action = 'admin_update.php'"); +} + + + /* * ############################################################################################################### * FINISH UP diff --git a/functions.php b/functions.php index 7bfb1deb..ccae0352 100644 --- a/functions.php +++ b/functions.php @@ -1186,3 +1186,34 @@ function getTicketStatusName($ticket_status) { return "Unknown"; } + + +function fetchUpdates() { + + global $mysqli, $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; + +} \ No newline at end of file From 352fbd852e3544199c87eb32a14397c4a0f7356e Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 13 May 2024 11:22:57 -0300 Subject: [PATCH 27/67] typos --- cron.php | 2 +- functions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cron.php b/cron.php index 093af55b..3b6f685b 100644 --- a/cron.php +++ b/cron.php @@ -987,7 +987,7 @@ $update_message = $updates->update_message; if ($updates->current_version !== $updates->latest_version) { // Send Alert to inform Updates Available - mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Updates', notification = '$update_message', notification_action = 'admin_update.php'"); + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Update', notification = '$update_message', notification_action = 'admin_update.php'"); } diff --git a/functions.php b/functions.php index ccae0352..389d018f 100644 --- a/functions.php +++ b/functions.php @@ -1190,7 +1190,7 @@ function getTicketStatusName($ticket_status) { function fetchUpdates() { - global $mysqli, $repo_branch; + global $repo_branch; // Fetch the latest code changes but don't apply them exec("git fetch", $output, $result); From cdf4767590f46c0ca119893e42304c3d27019445 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 13 May 2024 12:19:11 -0300 Subject: [PATCH 28/67] search in all folders when in root Enable search recursive/all folders when in / (root). In the future will be nice to have this as an advanced search. reference: https://forum.itflow.org/d/850-search-documents-recursive --- client_documents.php | 36 +++++++++++++++++++++++++----------- client_files.php | 33 +++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 21 deletions(-) diff --git a/client_documents.php b/client_documents.php index c826c5d6..e7958fd9 100644 --- a/client_documents.php +++ b/client_documents.php @@ -33,17 +33,31 @@ if (!empty($_GET['folder_id'])) { // Set Folder Location Var used when creating folders $folder_location = 0; -$sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM documents - LEFT JOIN users ON document_created_by = user_id - WHERE document_client_id = $client_id - AND document_template = 0 - AND document_folder_id = $folder - AND document_archived_at IS NULL - $query_snippet - ORDER BY $sort $order LIMIT $record_from, $record_to" -); +if ($folder == 0) { + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM documents + LEFT JOIN users ON document_created_by = user_id + WHERE document_client_id = $client_id + AND document_template = 0 + + AND document_archived_at IS NULL + $query_snippet + ORDER BY $sort $order LIMIT $record_from, $record_to" + ); +}else{ + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM documents + LEFT JOIN users ON document_created_by = user_id + WHERE document_client_id = $client_id + AND document_template = 0 + AND document_folder_id = $folder + AND document_archived_at IS NULL + $query_snippet + ORDER BY $sort $order LIMIT $record_from, $record_to" + ); +} $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/client_files.php b/client_files.php index c9ba024b..b6d871ef 100644 --- a/client_files.php +++ b/client_files.php @@ -39,16 +39,29 @@ if ($view == 1) { // Set Folder Location Var used when creating folders $folder_location = 1; -$sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM files - WHERE file_client_id = $client_id - AND file_folder_id = $folder_id - AND file_archived_at IS NULL - AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%') - $query_images - ORDER BY $sort $order LIMIT $record_from, $record_to" -); +if ($folder == 0) { + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM files + WHERE file_client_id = $client_id + + AND file_archived_at IS NULL + AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%') + $query_images + ORDER BY $sort $order LIMIT $record_from, $record_to" + ); +}else{ + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM files + WHERE file_client_id = $client_id + AND file_folder_id = $folder_id + AND file_archived_at IS NULL + AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%') + $query_images + ORDER BY $sort $order LIMIT $record_from, $record_to" + ); +} $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); From 9e758b1eddc29ad99a57973e20c9570c2811ec19 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 13 May 2024 17:26:23 -0300 Subject: [PATCH 29/67] only when search --- client_documents.php | 2 +- client_files.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client_documents.php b/client_documents.php index e7958fd9..77b1fb23 100644 --- a/client_documents.php +++ b/client_documents.php @@ -33,7 +33,7 @@ if (!empty($_GET['folder_id'])) { // Set Folder Location Var used when creating folders $folder_location = 0; -if ($folder == 0) { +if ($folder == 0 && $_GET["q"]) { $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM documents diff --git a/client_files.php b/client_files.php index b6d871ef..17f75a48 100644 --- a/client_files.php +++ b/client_files.php @@ -39,7 +39,7 @@ if ($view == 1) { // Set Folder Location Var used when creating folders $folder_location = 1; -if ($folder == 0) { +if ($folder == 0 && $_GET["q"]) { $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM files From 1242bd31c97f49b99984097ababa0ae33d3a8245 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Mon, 13 May 2024 17:28:53 -0300 Subject: [PATCH 30/67] wrong folder id names --- client_documents.php | 2 +- client_files.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client_documents.php b/client_documents.php index 77b1fb23..f7a7e9bf 100644 --- a/client_documents.php +++ b/client_documents.php @@ -33,7 +33,7 @@ if (!empty($_GET['folder_id'])) { // Set Folder Location Var used when creating folders $folder_location = 0; -if ($folder == 0 && $_GET["q"]) { +if ($get_folder_id == 0 && $_GET["q"]) { $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM documents diff --git a/client_files.php b/client_files.php index 17f75a48..f21eca9f 100644 --- a/client_files.php +++ b/client_files.php @@ -39,7 +39,7 @@ if ($view == 1) { // Set Folder Location Var used when creating folders $folder_location = 1; -if ($folder == 0 && $_GET["q"]) { +if ($get_folder_id == 0 && $_GET["q"]) { $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM files From cddd9b49773be35dedd4d1d3dbd4ace408d67b50 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 15 May 2024 10:40:15 -0400 Subject: [PATCH 31/67] Removed the AI Prompt as it did not always work correctly --- post/ai.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post/ai.php b/post/ai.php index 4810cde8..16264f73 100644 --- a/post/ai.php +++ b/post/ai.php @@ -12,7 +12,7 @@ if (isset($_GET['ai_reword'])) { $inputJSON = file_get_contents('php://input'); $input = json_decode($inputJSON, TRUE); // Convert JSON into array. - $promptText = "You are an experienced technician at a help desk, training a new technician. You are helping rewrite response for clarity and professionalism, but dont make it too wordy."; + $promptText = ""; $userText = $input['text']; // Preparing the data for the OpenAI Chat API request. From 5b38a562bbea83a29cd5ecde34878a4679ea4547 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 15 May 2024 10:44:04 -0400 Subject: [PATCH 32/67] Update the AI prompt to reword --- post/ai.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post/ai.php b/post/ai.php index 16264f73..d5fa2f79 100644 --- a/post/ai.php +++ b/post/ai.php @@ -12,7 +12,7 @@ if (isset($_GET['ai_reword'])) { $inputJSON = file_get_contents('php://input'); $input = json_decode($inputJSON, TRUE); // Convert JSON into array. - $promptText = ""; + $promptText = "reword"; $userText = $input['text']; // Preparing the data for the OpenAI Chat API request. From abc936d753f156eb06e1ee6af7c1000d2d3266c7 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 15 May 2024 10:47:27 -0400 Subject: [PATCH 33/67] Update the AI prompt to style with html formatting --- post/ai.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post/ai.php b/post/ai.php index d5fa2f79..5fe9d11b 100644 --- a/post/ai.php +++ b/post/ai.php @@ -12,7 +12,7 @@ if (isset($_GET['ai_reword'])) { $inputJSON = file_get_contents('php://input'); $input = json_decode($inputJSON, TRUE); // Convert JSON into array. - $promptText = "reword"; + $promptText = "reword with html format"; $userText = $input['text']; // Preparing the data for the OpenAI Chat API request. From 067d674c168bba1cd8d60f449fa7e53e7bc5011e Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Thu, 16 May 2024 10:48:41 -0300 Subject: [PATCH 34/67] client_logins uri limit with ellipsis limits long uri that may break lines in table --- client_logins.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client_logins.php b/client_logins.php index 3e9e7437..6812a396 100644 --- a/client_logins.php +++ b/client_logins.php @@ -90,6 +90,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (empty($login_uri)) { $login_uri_display = "-"; } else { + $login_uri_display_size = 40; + $login_uri_display_ellipsis = ""; + if (strlen($login_uri) > $login_uri_display_size) { + $login_uri_display_ellipsis = "..."; + } $login_uri_display = "$login_uri"; } $login_uri_2 = nullable_htmlentities($row['login_uri_2']); From edf9371ffabafd620f0816ab8a983a0662edbbf4 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Thu, 16 May 2024 11:00:04 -0300 Subject: [PATCH 35/67] show tasks progress bar on tickets view --- tickets.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tickets.php b/tickets.php index 14954ec4..7bd7cac0 100644 --- a/tickets.php +++ b/tickets.php @@ -395,6 +395,23 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); $ticket_reply_created_at_time_ago = timeAgo($ticket_reply_created_at); } + + // Get Tasks + $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_id ORDER BY task_created_at ASC"); + $task_count = mysqli_num_rows($sql_tasks); + // Get Completed Task Count + $sql_tasks_completed = mysqli_query($mysqli, + "SELECT * FROM tasks + WHERE task_ticket_id = $ticket_id + AND task_completed_at IS NOT NULL" + ); + $completed_task_count = mysqli_num_rows($sql_tasks_completed); + + // Tasks Completed Percent + if($task_count) { + $tasks_completed_percent = round(($completed_task_count / $task_count) * 100); + } + ?> "> From d4da95a6f17fb633b949c286ce2f3d7c8fdb14a1 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Thu, 16 May 2024 11:01:34 -0300 Subject: [PATCH 36/67] show bar on html --- tickets.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tickets.php b/tickets.php index 7bd7cac0..260578a2 100644 --- a/tickets.php +++ b/tickets.php @@ -435,6 +435,12 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); + + +
    +
    /
    +
    + From d1aab02721d543feb3dafc9be8aa0d64f88545af Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Thu, 16 May 2024 11:04:25 -0300 Subject: [PATCH 37/67] tasks table header --- tickets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tickets.php b/tickets.php index 260578a2..d68420c6 100644 --- a/tickets.php +++ b/tickets.php @@ -284,7 +284,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); Number - Subject + Subject / Tasks Client / Contact From aef2cde9d22e3271a45ce53b0b108b0f8e6ad12c Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Thu, 16 May 2024 11:14:20 -0300 Subject: [PATCH 38/67] Update client_logins.php --- client_logins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_logins.php b/client_logins.php index 6812a396..03c36a88 100644 --- a/client_logins.php +++ b/client_logins.php @@ -95,7 +95,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (strlen($login_uri) > $login_uri_display_size) { $login_uri_display_ellipsis = "..."; } - $login_uri_display = "$login_uri"; + $login_uri_display = substr($login_uri, 0, 35) . "$login_uri_display_ellipsis"; } $login_uri_2 = nullable_htmlentities($row['login_uri_2']); $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); From 4782892c8a19033d74ddd93dbb62be02cdf0fe51 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Fri, 17 May 2024 15:55:13 -0300 Subject: [PATCH 39/67] using truncate function --- client_logins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_logins.php b/client_logins.php index 03c36a88..13180be4 100644 --- a/client_logins.php +++ b/client_logins.php @@ -95,7 +95,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (strlen($login_uri) > $login_uri_display_size) { $login_uri_display_ellipsis = "..."; } - $login_uri_display = substr($login_uri, 0, 35) . "$login_uri_display_ellipsis"; + $login_uri_display = truncate($login_uri,40) . ""; } $login_uri_2 = nullable_htmlentities($row['login_uri_2']); $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); From a96b3a30bd379cf1ffef1caeef526f77c873f9a6 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Fri, 17 May 2024 16:14:46 -0300 Subject: [PATCH 40/67] Update client_logins.php --- client_logins.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/client_logins.php b/client_logins.php index 13180be4..5ab1f1ed 100644 --- a/client_logins.php +++ b/client_logins.php @@ -89,12 +89,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $login_uri = nullable_htmlentities($row['login_uri']); if (empty($login_uri)) { $login_uri_display = "-"; - } else { - $login_uri_display_size = 40; - $login_uri_display_ellipsis = ""; - if (strlen($login_uri) > $login_uri_display_size) { - $login_uri_display_ellipsis = "..."; - } + } else { $login_uri_display = truncate($login_uri,40) . ""; } $login_uri_2 = nullable_htmlentities($row['login_uri_2']); From cabc7e8c8ba19ba09a5ce57e19a7047f73c8f9e4 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Fri, 17 May 2024 23:26:22 +0100 Subject: [PATCH 41/67] Set 2FA Remember-me cookie expiry to number of days the token should be valid for Currently, the token is only valid for 2 days (86400 seconds = 24 hrs, multiplied by 2). This PR adjusts the cookie expiry date to the number of days configured that tokens are cleared after. This should help ensure users are not prompted for 2FA every few days, even if they've set a longer interval. --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index aa8fed08..54d06fdd 100644 --- a/login.php +++ b/login.php @@ -159,7 +159,7 @@ if (isset($_POST['login'])) { if (isset($_POST['remember_me'])) { // TODO: Record the UA and IP a token is generated from so that can be shown later on $newRememberToken = bin2hex(random_bytes(64)); - setcookie('rememberme', $newRememberToken, time() + 86400*2, "/", null, true, true); + setcookie('rememberme', $newRememberToken, time() + 86400*$config_login_remember_me_expire, "/", null, true, true); mysqli_query($mysqli, "INSERT INTO remember_tokens SET remember_token_user_id = $user_id, remember_token_token = '$newRememberToken'"); $extended_log .= ", generated a new remember-me token"; From c02d6d4cf0a33502a5072b7d3b5b7371ee191c27 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 21 May 2024 13:33:53 -0400 Subject: [PATCH 42/67] Add Recurring Tickets NextDate to the Calendars --- calendar_events.php | 23 +++++++++++++++++++++++ client_events.php | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/calendar_events.php b/calendar_events.php index 68841c31..b9c0275c 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -180,6 +180,29 @@ while ($row = mysqli_fetch_array($sql)) { echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },"; } + // Recurring Tickets + $sql = mysqli_query($mysqli, "SELECT * FROM clients + LEFT JOIN scheduled_tickets ON client_id = scheduled_ticket_client_id + LEFT JOIN users ON scheduled_ticket_assigned_to = user_id" + ); + while ($row = mysqli_fetch_array($sql)) { + $event_id = intval($row['scheduled_ticket_id']); + $client_id = intval($row['client_id']); + $username = $row['user_name']; + $frequency = $row['scheduled_ticket_frequency']; + if (empty($username)) { + $username = ""; + } else { + //Limit to characters and add ... + $username = "[". substr($row['user_name'], 0, 9) . "...]"; + } + + $event_title = json_encode("R Ticket ($frequency) - " . $row['scheduled_ticket_subject'] . " " . $username); + $event_start = json_encode($row['scheduled_ticket_next_run']); + + echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'client_recurring_tickets.php?client_id=$client_id' },"; + } + //Tickets Scheduled $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id diff --git a/client_events.php b/client_events.php index 590b202e..f4777ed7 100644 --- a/client_events.php +++ b/client_events.php @@ -180,6 +180,29 @@ while ($row = mysqli_fetch_array($sql)) { echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },"; } + // Recurring Tickets + $sql = mysqli_query($mysqli, "SELECT * FROM clients + LEFT JOIN scheduled_tickets ON client_id = scheduled_ticket_client_id + LEFT JOIN users ON scheduled_ticket_assigned_to = user_id" + ); + while ($row = mysqli_fetch_array($sql)) { + $event_id = intval($row['scheduled_ticket_id']); + $client_id = intval($row['client_id']); + $username = $row['user_name']; + $frequency = $row['scheduled_ticket_frequency']; + if (empty($username)) { + $username = ""; + } else { + //Limit to characters and add ... + $username = "[". substr($row['user_name'], 0, 9) . "...]"; + } + + $event_title = json_encode("R Ticket ($frequency) - " . $row['scheduled_ticket_subject'] . " " . $username); + $event_start = json_encode($row['scheduled_ticket_next_run']); + + echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'client_recurring_tickets.php?client_id=$client_id' },"; + } + //Tickets Scheduled $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id From 8b1ba7028eacf14cfe10edae1f6323d73726f4ab Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 26 May 2024 16:08:06 +0100 Subject: [PATCH 43/67] 2FA QR Codes Move away from the Google Charts API for generating QR codes as this is currently broken and not a security best practice. --- force_mfa.php | 5 +- plugins/barcode/barcode.php | 3348 +++++++++++++++++++++++++++++++++++ rfc6238.php | 8 - user_security.php | 6 +- 4 files changed, 3355 insertions(+), 12 deletions(-) create mode 100644 plugins/barcode/barcode.php diff --git a/force_mfa.php b/force_mfa.php index 0a70186e..05e6d1f2 100644 --- a/force_mfa.php +++ b/force_mfa.php @@ -36,8 +36,9 @@ require_once "header.php"; if (!empty($session_token)) { - //Generate QR Code based off the generated key - print sprintf('', TokenAuth6238::getBarCodeUrl($session_name, ' ', $session_token, $_SERVER['SERVER_NAME'])); + // Generate QR Code + $data = "otpauth://totp/ITFlow:$session_email?secret=$session_token"; + print ""; echo "

    $session_token

    "; } diff --git a/plugins/barcode/barcode.php b/plugins/barcode/barcode.php new file mode 100644 index 00000000..b1115011 --- /dev/null +++ b/plugins/barcode/barcode.php @@ -0,0 +1,3348 @@ +output_image($format, $_POST['s'], $_POST['d'], $_POST); + exit(0); + } + if (isset($_GET['s']) && isset($_GET['d'])) { + $generator = new barcode_generator(); + $format = (isset($_GET['f']) ? $_GET['f'] : 'png'); + $generator->output_image($format, $_GET['s'], $_GET['d'], $_GET); + exit(0); + } +} + +class barcode_generator { + + public function output_image($format, $symbology, $data, $options) { + switch (strtolower(preg_replace('/[^A-Za-z0-9]/', '', $format))) { + case 'png': + header('Content-Type: image/png'); + $image = $this->render_image($symbology, $data, $options); + imagepng($image); + imagedestroy($image); + break; + case 'gif': + header('Content-Type: image/gif'); + $image = $this->render_image($symbology, $data, $options); + imagegif($image); + imagedestroy($image); + break; + case 'jpg': case 'jpe': case 'jpeg': + header('Content-Type: image/jpeg'); + $image = $this->render_image($symbology, $data, $options); + imagejpeg($image); + imagedestroy($image); + break; + case 'svg': + header('Content-Type: image/svg+xml'); + echo $this->render_svg($symbology, $data, $options); + break; + } + } + + public function render_image($symbology, $data, $options) { + list($code, $widths, $width, $height, $x, $y, $w, $h) = + $this->encode_and_calculate_size($symbology, $data, $options); + $image = imagecreatetruecolor($width, $height); + imagesavealpha($image, true); + $bgcolor = (isset($options['bc']) ? $options['bc'] : 'FFF'); + $bgcolor = $this->allocate_color($image, $bgcolor); + imagefill($image, 0, 0, $bgcolor); + $colors = array( + (isset($options['cs']) ? $options['cs'] : ''), + (isset($options['cm']) ? $options['cm'] : '000'), + (isset($options['c2']) ? $options['c2'] : 'F00'), + (isset($options['c3']) ? $options['c3'] : 'FF0'), + (isset($options['c4']) ? $options['c4'] : '0F0'), + (isset($options['c5']) ? $options['c5'] : '0FF'), + (isset($options['c6']) ? $options['c6'] : '00F'), + (isset($options['c7']) ? $options['c7'] : 'F0F'), + (isset($options['c8']) ? $options['c8'] : 'FFF'), + (isset($options['c9']) ? $options['c9'] : '000'), + ); + foreach ($colors as $i => $color) { + $colors[$i] = $this->allocate_color($image, $color); + } + $this->dispatch_render_image( + $image, $code, $x, $y, $w, $h, $colors, $widths, $options + ); + return $image; + } + + public function render_svg($symbology, $data, $options) { + list($code, $widths, $width, $height, $x, $y, $w, $h) = + $this->encode_and_calculate_size($symbology, $data, $options); + $svg = ''; + $svg .= ''; + $bgcolor = (isset($options['bc']) ? $options['bc'] : 'white'); + if ($bgcolor) { + $svg .= ''; + } + $colors = array( + (isset($options['cs']) ? $options['cs'] : ''), + (isset($options['cm']) ? $options['cm'] : 'black'), + (isset($options['c2']) ? $options['c2'] : '#FF0000'), + (isset($options['c3']) ? $options['c3'] : '#FFFF00'), + (isset($options['c4']) ? $options['c4'] : '#00FF00'), + (isset($options['c5']) ? $options['c5'] : '#00FFFF'), + (isset($options['c6']) ? $options['c6'] : '#0000FF'), + (isset($options['c7']) ? $options['c7'] : '#FF00FF'), + (isset($options['c8']) ? $options['c8'] : 'white'), + (isset($options['c9']) ? $options['c9'] : 'black'), + ); + $svg .= $this->dispatch_render_svg( + $code, $x, $y, $w, $h, $colors, $widths, $options + ); + $svg .= ''; + return $svg; + } + + /* - - - - INTERNAL FUNCTIONS - - - - */ + + private function encode_and_calculate_size($symbology, $data, $options) { + $code = $this->dispatch_encode($symbology, $data, $options); + $widths = array( + (isset($options['wq']) ? (int)$options['wq'] : 1), + (isset($options['wm']) ? (int)$options['wm'] : 1), + (isset($options['ww']) ? (int)$options['ww'] : 3), + (isset($options['wn']) ? (int)$options['wn'] : 1), + (isset($options['w4']) ? (int)$options['w4'] : 1), + (isset($options['w5']) ? (int)$options['w5'] : 1), + (isset($options['w6']) ? (int)$options['w6'] : 1), + (isset($options['w7']) ? (int)$options['w7'] : 1), + (isset($options['w8']) ? (int)$options['w8'] : 1), + (isset($options['w9']) ? (int)$options['w9'] : 1), + ); + $size = $this->dispatch_calculate_size($code, $widths, $options); + $dscale = ($code && isset($code['g']) && $code['g'] == 'm') ? 4 : 1; + $scale = (isset($options['sf']) ? (float)$options['sf'] : $dscale); + $scalex = (isset($options['sx']) ? (float)$options['sx'] : $scale); + $scaley = (isset($options['sy']) ? (float)$options['sy'] : $scale); + $dpadding = ($code && isset($code['g']) && $code['g'] == 'm') ? 0 : 10; + $padding = (isset($options['p']) ? (int)$options['p'] : $dpadding); + $vert = (isset($options['pv']) ? (int)$options['pv'] : $padding); + $horiz = (isset($options['ph']) ? (int)$options['ph'] : $padding); + $top = (isset($options['pt']) ? (int)$options['pt'] : $vert); + $left = (isset($options['pl']) ? (int)$options['pl'] : $horiz); + $right = (isset($options['pr']) ? (int)$options['pr'] : $horiz); + $bottom = (isset($options['pb']) ? (int)$options['pb'] : $vert); + $dwidth = ceil($size[0] * $scalex) + $left + $right; + $dheight = ceil($size[1] * $scaley) + $top + $bottom; + $iwidth = (isset($options['w']) ? (int)$options['w'] : $dwidth); + $iheight = (isset($options['h']) ? (int)$options['h'] : $dheight); + $swidth = $iwidth - $left - $right; + $sheight = $iheight - $top - $bottom; + return array( + $code, $widths, $iwidth, $iheight, + $left, $top, $swidth, $sheight + ); + } + + private function allocate_color($image, $color) { + $color = preg_replace('/[^0-9A-Fa-f]/', '', $color); + switch (strlen($color)) { + case 1: + $v = hexdec($color) * 17; + return imagecolorallocate($image, $v, $v, $v); + case 2: + $v = hexdec($color); + return imagecolorallocate($image, $v, $v, $v); + case 3: + $r = hexdec(substr($color, 0, 1)) * 17; + $g = hexdec(substr($color, 1, 1)) * 17; + $b = hexdec(substr($color, 2, 1)) * 17; + return imagecolorallocate($image, $r, $g, $b); + case 4: + $a = hexdec(substr($color, 0, 1)) * 17; + $r = hexdec(substr($color, 1, 1)) * 17; + $g = hexdec(substr($color, 2, 1)) * 17; + $b = hexdec(substr($color, 3, 1)) * 17; + $a = round((255 - $a) * 127 / 255); + return imagecolorallocatealpha($image, $r, $g, $b, $a); + case 6: + $r = hexdec(substr($color, 0, 2)); + $g = hexdec(substr($color, 2, 2)); + $b = hexdec(substr($color, 4, 2)); + return imagecolorallocate($image, $r, $g, $b); + case 8: + $a = hexdec(substr($color, 0, 2)); + $r = hexdec(substr($color, 2, 2)); + $g = hexdec(substr($color, 4, 2)); + $b = hexdec(substr($color, 6, 2)); + $a = round((255 - $a) * 127 / 255); + return imagecolorallocatealpha($image, $r, $g, $b, $a); + default: + return imagecolorallocatealpha($image, 0, 0, 0, 127); + } + } + + /* - - - - DISPATCH - - - - */ + + private function dispatch_encode($symbology, $data, $options) { + switch (strtolower(preg_replace('/[^A-Za-z0-9]/', '', $symbology))) { + case 'upca' : return $this->upc_a_encode($data); + case 'upce' : return $this->upc_e_encode($data); + case 'ean13nopad' : return $this->ean_13_encode($data, ' '); + case 'ean13pad' : return $this->ean_13_encode($data, '>'); + case 'ean13' : return $this->ean_13_encode($data, '>'); + case 'ean8' : return $this->ean_8_encode($data); + case 'code39' : return $this->code_39_encode($data); + case 'code39ascii': return $this->code_39_ascii_encode($data); + case 'code93' : return $this->code_93_encode($data); + case 'code93ascii': return $this->code_93_ascii_encode($data); + case 'code128' : return $this->code_128_encode($data, 0,false); + case 'code128a' : return $this->code_128_encode($data, 1,false); + case 'code128b' : return $this->code_128_encode($data, 2,false); + case 'code128c' : return $this->code_128_encode($data, 3,false); + case 'code128ac' : return $this->code_128_encode($data,-1,false); + case 'code128bc' : return $this->code_128_encode($data,-2,false); + case 'ean128' : return $this->code_128_encode($data, 0, true); + case 'ean128a' : return $this->code_128_encode($data, 1, true); + case 'ean128b' : return $this->code_128_encode($data, 2, true); + case 'ean128c' : return $this->code_128_encode($data, 3, true); + case 'ean128ac' : return $this->code_128_encode($data,-1, true); + case 'ean128bc' : return $this->code_128_encode($data,-2, true); + case 'codabar' : return $this->codabar_encode($data); + case 'itf' : return $this->itf_encode($data); + case 'itf14' : return $this->itf_encode($data); + case 'qr' : return $this->qr_encode($data, 0); + case 'qrl' : return $this->qr_encode($data, 0); + case 'qrm' : return $this->qr_encode($data, 1); + case 'qrq' : return $this->qr_encode($data, 2); + case 'qrh' : return $this->qr_encode($data, 3); + case 'dmtx' : return $this->dmtx_encode($data,false,false); + case 'dmtxs' : return $this->dmtx_encode($data,false,false); + case 'dmtxr' : return $this->dmtx_encode($data, true,false); + case 'gs1dmtx' : return $this->dmtx_encode($data,false, true); + case 'gs1dmtxs' : return $this->dmtx_encode($data,false, true); + case 'gs1dmtxr' : return $this->dmtx_encode($data, true, true); + } + return null; + } + + private function dispatch_calculate_size($code, $widths, $options) { + if ($code && isset($code['g']) && $code['g']) { + switch ($code['g']) { + case 'l': + return $this->linear_calculate_size($code, $widths); + case 'm': + return $this->matrix_calculate_size($code, $widths); + } + } + return array(0, 0); + } + + private function dispatch_render_image( + $image, $code, $x, $y, $w, $h, $colors, $widths, $options + ) { + if ($code && isset($code['g']) && $code['g']) { + switch ($code['g']) { + case 'l': + $this->linear_render_image( + $image, $code, $x, $y, $w, $h, + $colors, $widths, $options + ); + break; + case 'm': + $this->matrix_render_image( + $image, $code, $x, $y, $w, $h, + $colors, $widths, $options + ); + break; + } + } + } + + private function dispatch_render_svg( + $code, $x, $y, $w, $h, $colors, $widths, $options + ) { + if ($code && isset($code['g']) && $code['g']) { + switch ($code['g']) { + case 'l': + return $this->linear_render_svg( + $code, $x, $y, $w, $h, + $colors, $widths, $options + ); + case 'm': + return $this->matrix_render_svg( + $code, $x, $y, $w, $h, + $colors, $widths, $options + ); + } + } + return ''; + } + + /* - - - - LINEAR BARCODE RENDERER - - - - */ + + private function linear_calculate_size($code, $widths) { + $width = 0; + foreach ($code['b'] as $block) { + foreach ($block['m'] as $module) { + $width += $module[1] * $widths[$module[2]]; + } + } + return array($width, 80); + } + + private function linear_render_image( + $image, $code, $x, $y, $w, $h, $colors, $widths, $options + ) { + $textheight = (isset($options['th']) ? (int)$options['th'] : 10); + $textsize = (isset($options['ts']) ? (int)$options['ts'] : 1); + $textcolor = (isset($options['tc']) ? $options['tc'] : '000'); + $textcolor = $this->allocate_color($image, $textcolor); + $width = 0; + foreach ($code['b'] as $block) { + foreach ($block['m'] as $module) { + $width += $module[1] * $widths[$module[2]]; + } + } + if ($width) { + $scale = $w / $width; + $scale = (($scale > 1) ? floor($scale) : 1); + $x = floor($x + ($w - $width * $scale) / 2); + } else { + $scale = 1; + $x = floor($x + $w / 2); + } + foreach ($code['b'] as $block) { + if (isset($block['l'])) { + $label = $block['l'][0]; + $ly = (isset($block['l'][1]) ? (float)$block['l'][1] : 1); + $lx = (isset($block['l'][2]) ? (float)$block['l'][2] : 0.5); + $my = round($y + min($h, $h + ($ly - 1) * $textheight)); + $ly = ($y + $h + $ly * $textheight); + $ly = round($ly - imagefontheight($textsize)); + } else { + $label = null; + $my = $y + $h; + } + $mx = $x; + foreach ($block['m'] as $module) { + $mc = $colors[$module[0]]; + $mw = $mx + $module[1] * $widths[$module[2]] * $scale; + imagefilledrectangle($image, $mx, $y, $mw - 1, $my - 1, $mc); + $mx = $mw; + } + if (!is_null($label)) { + $lx = ($x + ($mx - $x) * $lx); + $lw = imagefontwidth($textsize) * strlen($label); + $lx = round($lx - $lw / 2); + imagestring($image, $textsize, $lx, $ly, $label, $textcolor); + } + $x = $mx; + } + } + + private function linear_render_svg( + $code, $x, $y, $w, $h, $colors, $widths, $options + ) { + $textheight = (isset($options['th']) ? (int)$options['th'] : 10); + $textfont = (isset($options['tf']) ? $options['tf'] : 'monospace'); + $textsize = (isset($options['ts']) ? (int)$options['ts'] : 10); + $textcolor = (isset($options['tc']) ? $options['tc'] : 'black'); + $width = 0; + foreach ($code['b'] as $block) { + foreach ($block['m'] as $module) { + $width += $module[1] * $widths[$module[2]]; + } + } + if ($width) { + $scale = $w / $width; + if ($scale > 1) { + $scale = floor($scale); + $x = floor($x + ($w - $width * $scale) / 2); + } + } else { + $scale = 1; + $x = floor($x + $w / 2); + } + $tx = 'translate(' . $x . ' ' . $y . ')'; + if ($scale != 1) $tx .= ' scale(' . $scale . ' 1)'; + $svg = ''; + $x = 0; + foreach ($code['b'] as $block) { + if (isset($block['l'])) { + $label = $block['l'][0]; + $ly = (isset($block['l'][1]) ? (float)$block['l'][1] : 1); + $lx = (isset($block['l'][2]) ? (float)$block['l'][2] : 0.5); + $mh = min($h, $h + ($ly - 1) * $textheight); + $ly = $h + $ly * $textheight; + } else { + $label = null; + $mh = $h; + } + $svg .= ''; + $mx = $x; + foreach ($block['m'] as $module) { + $mc = htmlspecialchars($colors[$module[0]]); + $mw = $module[1] * $widths[$module[2]]; + if ($mc) { + $svg .= ''; + } + $mx += $mw; + } + if (!is_null($label)) { + $lx = ($x + ($mx - $x) * $lx); + $svg .= ''; + $svg .= htmlspecialchars($label); + $svg .= ''; + } + $svg .= ''; + $x = $mx; + } + return $svg . ''; + } + + /* - - - - MATRIX BARCODE RENDERER - - - - */ + + private function matrix_calculate_size($code, $widths) { + $width = ( + $code['q'][3] * $widths[0] + + $code['s'][0] * $widths[1] + + $code['q'][1] * $widths[0] + ); + $height = ( + $code['q'][0] * $widths[0] + + $code['s'][1] * $widths[1] + + $code['q'][2] * $widths[0] + ); + return array($width, $height); + } + + private function matrix_render_image( + $image, $code, $x, $y, $w, $h, $colors, $widths, $options + ) { + $shape = (isset($options['ms']) ? strtolower($options['ms']) : ''); + $density = (isset($options['md']) ? (float)$options['md'] : 1); + list($width, $height) = $this->matrix_calculate_size($code, $widths); + if ($width && $height) { + $scale = min($w / $width, $h / $height); + $scale = (($scale > 1) ? floor($scale) : 1); + $x = floor($x + ($w - $width * $scale) / 2); + $y = floor($y + ($h - $height * $scale) / 2); + } else { + $scale = 1; + $x = floor($x + $w / 2); + $y = floor($y + $h / 2); + } + $x += $code['q'][3] * $widths[0] * $scale; + $y += $code['q'][0] * $widths[0] * $scale; + $wh = $widths[1] * $scale; + foreach ($code['b'] as $by => $row) { + $y1 = $y + $by * $wh; + foreach ($row as $bx => $color) { + $x1 = $x + $bx * $wh; + $mc = $colors[$color]; + $this->matrix_dot_image( + $image, $x1, $y1, $wh, $wh, $mc, $shape, $density + ); + } + } + } + + private function matrix_render_svg( + $code, $x, $y, $w, $h, $colors, $widths, $options + ) { + $shape = (isset($options['ms']) ? strtolower($options['ms']) : ''); + $density = (isset($options['md']) ? (float)$options['md'] : 1); + list($width, $height) = $this->matrix_calculate_size($code, $widths); + if ($width && $height) { + $scale = min($w / $width, $h / $height); + if ($scale > 1) $scale = floor($scale); + $x = floor($x + ($w - $width * $scale) / 2); + $y = floor($y + ($h - $height * $scale) / 2); + } else { + $scale = 1; + $x = floor($x + $w / 2); + $y = floor($y + $h / 2); + } + $tx = 'translate(' . $x . ' ' . $y . ')'; + if ($scale != 1) $tx .= ' scale(' . $scale . ' ' . $scale . ')'; + $svg = ''; + $x = $code['q'][3] * $widths[0]; + $y = $code['q'][0] * $widths[0]; + $wh = $widths[1]; + foreach ($code['b'] as $by => $row) { + $y1 = $y + $by * $wh; + foreach ($row as $bx => $color) { + $x1 = $x + $bx * $wh; + $mc = $colors[$color]; + if ($mc) { + $svg .= $this->matrix_dot_svg( + $x1, $y1, $wh, $wh, $mc, $shape, $density + ); + } + } + } + return $svg . ''; + } + + private function matrix_dot_image($image, $x, $y, $w, $h, $mc, $ms, $md) { + switch ($ms) { + default: + $x = floor($x + (1 - $md) * $w / 2); + $y = floor($y + (1 - $md) * $h / 2); + $w = ceil($w * $md); + $h = ceil($h * $md); + imagefilledrectangle($image, $x, $y, $x+$w-1, $y+$h-1, $mc); + break; + case 'r': + $cx = floor($x + $w / 2); + $cy = floor($y + $h / 2); + $dx = ceil($w * $md); + $dy = ceil($h * $md); + imagefilledellipse($image, $cx, $cy, $dx, $dy, $mc); + break; + case 'x': + $x = floor($x + (1 - $md) * $w / 2); + $y = floor($y + (1 - $md) * $h / 2); + $w = ceil($w * $md); + $h = ceil($h * $md); + imageline($image, $x, $y, $x+$w-1, $y+$h-1, $mc); + imageline($image, $x, $y+$h-1, $x+$w-1, $y, $mc); + break; + } + } + + private function matrix_dot_svg($x, $y, $w, $h, $mc, $ms, $md) { + switch ($ms) { + default: + $x += (1 - $md) * $w / 2; + $y += (1 - $md) * $h / 2; + $w *= $md; + $h *= $md; + $svg = ''; + return $svg; + case 'r': + $cx = $x + $w / 2; + $cy = $y + $h / 2; + $rx = $w * $md / 2; + $ry = $h * $md / 2; + $svg = ''; + return $svg; + case 'x': + $x1 = $x + (1 - $md) * $w / 2; + $y1 = $y + (1 - $md) * $h / 2; + $x2 = $x + $w - (1 - $md) * $w / 2; + $y2 = $y + $h - (1 - $md) * $h / 2; + $svg = ''; + $svg .= ''; + return '' . $svg . ''; + } + } + + /* - - - - UPC FAMILY ENCODER - - - - */ + + private function upc_a_encode($data) { + $data = $this->upc_a_normalize($data); + $blocks = array(); + /* Quiet zone, start, first digit. */ + $digit = substr($data, 0, 1); + $blocks[] = array( + 'm' => array(array(0, 9, 0)), + 'l' => array($digit, 0, 1/3) + ); + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + $blocks[] = array( + 'm' => array( + array(0, $this->upc_alphabet[$digit][0], 1), + array(1, $this->upc_alphabet[$digit][1], 1), + array(0, $this->upc_alphabet[$digit][2], 1), + array(1, $this->upc_alphabet[$digit][3], 1), + ) + ); + /* Left zone. */ + for ($i = 1; $i < 6; $i++) { + $digit = substr($data, $i, 1); + $blocks[] = array( + 'm' => array( + array(0, $this->upc_alphabet[$digit][0], 1), + array(1, $this->upc_alphabet[$digit][1], 1), + array(0, $this->upc_alphabet[$digit][2], 1), + array(1, $this->upc_alphabet[$digit][3], 1), + ), + 'l' => array($digit, 0.5, (6 - $i) / 6) + ); + } + /* Middle. */ + $blocks[] = array( + 'm' => array( + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + ) + ); + /* Right zone. */ + for ($i = 6; $i < 11; $i++) { + $digit = substr($data, $i, 1); + $blocks[] = array( + 'm' => array( + array(1, $this->upc_alphabet[$digit][0], 1), + array(0, $this->upc_alphabet[$digit][1], 1), + array(1, $this->upc_alphabet[$digit][2], 1), + array(0, $this->upc_alphabet[$digit][3], 1), + ), + 'l' => array($digit, 0.5, (11 - $i) / 6) + ); + } + /* Last digit, end, quiet zone. */ + $digit = substr($data, 11, 1); + $blocks[] = array( + 'm' => array( + array(1, $this->upc_alphabet[$digit][0], 1), + array(0, $this->upc_alphabet[$digit][1], 1), + array(1, $this->upc_alphabet[$digit][2], 1), + array(0, $this->upc_alphabet[$digit][3], 1), + ) + ); + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + $blocks[] = array( + 'm' => array(array(0, 9, 0)), + 'l' => array($digit, 0, 2/3) + ); + /* Return code. */ + return array('g' => 'l', 'b' => $blocks); + } + + private function upc_e_encode($data) { + $data = $this->upc_e_normalize($data); + $blocks = array(); + /* Quiet zone, start. */ + $blocks[] = array( + 'm' => array(array(0, 9, 0)) + ); + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + /* Digits */ + $system = substr($data, 0, 1) & 1; + $check = substr($data, 7, 1); + $pbits = $this->upc_parity[$check]; + for ($i = 1; $i < 7; $i++) { + $digit = substr($data, $i, 1); + $pbit = $pbits[$i - 1] ^ $system; + $blocks[] = array( + 'm' => array( + array(0, $this->upc_alphabet[$digit][$pbit ? 3 : 0], 1), + array(1, $this->upc_alphabet[$digit][$pbit ? 2 : 1], 1), + array(0, $this->upc_alphabet[$digit][$pbit ? 1 : 2], 1), + array(1, $this->upc_alphabet[$digit][$pbit ? 0 : 3], 1), + ), + 'l' => array($digit, 0.5, (7 - $i) / 7) + ); + } + /* End, quiet zone. */ + $blocks[] = array( + 'm' => array( + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + $blocks[] = array( + 'm' => array(array(0, 9, 0)) + ); + /* Return code. */ + return array('g' => 'l', 'b' => $blocks); + } + + private function ean_13_encode($data, $pad) { + $data = $this->ean_13_normalize($data); + $blocks = array(); + /* Quiet zone, start, first digit (as parity). */ + $system = substr($data, 0, 1); + $pbits = ( + (int)$system ? + $this->upc_parity[$system] : + array(1, 1, 1, 1, 1, 1) + ); + $blocks[] = array( + 'm' => array(array(0, 9, 0)), + 'l' => array($system, 0.5, 1/3) + ); + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + /* Left zone. */ + for ($i = 1; $i < 7; $i++) { + $digit = substr($data, $i, 1); + $pbit = $pbits[$i - 1]; + $blocks[] = array( + 'm' => array( + array(0, $this->upc_alphabet[$digit][$pbit ? 0 : 3], 1), + array(1, $this->upc_alphabet[$digit][$pbit ? 1 : 2], 1), + array(0, $this->upc_alphabet[$digit][$pbit ? 2 : 1], 1), + array(1, $this->upc_alphabet[$digit][$pbit ? 3 : 0], 1), + ), + 'l' => array($digit, 0.5, (7 - $i) / 7) + ); + } + /* Middle. */ + $blocks[] = array( + 'm' => array( + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + ) + ); + /* Right zone. */ + for ($i = 7; $i < 13; $i++) { + $digit = substr($data, $i, 1); + $blocks[] = array( + 'm' => array( + array(1, $this->upc_alphabet[$digit][0], 1), + array(0, $this->upc_alphabet[$digit][1], 1), + array(1, $this->upc_alphabet[$digit][2], 1), + array(0, $this->upc_alphabet[$digit][3], 1), + ), + 'l' => array($digit, 0.5, (13 - $i) / 7) + ); + } + /* End, quiet zone. */ + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + $blocks[] = array( + 'm' => array(array(0, 9, 0)), + 'l' => array($pad, 0.5, 2/3) + ); + /* Return code. */ + return array('g' => 'l', 'b' => $blocks); + } + + private function ean_8_encode($data) { + $data = $this->ean_8_normalize($data); + $blocks = array(); + /* Quiet zone, start. */ + $blocks[] = array( + 'm' => array(array(0, 9, 0)), + 'l' => array('<', 0.5, 1/3) + ); + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + /* Left zone. */ + for ($i = 0; $i < 4; $i++) { + $digit = substr($data, $i, 1); + $blocks[] = array( + 'm' => array( + array(0, $this->upc_alphabet[$digit][0], 1), + array(1, $this->upc_alphabet[$digit][1], 1), + array(0, $this->upc_alphabet[$digit][2], 1), + array(1, $this->upc_alphabet[$digit][3], 1), + ), + 'l' => array($digit, 0.5, (4 - $i) / 5) + ); + } + /* Middle. */ + $blocks[] = array( + 'm' => array( + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + ) + ); + /* Right zone. */ + for ($i = 4; $i < 8; $i++) { + $digit = substr($data, $i, 1); + $blocks[] = array( + 'm' => array( + array(1, $this->upc_alphabet[$digit][0], 1), + array(0, $this->upc_alphabet[$digit][1], 1), + array(1, $this->upc_alphabet[$digit][2], 1), + array(0, $this->upc_alphabet[$digit][3], 1), + ), + 'l' => array($digit, 0.5, (8 - $i) / 5) + ); + } + /* End, quiet zone. */ + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + $blocks[] = array( + 'm' => array(array(0, 9, 0)), + 'l' => array('>', 0.5, 2/3) + ); + /* Return code. */ + return array('g' => 'l', 'b' => $blocks); + } + + private function upc_a_normalize($data) { + $data = preg_replace('/[^0-9*]/', '', $data); + /* Set length to 12 digits. */ + if (strlen($data) < 5) { + $data = str_repeat('0', 12); + } else if (strlen($data) < 12) { + $system = substr($data, 0, 1); + $edata = substr($data, 1, -2); + $epattern = (int)substr($data, -2, 1); + $check = substr($data, -1); + if ($epattern < 3) { + $left = $system . substr($edata, 0, 2) . $epattern; + $right = substr($edata, 2) . $check; + } else if ($epattern < strlen($edata)) { + $left = $system . substr($edata, 0, $epattern); + $right = substr($edata, $epattern) . $check; + } else { + $left = $system . $edata; + $right = $epattern . $check; + } + $center = str_repeat('0', 12 - strlen($left . $right)); + $data = $left . $center . $right; + } else if (strlen($data) > 12) { + $left = substr($data, 0, 6); + $right = substr($data, -6); + $data = $left . $right; + } + /* Replace * with missing or check digit. */ + while (($o = strrpos($data, '*')) !== false) { + $checksum = 0; + for ($i = 0; $i < 12; $i++) { + $digit = substr($data, $i, 1); + $checksum += (($i % 2) ? 1 : 3) * $digit; + } + $checksum *= (($o % 2) ? 9 : 3); + $left = substr($data, 0, $o); + $center = substr($checksum, -1); + $right = substr($data, $o + 1); + $data = $left . $center . $right; + } + return $data; + } + + private function upc_e_normalize($data) { + $data = preg_replace('/[^0-9*]/', '', $data); + /* If exactly 8 digits, use verbatim even if check digit is wrong. */ + if (preg_match( + '/^([01])([0-9][0-9][0-9][0-9][0-9][0-9])([0-9])$/', + $data, $m + )) { + return $data; + } + /* If unknown check digit, use verbatim but calculate check digit. */ + if (preg_match( + '/^([01])([0-9][0-9][0-9][0-9][0-9][0-9])([*])$/', + $data, $m + )) { + $data = $this->upc_a_normalize($data); + return $m[1] . $m[2] . substr($data, -1); + } + /* Otherwise normalize to UPC-A and convert back. */ + $data = $this->upc_a_normalize($data); + if (preg_match( + '/^([01])([0-9][0-9])([0-2])0000([0-9][0-9][0-9])([0-9])$/', + $data, $m + )) { + return $m[1] . $m[2] . $m[4] . $m[3] . $m[5]; + } + if (preg_match( + '/^([01])([0-9][0-9][0-9])00000([0-9][0-9])([0-9])$/', + $data, $m + )) { + return $m[1] . $m[2] . $m[3] . '3' . $m[4]; + } + if (preg_match( + '/^([01])([0-9][0-9][0-9][0-9])00000([0-9])([0-9])$/', + $data, $m + )) { + return $m[1] . $m[2] . $m[3] . '4' . $m[4]; + } + if (preg_match( + '/^([01])([0-9][0-9][0-9][0-9][0-9])0000([5-9])([0-9])$/', + $data, $m + )) { + return $m[1] . $m[2] . $m[3] . $m[4]; + } + return str_repeat('0', 8); + } + + private function ean_13_normalize($data) { + $data = preg_replace('/[^0-9*]/', '', $data); + /* Set length to 13 digits. */ + if (strlen($data) < 13) { + return '0' . $this->upc_a_normalize($data); + } else if (strlen($data) > 13) { + $left = substr($data, 0, 7); + $right = substr($data, -6); + $data = $left . $right; + } + /* Replace * with missing or check digit. */ + while (($o = strrpos($data, '*')) !== false) { + $checksum = 0; + for ($i = 0; $i < 13; $i++) { + $digit = substr($data, $i, 1); + $checksum += (($i % 2) ? 3 : 1) * $digit; + } + $checksum *= (($o % 2) ? 3 : 9); + $left = substr($data, 0, $o); + $center = substr($checksum, -1); + $right = substr($data, $o + 1); + $data = $left . $center . $right; + } + return $data; + } + + private function ean_8_normalize($data) { + $data = preg_replace('/[^0-9*]/', '', $data); + /* Set length to 8 digits. */ + if (strlen($data) < 8) { + $midpoint = floor(strlen($data) / 2); + $left = substr($data, 0, $midpoint); + $center = str_repeat('0', 8 - strlen($data)); + $right = substr($data, $midpoint); + $data = $left . $center . $right; + } else if (strlen($data) > 8) { + $left = substr($data, 0, 4); + $right = substr($data, -4); + $data = $left . $right; + } + /* Replace * with missing or check digit. */ + while (($o = strrpos($data, '*')) !== false) { + $checksum = 0; + for ($i = 0; $i < 8; $i++) { + $digit = substr($data, $i, 1); + $checksum += (($i % 2) ? 1 : 3) * $digit; + } + $checksum *= (($o % 2) ? 9 : 3); + $left = substr($data, 0, $o); + $center = substr($checksum, -1); + $right = substr($data, $o + 1); + $data = $left . $center . $right; + } + return $data; + } + + private $upc_alphabet = array( + '0' => array(3, 2, 1, 1), + '1' => array(2, 2, 2, 1), + '2' => array(2, 1, 2, 2), + '3' => array(1, 4, 1, 1), + '4' => array(1, 1, 3, 2), + '5' => array(1, 2, 3, 1), + '6' => array(1, 1, 1, 4), + '7' => array(1, 3, 1, 2), + '8' => array(1, 2, 1, 3), + '9' => array(3, 1, 1, 2), + ); + + private $upc_parity = array( + '0' => array(1, 1, 1, 0, 0, 0), + '1' => array(1, 1, 0, 1, 0, 0), + '2' => array(1, 1, 0, 0, 1, 0), + '3' => array(1, 1, 0, 0, 0, 1), + '4' => array(1, 0, 1, 1, 0, 0), + '5' => array(1, 0, 0, 1, 1, 0), + '6' => array(1, 0, 0, 0, 1, 1), + '7' => array(1, 0, 1, 0, 1, 0), + '8' => array(1, 0, 1, 0, 0, 1), + '9' => array(1, 0, 0, 1, 0, 1), + ); + + /* - - - - CODE 39 FAMILY ENCODER - - - - */ + + private function code_39_encode($data) { + $data = strtoupper(preg_replace('/[^0-9A-Za-z%$\/+ .-]/', '', $data)); + $blocks = array(); + /* Start */ + $blocks[] = array( + 'm' => array( + array(1, 1, 1), array(0, 1, 2), array(1, 1, 1), + array(0, 1, 1), array(1, 1, 2), array(0, 1, 1), + array(1, 1, 2), array(0, 1, 1), array(1, 1, 1), + ), + 'l' => array('*') + ); + /* Data */ + for ($i = 0, $n = strlen($data); $i < $n; $i++) { + $blocks[] = array( + 'm' => array(array(0, 1, 3)) + ); + $char = substr($data, $i, 1); + $block = $this->code_39_alphabet[$char]; + $blocks[] = array( + 'm' => array( + array(1, 1, $block[0]), + array(0, 1, $block[1]), + array(1, 1, $block[2]), + array(0, 1, $block[3]), + array(1, 1, $block[4]), + array(0, 1, $block[5]), + array(1, 1, $block[6]), + array(0, 1, $block[7]), + array(1, 1, $block[8]), + ), + 'l' => array($char) + ); + } + $blocks[] = array( + 'm' => array(array(0, 1, 3)) + ); + /* End */ + $blocks[] = array( + 'm' => array( + array(1, 1, 1), array(0, 1, 2), array(1, 1, 1), + array(0, 1, 1), array(1, 1, 2), array(0, 1, 1), + array(1, 1, 2), array(0, 1, 1), array(1, 1, 1), + ), + 'l' => array('*') + ); + /* Return */ + return array('g' => 'l', 'b' => $blocks); + } + + private function code_39_ascii_encode($data) { + $modules = array(); + /* Start */ + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 2); + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 2); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 2); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + /* Data */ + $label = ''; + for ($i = 0, $n = strlen($data); $i < $n; $i++) { + $char = substr($data, $i, 1); + $ch = ord($char); + if ($ch < 128) { + if ($ch < 32 || $ch >= 127) { + $label .= ' '; + } else { + $label .= $char; + } + $ch = $this->code_39_asciibet[$ch]; + for ($j = 0, $m = strlen($ch); $j < $m; $j++) { + $c = substr($ch, $j, 1); + $b = $this->code_39_alphabet[$c]; + $modules[] = array(0, 1, 3); + $modules[] = array(1, 1, $b[0]); + $modules[] = array(0, 1, $b[1]); + $modules[] = array(1, 1, $b[2]); + $modules[] = array(0, 1, $b[3]); + $modules[] = array(1, 1, $b[4]); + $modules[] = array(0, 1, $b[5]); + $modules[] = array(1, 1, $b[6]); + $modules[] = array(0, 1, $b[7]); + $modules[] = array(1, 1, $b[8]); + } + } + } + $modules[] = array(0, 1, 3); + /* End */ + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 2); + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 2); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 2); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + /* Return */ + $blocks = array(array('m' => $modules, 'l' => array($label))); + return array('g' => 'l', 'b' => $blocks); + } + + private function code_93_encode($data) { + $data = strtoupper(preg_replace('/[^0-9A-Za-z%+\/$ .-]/', '', $data)); + $modules = array(); + /* Start */ + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 4, 1); + $modules[] = array(0, 1, 1); + /* Data */ + $values = array(); + for ($i = 0, $n = strlen($data); $i < $n; $i++) { + $char = substr($data, $i, 1); + $block = $this->code_93_alphabet[$char]; + $modules[] = array(1, $block[0], 1); + $modules[] = array(0, $block[1], 1); + $modules[] = array(1, $block[2], 1); + $modules[] = array(0, $block[3], 1); + $modules[] = array(1, $block[4], 1); + $modules[] = array(0, $block[5], 1); + $values[] = $block[6]; + } + /* Check Digits */ + for ($i = 0; $i < 2; $i++) { + $index = count($values); + $weight = 0; + $checksum = 0; + while ($index) { + $index--; + $weight++; + $checksum += $weight * $values[$index]; + $checksum %= 47; + $weight %= ($i ? 15 : 20); + } + $values[] = $checksum; + } + $alphabet = array_values($this->code_93_alphabet); + for ($i = count($values) - 2, $n = count($values); $i < $n; $i++) { + $block = $alphabet[$values[$i]]; + $modules[] = array(1, $block[0], 1); + $modules[] = array(0, $block[1], 1); + $modules[] = array(1, $block[2], 1); + $modules[] = array(0, $block[3], 1); + $modules[] = array(1, $block[4], 1); + $modules[] = array(0, $block[5], 1); + } + /* End */ + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 4, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + /* Return */ + $blocks = array(array('m' => $modules, 'l' => array($data))); + return array('g' => 'l', 'b' => $blocks); + } + + private function code_93_ascii_encode($data) { + $modules = array(); + /* Start */ + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 4, 1); + $modules[] = array(0, 1, 1); + /* Data */ + $label = ''; + $values = array(); + for ($i = 0, $n = strlen($data); $i < $n; $i++) { + $char = substr($data, $i, 1); + $ch = ord($char); + if ($ch < 128) { + if ($ch < 32 || $ch >= 127) { + $label .= ' '; + } else { + $label .= $char; + } + $ch = $this->code_93_asciibet[$ch]; + for ($j = 0, $m = strlen($ch); $j < $m; $j++) { + $c = substr($ch, $j, 1); + $b = $this->code_93_alphabet[$c]; + $modules[] = array(1, $b[0], 1); + $modules[] = array(0, $b[1], 1); + $modules[] = array(1, $b[2], 1); + $modules[] = array(0, $b[3], 1); + $modules[] = array(1, $b[4], 1); + $modules[] = array(0, $b[5], 1); + $values[] = $b[6]; + } + } + } + /* Check Digits */ + for ($i = 0; $i < 2; $i++) { + $index = count($values); + $weight = 0; + $checksum = 0; + while ($index) { + $index--; + $weight++; + $checksum += $weight * $values[$index]; + $checksum %= 47; + $weight %= ($i ? 15 : 20); + } + $values[] = $checksum; + } + $alphabet = array_values($this->code_93_alphabet); + for ($i = count($values) - 2, $n = count($values); $i < $n; $i++) { + $block = $alphabet[$values[$i]]; + $modules[] = array(1, $block[0], 1); + $modules[] = array(0, $block[1], 1); + $modules[] = array(1, $block[2], 1); + $modules[] = array(0, $block[3], 1); + $modules[] = array(1, $block[4], 1); + $modules[] = array(0, $block[5], 1); + } + /* End */ + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 4, 1); + $modules[] = array(0, 1, 1); + $modules[] = array(1, 1, 1); + /* Return */ + $blocks = array(array('m' => $modules, 'l' => array($label))); + return array('g' => 'l', 'b' => $blocks); + } + + private $code_39_alphabet = array( + '1' => array(2, 1, 1, 2, 1, 1, 1, 1, 2), + '2' => array(1, 1, 2, 2, 1, 1, 1, 1, 2), + '3' => array(2, 1, 2, 2, 1, 1, 1, 1, 1), + '4' => array(1, 1, 1, 2, 2, 1, 1, 1, 2), + '5' => array(2, 1, 1, 2, 2, 1, 1, 1, 1), + '6' => array(1, 1, 2, 2, 2, 1, 1, 1, 1), + '7' => array(1, 1, 1, 2, 1, 1, 2, 1, 2), + '8' => array(2, 1, 1, 2, 1, 1, 2, 1, 1), + '9' => array(1, 1, 2, 2, 1, 1, 2, 1, 1), + '0' => array(1, 1, 1, 2, 2, 1, 2, 1, 1), + 'A' => array(2, 1, 1, 1, 1, 2, 1, 1, 2), + 'B' => array(1, 1, 2, 1, 1, 2, 1, 1, 2), + 'C' => array(2, 1, 2, 1, 1, 2, 1, 1, 1), + 'D' => array(1, 1, 1, 1, 2, 2, 1, 1, 2), + 'E' => array(2, 1, 1, 1, 2, 2, 1, 1, 1), + 'F' => array(1, 1, 2, 1, 2, 2, 1, 1, 1), + 'G' => array(1, 1, 1, 1, 1, 2, 2, 1, 2), + 'H' => array(2, 1, 1, 1, 1, 2, 2, 1, 1), + 'I' => array(1, 1, 2, 1, 1, 2, 2, 1, 1), + 'J' => array(1, 1, 1, 1, 2, 2, 2, 1, 1), + 'K' => array(2, 1, 1, 1, 1, 1, 1, 2, 2), + 'L' => array(1, 1, 2, 1, 1, 1, 1, 2, 2), + 'M' => array(2, 1, 2, 1, 1, 1, 1, 2, 1), + 'N' => array(1, 1, 1, 1, 2, 1, 1, 2, 2), + 'O' => array(2, 1, 1, 1, 2, 1, 1, 2, 1), + 'P' => array(1, 1, 2, 1, 2, 1, 1, 2, 1), + 'Q' => array(1, 1, 1, 1, 1, 1, 2, 2, 2), + 'R' => array(2, 1, 1, 1, 1, 1, 2, 2, 1), + 'S' => array(1, 1, 2, 1, 1, 1, 2, 2, 1), + 'T' => array(1, 1, 1, 1, 2, 1, 2, 2, 1), + 'U' => array(2, 2, 1, 1, 1, 1, 1, 1, 2), + 'V' => array(1, 2, 2, 1, 1, 1, 1, 1, 2), + 'W' => array(2, 2, 2, 1, 1, 1, 1, 1, 1), + 'X' => array(1, 2, 1, 1, 2, 1, 1, 1, 2), + 'Y' => array(2, 2, 1, 1, 2, 1, 1, 1, 1), + 'Z' => array(1, 2, 2, 1, 2, 1, 1, 1, 1), + '-' => array(1, 2, 1, 1, 1, 1, 2, 1, 2), + '.' => array(2, 2, 1, 1, 1, 1, 2, 1, 1), + ' ' => array(1, 2, 2, 1, 1, 1, 2, 1, 1), + '*' => array(1, 2, 1, 1, 2, 1, 2, 1, 1), + '+' => array(1, 2, 1, 1, 1, 2, 1, 2, 1), + '/' => array(1, 2, 1, 2, 1, 1, 1, 2, 1), + '$' => array(1, 2, 1, 2, 1, 2, 1, 1, 1), + '%' => array(1, 1, 1, 2, 1, 2, 1, 2, 1), + ); + + private $code_39_asciibet = array( + '%U', '$A', '$B', '$C', '$D', '$E', '$F', '$G', + '$H', '$I', '$J', '$K', '$L', '$M', '$N', '$O', + '$P', '$Q', '$R', '$S', '$T', '$U', '$V', '$W', + '$X', '$Y', '$Z', '%A', '%B', '%C', '%D', '%E', + ' ' , '/A', '/B', '/C', '/D', '/E', '/F', '/G', + '/H', '/I', '/J', '/K', '/L', '-' , '.' , '/O', + '0' , '1' , '2' , '3' , '4' , '5' , '6' , '7' , + '8' , '9' , '/Z', '%F', '%G', '%H', '%I', '%J', + '%V', 'A' , 'B' , 'C' , 'D' , 'E' , 'F' , 'G' , + 'H' , 'I' , 'J' , 'K' , 'L' , 'M' , 'N' , 'O' , + 'P' , 'Q' , 'R' , 'S' , 'T' , 'U' , 'V' , 'W' , + 'X' , 'Y' , 'Z' , '%K', '%L', '%M', '%N', '%O', + '%W', '+A', '+B', '+C', '+D', '+E', '+F', '+G', + '+H', '+I', '+J', '+K', '+L', '+M', '+N', '+O', + '+P', '+Q', '+R', '+S', '+T', '+U', '+V', '+W', + '+X', '+Y', '+Z', '%P', '%Q', '%R', '%S', '%T', + ); + + private $code_93_alphabet = array( + '0' => array(1, 3, 1, 1, 1, 2, 0), + '1' => array(1, 1, 1, 2, 1, 3, 1), + '2' => array(1, 1, 1, 3, 1, 2, 2), + '3' => array(1, 1, 1, 4, 1, 1, 3), + '4' => array(1, 2, 1, 1, 1, 3, 4), + '5' => array(1, 2, 1, 2, 1, 2, 5), + '6' => array(1, 2, 1, 3, 1, 1, 6), + '7' => array(1, 1, 1, 1, 1, 4, 7), + '8' => array(1, 3, 1, 2, 1, 1, 8), + '9' => array(1, 4, 1, 1, 1, 1, 9), + 'A' => array(2, 1, 1, 1, 1, 3, 10), + 'B' => array(2, 1, 1, 2, 1, 2, 11), + 'C' => array(2, 1, 1, 3, 1, 1, 12), + 'D' => array(2, 2, 1, 1, 1, 2, 13), + 'E' => array(2, 2, 1, 2, 1, 1, 14), + 'F' => array(2, 3, 1, 1, 1, 1, 15), + 'G' => array(1, 1, 2, 1, 1, 3, 16), + 'H' => array(1, 1, 2, 2, 1, 2, 17), + 'I' => array(1, 1, 2, 3, 1, 1, 18), + 'J' => array(1, 2, 2, 1, 1, 2, 19), + 'K' => array(1, 3, 2, 1, 1, 1, 20), + 'L' => array(1, 1, 1, 1, 2, 3, 21), + 'M' => array(1, 1, 1, 2, 2, 2, 22), + 'N' => array(1, 1, 1, 3, 2, 1, 23), + 'O' => array(1, 2, 1, 1, 2, 2, 24), + 'P' => array(1, 3, 1, 1, 2, 1, 25), + 'Q' => array(2, 1, 2, 1, 1, 2, 26), + 'R' => array(2, 1, 2, 2, 1, 1, 27), + 'S' => array(2, 1, 1, 1, 2, 2, 28), + 'T' => array(2, 1, 1, 2, 2, 1, 29), + 'U' => array(2, 2, 1, 1, 2, 1, 30), + 'V' => array(2, 2, 2, 1, 1, 1, 31), + 'W' => array(1, 1, 2, 1, 2, 2, 32), + 'X' => array(1, 1, 2, 2, 2, 1, 33), + 'Y' => array(1, 2, 2, 1, 2, 1, 34), + 'Z' => array(1, 2, 3, 1, 1, 1, 35), + '-' => array(1, 2, 1, 1, 3, 1, 36), + '.' => array(3, 1, 1, 1, 1, 2, 37), + ' ' => array(3, 1, 1, 2, 1, 1, 38), + '$' => array(3, 2, 1, 1, 1, 1, 39), + '/' => array(1, 1, 2, 1, 3, 1, 40), + '+' => array(1, 1, 3, 1, 2, 1, 41), + '%' => array(2, 1, 1, 1, 3, 1, 42), + '#' => array(1, 2, 1, 2, 2, 1, 43), /* ($) */ + '&' => array(3, 1, 2, 1, 1, 1, 44), /* (%) */ + '|' => array(3, 1, 1, 1, 2, 1, 45), /* (/) */ + '=' => array(1, 2, 2, 2, 1, 1, 46), /* (+) */ + '*' => array(1, 1, 1, 1, 4, 1, 0), + ); + + private $code_93_asciibet = array( + '&U', '#A', '#B', '#C', '#D', '#E', '#F', '#G', + '#H', '#I', '#J', '#K', '#L', '#M', '#N', '#O', + '#P', '#Q', '#R', '#S', '#T', '#U', '#V', '#W', + '#X', '#Y', '#Z', '&A', '&B', '&C', '&D', '&E', + ' ' , '|A', '|B', '|C', '$' , '%' , '|F', '|G', + '|H', '|I', '|J', '+' , '|L', '-' , '.' , '/' , + '0' , '1' , '2' , '3' , '4' , '5' , '6' , '7' , + '8' , '9' , '|Z', '&F', '&G', '&H', '&I', '&J', + '&V', 'A' , 'B' , 'C' , 'D' , 'E' , 'F' , 'G' , + 'H' , 'I' , 'J' , 'K' , 'L' , 'M' , 'N' , 'O' , + 'P' , 'Q' , 'R' , 'S' , 'T' , 'U' , 'V' , 'W' , + 'X' , 'Y' , 'Z' , '&K', '&L', '&M', '&N', '&O', + '&W', '=A', '=B', '=C', '=D', '=E', '=F', '=G', + '=H', '=I', '=J', '=K', '=L', '=M', '=N', '=O', + '=P', '=Q', '=R', '=S', '=T', '=U', '=V', '=W', + '=X', '=Y', '=Z', '&P', '&Q', '&R', '&S', '&T', + ); + + /* - - - - CODE 128 ENCODER - - - - */ + + private function code_128_encode($data, $dstate, $fnc1) { + $data = preg_replace('/[\x80-\xFF]/', '', $data); + $label = preg_replace('/[\x00-\x1F\x7F]/', ' ', $data); + $chars = $this->code_128_normalize($data, $dstate, $fnc1); + $checksum = $chars[0] % 103; + for ($i = 1, $n = count($chars); $i < $n; $i++) { + $checksum += $i * $chars[$i]; + $checksum %= 103; + } + $chars[] = $checksum; + $chars[] = 106; + $modules = array(); + $modules[] = array(0, 10, 0); + foreach ($chars as $char) { + $block = $this->code_128_alphabet[$char]; + foreach ($block as $i => $module) { + $modules[] = array(($i & 1) ^ 1, $module, 1); + } + } + $modules[] = array(0, 10, 0); + $blocks = array(array('m' => $modules, 'l' => array($label))); + return array('g' => 'l', 'b' => $blocks); + } + + private function code_128_normalize($data, $dstate, $fnc1) { + $detectcba = '/(^[0-9]{4,}|^[0-9]{2}$)|([\x60-\x7F])|([\x00-\x1F])/'; + $detectc = '/(^[0-9]{6,}|^[0-9]{4,}$)/'; + $detectba = '/([\x60-\x7F])|([\x00-\x1F])/'; + $consumec = '/(^[0-9]{2})/'; + $state = (($dstate > 0 && $dstate < 4) ? $dstate : 0); + $abstate = ((abs($dstate) == 2) ? 2 : 1); + $chars = array(102 + ($state ? $state : $abstate)); + if ($fnc1) $chars[] = 102; + while (strlen($data)) { + switch ($state) { + case 0: + if (preg_match($detectcba, $data, $m)) { + if ($m[1]) { + $state = 3; + } else if ($m[2]) { + $state = 2; + } else { + $state = 1; + } + } else { + $state = $abstate; + } + $chars = array(102 + $state); + if ($fnc1) $chars[] = 102; + break; + case 1: + if ($dstate <= 0 && preg_match($detectc, $data, $m)) { + if (strlen($m[0]) % 2) { + $data = substr($data, 1); + $chars[] = 16 + substr($m[0], 0, 1); + } + $state = 3; + $chars[] = 99; + } else { + $ch = ord(substr($data, 0, 1)); + $data = substr($data, 1); + if ($ch < 32) { + $chars[] = $ch + 64; + } else if ($ch < 96) { + $chars[] = $ch - 32; + } else { + if (preg_match($detectba, $data, $m)) { + if ($m[1]) { + $state = 2; + $chars[] = 100; + } else { + $chars[] = 98; + } + } else { + $chars[] = 98; + } + $chars[] = $ch - 32; + } + } + break; + case 2: + if ($dstate <= 0 && preg_match($detectc, $data, $m)) { + if (strlen($m[0]) % 2) { + $data = substr($data, 1); + $chars[] = 16 + substr($m[0], 0, 1); + } + $state = 3; + $chars[] = 99; + } else { + $ch = ord(substr($data, 0, 1)); + $data = substr($data, 1); + if ($ch >= 32) { + $chars[] = $ch - 32; + } else { + if (preg_match($detectba, $data, $m)) { + if ($m[2]) { + $state = 1; + $chars[] = 101; + } else { + $chars[] = 98; + } + } else { + $chars[] = 98; + } + $chars[] = $ch + 64; + } + } + break; + case 3: + if (preg_match($consumec, $data, $m)) { + $data = substr($data, 2); + $chars[] = (int)$m[0]; + } else { + if (preg_match($detectba, $data, $m)) { + if ($m[1]) { + $state = 2; + } else { + $state = 1; + } + } else { + $state = $abstate; + } + $chars[] = 102 - $state; + } + break; + } + } + return $chars; + } + + private $code_128_alphabet = array( + array(2, 1, 2, 2, 2, 2), array(2, 2, 2, 1, 2, 2), + array(2, 2, 2, 2, 2, 1), array(1, 2, 1, 2, 2, 3), + array(1, 2, 1, 3, 2, 2), array(1, 3, 1, 2, 2, 2), + array(1, 2, 2, 2, 1, 3), array(1, 2, 2, 3, 1, 2), + array(1, 3, 2, 2, 1, 2), array(2, 2, 1, 2, 1, 3), + array(2, 2, 1, 3, 1, 2), array(2, 3, 1, 2, 1, 2), + array(1, 1, 2, 2, 3, 2), array(1, 2, 2, 1, 3, 2), + array(1, 2, 2, 2, 3, 1), array(1, 1, 3, 2, 2, 2), + array(1, 2, 3, 1, 2, 2), array(1, 2, 3, 2, 2, 1), + array(2, 2, 3, 2, 1, 1), array(2, 2, 1, 1, 3, 2), + array(2, 2, 1, 2, 3, 1), array(2, 1, 3, 2, 1, 2), + array(2, 2, 3, 1, 1, 2), array(3, 1, 2, 1, 3, 1), + array(3, 1, 1, 2, 2, 2), array(3, 2, 1, 1, 2, 2), + array(3, 2, 1, 2, 2, 1), array(3, 1, 2, 2, 1, 2), + array(3, 2, 2, 1, 1, 2), array(3, 2, 2, 2, 1, 1), + array(2, 1, 2, 1, 2, 3), array(2, 1, 2, 3, 2, 1), + array(2, 3, 2, 1, 2, 1), array(1, 1, 1, 3, 2, 3), + array(1, 3, 1, 1, 2, 3), array(1, 3, 1, 3, 2, 1), + array(1, 1, 2, 3, 1, 3), array(1, 3, 2, 1, 1, 3), + array(1, 3, 2, 3, 1, 1), array(2, 1, 1, 3, 1, 3), + array(2, 3, 1, 1, 1, 3), array(2, 3, 1, 3, 1, 1), + array(1, 1, 2, 1, 3, 3), array(1, 1, 2, 3, 3, 1), + array(1, 3, 2, 1, 3, 1), array(1, 1, 3, 1, 2, 3), + array(1, 1, 3, 3, 2, 1), array(1, 3, 3, 1, 2, 1), + array(3, 1, 3, 1, 2, 1), array(2, 1, 1, 3, 3, 1), + array(2, 3, 1, 1, 3, 1), array(2, 1, 3, 1, 1, 3), + array(2, 1, 3, 3, 1, 1), array(2, 1, 3, 1, 3, 1), + array(3, 1, 1, 1, 2, 3), array(3, 1, 1, 3, 2, 1), + array(3, 3, 1, 1, 2, 1), array(3, 1, 2, 1, 1, 3), + array(3, 1, 2, 3, 1, 1), array(3, 3, 2, 1, 1, 1), + array(3, 1, 4, 1, 1, 1), array(2, 2, 1, 4, 1, 1), + array(4, 3, 1, 1, 1, 1), array(1, 1, 1, 2, 2, 4), + array(1, 1, 1, 4, 2, 2), array(1, 2, 1, 1, 2, 4), + array(1, 2, 1, 4, 2, 1), array(1, 4, 1, 1, 2, 2), + array(1, 4, 1, 2, 2, 1), array(1, 1, 2, 2, 1, 4), + array(1, 1, 2, 4, 1, 2), array(1, 2, 2, 1, 1, 4), + array(1, 2, 2, 4, 1, 1), array(1, 4, 2, 1, 1, 2), + array(1, 4, 2, 2, 1, 1), array(2, 4, 1, 2, 1, 1), + array(2, 2, 1, 1, 1, 4), array(4, 1, 3, 1, 1, 1), + array(2, 4, 1, 1, 1, 2), array(1, 3, 4, 1, 1, 1), + array(1, 1, 1, 2, 4, 2), array(1, 2, 1, 1, 4, 2), + array(1, 2, 1, 2, 4, 1), array(1, 1, 4, 2, 1, 2), + array(1, 2, 4, 1, 1, 2), array(1, 2, 4, 2, 1, 1), + array(4, 1, 1, 2, 1, 2), array(4, 2, 1, 1, 1, 2), + array(4, 2, 1, 2, 1, 1), array(2, 1, 2, 1, 4, 1), + array(2, 1, 4, 1, 2, 1), array(4, 1, 2, 1, 2, 1), + array(1, 1, 1, 1, 4, 3), array(1, 1, 1, 3, 4, 1), + array(1, 3, 1, 1, 4, 1), array(1, 1, 4, 1, 1, 3), + array(1, 1, 4, 3, 1, 1), array(4, 1, 1, 1, 1, 3), + array(4, 1, 1, 3, 1, 1), array(1, 1, 3, 1, 4, 1), + array(1, 1, 4, 1, 3, 1), array(3, 1, 1, 1, 4, 1), + array(4, 1, 1, 1, 3, 1), array(2, 1, 1, 4, 1, 2), + array(2, 1, 1, 2, 1, 4), array(2, 1, 1, 2, 3, 2), + array(2, 3, 3, 1, 1, 1, 2) + ); + + /* - - - - CODABAR ENCODER - - - - */ + + private function codabar_encode($data) { + $data = strtoupper(preg_replace( + '/[^0-9ABCDENTabcdent*.\/:+$-]/', '', $data + )); + $blocks = array(); + for ($i = 0, $n = strlen($data); $i < $n; $i++) { + if ($blocks) { + $blocks[] = array( + 'm' => array(array(0, 1, 3)) + ); + } + $char = substr($data, $i, 1); + $block = $this->codabar_alphabet[$char]; + $blocks[] = array( + 'm' => array( + array(1, 1, $block[0]), + array(0, 1, $block[1]), + array(1, 1, $block[2]), + array(0, 1, $block[3]), + array(1, 1, $block[4]), + array(0, 1, $block[5]), + array(1, 1, $block[6]), + ), + 'l' => array($char) + ); + } + return array('g' => 'l', 'b' => $blocks); + } + + private $codabar_alphabet = array( + '0' => array(1, 1, 1, 1, 1, 2, 2), + '1' => array(1, 1, 1, 1, 2, 2, 1), + '4' => array(1, 1, 2, 1, 1, 2, 1), + '5' => array(2, 1, 1, 1, 1, 2, 1), + '2' => array(1, 1, 1, 2, 1, 1, 2), + '-' => array(1, 1, 1, 2, 2, 1, 1), + '$' => array(1, 1, 2, 2, 1, 1, 1), + '9' => array(2, 1, 1, 2, 1, 1, 1), + '6' => array(1, 2, 1, 1, 1, 1, 2), + '7' => array(1, 2, 1, 1, 2, 1, 1), + '8' => array(1, 2, 2, 1, 1, 1, 1), + '3' => array(2, 2, 1, 1, 1, 1, 1), + 'C' => array(1, 1, 1, 2, 1, 2, 2), + 'D' => array(1, 1, 1, 2, 2, 2, 1), + 'A' => array(1, 1, 2, 2, 1, 2, 1), + 'B' => array(1, 2, 1, 2, 1, 1, 2), + '*' => array(1, 1, 1, 2, 1, 2, 2), + 'E' => array(1, 1, 1, 2, 2, 2, 1), + 'T' => array(1, 1, 2, 2, 1, 2, 1), + 'N' => array(1, 2, 1, 2, 1, 1, 2), + '.' => array(2, 1, 2, 1, 2, 1, 1), + '/' => array(2, 1, 2, 1, 1, 1, 2), + ':' => array(2, 1, 1, 1, 2, 1, 2), + '+' => array(1, 1, 2, 1, 2, 1, 2), + ); + + /* - - - - ITF ENCODER - - - - */ + + private function itf_encode($data) { + $data = preg_replace('/[^0-9]/', '', $data); + if (strlen($data) % 2) $data = '0' . $data; + $blocks = array(); + /* Quiet zone, start. */ + $blocks[] = array( + 'm' => array(array(0, 10, 0)) + ); + $blocks[] = array( + 'm' => array( + array(1, 1, 1), + array(0, 1, 1), + array(1, 1, 1), + array(0, 1, 1), + ) + ); + /* Data. */ + for ($i = 0, $n = strlen($data); $i < $n; $i += 2) { + $c1 = substr($data, $i, 1); + $c2 = substr($data, $i+1, 1); + $b1 = $this->itf_alphabet[$c1]; + $b2 = $this->itf_alphabet[$c2]; + $blocks[] = array( + 'm' => array( + array(1, 1, $b1[0]), + array(0, 1, $b2[0]), + array(1, 1, $b1[1]), + array(0, 1, $b2[1]), + array(1, 1, $b1[2]), + array(0, 1, $b2[2]), + array(1, 1, $b1[3]), + array(0, 1, $b2[3]), + array(1, 1, $b1[4]), + array(0, 1, $b2[4]), + ), + 'l' => array($c1 . $c2) + ); + } + /* End, quiet zone. */ + $blocks[] = array( + 'm' => array( + array(1, 1, 2), + array(0, 1, 1), + array(1, 1, 1), + ) + ); + $blocks[] = array( + 'm' => array(array(0, 10, 0)) + ); + /* Return code. */ + return array('g' => 'l', 'b' => $blocks); + } + + private $itf_alphabet = array( + '0' => array(1, 1, 2, 2, 1), + '1' => array(2, 1, 1, 1, 2), + '2' => array(1, 2, 1, 1, 2), + '3' => array(2, 2, 1, 1, 1), + '4' => array(1, 1, 2, 1, 2), + '5' => array(2, 1, 2, 1, 1), + '6' => array(1, 2, 2, 1, 1), + '7' => array(1, 1, 1, 2, 2), + '8' => array(2, 1, 1, 2, 1), + '9' => array(1, 2, 1, 2, 1), + ); + + /* - - - - QR ENCODER - - - - */ + + private function qr_encode($data, $ecl) { + list($mode, $vers, $ec, $data) = $this->qr_encode_data($data, $ecl); + $data = $this->qr_encode_ec($data, $ec, $vers); + list($size, $mtx) = $this->qr_create_matrix($vers, $data); + list($mask, $mtx) = $this->qr_apply_best_mask($mtx, $size); + $mtx = $this->qr_finalize_matrix($mtx, $size, $ecl, $mask, $vers); + return array( + 'g' => 'm', + 'q' => array(4, 4, 4, 4), + 's' => array($size, $size), + 'b' => $mtx + ); + } + + private function qr_encode_data($data, $ecl) { + $mode = $this->qr_detect_mode($data); + $version = $this->qr_detect_version($data, $mode, $ecl); + $version_group = (($version < 10) ? 0 : (($version < 27) ? 1 : 2)); + $ec_params = $this->qr_ec_params[($version - 1) * 4 + $ecl]; + /* Don't cut off mid-character if exceeding capacity. */ + $max_chars = $this->qr_capacity[$version - 1][$ecl][$mode]; + if ($mode == 3) $max_chars <<= 1; + $data = substr($data, 0, $max_chars); + /* Convert from character level to bit level. */ + switch ($mode) { + case 0: + $code = $this->qr_encode_numeric($data, $version_group); + break; + case 1: + $code = $this->qr_encode_alphanumeric($data, $version_group); + break; + case 2: + $code = $this->qr_encode_binary($data, $version_group); + break; + case 3: + $code = $this->qr_encode_kanji($data, $version_group); + break; + } + for ($i = 0; $i < 4; $i++) $code[] = 0; + while (count($code) % 8) $code[] = 0; + /* Convert from bit level to byte level. */ + $data = array(); + for ($i = 0, $n = count($code); $i < $n; $i += 8) { + $byte = 0; + if ($code[$i + 0]) $byte |= 0x80; + if ($code[$i + 1]) $byte |= 0x40; + if ($code[$i + 2]) $byte |= 0x20; + if ($code[$i + 3]) $byte |= 0x10; + if ($code[$i + 4]) $byte |= 0x08; + if ($code[$i + 5]) $byte |= 0x04; + if ($code[$i + 6]) $byte |= 0x02; + if ($code[$i + 7]) $byte |= 0x01; + $data[] = $byte; + } + for ( + $i = count($data), $a = 1, $n = $ec_params[0]; + $i < $n; $i++, $a ^= 1 + ) { + $data[] = $a ? 236 : 17; + } + /* Return. */ + return array($mode, $version, $ec_params, $data); + } + + private function qr_detect_mode($data) { + $numeric = '/^[0-9]*$/'; + $alphanumeric = '/^[0-9A-Z .\/:$%*+-]*$/'; + $kanji = '/^([\x81-\x9F\xE0-\xEA][\x40-\xFC]|[\xEB][\x40-\xBF])*$/'; + if (preg_match($numeric, $data)) return 0; + if (preg_match($alphanumeric, $data)) return 1; + if (preg_match($kanji, $data)) return 3; + return 2; + } + + private function qr_detect_version($data, $mode, $ecl) { + $length = strlen($data); + if ($mode == 3) $length >>= 1; + for ($v = 0; $v < 40; $v++) { + if ($length <= $this->qr_capacity[$v][$ecl][$mode]) { + return $v + 1; + } + } + return 40; + } + + private function qr_encode_numeric($data, $version_group) { + $code = array(0, 0, 0, 1); + $length = strlen($data); + switch ($version_group) { + case 2: /* 27 - 40 */ + $code[] = $length & 0x2000; + $code[] = $length & 0x1000; + case 1: /* 10 - 26 */ + $code[] = $length & 0x0800; + $code[] = $length & 0x0400; + case 0: /* 1 - 9 */ + $code[] = $length & 0x0200; + $code[] = $length & 0x0100; + $code[] = $length & 0x0080; + $code[] = $length & 0x0040; + $code[] = $length & 0x0020; + $code[] = $length & 0x0010; + $code[] = $length & 0x0008; + $code[] = $length & 0x0004; + $code[] = $length & 0x0002; + $code[] = $length & 0x0001; + } + for ($i = 0; $i < $length; $i += 3) { + $group = substr($data, $i, 3); + switch (strlen($group)) { + case 3: + $code[] = $group & 0x200; + $code[] = $group & 0x100; + $code[] = $group & 0x080; + case 2: + $code[] = $group & 0x040; + $code[] = $group & 0x020; + $code[] = $group & 0x010; + case 1: + $code[] = $group & 0x008; + $code[] = $group & 0x004; + $code[] = $group & 0x002; + $code[] = $group & 0x001; + } + } + return $code; + } + + private function qr_encode_alphanumeric($data, $version_group) { + $alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:'; + $code = array(0, 0, 1, 0); + $length = strlen($data); + switch ($version_group) { + case 2: /* 27 - 40 */ + $code[] = $length & 0x1000; + $code[] = $length & 0x0800; + case 1: /* 10 - 26 */ + $code[] = $length & 0x0400; + $code[] = $length & 0x0200; + case 0: /* 1 - 9 */ + $code[] = $length & 0x0100; + $code[] = $length & 0x0080; + $code[] = $length & 0x0040; + $code[] = $length & 0x0020; + $code[] = $length & 0x0010; + $code[] = $length & 0x0008; + $code[] = $length & 0x0004; + $code[] = $length & 0x0002; + $code[] = $length & 0x0001; + } + for ($i = 0; $i < $length; $i += 2) { + $group = substr($data, $i, 2); + if (strlen($group) > 1) { + $c1 = strpos($alphabet, substr($group, 0, 1)); + $c2 = strpos($alphabet, substr($group, 1, 1)); + $ch = $c1 * 45 + $c2; + $code[] = $ch & 0x400; + $code[] = $ch & 0x200; + $code[] = $ch & 0x100; + $code[] = $ch & 0x080; + $code[] = $ch & 0x040; + $code[] = $ch & 0x020; + $code[] = $ch & 0x010; + $code[] = $ch & 0x008; + $code[] = $ch & 0x004; + $code[] = $ch & 0x002; + $code[] = $ch & 0x001; + } else { + $ch = strpos($alphabet, $group); + $code[] = $ch & 0x020; + $code[] = $ch & 0x010; + $code[] = $ch & 0x008; + $code[] = $ch & 0x004; + $code[] = $ch & 0x002; + $code[] = $ch & 0x001; + } + } + return $code; + } + + private function qr_encode_binary($data, $version_group) { + $code = array(0, 1, 0, 0); + $length = strlen($data); + switch ($version_group) { + case 2: /* 27 - 40 */ + case 1: /* 10 - 26 */ + $code[] = $length & 0x8000; + $code[] = $length & 0x4000; + $code[] = $length & 0x2000; + $code[] = $length & 0x1000; + $code[] = $length & 0x0800; + $code[] = $length & 0x0400; + $code[] = $length & 0x0200; + $code[] = $length & 0x0100; + case 0: /* 1 - 9 */ + $code[] = $length & 0x0080; + $code[] = $length & 0x0040; + $code[] = $length & 0x0020; + $code[] = $length & 0x0010; + $code[] = $length & 0x0008; + $code[] = $length & 0x0004; + $code[] = $length & 0x0002; + $code[] = $length & 0x0001; + } + for ($i = 0; $i < $length; $i++) { + $ch = ord(substr($data, $i, 1)); + $code[] = $ch & 0x80; + $code[] = $ch & 0x40; + $code[] = $ch & 0x20; + $code[] = $ch & 0x10; + $code[] = $ch & 0x08; + $code[] = $ch & 0x04; + $code[] = $ch & 0x02; + $code[] = $ch & 0x01; + } + return $code; + } + + private function qr_encode_kanji($data, $version_group) { + $code = array(1, 0, 0, 0); + $length = strlen($data); + switch ($version_group) { + case 2: /* 27 - 40 */ + $code[] = $length & 0x1000; + $code[] = $length & 0x0800; + case 1: /* 10 - 26 */ + $code[] = $length & 0x0400; + $code[] = $length & 0x0200; + case 0: /* 1 - 9 */ + $code[] = $length & 0x0100; + $code[] = $length & 0x0080; + $code[] = $length & 0x0040; + $code[] = $length & 0x0020; + $code[] = $length & 0x0010; + $code[] = $length & 0x0008; + $code[] = $length & 0x0004; + $code[] = $length & 0x0002; + } + for ($i = 0; $i < $length; $i += 2) { + $group = substr($data, $i, 2); + $c1 = ord(substr($group, 0, 1)); + $c2 = ord(substr($group, 1, 1)); + if ($c1 >= 0x81 && $c1 <= 0x9F && $c2 >= 0x40 && $c2 <= 0xFC) { + $ch = ($c1 - 0x81) * 0xC0 + ($c2 - 0x40); + } else if ( + ($c1 >= 0xE0 && $c1 <= 0xEA && $c2 >= 0x40 && $c2 <= 0xFC) || + ($c1 == 0xEB && $c2 >= 0x40 && $c2 <= 0xBF) + ) { + $ch = ($c1 - 0xC1) * 0xC0 + ($c2 - 0x40); + } else { + $ch = 0; + } + $code[] = $ch & 0x1000; + $code[] = $ch & 0x0800; + $code[] = $ch & 0x0400; + $code[] = $ch & 0x0200; + $code[] = $ch & 0x0100; + $code[] = $ch & 0x0080; + $code[] = $ch & 0x0040; + $code[] = $ch & 0x0020; + $code[] = $ch & 0x0010; + $code[] = $ch & 0x0008; + $code[] = $ch & 0x0004; + $code[] = $ch & 0x0002; + $code[] = $ch & 0x0001; + } + return $code; + } + + private function qr_encode_ec($data, $ec_params, $version) { + $blocks = $this->qr_ec_split($data, $ec_params); + $ec_blocks = array(); + for ($i = 0, $n = count($blocks); $i < $n; $i++) { + $ec_blocks[] = $this->qr_ec_divide($blocks[$i], $ec_params); + } + $data = $this->qr_ec_interleave($blocks); + $ec_data = $this->qr_ec_interleave($ec_blocks); + $code = array(); + foreach ($data as $ch) { + $code[] = $ch & 0x80; + $code[] = $ch & 0x40; + $code[] = $ch & 0x20; + $code[] = $ch & 0x10; + $code[] = $ch & 0x08; + $code[] = $ch & 0x04; + $code[] = $ch & 0x02; + $code[] = $ch & 0x01; + } + foreach ($ec_data as $ch) { + $code[] = $ch & 0x80; + $code[] = $ch & 0x40; + $code[] = $ch & 0x20; + $code[] = $ch & 0x10; + $code[] = $ch & 0x08; + $code[] = $ch & 0x04; + $code[] = $ch & 0x02; + $code[] = $ch & 0x01; + } + for ($n = $this->qr_remainder_bits[$version - 1]; $n > 0; $n--) { + $code[] = 0; + } + return $code; + } + + private function qr_ec_split($data, $ec_params) { + $blocks = array(); + $offset = 0; + for ($i = $ec_params[2], $length = $ec_params[3]; $i > 0; $i--) { + $blocks[] = array_slice($data, $offset, $length); + $offset += $length; + } + for ($i = $ec_params[4], $length = $ec_params[5]; $i > 0; $i--) { + $blocks[] = array_slice($data, $offset, $length); + $offset += $length; + } + return $blocks; + } + + private function qr_ec_divide($data, $ec_params) { + $num_data = count($data); + $num_error = $ec_params[1]; + $generator = $this->qr_ec_polynomials[$num_error]; + $message = $data; + for ($i = 0; $i < $num_error; $i++) { + $message[] = 0; + } + for ($i = 0; $i < $num_data; $i++) { + if ($message[$i]) { + $leadterm = $this->qr_log[$message[$i]]; + for ($j = 0; $j <= $num_error; $j++) { + $term = ($generator[$j] + $leadterm) % 255; + $message[$i + $j] ^= $this->qr_exp[$term]; + } + } + } + return array_slice($message, $num_data, $num_error); + } + + private function qr_ec_interleave($blocks) { + $data = array(); + $num_blocks = count($blocks); + for ($offset = 0; true; $offset++) { + $break = true; + for ($i = 0; $i < $num_blocks; $i++) { + if (isset($blocks[$i][$offset])) { + $data[] = $blocks[$i][$offset]; + $break = false; + } + } + if ($break) break; + } + return $data; + } + + private function qr_create_matrix($version, $data) { + $size = $version * 4 + 17; + $matrix = array(); + for ($i = 0; $i < $size; $i++) { + $row = array(); + for ($j = 0; $j < $size; $j++) { + $row[] = 0; + } + $matrix[] = $row; + } + /* Finder patterns. */ + for ($i = 0; $i < 8; $i++) { + for ($j = 0; $j < 8; $j++) { + $m = (($i == 7 || $j == 7) ? 2 : + (($i == 0 || $j == 0 || $i == 6 || $j == 6) ? 3 : + (($i == 1 || $j == 1 || $i == 5 || $j == 5) ? 2 : 3))); + $matrix[$i][$j] = $m; + $matrix[$size - $i - 1][$j] = $m; + $matrix[$i][$size - $j - 1] = $m; + } + } + /* Alignment patterns. */ + if ($version >= 2) { + $alignment = $this->qr_alignment_patterns[$version - 2]; + foreach ($alignment as $i) { + foreach ($alignment as $j) { + if (!$matrix[$i][$j]) { + for ($ii = -2; $ii <= 2; $ii++) { + for ($jj = -2; $jj <= 2; $jj++) { + $m = (max(abs($ii), abs($jj)) & 1) ^ 3; + $matrix[$i + $ii][$j + $jj] = $m; + } + } + } + } + } + } + /* Timing patterns. */ + for ($i = $size - 9; $i >= 8; $i--) { + $matrix[$i][6] = ($i & 1) ^ 3; + $matrix[6][$i] = ($i & 1) ^ 3; + } + /* Dark module. Such an ominous name for such an innocuous thing. */ + $matrix[$size - 8][8] = 3; + /* Format information area. */ + for ($i = 0; $i <= 8; $i++) { + if (!$matrix[$i][8]) $matrix[$i][8] = 1; + if (!$matrix[8][$i]) $matrix[8][$i] = 1; + if ($i && !$matrix[$size - $i][8]) $matrix[$size - $i][8] = 1; + if ($i && !$matrix[8][$size - $i]) $matrix[8][$size - $i] = 1; + } + /* Version information area. */ + if ($version >= 7) { + for ($i = 9; $i < 12; $i++) { + for ($j = 0; $j < 6; $j++) { + $matrix[$size - $i][$j] = 1; + $matrix[$j][$size - $i] = 1; + } + } + } + /* Data. */ + $col = $size - 1; + $row = $size - 1; + $dir = -1; + $offset = 0; + $length = count($data); + while ($col > 0 && $offset < $length) { + if (!$matrix[$row][$col]) { + $matrix[$row][$col] = $data[$offset] ? 5 : 4; + $offset++; + } + if (!$matrix[$row][$col - 1]) { + $matrix[$row][$col - 1] = $data[$offset] ? 5 : 4; + $offset++; + } + $row += $dir; + if ($row < 0 || $row >= $size) { + $dir = -$dir; + $row += $dir; + $col -= 2; + if ($col == 6) $col--; + } + } + return array($size, $matrix); + } + + private function qr_apply_best_mask($matrix, $size) { + $best_mask = 0; + $best_matrix = $this->qr_apply_mask($matrix, $size, $best_mask); + $best_penalty = $this->qr_penalty($best_matrix, $size); + for ($test_mask = 1; $test_mask < 8; $test_mask++) { + $test_matrix = $this->qr_apply_mask($matrix, $size, $test_mask); + $test_penalty = $this->qr_penalty($test_matrix, $size); + if ($test_penalty < $best_penalty) { + $best_mask = $test_mask; + $best_matrix = $test_matrix; + $best_penalty = $test_penalty; + } + } + return array($best_mask, $best_matrix); + } + + private function qr_apply_mask($matrix, $size, $mask) { + for ($i = 0; $i < $size; $i++) { + for ($j = 0; $j < $size; $j++) { + if ($matrix[$i][$j] >= 4) { + if ($this->qr_mask($mask, $i, $j)) { + $matrix[$i][$j] ^= 1; + } + } + } + } + return $matrix; + } + + private function qr_mask($mask, $r, $c) { + switch ($mask) { + case 0: return !( ($r + $c) % 2 ); + case 1: return !( ($r ) % 2 ); + case 2: return !( ( $c) % 3 ); + case 3: return !( ($r + $c) % 3 ); + case 4: return !( (floor(($r) / 2) + floor(($c) / 3)) % 2 ); + case 5: return !( ((($r * $c) % 2) + (($r * $c) % 3)) ); + case 6: return !( ((($r * $c) % 2) + (($r * $c) % 3)) % 2 ); + case 7: return !( ((($r + $c) % 2) + (($r * $c) % 3)) % 2 ); + } + } + + private function qr_penalty(&$matrix, $size) { + $score = $this->qr_penalty_1($matrix, $size); + $score += $this->qr_penalty_2($matrix, $size); + $score += $this->qr_penalty_3($matrix, $size); + $score += $this->qr_penalty_4($matrix, $size); + return $score; + } + + private function qr_penalty_1(&$matrix, $size) { + $score = 0; + for ($i = 0; $i < $size; $i++) { + $rowvalue = 0; + $rowcount = 0; + $colvalue = 0; + $colcount = 0; + for ($j = 0; $j < $size; $j++) { + $rv = ($matrix[$i][$j] == 5 || $matrix[$i][$j] == 3) ? 1 : 0; + $cv = ($matrix[$j][$i] == 5 || $matrix[$j][$i] == 3) ? 1 : 0; + if ($rv == $rowvalue) { + $rowcount++; + } else { + if ($rowcount >= 5) $score += $rowcount - 2; + $rowvalue = $rv; + $rowcount = 1; + } + if ($cv == $colvalue) { + $colcount++; + } else { + if ($colcount >= 5) $score += $colcount - 2; + $colvalue = $cv; + $colcount = 1; + } + } + if ($rowcount >= 5) $score += $rowcount - 2; + if ($colcount >= 5) $score += $colcount - 2; + } + return $score; + } + + private function qr_penalty_2(&$matrix, $size) { + $score = 0; + for ($i = 1; $i < $size; $i++) { + for ($j = 1; $j < $size; $j++) { + $v1 = $matrix[$i - 1][$j - 1]; + $v2 = $matrix[$i - 1][$j ]; + $v3 = $matrix[$i ][$j - 1]; + $v4 = $matrix[$i ][$j ]; + $v1 = ($v1 == 5 || $v1 == 3) ? 1 : 0; + $v2 = ($v2 == 5 || $v2 == 3) ? 1 : 0; + $v3 = ($v3 == 5 || $v3 == 3) ? 1 : 0; + $v4 = ($v4 == 5 || $v4 == 3) ? 1 : 0; + if ($v1 == $v2 && $v2 == $v3 && $v3 == $v4) $score += 3; + } + } + return $score; + } + + private function qr_penalty_3(&$matrix, $size) { + $score = 0; + for ($i = 0; $i < $size; $i++) { + $rowvalue = 0; + $colvalue = 0; + for ($j = 0; $j < 11; $j++) { + $rv = ($matrix[$i][$j] == 5 || $matrix[$i][$j] == 3) ? 1 : 0; + $cv = ($matrix[$j][$i] == 5 || $matrix[$j][$i] == 3) ? 1 : 0; + $rowvalue = (($rowvalue << 1) & 0x7FF) | $rv; + $colvalue = (($colvalue << 1) & 0x7FF) | $cv; + } + if ($rowvalue == 0x5D0 || $rowvalue == 0x5D) $score += 40; + if ($colvalue == 0x5D0 || $colvalue == 0x5D) $score += 40; + for ($j = 11; $j < $size; $j++) { + $rv = ($matrix[$i][$j] == 5 || $matrix[$i][$j] == 3) ? 1 : 0; + $cv = ($matrix[$j][$i] == 5 || $matrix[$j][$i] == 3) ? 1 : 0; + $rowvalue = (($rowvalue << 1) & 0x7FF) | $rv; + $colvalue = (($colvalue << 1) & 0x7FF) | $cv; + if ($rowvalue == 0x5D0 || $rowvalue == 0x5D) $score += 40; + if ($colvalue == 0x5D0 || $colvalue == 0x5D) $score += 40; + } + } + return $score; + } + + private function qr_penalty_4(&$matrix, $size) { + $dark = 0; + for ($i = 0; $i < $size; $i++) { + for ($j = 0; $j < $size; $j++) { + if ($matrix[$i][$j] == 5 || $matrix[$i][$j] == 3) { + $dark++; + } + } + } + $dark *= 20; + $dark /= $size * $size; + $a = abs(floor($dark) - 10); + $b = abs(ceil($dark) - 10); + return min($a, $b) * 10; + } + + private function qr_finalize_matrix( + $matrix, $size, $ecl, $mask, $version + ) { + /* Format Info */ + $format = $this->qr_format_info[$ecl * 8 + $mask]; + $matrix[8][0] = $format[0]; + $matrix[8][1] = $format[1]; + $matrix[8][2] = $format[2]; + $matrix[8][3] = $format[3]; + $matrix[8][4] = $format[4]; + $matrix[8][5] = $format[5]; + $matrix[8][7] = $format[6]; + $matrix[8][8] = $format[7]; + $matrix[7][8] = $format[8]; + $matrix[5][8] = $format[9]; + $matrix[4][8] = $format[10]; + $matrix[3][8] = $format[11]; + $matrix[2][8] = $format[12]; + $matrix[1][8] = $format[13]; + $matrix[0][8] = $format[14]; + $matrix[$size - 1][8] = $format[0]; + $matrix[$size - 2][8] = $format[1]; + $matrix[$size - 3][8] = $format[2]; + $matrix[$size - 4][8] = $format[3]; + $matrix[$size - 5][8] = $format[4]; + $matrix[$size - 6][8] = $format[5]; + $matrix[$size - 7][8] = $format[6]; + $matrix[8][$size - 8] = $format[7]; + $matrix[8][$size - 7] = $format[8]; + $matrix[8][$size - 6] = $format[9]; + $matrix[8][$size - 5] = $format[10]; + $matrix[8][$size - 4] = $format[11]; + $matrix[8][$size - 3] = $format[12]; + $matrix[8][$size - 2] = $format[13]; + $matrix[8][$size - 1] = $format[14]; + /* Version Info */ + if ($version >= 7) { + $version = $this->qr_version_info[$version - 7]; + for ($i = 0; $i < 18; $i++) { + $r = $size - 9 - ($i % 3); + $c = 5 - floor($i / 3); + $matrix[$r][$c] = $version[$i]; + $matrix[$c][$r] = $version[$i]; + } + } + /* Patterns & Data */ + for ($i = 0; $i < $size; $i++) { + for ($j = 0; $j < $size; $j++) { + $matrix[$i][$j] &= 1; + } + } + return $matrix; + } + + /* maximum encodable characters = $qr_capacity [ (version - 1) ] */ + /* [ (0 for L, 1 for M, 2 for Q, 3 for H) ] */ + /* [ (0 for numeric, 1 for alpha, 2 for binary, 3 for kanji) ] */ + private $qr_capacity = array( + array(array( 41, 25, 17, 10), array( 34, 20, 14, 8), + array( 27, 16, 11, 7), array( 17, 10, 7, 4)), + array(array( 77, 47, 32, 20), array( 63, 38, 26, 16), + array( 48, 29, 20, 12), array( 34, 20, 14, 8)), + array(array( 127, 77, 53, 32), array( 101, 61, 42, 26), + array( 77, 47, 32, 20), array( 58, 35, 24, 15)), + array(array( 187, 114, 78, 48), array( 149, 90, 62, 38), + array( 111, 67, 46, 28), array( 82, 50, 34, 21)), + array(array( 255, 154, 106, 65), array( 202, 122, 84, 52), + array( 144, 87, 60, 37), array( 106, 64, 44, 27)), + array(array( 322, 195, 134, 82), array( 255, 154, 106, 65), + array( 178, 108, 74, 45), array( 139, 84, 58, 36)), + array(array( 370, 224, 154, 95), array( 293, 178, 122, 75), + array( 207, 125, 86, 53), array( 154, 93, 64, 39)), + array(array( 461, 279, 192, 118), array( 365, 221, 152, 93), + array( 259, 157, 108, 66), array( 202, 122, 84, 52)), + array(array( 552, 335, 230, 141), array( 432, 262, 180, 111), + array( 312, 189, 130, 80), array( 235, 143, 98, 60)), + array(array( 652, 395, 271, 167), array( 513, 311, 213, 131), + array( 364, 221, 151, 93), array( 288, 174, 119, 74)), + array(array( 772, 468, 321, 198), array( 604, 366, 251, 155), + array( 427, 259, 177, 109), array( 331, 200, 137, 85)), + array(array( 883, 535, 367, 226), array( 691, 419, 287, 177), + array( 489, 296, 203, 125), array( 374, 227, 155, 96)), + array(array(1022, 619, 425, 262), array( 796, 483, 331, 204), + array( 580, 352, 241, 149), array( 427, 259, 177, 109)), + array(array(1101, 667, 458, 282), array( 871, 528, 362, 223), + array( 621, 376, 258, 159), array( 468, 283, 194, 120)), + array(array(1250, 758, 520, 320), array( 991, 600, 412, 254), + array( 703, 426, 292, 180), array( 530, 321, 220, 136)), + array(array(1408, 854, 586, 361), array(1082, 656, 450, 277), + array( 775, 470, 322, 198), array( 602, 365, 250, 154)), + array(array(1548, 938, 644, 397), array(1212, 734, 504, 310), + array( 876, 531, 364, 224), array( 674, 408, 280, 173)), + array(array(1725, 1046, 718, 442), array(1346, 816, 560, 345), + array( 948, 574, 394, 243), array( 746, 452, 310, 191)), + array(array(1903, 1153, 792, 488), array(1500, 909, 624, 384), + array(1063, 644, 442, 272), array( 813, 493, 338, 208)), + array(array(2061, 1249, 858, 528), array(1600, 970, 666, 410), + array(1159, 702, 482, 297), array( 919, 557, 382, 235)), + array(array(2232, 1352, 929, 572), array(1708, 1035, 711, 438), + array(1224, 742, 509, 314), array( 969, 587, 403, 248)), + array(array(2409, 1460, 1003, 618), array(1872, 1134, 779, 480), + array(1358, 823, 565, 348), array(1056, 640, 439, 270)), + array(array(2620, 1588, 1091, 672), array(2059, 1248, 857, 528), + array(1468, 890, 611, 376), array(1108, 672, 461, 284)), + array(array(2812, 1704, 1171, 721), array(2188, 1326, 911, 561), + array(1588, 963, 661, 407), array(1228, 744, 511, 315)), + array(array(3057, 1853, 1273, 784), array(2395, 1451, 997, 614), + array(1718, 1041, 715, 440), array(1286, 779, 535, 330)), + array(array(3283, 1990, 1367, 842), array(2544, 1542, 1059, 652), + array(1804, 1094, 751, 462), array(1425, 864, 593, 365)), + array(array(3517, 2132, 1465, 902), array(2701, 1637, 1125, 692), + array(1933, 1172, 805, 496), array(1501, 910, 625, 385)), + array(array(3669, 2223, 1528, 940), array(2857, 1732, 1190, 732), + array(2085, 1263, 868, 534), array(1581, 958, 658, 405)), + array(array(3909, 2369, 1628, 1002), array(3035, 1839, 1264, 778), + array(2181, 1322, 908, 559), array(1677, 1016, 698, 430)), + array(array(4158, 2520, 1732, 1066), array(3289, 1994, 1370, 843), + array(2358, 1429, 982, 604), array(1782, 1080, 742, 457)), + array(array(4417, 2677, 1840, 1132), array(3486, 2113, 1452, 894), + array(2473, 1499, 1030, 634), array(1897, 1150, 790, 486)), + array(array(4686, 2840, 1952, 1201), array(3693, 2238, 1538, 947), + array(2670, 1618, 1112, 684), array(2022, 1226, 842, 518)), + array(array(4965, 3009, 2068, 1273), array(3909, 2369, 1628, 1002), + array(2805, 1700, 1168, 719), array(2157, 1307, 898, 553)), + array(array(5253, 3183, 2188, 1347), array(4134, 2506, 1722, 1060), + array(2949, 1787, 1228, 756), array(2301, 1394, 958, 590)), + array(array(5529, 3351, 2303, 1417), array(4343, 2632, 1809, 1113), + array(3081, 1867, 1283, 790), array(2361, 1431, 983, 605)), + array(array(5836, 3537, 2431, 1496), array(4588, 2780, 1911, 1176), + array(3244, 1966, 1351, 832), array(2524, 1530, 1051, 647)), + array(array(6153, 3729, 2563, 1577), array(4775, 2894, 1989, 1224), + array(3417, 2071, 1423, 876), array(2625, 1591, 1093, 673)), + array(array(6479, 3927, 2699, 1661), array(5039, 3054, 2099, 1292), + array(3599, 2181, 1499, 923), array(2735, 1658, 1139, 701)), + array(array(6743, 4087, 2809, 1729), array(5313, 3220, 2213, 1362), + array(3791, 2298, 1579, 972), array(2927, 1774, 1219, 750)), + array(array(7089, 4296, 2953, 1817), array(5596, 3391, 2331, 1435), + array(3993, 2420, 1663, 1024), array(3057, 1852, 1273, 784)), + ); + + /* $qr_ec_params[ */ + /* 4 * (version - 1) + (0 for L, 1 for M, 2 for Q, 3 for H) */ + /* ] = array( */ + /* total number of data codewords, */ + /* number of error correction codewords per block, */ + /* number of blocks in first group, */ + /* number of data codewords per block in first group, */ + /* number of blocks in second group, */ + /* number of data codewords per block in second group */ + /* ); */ + private $qr_ec_params = array( + array( 19, 7, 1, 19, 0, 0 ), + array( 16, 10, 1, 16, 0, 0 ), + array( 13, 13, 1, 13, 0, 0 ), + array( 9, 17, 1, 9, 0, 0 ), + array( 34, 10, 1, 34, 0, 0 ), + array( 28, 16, 1, 28, 0, 0 ), + array( 22, 22, 1, 22, 0, 0 ), + array( 16, 28, 1, 16, 0, 0 ), + array( 55, 15, 1, 55, 0, 0 ), + array( 44, 26, 1, 44, 0, 0 ), + array( 34, 18, 2, 17, 0, 0 ), + array( 26, 22, 2, 13, 0, 0 ), + array( 80, 20, 1, 80, 0, 0 ), + array( 64, 18, 2, 32, 0, 0 ), + array( 48, 26, 2, 24, 0, 0 ), + array( 36, 16, 4, 9, 0, 0 ), + array( 108, 26, 1, 108, 0, 0 ), + array( 86, 24, 2, 43, 0, 0 ), + array( 62, 18, 2, 15, 2, 16 ), + array( 46, 22, 2, 11, 2, 12 ), + array( 136, 18, 2, 68, 0, 0 ), + array( 108, 16, 4, 27, 0, 0 ), + array( 76, 24, 4, 19, 0, 0 ), + array( 60, 28, 4, 15, 0, 0 ), + array( 156, 20, 2, 78, 0, 0 ), + array( 124, 18, 4, 31, 0, 0 ), + array( 88, 18, 2, 14, 4, 15 ), + array( 66, 26, 4, 13, 1, 14 ), + array( 194, 24, 2, 97, 0, 0 ), + array( 154, 22, 2, 38, 2, 39 ), + array( 110, 22, 4, 18, 2, 19 ), + array( 86, 26, 4, 14, 2, 15 ), + array( 232, 30, 2, 116, 0, 0 ), + array( 182, 22, 3, 36, 2, 37 ), + array( 132, 20, 4, 16, 4, 17 ), + array( 100, 24, 4, 12, 4, 13 ), + array( 274, 18, 2, 68, 2, 69 ), + array( 216, 26, 4, 43, 1, 44 ), + array( 154, 24, 6, 19, 2, 20 ), + array( 122, 28, 6, 15, 2, 16 ), + array( 324, 20, 4, 81, 0, 0 ), + array( 254, 30, 1, 50, 4, 51 ), + array( 180, 28, 4, 22, 4, 23 ), + array( 140, 24, 3, 12, 8, 13 ), + array( 370, 24, 2, 92, 2, 93 ), + array( 290, 22, 6, 36, 2, 37 ), + array( 206, 26, 4, 20, 6, 21 ), + array( 158, 28, 7, 14, 4, 15 ), + array( 428, 26, 4, 107, 0, 0 ), + array( 334, 22, 8, 37, 1, 38 ), + array( 244, 24, 8, 20, 4, 21 ), + array( 180, 22, 12, 11, 4, 12 ), + array( 461, 30, 3, 115, 1, 116 ), + array( 365, 24, 4, 40, 5, 41 ), + array( 261, 20, 11, 16, 5, 17 ), + array( 197, 24, 11, 12, 5, 13 ), + array( 523, 22, 5, 87, 1, 88 ), + array( 415, 24, 5, 41, 5, 42 ), + array( 295, 30, 5, 24, 7, 25 ), + array( 223, 24, 11, 12, 7, 13 ), + array( 589, 24, 5, 98, 1, 99 ), + array( 453, 28, 7, 45, 3, 46 ), + array( 325, 24, 15, 19, 2, 20 ), + array( 253, 30, 3, 15, 13, 16 ), + array( 647, 28, 1, 107, 5, 108 ), + array( 507, 28, 10, 46, 1, 47 ), + array( 367, 28, 1, 22, 15, 23 ), + array( 283, 28, 2, 14, 17, 15 ), + array( 721, 30, 5, 120, 1, 121 ), + array( 563, 26, 9, 43, 4, 44 ), + array( 397, 28, 17, 22, 1, 23 ), + array( 313, 28, 2, 14, 19, 15 ), + array( 795, 28, 3, 113, 4, 114 ), + array( 627, 26, 3, 44, 11, 45 ), + array( 445, 26, 17, 21, 4, 22 ), + array( 341, 26, 9, 13, 16, 14 ), + array( 861, 28, 3, 107, 5, 108 ), + array( 669, 26, 3, 41, 13, 42 ), + array( 485, 30, 15, 24, 5, 25 ), + array( 385, 28, 15, 15, 10, 16 ), + array( 932, 28, 4, 116, 4, 117 ), + array( 714, 26, 17, 42, 0, 0 ), + array( 512, 28, 17, 22, 6, 23 ), + array( 406, 30, 19, 16, 6, 17 ), + array( 1006, 28, 2, 111, 7, 112 ), + array( 782, 28, 17, 46, 0, 0 ), + array( 568, 30, 7, 24, 16, 25 ), + array( 442, 24, 34, 13, 0, 0 ), + array( 1094, 30, 4, 121, 5, 122 ), + array( 860, 28, 4, 47, 14, 48 ), + array( 614, 30, 11, 24, 14, 25 ), + array( 464, 30, 16, 15, 14, 16 ), + array( 1174, 30, 6, 117, 4, 118 ), + array( 914, 28, 6, 45, 14, 46 ), + array( 664, 30, 11, 24, 16, 25 ), + array( 514, 30, 30, 16, 2, 17 ), + array( 1276, 26, 8, 106, 4, 107 ), + array( 1000, 28, 8, 47, 13, 48 ), + array( 718, 30, 7, 24, 22, 25 ), + array( 538, 30, 22, 15, 13, 16 ), + array( 1370, 28, 10, 114, 2, 115 ), + array( 1062, 28, 19, 46, 4, 47 ), + array( 754, 28, 28, 22, 6, 23 ), + array( 596, 30, 33, 16, 4, 17 ), + array( 1468, 30, 8, 122, 4, 123 ), + array( 1128, 28, 22, 45, 3, 46 ), + array( 808, 30, 8, 23, 26, 24 ), + array( 628, 30, 12, 15, 28, 16 ), + array( 1531, 30, 3, 117, 10, 118 ), + array( 1193, 28, 3, 45, 23, 46 ), + array( 871, 30, 4, 24, 31, 25 ), + array( 661, 30, 11, 15, 31, 16 ), + array( 1631, 30, 7, 116, 7, 117 ), + array( 1267, 28, 21, 45, 7, 46 ), + array( 911, 30, 1, 23, 37, 24 ), + array( 701, 30, 19, 15, 26, 16 ), + array( 1735, 30, 5, 115, 10, 116 ), + array( 1373, 28, 19, 47, 10, 48 ), + array( 985, 30, 15, 24, 25, 25 ), + array( 745, 30, 23, 15, 25, 16 ), + array( 1843, 30, 13, 115, 3, 116 ), + array( 1455, 28, 2, 46, 29, 47 ), + array( 1033, 30, 42, 24, 1, 25 ), + array( 793, 30, 23, 15, 28, 16 ), + array( 1955, 30, 17, 115, 0, 0 ), + array( 1541, 28, 10, 46, 23, 47 ), + array( 1115, 30, 10, 24, 35, 25 ), + array( 845, 30, 19, 15, 35, 16 ), + array( 2071, 30, 17, 115, 1, 116 ), + array( 1631, 28, 14, 46, 21, 47 ), + array( 1171, 30, 29, 24, 19, 25 ), + array( 901, 30, 11, 15, 46, 16 ), + array( 2191, 30, 13, 115, 6, 116 ), + array( 1725, 28, 14, 46, 23, 47 ), + array( 1231, 30, 44, 24, 7, 25 ), + array( 961, 30, 59, 16, 1, 17 ), + array( 2306, 30, 12, 121, 7, 122 ), + array( 1812, 28, 12, 47, 26, 48 ), + array( 1286, 30, 39, 24, 14, 25 ), + array( 986, 30, 22, 15, 41, 16 ), + array( 2434, 30, 6, 121, 14, 122 ), + array( 1914, 28, 6, 47, 34, 48 ), + array( 1354, 30, 46, 24, 10, 25 ), + array( 1054, 30, 2, 15, 64, 16 ), + array( 2566, 30, 17, 122, 4, 123 ), + array( 1992, 28, 29, 46, 14, 47 ), + array( 1426, 30, 49, 24, 10, 25 ), + array( 1096, 30, 24, 15, 46, 16 ), + array( 2702, 30, 4, 122, 18, 123 ), + array( 2102, 28, 13, 46, 32, 47 ), + array( 1502, 30, 48, 24, 14, 25 ), + array( 1142, 30, 42, 15, 32, 16 ), + array( 2812, 30, 20, 117, 4, 118 ), + array( 2216, 28, 40, 47, 7, 48 ), + array( 1582, 30, 43, 24, 22, 25 ), + array( 1222, 30, 10, 15, 67, 16 ), + array( 2956, 30, 19, 118, 6, 119 ), + array( 2334, 28, 18, 47, 31, 48 ), + array( 1666, 30, 34, 24, 34, 25 ), + array( 1276, 30, 20, 15, 61, 16 ), + ); + + private $qr_ec_polynomials = array( + 7 => array( + 0, 87, 229, 146, 149, 238, 102, 21 + ), + 10 => array( + 0, 251, 67, 46, 61, 118, 70, 64, 94, 32, 45 + ), + 13 => array( + 0, 74, 152, 176, 100, 86, 100, + 106, 104, 130, 218, 206, 140, 78 + ), + 15 => array( + 0, 8, 183, 61, 91, 202, 37, 51, + 58, 58, 237, 140, 124, 5, 99, 105 + ), + 16 => array( + 0, 120, 104, 107, 109, 102, 161, 76, 3, + 91, 191, 147, 169, 182, 194, 225, 120 + ), + 17 => array( + 0, 43, 139, 206, 78, 43, 239, 123, 206, + 214, 147, 24, 99, 150, 39, 243, 163, 136 + ), + 18 => array( + 0, 215, 234, 158, 94, 184, 97, 118, 170, 79, + 187, 152, 148, 252, 179, 5, 98, 96, 153 + ), + 20 => array( + 0, 17, 60, 79, 50, 61, 163, 26, 187, 202, 180, + 221, 225, 83, 239, 156, 164, 212, 212, 188, 190 + ), + 22 => array( + 0, 210, 171, 247, 242, 93, 230, 14, 109, 221, 53, 200, + 74, 8, 172, 98, 80, 219, 134, 160, 105, 165, 231 + ), + 24 => array( + 0, 229, 121, 135, 48, 211, 117, 251, 126, 159, 180, 169, + 152, 192, 226, 228, 218, 111, 0, 117, 232, 87, 96, 227, 21 + ), + 26 => array( + 0, 173, 125, 158, 2, 103, 182, 118, 17, + 145, 201, 111, 28, 165, 53, 161, 21, 245, + 142, 13, 102, 48, 227, 153, 145, 218, 70 + ), + 28 => array( + 0, 168, 223, 200, 104, 224, 234, 108, 180, + 110, 190, 195, 147, 205, 27, 232, 201, 21, 43, + 245, 87, 42, 195, 212, 119, 242, 37, 9, 123 + ), + 30 => array( + 0, 41, 173, 145, 152, 216, 31, 179, 182, 50, 48, + 110, 86, 239, 96, 222, 125, 42, 173, 226, 193, + 224, 130, 156, 37, 251, 216, 238, 40, 192, 180 + ), + ); + + private $qr_log = array( + 0, 0, 1, 25, 2, 50, 26, 198, + 3, 223, 51, 238, 27, 104, 199, 75, + 4, 100, 224, 14, 52, 141, 239, 129, + 28, 193, 105, 248, 200, 8, 76, 113, + 5, 138, 101, 47, 225, 36, 15, 33, + 53, 147, 142, 218, 240, 18, 130, 69, + 29, 181, 194, 125, 106, 39, 249, 185, + 201, 154, 9, 120, 77, 228, 114, 166, + 6, 191, 139, 98, 102, 221, 48, 253, + 226, 152, 37, 179, 16, 145, 34, 136, + 54, 208, 148, 206, 143, 150, 219, 189, + 241, 210, 19, 92, 131, 56, 70, 64, + 30, 66, 182, 163, 195, 72, 126, 110, + 107, 58, 40, 84, 250, 133, 186, 61, + 202, 94, 155, 159, 10, 21, 121, 43, + 78, 212, 229, 172, 115, 243, 167, 87, + 7, 112, 192, 247, 140, 128, 99, 13, + 103, 74, 222, 237, 49, 197, 254, 24, + 227, 165, 153, 119, 38, 184, 180, 124, + 17, 68, 146, 217, 35, 32, 137, 46, + 55, 63, 209, 91, 149, 188, 207, 205, + 144, 135, 151, 178, 220, 252, 190, 97, + 242, 86, 211, 171, 20, 42, 93, 158, + 132, 60, 57, 83, 71, 109, 65, 162, + 31, 45, 67, 216, 183, 123, 164, 118, + 196, 23, 73, 236, 127, 12, 111, 246, + 108, 161, 59, 82, 41, 157, 85, 170, + 251, 96, 134, 177, 187, 204, 62, 90, + 203, 89, 95, 176, 156, 169, 160, 81, + 11, 245, 22, 235, 122, 117, 44, 215, + 79, 174, 213, 233, 230, 231, 173, 232, + 116, 214, 244, 234, 168, 80, 88, 175, + ); + + private $qr_exp = array( + 1, 2, 4, 8, 16, 32, 64, 128, + 29, 58, 116, 232, 205, 135, 19, 38, + 76, 152, 45, 90, 180, 117, 234, 201, + 143, 3, 6, 12, 24, 48, 96, 192, + 157, 39, 78, 156, 37, 74, 148, 53, + 106, 212, 181, 119, 238, 193, 159, 35, + 70, 140, 5, 10, 20, 40, 80, 160, + 93, 186, 105, 210, 185, 111, 222, 161, + 95, 190, 97, 194, 153, 47, 94, 188, + 101, 202, 137, 15, 30, 60, 120, 240, + 253, 231, 211, 187, 107, 214, 177, 127, + 254, 225, 223, 163, 91, 182, 113, 226, + 217, 175, 67, 134, 17, 34, 68, 136, + 13, 26, 52, 104, 208, 189, 103, 206, + 129, 31, 62, 124, 248, 237, 199, 147, + 59, 118, 236, 197, 151, 51, 102, 204, + 133, 23, 46, 92, 184, 109, 218, 169, + 79, 158, 33, 66, 132, 21, 42, 84, + 168, 77, 154, 41, 82, 164, 85, 170, + 73, 146, 57, 114, 228, 213, 183, 115, + 230, 209, 191, 99, 198, 145, 63, 126, + 252, 229, 215, 179, 123, 246, 241, 255, + 227, 219, 171, 75, 150, 49, 98, 196, + 149, 55, 110, 220, 165, 87, 174, 65, + 130, 25, 50, 100, 200, 141, 7, 14, + 28, 56, 112, 224, 221, 167, 83, 166, + 81, 162, 89, 178, 121, 242, 249, 239, + 195, 155, 43, 86, 172, 69, 138, 9, + 18, 36, 72, 144, 61, 122, 244, 245, + 247, 243, 251, 235, 203, 139, 11, 22, + 44, 88, 176, 125, 250, 233, 207, 131, + 27, 54, 108, 216, 173, 71, 142, 1, + ); + + private $qr_remainder_bits = array( + 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, + ); + + private $qr_alignment_patterns = array( + array(6, 18), + array(6, 22), + array(6, 26), + array(6, 30), + array(6, 34), + array(6, 22, 38), + array(6, 24, 42), + array(6, 26, 46), + array(6, 28, 50), + array(6, 30, 54), + array(6, 32, 58), + array(6, 34, 62), + array(6, 26, 46, 66), + array(6, 26, 48, 70), + array(6, 26, 50, 74), + array(6, 30, 54, 78), + array(6, 30, 56, 82), + array(6, 30, 58, 86), + array(6, 34, 62, 90), + array(6, 28, 50, 72, 94), + array(6, 26, 50, 74, 98), + array(6, 30, 54, 78, 102), + array(6, 28, 54, 80, 106), + array(6, 32, 58, 84, 110), + array(6, 30, 58, 86, 114), + array(6, 34, 62, 90, 118), + array(6, 26, 50, 74, 98, 122), + array(6, 30, 54, 78, 102, 126), + array(6, 26, 52, 78, 104, 130), + array(6, 30, 56, 82, 108, 134), + array(6, 34, 60, 86, 112, 138), + array(6, 30, 58, 86, 114, 142), + array(6, 34, 62, 90, 118, 146), + array(6, 30, 54, 78, 102, 126, 150), + array(6, 24, 50, 76, 102, 128, 154), + array(6, 28, 54, 80, 106, 132, 158), + array(6, 32, 58, 84, 110, 136, 162), + array(6, 26, 54, 82, 110, 138, 166), + array(6, 30, 58, 86, 114, 142, 170), + ); + + /* format info string = $qr_format_info[ */ + /* (0 for L, 8 for M, 16 for Q, 24 for H) + mask */ + /* ]; */ + private $qr_format_info = array( + array( 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0 ), + array( 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1 ), + array( 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0 ), + array( 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1 ), + array( 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1 ), + array( 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0 ), + array( 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1 ), + array( 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0 ), + array( 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0 ), + array( 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1 ), + array( 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0 ), + array( 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1 ), + array( 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1 ), + array( 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0 ), + array( 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1 ), + array( 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0 ), + array( 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1 ), + array( 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0 ), + array( 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1 ), + array( 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0 ), + array( 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0 ), + array( 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1 ), + array( 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0 ), + array( 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1 ), + array( 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1 ), + array( 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0 ), + array( 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1 ), + array( 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0 ), + array( 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0 ), + array( 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1 ), + array( 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0 ), + array( 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1 ), + ); + + /* version info string = $qr_version_info[ (version - 7) ] */ + private $qr_version_info = array( + array( 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0 ), + array( 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0 ), + array( 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1 ), + array( 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1 ), + array( 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0 ), + array( 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0 ), + array( 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1 ), + array( 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1 ), + array( 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0 ), + array( 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0 ), + array( 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1 ), + array( 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1 ), + array( 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0 ), + array( 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0 ), + array( 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1 ), + array( 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1 ), + array( 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0 ), + array( 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0 ), + array( 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1 ), + array( 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1 ), + array( 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0 ), + array( 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0 ), + array( 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1 ), + array( 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1 ), + array( 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 ), + array( 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1 ), + array( 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0 ), + array( 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0 ), + array( 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1 ), + array( 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1 ), + array( 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0 ), + array( 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0 ), + array( 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1 ), + array( 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1 ), + ); + + /* - - - - DATA MATRIX ENCODER - - - - */ + + private function dmtx_encode($data, $rect, $fnc1) { + list($data, $ec) = $this->dmtx_encode_data($data, $rect, $fnc1); + $data = $this->dmtx_encode_ec($data, $ec); + list($h, $w, $mtx) = $this->dmtx_create_matrix($ec, $data); + return array( + 'g' => 'm', + 'q' => array(1, 1, 1, 1), + 's' => array($w, $h), + 'b' => $mtx + ); + } + + private function dmtx_encode_data($data, $rect, $fnc1) { + /* Convert to data codewords. */ + $edata = ($fnc1 ? array(232) : array()); + $length = strlen($data); + $offset = 0; + while ($offset < $length) { + $ch1 = ord(substr($data, $offset, 1)); + $offset++; + if ($ch1 >= 0x30 && $ch1 <= 0x39) { + $ch2 = ord(substr($data, $offset, 1)); + if ($ch2 >= 0x30 && $ch2 <= 0x39) { + $offset++; + $edata[] = (($ch1 - 0x30) * 10) + ($ch2 - 0x30) + 130; + } else { + $edata[] = $ch1 + 1; + } + } else if ($ch1 < 0x80) { + $edata[] = $ch1 + 1; + } else { + $edata[] = 235; + $edata[] = ($ch1 - 0x80) + 1; + } + } + /* Add padding. */ + $length = count($edata); + $ec_params = $this->dmtx_detect_version($length, $rect); + if ($length > $ec_params[0]) { + $length = $ec_params[0]; + $edata = array_slice($edata, 0, $length); + if ($edata[$length - 1] == 235) { + $edata[$length - 1] = 129; + } + } else if ($length < $ec_params[0]) { + $length++; + $edata[] = 129; + while ($length < $ec_params[0]) { + $length++; + $r = (($length * 149) % 253) + 1; + $edata[] = ($r + 129) % 254; + } + } + /* Return. */ + return array($edata, $ec_params); + } + + private function dmtx_detect_version($length, $rect) { + for ($i = ($rect ? 24 : 0), $j = ($rect ? 30 : 24); $i < $j; $i++) { + if ($length <= $this->dmtx_ec_params[$i][0]) { + return $this->dmtx_ec_params[$i]; + } + } + return $this->dmtx_ec_params[$j - 1]; + } + + private function dmtx_encode_ec($data, $ec_params) { + $blocks = $this->dmtx_ec_split($data, $ec_params); + for ($i = 0, $n = count($blocks); $i < $n; $i++) { + $ec_block = $this->dmtx_ec_divide($blocks[$i], $ec_params); + $blocks[$i] = array_merge($blocks[$i], $ec_block); + } + return $this->dmtx_ec_interleave($blocks); + } + + private function dmtx_ec_split($data, $ec_params) { + $blocks = array(); + $num_blocks = $ec_params[2] + $ec_params[4]; + for ($i = 0; $i < $num_blocks; $i++) { + $blocks[$i] = array(); + } + for ($i = 0, $length = count($data); $i < $length; $i++) { + $blocks[$i % $num_blocks][] = $data[$i]; + } + return $blocks; + } + + private function dmtx_ec_divide($data, $ec_params) { + $num_data = count($data); + $num_error = $ec_params[1]; + $generator = $this->dmtx_ec_polynomials[$num_error]; + $message = $data; + for ($i = 0; $i < $num_error; $i++) { + $message[] = 0; + } + for ($i = 0; $i < $num_data; $i++) { + if ($message[$i]) { + $leadterm = $this->dmtx_log[$message[$i]]; + for ($j = 0; $j <= $num_error; $j++) { + $term = ($generator[$j] + $leadterm) % 255; + $message[$i + $j] ^= $this->dmtx_exp[$term]; + } + } + } + return array_slice($message, $num_data, $num_error); + } + + private function dmtx_ec_interleave($blocks) { + $data = array(); + $num_blocks = count($blocks); + for ($offset = 0; true; $offset++) { + $break = true; + for ($i = 0; $i < $num_blocks; $i++) { + if (isset($blocks[$i][$offset])) { + $data[] = $blocks[$i][$offset]; + $break = false; + } + } + if ($break) break; + } + return $data; + } + + private function dmtx_create_matrix($ec_params, $data) { + /* Create matrix. */ + $rheight = $ec_params[8] + 2; + $rwidth = $ec_params[9] + 2; + $height = $ec_params[6] * $rheight; + $width = $ec_params[7] * $rwidth; + $bitmap = array(); + for ($y = 0; $y < $height; $y++) { + $row = array(); + for ($x = 0; $x < $width; $x++) { + $row[] = (( + ((($x + $y) % 2) == 0) || + (($x % $rwidth) == 0) || + (($y % $rheight) == ($rheight - 1)) + ) ? 1 : 0); + } + $bitmap[] = $row; + } + /* Create data region. */ + $rows = $ec_params[6] * $ec_params[8]; + $cols = $ec_params[7] * $ec_params[9]; + $matrix = array(); + for ($y = 0; $y < $rows; $y++) { + $row = array(); + for ($x = 0; $x < $width; $x++) { + $row[] = null; + } + $matrix[] = $row; + } + $this->dmtx_place_data($matrix, $rows, $cols, $data); + /* Copy into matrix. */ + for ($yy = 0; $yy < $ec_params[6]; $yy++) { + for ($xx = 0; $xx < $ec_params[7]; $xx++) { + for ($y = 0; $y < $ec_params[8]; $y++) { + for ($x = 0; $x < $ec_params[9]; $x++) { + $row = $yy * $ec_params[8] + $y; + $col = $xx * $ec_params[9] + $x; + $b = $matrix[$row][$col]; + if (is_null($b)) continue; + $row = $yy * $rheight + $y + 1; + $col = $xx * $rwidth + $x + 1; + $bitmap[$row][$col] = $b; + } + } + } + } + /* Return matrix. */ + return array($height, $width, $bitmap); + } + + private function dmtx_place_data(&$mtx, $rows, $cols, $data) { + $row = 4; + $col = 0; + $offset = 0; + $length = count($data); + while (($row < $rows || $col < $cols) && $offset < $length) { + /* Corner cases. Literally. */ + if ($row == $rows && $col == 0) { + $this->dmtx_place_1($mtx, $rows, $cols, $data[$offset++]); + } else if ($row == $rows - 2 && $col == 0 && $cols % 4 != 0) { + $this->dmtx_place_2($mtx, $rows, $cols, $data[$offset++]); + } else if ($row == $rows - 2 && $col == 0 && $cols % 8 == 4) { + $this->dmtx_place_3($mtx, $rows, $cols, $data[$offset++]); + } else if ($row == $rows + 4 && $col == 2 && $cols % 8 == 0) { + $this->dmtx_place_4($mtx, $rows, $cols, $data[$offset++]); + } + /* Up and to the right. */ + while ($row >= 0 && $col < $cols && $offset < $length) { + if ($row < $rows && $col >= 0 && is_null($mtx[$row][$col])) { + $b = $data[$offset++]; + $this->dmtx_place_0($mtx, $rows, $cols, $row, $col, $b); + } + $row -= 2; + $col += 2; + } + $row += 1; + $col += 3; + /* Down and to the left. */ + while ($row < $rows && $col >= 0 && $offset < $length) { + if ($row >= 0 && $col < $cols && is_null($mtx[$row][$col])) { + $b = $data[$offset++]; + $this->dmtx_place_0($mtx, $rows, $cols, $row, $col, $b); + } + $row += 2; + $col -= 2; + } + $row += 3; + $col += 1; + } + } + + private function dmtx_place_1(&$matrix, $rows, $cols, $b) { + $matrix[$rows - 1][0] = (($b & 0x80) ? 1 : 0); + $matrix[$rows - 1][1] = (($b & 0x40) ? 1 : 0); + $matrix[$rows - 1][2] = (($b & 0x20) ? 1 : 0); + $matrix[0][$cols - 2] = (($b & 0x10) ? 1 : 0); + $matrix[0][$cols - 1] = (($b & 0x08) ? 1 : 0); + $matrix[1][$cols - 1] = (($b & 0x04) ? 1 : 0); + $matrix[2][$cols - 1] = (($b & 0x02) ? 1 : 0); + $matrix[3][$cols - 1] = (($b & 0x01) ? 1 : 0); + } + + private function dmtx_place_2(&$matrix, $rows, $cols, $b) { + $matrix[$rows - 3][0] = (($b & 0x80) ? 1 : 0); + $matrix[$rows - 2][0] = (($b & 0x40) ? 1 : 0); + $matrix[$rows - 1][0] = (($b & 0x20) ? 1 : 0); + $matrix[0][$cols - 4] = (($b & 0x10) ? 1 : 0); + $matrix[0][$cols - 3] = (($b & 0x08) ? 1 : 0); + $matrix[0][$cols - 2] = (($b & 0x04) ? 1 : 0); + $matrix[0][$cols - 1] = (($b & 0x02) ? 1 : 0); + $matrix[1][$cols - 1] = (($b & 0x01) ? 1 : 0); + } + + private function dmtx_place_3(&$matrix, $rows, $cols, $b) { + $matrix[$rows - 3][0] = (($b & 0x80) ? 1 : 0); + $matrix[$rows - 2][0] = (($b & 0x40) ? 1 : 0); + $matrix[$rows - 1][0] = (($b & 0x20) ? 1 : 0); + $matrix[0][$cols - 2] = (($b & 0x10) ? 1 : 0); + $matrix[0][$cols - 1] = (($b & 0x08) ? 1 : 0); + $matrix[1][$cols - 1] = (($b & 0x04) ? 1 : 0); + $matrix[2][$cols - 1] = (($b & 0x02) ? 1 : 0); + $matrix[3][$cols - 1] = (($b & 0x01) ? 1 : 0); + } + + private function dmtx_place_4(&$matrix, $rows, $cols, $b) { + $matrix[$rows - 1][ 0] = (($b & 0x80) ? 1 : 0); + $matrix[$rows - 1][$cols - 1] = (($b & 0x40) ? 1 : 0); + $matrix[ 0][$cols - 3] = (($b & 0x20) ? 1 : 0); + $matrix[ 0][$cols - 2] = (($b & 0x10) ? 1 : 0); + $matrix[ 0][$cols - 1] = (($b & 0x08) ? 1 : 0); + $matrix[ 1][$cols - 3] = (($b & 0x04) ? 1 : 0); + $matrix[ 1][$cols - 2] = (($b & 0x02) ? 1 : 0); + $matrix[ 1][$cols - 1] = (($b & 0x01) ? 1 : 0); + } + + private function dmtx_place_0(&$matrix, $rows, $cols, $row, $col, $b) { + $this->dmtx_place_b($matrix, $rows, $cols, $row-2, $col-2, $b & 0x80); + $this->dmtx_place_b($matrix, $rows, $cols, $row-2, $col-1, $b & 0x40); + $this->dmtx_place_b($matrix, $rows, $cols, $row-1, $col-2, $b & 0x20); + $this->dmtx_place_b($matrix, $rows, $cols, $row-1, $col-1, $b & 0x10); + $this->dmtx_place_b($matrix, $rows, $cols, $row-1, $col-0, $b & 0x08); + $this->dmtx_place_b($matrix, $rows, $cols, $row-0, $col-2, $b & 0x04); + $this->dmtx_place_b($matrix, $rows, $cols, $row-0, $col-1, $b & 0x02); + $this->dmtx_place_b($matrix, $rows, $cols, $row-0, $col-0, $b & 0x01); + } + + private function dmtx_place_b(&$matrix, $rows, $cols, $row, $col, $b) { + if ($row < 0) { + $row += $rows; + $col += (4 - (($rows + 4) % 8)); + } + if ($col < 0) { + $col += $cols; + $row += (4 - (($cols + 4) % 8)); + } + $matrix[$row][$col] = ($b ? 1 : 0); + } + + /* $dmtx_ec_params[] = array( */ + /* total number of data codewords, */ + /* number of error correction codewords per block, */ + /* number of blocks in first group, */ + /* number of data codewords per block in first group, */ + /* number of blocks in second group, */ + /* number of data codewords per block in second group, */ + /* number of data regions (vertical), */ + /* number of data regions (horizontal), */ + /* number of rows per data region, */ + /* number of columns per data region */ + /* ); */ + private $dmtx_ec_params = array( + array( 3, 5, 1, 3, 0, 0, 1, 1, 8, 8 ), + array( 5, 7, 1, 5, 0, 0, 1, 1, 10, 10 ), + array( 8, 10, 1, 8, 0, 0, 1, 1, 12, 12 ), + array( 12, 12, 1, 12, 0, 0, 1, 1, 14, 14 ), + array( 18, 14, 1, 18, 0, 0, 1, 1, 16, 16 ), + array( 22, 18, 1, 22, 0, 0, 1, 1, 18, 18 ), + array( 30, 20, 1, 30, 0, 0, 1, 1, 20, 20 ), + array( 36, 24, 1, 36, 0, 0, 1, 1, 22, 22 ), + array( 44, 28, 1, 44, 0, 0, 1, 1, 24, 24 ), + array( 62, 36, 1, 62, 0, 0, 2, 2, 14, 14 ), + array( 86, 42, 1, 86, 0, 0, 2, 2, 16, 16 ), + array( 114, 48, 1, 114, 0, 0, 2, 2, 18, 18 ), + array( 144, 56, 1, 144, 0, 0, 2, 2, 20, 20 ), + array( 174, 68, 1, 174, 0, 0, 2, 2, 22, 22 ), + array( 204, 42, 2, 102, 0, 0, 2, 2, 24, 24 ), + array( 280, 56, 2, 140, 0, 0, 4, 4, 14, 14 ), + array( 368, 36, 4, 92, 0, 0, 4, 4, 16, 16 ), + array( 456, 48, 4, 114, 0, 0, 4, 4, 18, 18 ), + array( 576, 56, 4, 144, 0, 0, 4, 4, 20, 20 ), + array( 696, 68, 4, 174, 0, 0, 4, 4, 22, 22 ), + array( 816, 56, 6, 136, 0, 0, 4, 4, 24, 24 ), + array( 1050, 68, 6, 175, 0, 0, 6, 6, 18, 18 ), + array( 1304, 62, 8, 163, 0, 0, 6, 6, 20, 20 ), + array( 1558, 62, 8, 156, 2, 155, 6, 6, 22, 22 ), + array( 5, 7, 1, 5, 0, 0, 1, 1, 6, 16 ), + array( 10, 11, 1, 10, 0, 0, 1, 2, 6, 14 ), + array( 16, 14, 1, 16, 0, 0, 1, 1, 10, 24 ), + array( 22, 18, 1, 22, 0, 0, 1, 2, 10, 16 ), + array( 32, 24, 1, 32, 0, 0, 1, 2, 14, 16 ), + array( 49, 28, 1, 49, 0, 0, 1, 2, 14, 22 ), + ); + + private $dmtx_ec_polynomials = array( + 5 => array( + 0, 235, 207, 210, 244, 15 + ), + 7 => array( + 0, 177, 30, 214, 218, 42, 197, 28 + ), + 10 => array( + 0, 199, 50, 150, 120, 237, 131, 172, 83, 243, 55 + ), + 11 => array( + 0, 213, 173, 212, 156, 103, 109, 174, 242, 215, 12, 66 + ), + 12 => array( + 0, 168, 142, 35, 173, 94, 185, 107, 199, 74, 194, 233, 78 + ), + 14 => array( + 0, 83, 171, 33, 39, 8, 12, 248, + 27, 38, 84, 93, 246, 173, 105 + ), + 18 => array( + 0, 164, 9, 244, 69, 177, 163, 161, 231, 94, + 250, 199, 220, 253, 164, 103, 142, 61, 171 + ), + 20 => array( + 0, 127, 33, 146, 23, 79, 25, 193, 122, 209, 233, + 230, 164, 1, 109, 184, 149, 38, 201, 61, 210 + ), + 24 => array( + 0, 65, 141, 245, 31, 183, 242, 236, 177, 127, 225, 106, + 22, 131, 20, 202, 22, 106, 137, 103, 231, 215, 136, 85, 45 + ), + 28 => array( + 0, 150, 32, 109, 149, 239, 213, 198, 48, 94, + 50, 12, 195, 167, 130, 196, 253, 99, 166, 239, + 222, 146, 190, 245, 184, 173, 125, 17, 151 + ), + 36 => array( + 0, 57, 86, 187, 69, 140, 153, 31, 66, 135, 67, 248, 84, + 90, 81, 219, 197, 2, 1, 39, 16, 75, 229, 20, 51, 252, + 108, 213, 181, 183, 87, 111, 77, 232, 168, 176, 156 + ), + 42 => array( + 0, 225, 38, 225, 148, 192, 254, 141, 11, 82, 237, + 81, 24, 13, 122, 0, 106, 167, 13, 207, 160, 88, + 203, 38, 142, 84, 66, 3, 168, 102, 156, 1, 200, + 88, 60, 233, 134, 115, 114, 234, 90, 65, 138 + ), + 48 => array( + 0, 114, 69, 122, 30, 94, 11, 66, 230, 132, 73, 145, 137, + 135, 79, 214, 33, 12, 220, 142, 213, 136, 124, 215, 166, + 9, 222, 28, 154, 132, 4, 100, 170, 145, 59, 164, 215, 17, + 249, 102, 249, 134, 128, 5, 245, 131, 127, 221, 156 + ), + 56 => array( + 0, 29, 179, 99, 149, 159, 72, 125, 22, 55, 60, 217, + 176, 156, 90, 43, 80, 251, 235, 128, 169, 254, 134, + 249, 42, 121, 118, 72, 128, 129, 232, 37, 15, 24, 221, + 143, 115, 131, 40, 113, 254, 19, 123, 246, 68, 166, + 66, 118, 142, 47, 51, 195, 242, 249, 131, 38, 66 + ), + 62 => array( + 0, 182, 133, 162, 126, 236, 58, 172, 163, 53, 121, 159, 2, + 166, 137, 234, 158, 195, 164, 77, 228, 226, 145, 91, 180, + 232, 23, 241, 132, 135, 206, 184, 14, 6, 66, 238, 83, 100, + 111, 85, 202, 91, 156, 68, 218, 57, 83, 222, 188, 25, 179, + 144, 169, 164, 82, 154, 103, 89, 42, 141, 175, 32, 168 + ), + 68 => array( + 0, 33, 79, 190, 245, 91, 221, 233, 25, 24, 6, 144, + 151, 121, 186, 140, 127, 45, 153, 250, 183, 70, 131, + 198, 17, 89, 245, 121, 51, 140, 252, 203, 82, 83, 233, + 152, 220, 155, 18, 230, 210, 94, 32, 200, 197, 192, + 194, 202, 129, 10, 237, 198, 94, 176, 36, 40, 139, + 201, 132, 219, 34, 56, 113, 52, 20, 34, 247, 15, 51 + ), + ); + + private $dmtx_log = array( + 0, 0, 1, 240, 2, 225, 241, 53, + 3, 38, 226, 133, 242, 43, 54, 210, + 4, 195, 39, 114, 227, 106, 134, 28, + 243, 140, 44, 23, 55, 118, 211, 234, + 5, 219, 196, 96, 40, 222, 115, 103, + 228, 78, 107, 125, 135, 8, 29, 162, + 244, 186, 141, 180, 45, 99, 24, 49, + 56, 13, 119, 153, 212, 199, 235, 91, + 6, 76, 220, 217, 197, 11, 97, 184, + 41, 36, 223, 253, 116, 138, 104, 193, + 229, 86, 79, 171, 108, 165, 126, 145, + 136, 34, 9, 74, 30, 32, 163, 84, + 245, 173, 187, 204, 142, 81, 181, 190, + 46, 88, 100, 159, 25, 231, 50, 207, + 57, 147, 14, 67, 120, 128, 154, 248, + 213, 167, 200, 63, 236, 110, 92, 176, + 7, 161, 77, 124, 221, 102, 218, 95, + 198, 90, 12, 152, 98, 48, 185, 179, + 42, 209, 37, 132, 224, 52, 254, 239, + 117, 233, 139, 22, 105, 27, 194, 113, + 230, 206, 87, 158, 80, 189, 172, 203, + 109, 175, 166, 62, 127, 247, 146, 66, + 137, 192, 35, 252, 10, 183, 75, 216, + 31, 83, 33, 73, 164, 144, 85, 170, + 246, 65, 174, 61, 188, 202, 205, 157, + 143, 169, 82, 72, 182, 215, 191, 251, + 47, 178, 89, 151, 101, 94, 160, 123, + 26, 112, 232, 21, 51, 238, 208, 131, + 58, 69, 148, 18, 15, 16, 68, 17, + 121, 149, 129, 19, 155, 59, 249, 70, + 214, 250, 168, 71, 201, 156, 64, 60, + 237, 130, 111, 20, 93, 122, 177, 150, + ); + + private $dmtx_exp = array( + 1, 2, 4, 8, 16, 32, 64, 128, + 45, 90, 180, 69, 138, 57, 114, 228, + 229, 231, 227, 235, 251, 219, 155, 27, + 54, 108, 216, 157, 23, 46, 92, 184, + 93, 186, 89, 178, 73, 146, 9, 18, + 36, 72, 144, 13, 26, 52, 104, 208, + 141, 55, 110, 220, 149, 7, 14, 28, + 56, 112, 224, 237, 247, 195, 171, 123, + 246, 193, 175, 115, 230, 225, 239, 243, + 203, 187, 91, 182, 65, 130, 41, 82, + 164, 101, 202, 185, 95, 190, 81, 162, + 105, 210, 137, 63, 126, 252, 213, 135, + 35, 70, 140, 53, 106, 212, 133, 39, + 78, 156, 21, 42, 84, 168, 125, 250, + 217, 159, 19, 38, 76, 152, 29, 58, + 116, 232, 253, 215, 131, 43, 86, 172, + 117, 234, 249, 223, 147, 11, 22, 44, + 88, 176, 77, 154, 25, 50, 100, 200, + 189, 87, 174, 113, 226, 233, 255, 211, + 139, 59, 118, 236, 245, 199, 163, 107, + 214, 129, 47, 94, 188, 85, 170, 121, + 242, 201, 191, 83, 166, 97, 194, 169, + 127, 254, 209, 143, 51, 102, 204, 181, + 71, 142, 49, 98, 196, 165, 103, 206, + 177, 79, 158, 17, 34, 68, 136, 61, + 122, 244, 197, 167, 99, 198, 161, 111, + 222, 145, 15, 30, 60, 120, 240, 205, + 183, 67, 134, 33, 66, 132, 37, 74, + 148, 5, 10, 20, 40, 80, 160, 109, + 218, 153, 31, 62, 124, 248, 221, 151, + 3, 6, 12, 24, 48, 96, 192, 173, + 119, 238, 241, 207, 179, 75, 150, 1, + ); + +} \ No newline at end of file diff --git a/rfc6238.php b/rfc6238.php index 6d4c22b3..6503b07c 100644 --- a/rfc6238.php +++ b/rfc6238.php @@ -58,14 +58,6 @@ class TokenAuth6238 { return $result; } - public static function getBarCodeUrl($username, $domain, $secretkey, $issuer) { - $url = "https://chart.apis.google.com/chart"; - $url = $url."?chs=200x200&chld=M|0&cht=qr&chl=otpauth://totp/"; - $url = $url.$username . "@" . $domain . "%3Fsecret%3D" . $secretkey . '%26issuer%3D' . rawurlencode($issuer); - - return $url; - } - private static function oath_hotp ($key, $counter, $debug=false) { $result = ""; $orgcounter = $counter; diff --git a/user_security.php b/user_security.php index 5b938c8e..b3d85eb2 100644 --- a/user_security.php +++ b/user_security.php @@ -59,10 +59,12 @@ $remember_token_count = mysqli_num_rows($sql_remember_tokens); if (!empty($session_token)) { - //Generate QR Code based off the generated key - print sprintf('', TokenAuth6238::getBarCodeUrl($session_name, ' ', $session_token, $_SERVER['SERVER_NAME'])); + // Generate QR Code + $data = "otpauth://totp/ITFlow:$session_email?secret=$session_token"; + print ""; echo "

    $session_token

    "; + } ?> From 2b006af52db38b30a916bdf99b903eb24ed3e1b4 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 26 May 2024 16:29:35 +0100 Subject: [PATCH 44/67] 2FA QR Codes Move away from the Google Charts API for generating QR codes as this is currently broken and not a security best practice. --- plugins/barcode/barcode.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/barcode/barcode.php b/plugins/barcode/barcode.php index b1115011..1c29d10d 100644 --- a/plugins/barcode/barcode.php +++ b/plugins/barcode/barcode.php @@ -26,6 +26,10 @@ DEALINGS IN THE SOFTWARE. \****************************************************************************/ +// Check php-gd is installed +$testGD = get_extension_funcs("gd"); +if (!$testGD){ echo "The GD extension is not installed, please install using 'apt install php-gd', restart Apache, and try again"; exit; } + if (realpath(__FILE__) == realpath($_SERVER['SCRIPT_FILENAME'])) { if (isset($_POST['s']) && isset($_POST['d'])) { $generator = new barcode_generator(); @@ -3345,4 +3349,4 @@ class barcode_generator { 119, 238, 241, 207, 179, 75, 150, 1, ); -} \ No newline at end of file +} From 059a5516fc5871a3fdcb32e3f2565a1ec3ea22cf Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 26 May 2024 17:05:42 +0100 Subject: [PATCH 45/67] Ticket time tracking Bugfix for ticket time tracking as this was broken since the open ticket timer was removed --- js/header_timers.js | 147 ------------------------------------- js/ticket_time_tracking.js | 27 ++----- top_nav.php | 2 + 3 files changed, 7 insertions(+), 169 deletions(-) delete mode 100644 js/header_timers.js diff --git a/js/header_timers.js b/js/header_timers.js deleted file mode 100644 index b7059480..00000000 --- a/js/header_timers.js +++ /dev/null @@ -1,147 +0,0 @@ -// ticketCounter.js -(function() { - function getRunningTicketCount() { - let count = 0; - for (let i = 0; i < localStorage.length; i++) { - let key = localStorage.key(i); - if (key.includes("ticket-timer-running")) { - let isRunning = JSON.parse(localStorage.getItem(key)); - if (isRunning) { - count++; - } - } - } - return count; - } - - function updateTicketCountDisplay() { - let count = getRunningTicketCount(); - let countDisplay = document.getElementById("runningTicketsCount"); - if (countDisplay) { - countDisplay.innerText = count; - } - if (count == 0) { - countDisplay.classList.remove('badge-danger'); - } else { - //check to see if more than one ticket - if (count > 1) { - countDisplay.classList.add('badge-danger'); - } - //if count is one, check to see if its open in the current window by looking at the post variable ticket_id in url - if (count == 1) { - let urlParams = new URLSearchParams(window.location.search); - let ticketID = urlParams.get('ticket_id'); - console.log(ticketID); - // If ticket number equals one in local storage, then add badge-danger class - if (localStorage.getItem("ticket-timer-running-") == ticketID) { - countDisplay.classList.add('badge-danger'); - } else { - countDisplay.classList.remove('badge-danger'); - } - } - } - } - - function getElapsedSeconds(ticketID) { - let storedStartTime = parseInt(localStorage.getItem(ticketID + "-startTime") || "0"); - let pausedTime = parseInt(localStorage.getItem(ticketID + "-pausedTime") || "0"); - if (!storedStartTime) return pausedTime; - let timeSinceStart = Math.floor((Date.now() - storedStartTime) / 1000); - return pausedTime + timeSinceStart; - } - - function formatTime(seconds) { - let hours = Math.floor(seconds / 3600); - let minutes = Math.floor((seconds % 3600) / 60); - let secs = seconds % 60; - return `${hours}h ${minutes}m ${secs}s`; - } - - function loadOpenTickets() { - let openTicketsContainer = document.getElementById('openTicketsContainer'); - openTicketsContainer.innerHTML = ''; // Clear existing content - - for (let i = 0; i < localStorage.length; i++) { - let key = localStorage.key(i); - - if (key.startsWith("ticket-timer-running-")) { - let ticketID = key.replace("ticket-timer-running-", ""); - let isRunning = JSON.parse(localStorage.getItem(key)); - - let ticketDiv = document.createElement('div'); - ticketDiv.classList.add('card', 'card-outline', 'mb-3'); - // Add class based on ticket status - ticketDiv.classList.add(isRunning ? 'card-info' : 'card-warning'); - ticketDiv.id = 'ticket-' + ticketID; - - let elapsedSecs = getElapsedSeconds(ticketID); - let timeString = formatTime(elapsedSecs); - - ticketDiv.innerHTML = ` -
    -

    Ticket ID: ${ticketID}

    - View Ticket -
    -
    -

    Total Time: ${timeString}

    -
    - `; - - openTicketsContainer.appendChild(ticketDiv); - } - } - - requestAnimationFrame(() => updateRunningTickets()); - } - - function updateRunningTickets() { - let runningTickets = document.querySelectorAll('[id^="ticket-"]'); - runningTickets.forEach(ticket => { - let ticketID = ticket.id.replace("ticket-", ""); - let isRunning = JSON.parse(localStorage.getItem("ticket-timer-running-" + ticketID)); - - if (isRunning) { - let updatedTime = formatTime(getElapsedSeconds(ticketID)); - document.getElementById('time-' + ticketID).innerText = 'Total Time: ' + updatedTime; - } - }); - - requestAnimationFrame(updateRunningTickets); - } - - function clearAllTimers() { - // Collect keys to be removed - let keysToRemove = []; - for (let i = 0; i < localStorage.length; i++) { - let key = localStorage.key(i); - if (key.startsWith("ticket-timer-running-") || key.endsWith("-startTime") || key.endsWith("-pausedTime")) { - keysToRemove.push(key); - } - } - - // Remove collected keys - keysToRemove.forEach(key => localStorage.removeItem(key)); - - // Update the display and redirect - updateTicketCountDisplay(); - window.location.href = "/tickets.php"; - } - - // Initial update on script load - updateTicketCountDisplay(); - - // update every 10 seconds - setInterval(updateTicketCountDisplay, 10000); - - // Add event listener to modal - document.addEventListener('DOMContentLoaded', function() { - let modal = document.getElementById('openTicketsModal'); - if (modal) { - $('#openTicketsModal').on('show.bs.modal', loadOpenTickets); - } - }); - - // Add event listener to clear all timers button - document.getElementById('clearAllTimers').addEventListener('click', clearAllTimers); - -})(); diff --git a/js/ticket_time_tracking.js b/js/ticket_time_tracking.js index 081319e3..dc0d99c7 100644 --- a/js/ticket_time_tracking.js +++ b/js/ticket_time_tracking.js @@ -8,8 +8,6 @@ var ticketID = getCurrentTicketID(); var elapsedSecs = getElapsedSeconds(); - updateRunningTicketsCount(); - function getCurrentTicketID() { const urlParams = new URLSearchParams(window.location.search); return urlParams.get('ticket_id'); @@ -55,7 +53,6 @@ timerInterval = setInterval(countTime, 1000); isPaused = false; document.getElementById("startStopTimer").innerText = "Pause"; - updateRunningTicketsCount(); localStorage.setItem("ticket-timer-running-" + ticketID, "true"); } @@ -70,7 +67,6 @@ localStorage.removeItem(getLocalStorageKey("startTime")); isPaused = true; document.getElementById("startStopTimer").innerText = "Start"; - updateRunningTicketsCount(); localStorage.setItem("ticket-timer-running-" + ticketID, "false"); } @@ -91,7 +87,6 @@ document.getElementById("startStopTimer").innerText = "Start"; } localStorage.setItem("ticket-timer-running-" + ticketID, "false"); - updateRunningTicketsCount(); } function forceResetTimer() { @@ -102,7 +97,7 @@ displayTime(); document.getElementById("startStopTimer").innerText = "Start"; } - + function handleInputFocus() { if (!isPaused) { pauseTimer(); @@ -114,7 +109,7 @@ const minutes = parseInt(document.getElementById("minutes").value, 10) || 0; const seconds = parseInt(document.getElementById("seconds").value, 10) || 0; elapsedSecs = (hours * 3600) + (minutes * 60) + seconds; - + // Update local storage so the manually entered time is retained even if the page is reloaded. if (!timerInterval) { localStorage.setItem(getLocalStorageKey("pausedTime"), elapsedSecs.toString()); @@ -125,18 +120,6 @@ } } - function updateRunningTicketsCount() { - let runningTickets = parseInt(document.getElementById('runningTicketsCount').innerText, 10); - - if (!isPaused && timerInterval) { - runningTickets += 1; - } else { - runningTickets = Math.max(0, runningTickets - 1); - } - - document.getElementById('runningTicketsCount').innerText = runningTickets.toString(); - } - // Function to check status and pause timer function checkStatusAndPauseTimer() { var status = document.querySelector('select[name="status"]').value; @@ -148,7 +131,7 @@ document.getElementById("hours").addEventListener('change', updateTimeFromInput); document.getElementById("minutes").addEventListener('change', updateTimeFromInput); document.getElementById("seconds").addEventListener('change', updateTimeFromInput); - + document.getElementById("hours").addEventListener('focus', handleInputFocus); document.getElementById("minutes").addEventListener('focus', handleInputFocus); document.getElementById("seconds").addEventListener('focus', handleInputFocus); @@ -184,11 +167,11 @@ } else if (localStorage.getItem(getLocalStorageKey("startTime"))) { startTimer(); } - + // Check and pause timer if status is pending checkStatusAndPauseTimer(); } catch (error) { console.error("There was an issue initializing the timer:", error); } }); -})(); \ No newline at end of file +})(); diff --git a/top_nav.php b/top_nav.php index 6713fcd2..0cacd51d 100644 --- a/top_nav.php +++ b/top_nav.php @@ -12,6 +12,8 @@
      + +
      From c96989738928d301e27f7da6863b53146e3fa773 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 26 May 2024 17:09:04 +0100 Subject: [PATCH 46/67] Ticket time tracking Bugfix for ticket time tracking as this was broken since the open ticket timer was removed --- top_nav.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/top_nav.php b/top_nav.php index 0cacd51d..6713fcd2 100644 --- a/top_nav.php +++ b/top_nav.php @@ -12,8 +12,6 @@
        - -
        From e820ffec6b1205a7b9275de7c8b62fe863065fc0 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 26 May 2024 18:37:37 +0100 Subject: [PATCH 47/67] User roles Move the default user roles into the database to make way for custom roles & permissions --- admin_user_add_modal.php | 12 +++++++++--- admin_user_edit_modal.php | 23 ++++++++++------------- admin_users.php | 11 +++-------- database_updates.php | 19 +++++++++++++++---- database_version.php | 2 +- db.sql | 17 +++++++++++++++++ setup.php | 5 +++++ 7 files changed, 60 insertions(+), 29 deletions(-) diff --git a/admin_user_add_modal.php b/admin_user_add_modal.php index be5cf3a2..fe41a21f 100644 --- a/admin_user_add_modal.php +++ b/admin_user_add_modal.php @@ -55,9 +55,15 @@
    diff --git a/admin_user_edit_modal.php b/admin_user_edit_modal.php index 90ef2372..188d4974 100644 --- a/admin_user_edit_modal.php +++ b/admin_user_edit_modal.php @@ -67,19 +67,16 @@
    diff --git a/admin_users.php b/admin_users.php index 83464a28..78392192 100644 --- a/admin_users.php +++ b/admin_users.php @@ -12,8 +12,9 @@ $url_query_strings_sort = http_build_query($get_copy); $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings + "SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings, user_roles WHERE users.user_id = user_settings.user_id + AND user_settings.user_role = user_roles.user_role_id AND (user_name LIKE '%$q%' OR user_email LIKE '%$q%') AND user_archived_at IS NULL ORDER BY $sort $order LIMIT $record_from, $record_to" @@ -98,13 +99,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } $user_config_force_mfa = intval($row['user_config_force_mfa']); $user_role = $row['user_role']; - if ($user_role == 3) { - $user_role_display = "Administrator"; - } elseif ($user_role == 2) { - $user_role_display = "Technician"; - } else { - $user_role_display = "Accountant"; - } + $user_role_display = nullable_htmlentities($row['user_role_name']); $user_initials = nullable_htmlentities(initials($user_name)); $sql_last_login = mysqli_query( diff --git a/database_updates.php b/database_updates.php index f9fbdbdc..d5cbcd69 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1889,14 +1889,25 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '1.2.9') { mysqli_query($mysqli, "CREATE TABLE `user_permissions` (`user_id` int(11) NOT NULL,`client_id` int(11) NOT NULL, PRIMARY KEY (`user_id`,`client_id`))"); - + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.0'"); } - // if (CURRENT_DATABASE_VERSION == '1.3.0') { - // // Insert queries here required to update to DB version 1.3.0 + if (CURRENT_DATABASE_VERSION == '1.3.0') { + + mysqli_query($mysqli, "CREATE TABLE `itflow`.`user_roles` (`user_role_id` INT(11) NOT NULL AUTO_INCREMENT , `user_role_name` VARCHAR(200) NOT NULL , `user_role_description` VARCHAR(200) NULL DEFAULT NULL , `user_role_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , `user_role_updated_at` DATETIME on update CURRENT_TIMESTAMP NULL , `user_role_archived_at` DATETIME NULL , PRIMARY KEY (`user_role_id`)) ENGINE = InnoDB"); + + mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 1, user_role_name = 'Accountant', user_role_description = 'Built-in - Limited access to financial-focused modules'"); + mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 2, user_role_name = 'Technician', user_role_description = 'Built-in - Limited access to technical-focused modules'"); + mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 3, user_role_name = 'Administrator', user_role_description = 'Built-in - Full administrative access to all modules (including user management)'"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.1'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.3.1') { + // // Insert queries here required to update to DB version 1.3.1 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.1"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.2'"); // } } else { diff --git a/database_version.php b/database_version.php index 91fe0b03..e55dd88e 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.3.0"); +DEFINE("LATEST_DATABASE_VERSION", "1.3.1"); diff --git a/db.sql b/db.sql index 0bd7cf94..4059d711 100644 --- a/db.sql +++ b/db.sql @@ -1791,6 +1791,23 @@ CREATE TABLE `user_permissions` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `user_roles` +-- + +DROP TABLE IF EXISTS `user_roles`; +CREATE TABLE IF NOT EXISTS `user_roles` ( + `user_role_id` int(11) NOT NULL AUTO_INCREMENT, + `user_role_name` varchar(200) NOT NULL, + `user_role_description` varchar(200) DEFAULT NULL, + `user_role_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `user_role_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `user_role_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`user_role_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `user_settings` -- diff --git a/setup.php b/setup.php index 3dbbdc8f..dc78d4fe 100644 --- a/setup.php +++ b/setup.php @@ -302,6 +302,11 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Auto Close', ticket_status_color = '#343a40'"); // 4 mysqli_query($mysqli, "INSERT INTO ticket_statuses SET ticket_status_name = 'Closed', ticket_status_color = '#343a40'"); // 5 + // Add default roles + mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 1, user_role_name = 'Accountant', user_role_description = 'Built-in - Limited access to financial-focused modules'"); + mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 2, user_role_name = 'Technician', user_role_description = 'Built-in - Limited access to technical-focused modules'"); + mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 3, user_role_name = 'Administrator', user_role_description = 'Built-in - Full administrative access to all modules (including user management)'"); + $_SESSION['alert_message'] = "Company $name created!"; From 5210fae3ec3891522b929c328d2bf68429df513d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 26 May 2024 15:55:46 -0400 Subject: [PATCH 48/67] Fix --- ajax_calendar_events.php | 139 +++++++++++++++++++++++++++++++++++++++ calendar_events.php | 2 +- database_updates.php | 10 ++- 3 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 ajax_calendar_events.php diff --git a/ajax_calendar_events.php b/ajax_calendar_events.php new file mode 100644 index 00000000..c332f7e7 --- /dev/null +++ b/ajax_calendar_events.php @@ -0,0 +1,139 @@ + + +

    +

    + intval($row['event_id']), + 'title' => $row['event_title'], + 'start' => $row['event_start'], + 'end' => $row['event_end'], + 'color' => $row['calendar_color'] + ]; +} + +// Fetch invoices created +$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id WHERE invoice_date BETWEEN '$start_date' AND '$end_date'"); +while ($row = mysqli_fetch_array($sql)) { + $events[] = [ + 'id' => intval($row['invoice_id']), + 'title' => $row['invoice_prefix'] . $row['invoice_number'] . " created -scope: " . $row['invoice_scope'], + 'start' => $row['invoice_date'], + 'display' => 'list-item', + 'color' => 'blue', + 'url' => 'invoice.php?invoice_id=' . $row['invoice_id'] + ]; +} + +// Fetch quotes created +$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN quotes ON client_id = quote_client_id WHERE quote_date BETWEEN '$start_date' AND '$end_date'"); +while ($row = mysqli_fetch_array($sql)) { + $events[] = [ + 'id' => intval($row['quote_id']), + 'title' => $row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope'], + 'start' => $row['quote_date'], + 'display' => 'list-item', + 'color' => 'purple', + 'url' => 'quote.php?quote_id=' . $row['quote_id'] + ]; +} + +// Fetch tickets created +$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_created_at BETWEEN '$start_date' AND '$end_date'"); +while ($row = mysqli_fetch_array($sql)) { + $username = $row['user_name']; + $username = empty($username) ? "" : "[". substr($row['user_name'], 0, 9) . "...]"; + $events[] = [ + 'id' => intval($row['ticket_id']), + 'title' => $row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $row['ticket_status_name'] . "}", + 'start' => $row['ticket_created_at'], + 'color' => getTicketColor($row['ticket_status']), + 'url' => 'ticket.php?ticket_id=' . $row['ticket_id'] + ]; +} + +// Fetch recurring tickets +$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN scheduled_tickets ON client_id = scheduled_ticket_client_id LEFT JOIN users ON scheduled_ticket_assigned_to = user_id WHERE scheduled_ticket_next_run BETWEEN '$start_date' AND '$end_date'"); +while ($row = mysqli_fetch_array($sql)) { + $username = $row['user_name']; + $username = empty($username) ? "" : "[". substr($row['user_name'], 0, 9) . "...]"; + $events[] = [ + 'id' => intval($row['scheduled_ticket_id']), + 'title' => "R Ticket (" . $row['scheduled_ticket_frequency'] . ") - " . $row['scheduled_ticket_subject'] . " " . $username, + 'start' => $row['scheduled_ticket_next_run'], + 'color' => $row['calendar_color'], + 'url' => 'client_recurring_tickets.php?client_id=' . $row['client_id'] + ]; +} + +// Fetch scheduled tickets +$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule BETWEEN '$start_date' AND '$end_date'"); +while ($row = mysqli_fetch_array($sql)) { + $username = $row['user_name']; + $username = empty($username) ? "" : substr($row['user_name'], 0, 9) . "..."; + $events[] = [ + 'id' => intval($row['ticket_id']), + 'title' => $row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $row['ticket_status_name'] . "}", + 'start' => $row['ticket_schedule'], + 'color' => strtotime($row['ticket_schedule']) < time() ? (!empty($row['ticket_schedule']) ? "red" : "green") : "grey", + 'url' => 'ticket.php?ticket_id=' . $row['ticket_id'] + ]; +} + +// Fetch vendors created +$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND vendor_created_at BETWEEN '$start_date' AND '$end_date'"); +while ($row = mysqli_fetch_array($sql)) { + $events[] = [ + 'id' => intval($row['vendor_id']), + 'title' => "Vendor : '" . $row['vendor_name'] . "' created", + 'start' => $row['vendor_created_at'], + 'color' => 'brown', + 'url' => 'client_vendors.php?client_id=' . $row['client_id'] + ]; +} + +// Fetch clients added +$sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_created_at BETWEEN '$start_date' AND '$end_date'"); +while ($row = mysqli_fetch_array($sql)) { + $events[] = [ + 'id' => intval($row['client_id']), + 'title' => "Client: '" . $row['client_name'] . "' created", + 'start' => $row['client_created_at'], + 'color' => 'brown', + 'url' => 'client_overview.php?client_id=' . $row['client_id'] + ]; +} + +echo json_encode($events); + +function getTicketColor($status) { + switch ($status) { + case 1: + return 'red'; + case 2: + return 'blue'; + case 3: + return 'grey'; + default: + return 'black'; + } +} +?> \ No newline at end of file diff --git a/calendar_events.php b/calendar_events.php index b9c0275c..68bc44c4 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -293,4 +293,4 @@ while ($row = mysqli_fetch_array($sql)) { // Update the end date field document.getElementById("event_add_end").value = new_end; } - + \ No newline at end of file diff --git a/database_updates.php b/database_updates.php index d5cbcd69..7bff938b 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1895,7 +1895,15 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '1.3.0') { - mysqli_query($mysqli, "CREATE TABLE `itflow`.`user_roles` (`user_role_id` INT(11) NOT NULL AUTO_INCREMENT , `user_role_name` VARCHAR(200) NOT NULL , `user_role_description` VARCHAR(200) NULL DEFAULT NULL , `user_role_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , `user_role_updated_at` DATETIME on update CURRENT_TIMESTAMP NULL , `user_role_archived_at` DATETIME NULL , PRIMARY KEY (`user_role_id`)) ENGINE = InnoDB"); + mysqli_query($mysqli, "CREATE TABLE `user_roles` ( + `user_role_id` INT(11) NOT NULL AUTO_INCREMENT, + `user_role_name` VARCHAR(200) NOT NULL, + `user_role_description` VARCHAR(200) NULL DEFAULT NULL, + `user_role_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `user_role_updated_at` DATETIME ON UPDATE CURRENT_TIMESTAMP NULL, + `user_role_archived_at` DATETIME NULL, + PRIMARY KEY (`user_role_id`) + )"); mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 1, user_role_name = 'Accountant', user_role_description = 'Built-in - Limited access to financial-focused modules'"); mysqli_query($mysqli, "INSERT INTO `user_roles` SET user_role_id = 2, user_role_name = 'Technician', user_role_description = 'Built-in - Limited access to technical-focused modules'"); From 159c1d78a07b20abf20225b6fd39f2caddc20caf Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 26 May 2024 22:49:57 +0100 Subject: [PATCH 49/67] Ticket categories Add basic support for categorising tickets (e.g. Software/Network) --- admin_categories.php | 10 +++++++-- post/ticket.php | 3 ++- ticket.php | 21 +++++++++++++------ ticket_edit_modal.php | 48 ++++++++++++++++++++++++++++++++++--------- 4 files changed, 63 insertions(+), 19 deletions(-) diff --git a/admin_categories.php b/admin_categories.php index 00c0991d..c747ba79 100644 --- a/admin_categories.php +++ b/admin_categories.php @@ -93,6 +93,12 @@ if (isset($_GET['archived'])) { echo 'btn-default'; } ?>">Payment Method + Ticket purify($row['ticket_details']); $ticket_priority = nullable_htmlentities($row['ticket_priority']); @@ -404,18 +406,25 @@ if (isset($_GET['ticket_id'])) {
    - + Tasks Completed%
    /
    - +
    + + 0) { ?> +
    + +
    + +
    @@ -451,7 +460,7 @@ if (isset($_GET['ticket_id'])) { - + Close @@ -625,7 +634,7 @@ if (isset($_GET['ticket_id'])) { -
    Responses ()
    +
    Responses ()
    - + diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php index e972e0b7..9f519b70 100644 --- a/ticket_edit_modal.php +++ b/ticket_edit_modal.php @@ -55,17 +55,45 @@
    -
    - -
    -
    - +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    -
    From fbc87572e9582a8e5eab710e076fdf49e29ba0f7 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 26 May 2024 23:38:50 +0100 Subject: [PATCH 50/67] Calendar start day Allow customising the calendar to start on a Monday instead of Sunday --- calendar_events.php | 10 +++++++++- database_updates.php | 12 +++++++++--- database_version.php | 2 +- db.sql | 1 + post/profile.php | 9 ++++++++- user_preferences.php | 24 ++++++++++++++++++++---- 6 files changed, 48 insertions(+), 10 deletions(-) diff --git a/calendar_events.php b/calendar_events.php index 68bc44c4..e8f7eac4 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -261,6 +261,14 @@ while ($row = mysqli_fetch_array($sql)) { ?> ], eventOrder: 'allDay,start,-duration,title', + + + firstDay: , }); calendar.render(); @@ -293,4 +301,4 @@ while ($row = mysqli_fetch_array($sql)) { // Update the end date field document.getElementById("event_add_end").value = new_end; } - \ No newline at end of file + diff --git a/database_updates.php b/database_updates.php index 7bff938b..41660673 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1912,10 +1912,16 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.1'"); } - // if (CURRENT_DATABASE_VERSION == '1.3.1') { - // // Insert queries here required to update to DB version 1.3.1 + if (CURRENT_DATABASE_VERSION == '1.3.1') { + mysqli_query($mysqli, "ALTER TABLE `user_settings` ADD `user_config_calendar_first_day` TINYINT(1) NOT NULL DEFAULT 0 AFTER `user_config_dashboard_technical_enable`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.2'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.3.2') { + // // Insert queries here required to update to DB version 1.3.2 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.2'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.3'"); // } } else { diff --git a/database_version.php b/database_version.php index e55dd88e..c976e9a1 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.3.1"); +DEFINE("LATEST_DATABASE_VERSION", "1.3.2"); diff --git a/db.sql b/db.sql index 4059d711..81dc9df4 100644 --- a/db.sql +++ b/db.sql @@ -1822,6 +1822,7 @@ CREATE TABLE `user_settings` ( `user_config_records_per_page` int(11) NOT NULL DEFAULT 10, `user_config_dashboard_financial_enable` tinyint(1) NOT NULL DEFAULT 0, `user_config_dashboard_technical_enable` tinyint(1) NOT NULL DEFAULT 0, + `user_config_calendar_first_day` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/post/profile.php b/post/profile.php index 9bfc3dcc..d03a53ef 100644 --- a/post/profile.php +++ b/post/profile.php @@ -144,11 +144,18 @@ if (isset($_POST['edit_your_user_password'])) { header('Location: post.php?logout'); } -if (isset($_POST['edit_your_user_browser_extention'])) { +if (isset($_POST['edit_your_user_preferences'])) { // CSRF Check validateCSRFToken($_POST['csrf_token']); + $calendar_first_day = intval($_POST['calendar_first_day']); + + // Calendar + if (isset($calendar_first_day)) { + mysqli_query($mysqli, "UPDATE user_settings SET user_config_calendar_first_day = $calendar_first_day WHERE user_id = $session_user_id"); + } + // Enable extension access, only if it isn't already setup (user doesn't have cookie) if (isset($_POST['extension']) && $_POST['extension'] == 'Yes') { if (!isset($_COOKIE['user_extension_key'])) { diff --git a/user_preferences.php b/user_preferences.php index 1c5b2976..77426f7f 100644 --- a/user_preferences.php +++ b/user_preferences.php @@ -1,30 +1,46 @@
    -

    Browser Extension

    +

    Preferences

    +
    + +
    +
    + +
    + +
    +
    + 1) { ?>
    - > + > -

    Note: You must log out and back in again for these changes take effect.

    +

    Not currently in use / Note: You must log out and back in again for these changes take effect.

    - + From c389c6888318fc7c98765bdc18bd8e4df1014551 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 27 May 2024 13:46:17 -0400 Subject: [PATCH 51/67] Default Tickets to not billable and add Billable option to Create Ticket --- ajax_calendar_events.php | 139 --------------------------------------- ticket_add_modal.php | 15 +++++ 2 files changed, 15 insertions(+), 139 deletions(-) delete mode 100644 ajax_calendar_events.php diff --git a/ajax_calendar_events.php b/ajax_calendar_events.php deleted file mode 100644 index c332f7e7..00000000 --- a/ajax_calendar_events.php +++ /dev/null @@ -1,139 +0,0 @@ - - -

    -

    - intval($row['event_id']), - 'title' => $row['event_title'], - 'start' => $row['event_start'], - 'end' => $row['event_end'], - 'color' => $row['calendar_color'] - ]; -} - -// Fetch invoices created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id WHERE invoice_date BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['invoice_id']), - 'title' => $row['invoice_prefix'] . $row['invoice_number'] . " created -scope: " . $row['invoice_scope'], - 'start' => $row['invoice_date'], - 'display' => 'list-item', - 'color' => 'blue', - 'url' => 'invoice.php?invoice_id=' . $row['invoice_id'] - ]; -} - -// Fetch quotes created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN quotes ON client_id = quote_client_id WHERE quote_date BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['quote_id']), - 'title' => $row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope'], - 'start' => $row['quote_date'], - 'display' => 'list-item', - 'color' => 'purple', - 'url' => 'quote.php?quote_id=' . $row['quote_id'] - ]; -} - -// Fetch tickets created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_created_at BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $username = $row['user_name']; - $username = empty($username) ? "" : "[". substr($row['user_name'], 0, 9) . "...]"; - $events[] = [ - 'id' => intval($row['ticket_id']), - 'title' => $row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $row['ticket_status_name'] . "}", - 'start' => $row['ticket_created_at'], - 'color' => getTicketColor($row['ticket_status']), - 'url' => 'ticket.php?ticket_id=' . $row['ticket_id'] - ]; -} - -// Fetch recurring tickets -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN scheduled_tickets ON client_id = scheduled_ticket_client_id LEFT JOIN users ON scheduled_ticket_assigned_to = user_id WHERE scheduled_ticket_next_run BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $username = $row['user_name']; - $username = empty($username) ? "" : "[". substr($row['user_name'], 0, 9) . "...]"; - $events[] = [ - 'id' => intval($row['scheduled_ticket_id']), - 'title' => "R Ticket (" . $row['scheduled_ticket_frequency'] . ") - " . $row['scheduled_ticket_subject'] . " " . $username, - 'start' => $row['scheduled_ticket_next_run'], - 'color' => $row['calendar_color'], - 'url' => 'client_recurring_tickets.php?client_id=' . $row['client_id'] - ]; -} - -// Fetch scheduled tickets -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $username = $row['user_name']; - $username = empty($username) ? "" : substr($row['user_name'], 0, 9) . "..."; - $events[] = [ - 'id' => intval($row['ticket_id']), - 'title' => $row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $row['ticket_status_name'] . "}", - 'start' => $row['ticket_schedule'], - 'color' => strtotime($row['ticket_schedule']) < time() ? (!empty($row['ticket_schedule']) ? "red" : "green") : "grey", - 'url' => 'ticket.php?ticket_id=' . $row['ticket_id'] - ]; -} - -// Fetch vendors created -$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND vendor_created_at BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['vendor_id']), - 'title' => "Vendor : '" . $row['vendor_name'] . "' created", - 'start' => $row['vendor_created_at'], - 'color' => 'brown', - 'url' => 'client_vendors.php?client_id=' . $row['client_id'] - ]; -} - -// Fetch clients added -$sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_created_at BETWEEN '$start_date' AND '$end_date'"); -while ($row = mysqli_fetch_array($sql)) { - $events[] = [ - 'id' => intval($row['client_id']), - 'title' => "Client: '" . $row['client_name'] . "' created", - 'start' => $row['client_created_at'], - 'color' => 'brown', - 'url' => 'client_overview.php?client_id=' . $row['client_id'] - ]; -} - -echo json_encode($events); - -function getTicketColor($status) { - switch ($status) { - case 1: - return 'red'; - case 2: - return 'blue'; - case 3: - return 'grey'; - default: - return 'black'; - } -} -?> \ No newline at end of file diff --git a/ticket_add_modal.php b/ticket_add_modal.php index 0ee8c3b0..7b2922f1 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -139,6 +139,21 @@
    + +
    + +
    +
    + +
    + +
    +
    + +
    From 1d19b722298b373229964ce675c18a1bc4e42443 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 29 May 2024 17:55:39 -0400 Subject: [PATCH 52/67] Added Billable Recurring Tickets, UI: changed the Billable option to switch. Added ticket settings option to automatically mark new tickets as billable --- cron.php | 3 ++- database_updates.php | 12 +++++++++--- database_version.php | 2 +- get_settings.php | 1 + js/recurring_tickets_edit_modal.js | 1 + post/recurring_ticket_model.php | 1 + post/setting.php | 3 ++- post/ticket.php | 4 ++-- recurring_ticket_add_modal.php | 10 ++++++++++ recurring_ticket_edit_modal.php | 10 ++++++++++ settings_ticket.php | 10 ++++++++++ ticket_add_modal.php | 13 ++++--------- ticket_edit_modal.php | 17 +++++------------ 13 files changed, 58 insertions(+), 29 deletions(-) diff --git a/cron.php b/cron.php index 3b6f685b..c7532c26 100644 --- a/cron.php +++ b/cron.php @@ -252,6 +252,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) { $details = mysqli_real_escape_string($mysqli, $row['scheduled_ticket_details']); $priority = sanitizeInput($row['scheduled_ticket_priority']); $frequency = sanitizeInput(strtolower($row['scheduled_ticket_frequency'])); + $billable = intval($row['scheduled_ticket_billable']); $created_id = intval($row['scheduled_ticket_created_by']); $assigned_id = intval($row['scheduled_ticket_assigned_to']); $client_id = intval($row['scheduled_ticket_client_id']); @@ -272,7 +273,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) { mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); // Raise the ticket - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = '$ticket_status', ticket_billable = $billable, ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id"); $id = mysqli_insert_id($mysqli); // Logging diff --git a/database_updates.php b/database_updates.php index 41660673..5ad87177 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1918,10 +1918,16 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.2'"); } - // if (CURRENT_DATABASE_VERSION == '1.3.2') { - // // Insert queries here required to update to DB version 1.3.2 + if (CURRENT_DATABASE_VERSION == '1.3.2') { + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_default_billable` TINYINT(1) NOT NULL DEFAULT 0 AFTER `config_ticket_new_ticket_notification_email`"); + mysqli_query($mysqli, "ALTER TABLE `scheduled_tickets` ADD `scheduled_ticket_billable` TINYINT(1) NOT NULL DEFAULT 0 AFTER `scheduled_ticket_frequency`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.3'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.3.3') { + // // Insert queries here required to update to DB version 1.3.3 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.3'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.3.4'"); // } } else { diff --git a/database_version.php b/database_version.php index c976e9a1..8ddd52ae 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.3.2"); +DEFINE("LATEST_DATABASE_VERSION", "1.3.3"); diff --git a/get_settings.php b/get_settings.php index 0b53b9bc..58d5b3a6 100644 --- a/get_settings.php +++ b/get_settings.php @@ -72,6 +72,7 @@ $config_ticket_client_general_notifications = intval($row['config_ticket_client_ $config_ticket_autoclose = intval($row['config_ticket_autoclose']); $config_ticket_autoclose_hours = intval($row['config_ticket_autoclose_hours']); $config_ticket_new_ticket_notification_email = $row['config_ticket_new_ticket_notification_email']; +$config_ticket_default_billable = intval($row['config_ticket_default_billable']); // Cron $config_enable_cron = intval($row['config_enable_cron']); diff --git a/js/recurring_tickets_edit_modal.js b/js/recurring_tickets_edit_modal.js index 67966341..eeb5b1d2 100644 --- a/js/recurring_tickets_edit_modal.js +++ b/js/recurring_tickets_edit_modal.js @@ -19,6 +19,7 @@ function populateRecurringTicketEditModal(client_id, ticket_id) { document.getElementById("editHeader").innerText = " Edit Recurring ticket: " + ticket.scheduled_ticket_subject; document.getElementById("editTicketId").value = ticket_id; document.getElementById("editClientId").value = client_id; + document.getElementById("editTicketBillable").value = ticket.scheduled_ticket_billable; document.getElementById("editTicketSubject").value = ticket.scheduled_ticket_subject; document.getElementById("editTicketNextRun").value = ticket.scheduled_ticket_next_run; tinyMCE.get('editTicketDetails').setContent(ticket.scheduled_ticket_details); diff --git a/post/recurring_ticket_model.php b/post/recurring_ticket_model.php index ae42ccb9..c5dec4dd 100644 --- a/post/recurring_ticket_model.php +++ b/post/recurring_ticket_model.php @@ -5,6 +5,7 @@ $subject = sanitizeInput($_POST['subject']); $priority = sanitizeInput($_POST['priority']); $details = mysqli_real_escape_string($mysqli, $_POST['details']); $frequency = sanitizeInput($_POST['frequency']); +$billable = intval($_POST['billable']); $asset_id = "0"; if (isset($_POST['asset'])) { diff --git a/post/setting.php b/post/setting.php index b312c194..7e9b03b6 100644 --- a/post/setting.php +++ b/post/setting.php @@ -286,11 +286,12 @@ if (isset($_POST['edit_ticket_settings'])) { $config_ticket_prefix = sanitizeInput($_POST['config_ticket_prefix']); $config_ticket_next_number = intval($_POST['config_ticket_next_number']); $config_ticket_email_parse = intval($_POST['config_ticket_email_parse']); + $config_ticket_default_billable = intval($_POST['config_ticket_default_billable']); $config_ticket_autoclose = intval($_POST['config_ticket_autoclose']); $config_ticket_autoclose_hours = intval($_POST['config_ticket_autoclose_hours']); $config_ticket_new_ticket_notification_email = sanitizeInput($_POST['config_ticket_new_ticket_notification_email']); - mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_email_parse = $config_ticket_email_parse, config_ticket_autoclose = $config_ticket_autoclose, config_ticket_autoclose_hours = $config_ticket_autoclose_hours, config_ticket_new_ticket_notification_email = '$config_ticket_new_ticket_notification_email' WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_email_parse = $config_ticket_email_parse, config_ticket_autoclose = $config_ticket_autoclose, config_ticket_autoclose_hours = $config_ticket_autoclose_hours, config_ticket_new_ticket_notification_email = '$config_ticket_new_ticket_notification_email', config_ticket_default_billable = $config_ticket_default_billable WHERE company_id = 1"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified ticket settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); diff --git a/post/ticket.php b/post/ticket.php index 51ddf780..972a5611 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1597,7 +1597,7 @@ if (isset($_POST['add_recurring_ticket'])) { } // Add scheduled ticket - mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id"); + mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_billable = $billable, scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id"); $scheduled_ticket_id = mysqli_insert_id($mysqli); @@ -1626,7 +1626,7 @@ if (isset($_POST['edit_recurring_ticket'])) { } // Edit scheduled ticket - mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id"); + mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_billable = $billable, scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id"); // Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Recurring Ticket', log_action = 'Modify', log_description = '$session_name modified recurring ticket for $subject - $frequency', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $scheduled_ticket_id"); diff --git a/recurring_ticket_add_modal.php b/recurring_ticket_add_modal.php index 16e24bdb..bac39608 100644 --- a/recurring_ticket_add_modal.php +++ b/recurring_ticket_add_modal.php @@ -11,6 +11,7 @@ +
    @@ -86,6 +87,15 @@
    + +
    +
    + value="1" id="billable"> + +
    +
    + +
    diff --git a/recurring_ticket_edit_modal.php b/recurring_ticket_edit_modal.php index e07f15ad..cbb13735 100644 --- a/recurring_ticket_edit_modal.php +++ b/recurring_ticket_edit_modal.php @@ -10,6 +10,7 @@
    +
    @@ -73,6 +74,15 @@
    + +
    +
    + + +
    +
    + +
    diff --git a/settings_ticket.php b/settings_ticket.php index 18ef56de..75b106fb 100644 --- a/settings_ticket.php +++ b/settings_ticket.php @@ -11,6 +11,7 @@ require_once "inc_all_admin.php"; +
    @@ -39,6 +40,15 @@ require_once "inc_all_admin.php";
    + +
    +
    + value="1" id="ticketBillableSwitch"> + +
    +
    + +
    value="1" id="ticketAutoCloseSwitch"> diff --git a/ticket_add_modal.php b/ticket_add_modal.php index 7b2922f1..9cb3f7cb 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -8,6 +8,7 @@
    +
    @@ -141,15 +142,9 @@
    - -
    -
    - -
    - +
    + value="1" id="billableSwitch"> +
    diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php index 9f519b70..092819a1 100644 --- a/ticket_edit_modal.php +++ b/ticket_edit_modal.php @@ -12,6 +12,7 @@ "> +
      @@ -97,23 +98,15 @@
    - +
    - -
    -
    - -
    - +
    + value="1" id="billableSwitch"> +
    -
    From dfca3a04a1a057708852ecb47ac72e1a92aceba2 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 29 May 2024 17:56:59 -0400 Subject: [PATCH 53/67] DB Structure Dumnp for billable options --- db.sql | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/db.sql b/db.sql index 81dc9df4..4493b81d 100644 --- a/db.sql +++ b/db.sql @@ -1156,6 +1156,7 @@ CREATE TABLE `scheduled_tickets` ( `scheduled_ticket_details` longtext NOT NULL, `scheduled_ticket_priority` varchar(200) DEFAULT NULL, `scheduled_ticket_frequency` varchar(10) NOT NULL, + `scheduled_ticket_billable` tinyint(1) NOT NULL DEFAULT 0, `scheduled_ticket_start_date` date NOT NULL, `scheduled_ticket_next_run` date NOT NULL, `scheduled_ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(), @@ -1341,6 +1342,7 @@ CREATE TABLE `settings` ( `config_ticket_autoclose` tinyint(1) NOT NULL DEFAULT 0, `config_ticket_autoclose_hours` int(5) NOT NULL DEFAULT 72, `config_ticket_new_ticket_notification_email` varchar(200) DEFAULT NULL, + `config_ticket_default_billable` tinyint(1) NOT NULL DEFAULT 0, `config_enable_cron` tinyint(1) NOT NULL DEFAULT 0, `config_cron_key` varchar(255) DEFAULT NULL, `config_recurring_auto_send_invoice` tinyint(1) NOT NULL DEFAULT 1, @@ -1791,13 +1793,14 @@ CREATE TABLE `user_permissions` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `user_roles` -- DROP TABLE IF EXISTS `user_roles`; -CREATE TABLE IF NOT EXISTS `user_roles` ( +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `user_roles` ( `user_role_id` int(11) NOT NULL AUTO_INCREMENT, `user_role_name` varchar(200) NOT NULL, `user_role_description` varchar(200) DEFAULT NULL, @@ -1805,7 +1808,7 @@ CREATE TABLE IF NOT EXISTS `user_roles` ( `user_role_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `user_role_archived_at` datetime DEFAULT NULL, PRIMARY KEY (`user_role_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1935,4 +1938,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-05-10 11:33:39 +-- Dump completed on 2024-05-29 17:56:36 From 7eb6c2ac7f00d438fd3237f2bd79907618ead993 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 30 May 2024 13:49:52 -0400 Subject: [PATCH 54/67] Initial rework on UI for public comments, private notes and ticket events --- ticket.php | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/ticket.php b/ticket.php index ae3a2392..263bd19c 100644 --- a/ticket.php +++ b/ticket.php @@ -522,6 +522,20 @@ if (isset($_GET['ticket_id'])) { + + +
    +
    ...
    +
    ...
    +
    + @@ -634,7 +648,26 @@ if (isset($_GET['ticket_id'])) { -
    Responses ()
    + + +
    +
    ...
    +
    ...
    +
    ...
    +
    Date: Thu, 30 May 2024 13:56:30 -0400 Subject: [PATCH 55/67] More UI Updates to ticket comments --- ticket.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ticket.php b/ticket.php index 263bd19c..20ea5729 100644 --- a/ticket.php +++ b/ticket.php @@ -532,8 +532,8 @@ if (isset($_GET['ticket_id'])) {
    -
    ...
    -
    ...
    +
    Public Comment
    +
    Internal Note
    @@ -664,9 +664,10 @@ if (isset($_GET['ticket_id'])) {
    -
    ...
    -
    ...
    -
    ...
    +
    All Comments
    +
    Public Comments
    +
    Internal Notes
    +
    Events
    From f091d942821d47ac6fdd39cf9e645cfe83e80958 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 30 May 2024 14:53:49 -0400 Subject: [PATCH 56/67] Ticket Response UI Update Public Comment and Internal Note work now, added Events and Tasks to the Responses stil WIP there --- js/ticket_button_respond_note.js | 19 -------- post/ticket.php | 2 +- ticket.php | 84 ++++++++++++++------------------ 3 files changed, 37 insertions(+), 68 deletions(-) delete mode 100644 js/ticket_button_respond_note.js diff --git a/js/ticket_button_respond_note.js b/js/ticket_button_respond_note.js deleted file mode 100644 index bc345a46..00000000 --- a/js/ticket_button_respond_note.js +++ /dev/null @@ -1,19 +0,0 @@ -// Ticket.php - Changes the wording of the "Respond" button to "Add note" if reply is not a public update (based on checkbox) - -// Get Internal/Public Checkbox -let checkbox = document.getElementById('ticket_reply_type_checkbox'); - -// Get Respond button -let respond = document.getElementById('ticket_add_reply'); - -// When checkbox is checked/unchecked, update button wording -checkbox.addEventListener('change', e => { - if (e.target.checked) { - // Public reply - respond.innerHTML = "Respond"; - - } else { - // Internal note - respond.innerHTML = "Add note"; - } -}); diff --git a/post/ticket.php b/post/ticket.php index 972a5611..1228b23e 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1105,7 +1105,7 @@ if (isset($_POST['add_ticket_reply'])) { $client_id = intval($_POST['client_id']); - if (isset($_POST['public_reply_type'])) { + if ($_POST['public_reply_type'] == 1 ){ $ticket_reply_type = 'Public'; } else { $ticket_reply_type = 'Internal'; diff --git a/ticket.php b/ticket.php index 20ea5729..13f60770 100644 --- a/ticket.php +++ b/ticket.php @@ -523,22 +523,21 @@ if (isset($_GET['ticket_id'])) { - -
    -
    Public Comment
    -
    Internal Note
    -
    - + +
    +
    + + +
    +
    +
    @@ -609,37 +608,8 @@ if (isset($_GET['ticket_id'])) {
    - - - - - -
    -
    -
    - > - -
    -
    -
    -
    - +
    @@ -651,16 +621,34 @@ if (isset($_GET['ticket_id'])) {
    @@ -668,6 +656,7 @@ if (isset($_GET['ticket_id'])) {
    Public Comments
    Internal Notes
    Events
    +
    Tasks
    @@ -1142,7 +1131,6 @@ require_once "footer.php"; - From 8c007ea7b123da5c94da47bc0a707313f4eaeb6d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 30 May 2024 15:05:13 -0400 Subject: [PATCH 57/67] Calculate more ticket response counts --- ticket.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/ticket.php b/ticket.php index 13f60770..c987befd 100644 --- a/ticket.php +++ b/ticket.php @@ -208,6 +208,22 @@ if (isset($_GET['ticket_id'])) { $row = mysqli_fetch_array($ticket_responses_sql); $ticket_responses = intval($row['ticket_responses']); + $ticket_all_comments_sql = mysqli_query($mysqli, "SELECT COUNT(ticket_reply_id) AS ticket_all_comments_count FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND ticket_reply_ticket_id = $ticket_id"); + $row = mysqli_fetch_array($ticket_all_comments_sql); + $ticket_all_comments_count = intval($row['ticket_all_comments_count']); + + $ticket_internal_notes_sql = mysqli_query($mysqli, "SELECT COUNT(ticket_reply_id) AS ticket_internal_notes_count FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND ticket_reply_type = 'Internal' AND ticket_reply_ticket_id = $ticket_id"); + $row = mysqli_fetch_array($ticket_internal_notes_sql); + $ticket_internal_notes_count = intval($row['ticket_internal_notes_count']); + + $ticket_public_comments_sql = mysqli_query($mysqli, "SELECT COUNT(ticket_reply_id) AS ticket_public_comments_count FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND (ticket_reply_type = 'Public' OR ticket_reply_type = 'Client') AND ticket_reply_ticket_id = $ticket_id"); + $row = mysqli_fetch_array($ticket_public_comments_sql); + $ticket_public_comments_count = intval($row['ticket_public_comments_count']); + + $ticket_events_sql = mysqli_query($mysqli, "SELECT COUNT(ticket_reply_id) AS ticket_events_count FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND ticket_reply_type = 'Event' AND ticket_reply_ticket_id = $ticket_id"); + $row = mysqli_fetch_array($ticket_events_sql); + $ticket_events_count = intval($row['ticket_events_count']); + // Get & format asset warranty expiry $date = date('Y-m-d H:i:s'); @@ -623,19 +639,19 @@ if (isset($_GET['ticket_id'])) {
  • @@ -647,7 +663,7 @@ if (isset($_GET['ticket_id'])) {
    • From 237ba1dd202bee36c739fe7c6e0fa442a923742e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 30 May 2024 15:35:02 -0400 Subject: [PATCH 58/67] Removed Custom CSS for ticket was able to make work with CSS Library bootstrap, asjusted spacing and layout of ticket response controls, --- css/ticket_time_tracking.css | 13 ------ ticket.php | 78 ++++++++++++++---------------------- 2 files changed, 29 insertions(+), 62 deletions(-) delete mode 100644 css/ticket_time_tracking.css diff --git a/css/ticket_time_tracking.css b/css/ticket_time_tracking.css deleted file mode 100644 index eb2c2c5c..00000000 --- a/css/ticket_time_tracking.css +++ /dev/null @@ -1,13 +0,0 @@ -/* Custom CSS Styling for time tracking */ - -/* Small bit of space between the ticket status and time tracking inputs */ -.custom-tt-horizontal-spacing { - width: 20px; /* Adjust the width as needed for smaller spacing */ - display: inline-block; -} - -/* Adjust Hour, min, and second fields to be close together */ -.custom-tt-width { - width: 50px; /* Adjust the width as needed */ - padding: 0; /* Remove padding to maintain the desired width */ -} diff --git a/ticket.php b/ticket.php index c987befd..bd89a7d0 100644 --- a/ticket.php +++ b/ticket.php @@ -1,13 +1,6 @@ - - - - -Internal Note
    + +
    + + +
    +
    + +
    - -
    - -
    - -
    - - -
    - -
    - -
    - - +
    +
    -
    +
    @@ -592,40 +580,32 @@ if (isset($_GET['ticket_id'])) {
    - -
    - -
    +
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - +
    +
    -
    -
    - -
    -
    - - +
    + +
    + +
    + +
    + +
    + + +
    - +
    + +
    From 2149a33bd56f3d46638b37c2045cecd863713d90 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 30 May 2024 16:36:38 -0400 Subject: [PATCH 59/67] Added Email Client to ticket details, Public Comment does not email the client or watchers anything, but can view it in the ticker portal --- post/ticket.php | 9 +++++++-- ticket.php | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/post/ticket.php b/post/ticket.php index 1228b23e..7e076210 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1105,9 +1105,14 @@ if (isset($_POST['add_ticket_reply'])) { $client_id = intval($_POST['client_id']); + $send_email = 0; + if ($_POST['public_reply_type'] == 1 ){ $ticket_reply_type = 'Public'; - } else { + } elseif ($_POST['public_reply_type'] == 2 ) { + $ticket_reply_type = 'Public'; + $send_email = 1; + } else { $ticket_reply_type = 'Internal'; } @@ -1157,7 +1162,7 @@ if (isset($_POST['add_ticket_reply'])) { $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); // Send e-mail to client if public update & email is set up - if ($ticket_reply_type == 'Public' && !empty($config_smtp_host)) { + if ($ticket_reply_type == 'Public' && $send_email == 1 && !empty($config_smtp_host)) { if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { diff --git a/ticket.php b/ticket.php index bd89a7d0..2e88cb37 100644 --- a/ticket.php +++ b/ticket.php @@ -544,6 +544,9 @@ if (isset($_GET['ticket_id'])) { +
    @@ -583,7 +586,7 @@ if (isset($_GET['ticket_id'])) {
    -
    +
    @@ -604,7 +607,7 @@ if (isset($_GET['ticket_id'])) {
    - +
    @@ -630,10 +633,16 @@ if (isset($_GET['ticket_id'])) {
    • +
  • + +