diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 21cf847c..84329956 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -custom: ["https://donate.itflow.org"] +custom: ["https://services.itflow.org"] diff --git a/.htaccess b/.htaccess new file mode 100644 index 00000000..f38dbabc --- /dev/null +++ b/.htaccess @@ -0,0 +1,2 @@ +# Prevent access to .git, .github, and config.php +RedirectMatch 404 ^/(\.git|\.github|config\.php) \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..385e5534 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,116 @@ +# Changelog + +This file documents all notable changes made to ITFlow. + +## [25.02] +### Fixed +- Migrated several reports to the new permissions/roles system +- Resolved issue with empty task box showing for closed/resolved tickets +- Corrected ticket priority sorting +- Cloned asset interfaces when transferring assets between clients + +### Added / Changed +- Restored max number of records per page option back to 500 since we dont have repeating modals. +- Bulk Categorize Tickets feature +- Renamed "Interface port" to "Interface Description." "Interface Name" should now refer to port name and/or number +- Changed "Transfer Asset to Client" from a single action to a bulk action +- Updated Filter Footer UI to show "Showing x to x of x records" instead of just the total records +- Added Client Overview section to view client assets, contacts, licenses, credentials, etc. +- Introduced Quick Peek for asset details, contact information, and document viewing throughout the ITFlow App, all made possible by AJAX +- Enabled Simple Drag-and-Drop Ordering for Invoices, Recurring Invoices, Quotes, Ticket Tasks, and Ticket Template Tasks +- Added new Ticket View options: Kanban and Simple View +- Migrated all repeating modals to the new AJAX modal function for faster loading times and quicker development +- Allowed clients to upload PDF documents to accepted quotes +- Client Portal now shows ticket category +- Custom links can now be added to the Client Portal navbar +- Lots of little tweaks to UI, performance, bugs, etc. + +### Breaking Changes +- Cron scripts have officially been moved to the /scripts folder and are no longer in the root directory; they must be updated to function properly + +## [25.01.3] +### Fixed +- Fixed ticket assignment modal showing client contacts. + +## [25.01.2] +### Fixed +- Fixed app version. + +## [25.01.1] + +### Added / Changed +- Redesigned the Multi-Factor Authentication (MFA) Setup and Enforcement Flow UI/UX for a more intuitive user experience. +- Added a "Member" column in the user roles listing for improved visibility. +- General UI/UX improvements, along with minor performance optimizations and cleanups. + +### Fixed +- Fixed an issue where Stripe was not appearing as a recurring payment option. +- Corrected inaccurate Quarter 2 Expense results in the Profit & Loss Report. +- Resolved TOTP code not displaying correctly on hover in the Contact or Asset Details sections. +- Archived contacts no longer appear in the Bulk Mail section. +- Fixed an issue where the Ticket Assign Modal was showing both ITFlow and client users. +- Fixed issue with login key redirecting to legacy client portal page. + +## [25.01] + +### Added / Changed +- Added support for saving cards in Stripe for automatic invoice payments. +- Page titles now display detailed information (e.g., page name, client selection, company name, ticket and invoice info) for easier multi-tab navigation. +- Reintroduced the new admin role-check for admin pages. +- Admin roles can now be archived. +- Debug mode now shows the current Git branch. +- The auto-acknowledgment email for email-parsed tickets now includes a guest link. +- Recurring tickets no longer require a contact. +- Stripe online payment setup now prompts you to set the income/expense account. +- New cron/CLI scripts have been moved to the `/scripts` subfolder — remember to update your cron configurations! +- Moved modal includes to `/modals` to tidy up the root directory. +- Moved most include files to `/includes` to improve directory structure. +- Moved guest pages to `/guest` for better organization. +- Renamed the include file `pagination.php` to `filter_footer.php`, as it is used in conjunction with `filter_header.php` for page filtering. +- Guest ticket feedback now shows the ticket prefix and number, not just the ID. +- Individual POST handler logic pages are no longer directly accessible. +- Added the ability to delete payments on the Payments and Client Payments pages. +- Implemented domain history tracking. +- Added Asset Interface Linking/Connections to show what interface is connected to which interface port of another asset. +- Added Force Recurring Ticket option in more locations, not just for recurring tickets. +- Implemented row spanning and centered devices that occupy multiple units in a rack. +- Added tooltips to main navigation badge counts to clarify what is being counted. +- Reduced max records per page from 500 to 100 to prevent performance issues. +- Updated several plugins: + - `stripe-php` from 10.5.0 to 16.4.0 + - `Inputmask` from 5.0.8 to 5.0.9 + - `DataTables` from 2.1.8 to 2.2.1 + - `pdfmake` from 0.2.8 to 0.2.18 + - `php-mime-mail-parser` to 9.0.1 + - `TinyMCE` from 7.5.1 to 7.6.1 +- Removed unused libraries from the vendor folder and moved Stripe to the plugins folder, eliminating the vendor folder. +- Merged the MFA TOTP functionality files `base32static.php` and `rfc6238.php` into a single file (`totp`) and moved it to the plugins folder. +- No longer need to pass the DB connection (`$mysqli`) to the `addToMailQueue` function. +- Disabled HTML Purifier caching. +- Replaced the `nullable_htmlentities` function with `htmlspecialchars`. +- Updated filter variable naming. +- Implemented other minor UI updates, performance optimizations, and directory cleanups. + +### Fixed +- Fixed an issue where the ticket edit modal didn't show multi-client or no-client projects. +- Fixed asset interface losing DHCP settings. +- Fixed a 500 error when creating or editing recurring expenses due to an incorrect variable name. +- Fixed tickets created via the portal/email not being marked as billable. +- Fixed issues with editing recurring expenses. +- Resolved a regression where the TinyMCE editor didn’t display when adding or editing ticket templates. +- Fixed a TinyMCE license issue. + +### Removed / Deprecated +- Deprecated the cron scripts in the root directory. Cron jobs should now use the ones in the `/scripts` subfolder, which no longer require a cron key and must be run via CLI. + +### BREAKING CHANGES +- The client portal has been moved from `/portal` to `/client`: + - Links in previous emails will be broken. + - The Azure Entra ID SSO Redirect URI needs to be updated to `/client`. + - You may need to update other links (e.g., website, support page). +- Guest links have been moved from `/` to `/guest`. Previous links will be broken. + +## [24.12] + +### Added / Changed +- Introduced versioned releases for the first time! \ No newline at end of file diff --git a/README.md b/README.md index 6c1791cc..4863620d 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,10 @@ [![Contributors][contributors-shield]][contributors-url] [![Stargazers][stars-shield]][stars-url] -[![Issues][issues-shield]][issues-url] [![Commits][commit-shield]][commit-url] [![GPL License][license-shield]][license-url] -
-

ITFlow

@@ -47,43 +42,26 @@ ### The Problem -- You're a busy MSP with 101 things to do. -- Information about your clients is unorganised and unstructured: scattered in random tickets or folders - when you do eventually find it, it's out of date. -- For some issues, you spend longer looking for the relevant documentation than actually working the ticket. +- You're a small but busy managed service provider with 101 things to do. Information about your clients is unorganised, unstructured and outdated. +- For some work, you seem to spend longer looking for the relevant documentation than actually working on the issue/project. - On top of the technical day to day, you also have to take care of the financial side of the business - consistent pricing, quotes/invoicing, and accounting. ### The Solution: ITFlow -- ITFlow consolidates common MSP needs (IT Documentation, ticketing and billing) into one system - -### In Beta -* This project is in beta with many ongoing changes. Updates may unintentionally introduce bugs/security issues. Writing functional, secure code is very difficult. -* Whilst we are confident the code is safe, nothing in life is 100% safe or risk-free. Use your best judgement before deciding to store highly confidential information in ITFlow. -* We are hoping to have a stable 1.0 release by early 2025. +- ITFlow consolidates common MSP needs (documentation, ticketing and billing) into one unified system. ## Getting Started -ITFlow is self-hosted. There is a full installation guide in the [docs](https://docs.itflow.org/installation). +### Self Hosting +- The best installation method is to use the [install script](https://docs.itflow.org/installation_script) on Ubuntu/Debian. A video walk through is available [here](https://www.youtube.com/watch?v=kKz9NOU_1XE). +``` + wget -O itflow_install.sh https://github.com/itflow-org/itflow-install-script/raw/main/itflow_install.sh + bash itflow_install.sh +``` +- Other manual installation methods are available in the [docs](https://docs.itflow.org/installation). - - -### Installation via Script (Recommended Method) - - **Requirements** - - Clean Install of Debian 12 or Ubuntu 22.04 - - A public IP Address - - Ports 80 (HTTP) and 443 (HTTPS) TCP accessible from the outside in - - A Fully Qualified Domain Name pointing to the public IP Address – example itflow.example.com - - **Process** - - Login as root - - Download & run install script - ``` - wget -O itflow_install.sh https://github.com/itflow-org/itflow-install-script/raw/main/itflow_install.sh - bash itflow_install.sh - ``` - - Follow Instructions & navigate to setup URL shown - - Leave us feedback in the [forum](https://forum.itflow.org/d/11-road-map) +### Managed Hosting +- If you'd prefer, we can [host ITFlow for you](https://services.itflow.org/hosting.php). ## Key Features @@ -95,14 +73,7 @@ ITFlow is self-hosted. There is a full installation guide in the [docs](https:// ## Roadmap / Future to-do -* Comprehensive API to allow custom third party integration -* CalDAV to integrate with 3rd party calendars -* CardDAV to integrate with 3rd party Address books -* Recent caller toast alerts to click and bring up the clients account right away -* FIDO2 WebAuthn Support for passwordless auth (TPM Fingerprint), (USB Hardware keys such as Yubikey) - -See the [forum](https://forum.itflow.org/t/added-to-roadmap) and the [open issues](https://github.com/itflow-org/itflow/issues) for a full list of proposed features & known issues. - +We track the implementation of confirmed features and bugs via [TaskFlow](https://tasks.dev.itflow.org/tasks.php). Use the [forum](https://forum.itflow.org) to request features or raise bug reports. ## Support & Contributions @@ -111,7 +82,7 @@ See the [forum](https://forum.itflow.org/t/added-to-roadmap) and the [open issue For help using ITFlow, bugs, feature requests, and general ideas / discussions please use the community [forum](https://forum.itflow.org). ### Contributing -If you want to improve ITFlow, feel free to fork the repo and create a pull request, but make sure to discuss significant changes or new features with fellow contributors on the forum first. This helps ensure that your contributions are aligned with project goals, and saves time for everyone. All contributions should follow our [code standards](https://docs.itflow.org/code_standards). +If you want to improve ITFlow, feel free to fork the repo and create a pull reques. Make sure to discuss significant changes or new features with fellow contributors on the forum first. This helps ensure that your contributions are aligned with project goals, and saves time for everyone. All contributions should follow our [code standards](https://docs.itflow.org/code_standards). See the [contributing guide](https://docs.itflow.org/contribute). #### Contributors @@ -122,13 +93,14 @@ If you want to improve ITFlow, feel free to fork the repo and create a pull requ We’re incredibly grateful to the organizations and individuals who support the project - a big thank you to: - CompuMatter - F1 for HELP -- JetBrains - ## License - ITFlow is distributed "as is" under the GPL License, WITHOUT WARRANTY OF ANY KIND. See [`LICENSE`](https://github.com/itflow-org/itflow/blob/master/LICENSE) for details. +## Security +* As of 2025, we now have a stable release of the project. +* Whilst we are confident in the safety of the code, no system is risk-free. Nearly all software has bugs. Use your best judgement before storing highly confidential information in ITFlow. +* If you have a security concern, privately report it [here](https://github.com/itflow-org/itflow/security/policy). diff --git a/SECURITY.md b/SECURITY.md index f374eeac..bd6ba7fd 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,25 +1,21 @@ # Security Policy -## **Please do NOT report security concerns/vulnerabilities publicly (Github issues/forum)** +## **Please do NOT report security concerns/vulnerabilities publicly (Issues/forum)** ---- +**We take security seriously** -## In Beta - -ITFlow is currently in beta and is a work in progress. - -**We take security seriously.** Whilst we are confident the code is safe, nothing in life is 100% safe or risk-free. You should use your best judgment before entering confidential information into the app. - -We attempt to follow security best practices where possible, including [automated code scanning](https://sonarcloud.io/component_measures?id=itflow-org_itflow&metric=security_rating&view=list). - -[![Security](https://sonarcloud.io/api/project_badges/measure?project=itflow-org_itflow&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=itflow-org_itflow) +- Whilst we are confident in the safety of the code, no system is risk-free. Nearly all software has bugs. Use your best judgement before storing highly confidential information in ITFlow. +- We attempt to follow security best practices where possible, including [automated code scanning](https://sonarcloud.io/component_measures?id=itflow-org_itflow&metric=security_rating&view=list). +- [![Security](https://sonarcloud.io/api/project_badges/measure?project=itflow-org_itflow&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=itflow-org_itflow) ## Supported Versions +We operate a rolling release model. Any bug fixes will be released into latest version of ITFlow, so you must stay up-to-date. | Version | Supported | | ------- | ------------------ | -| Beta | :white_check_mark: | -| 1.0 | Yet to be released | +| Beta | :x: | +| 24.12 | :white_check_mark: | +| 25.1 | :white_check_mark: (When released) | ## Reporting a Vulnerability via GitHub Security Advisories diff --git a/account_edit_modal.php b/account_edit_modal.php deleted file mode 100644 index 58df3b62..00000000 --- a/account_edit_modal.php +++ /dev/null @@ -1,37 +0,0 @@ - diff --git a/accounts.php b/accounts.php index f23a0f7e..51025e27 100644 --- a/accounts.php +++ b/accounts.php @@ -4,7 +4,7 @@ $sort = "account_name"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -85,7 +85,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - + + + + + @@ -94,7 +102,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit @@ -109,18 +121,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
- @@ -174,7 +174,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + - + @@ -184,10 +184,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- + - + @@ -127,14 +127,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + - + @@ -295,11 +295,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
@@ -34,5 +34,5 @@ require_once "inc_all_admin.php";
- - -
-
-

Bulk Mail

-
- -
-
-
-
- - -
- -
- -
Email Message
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
- -
- -
-
- -
- -
- -
Select Contacts
-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
-
- -
- 		ClientNameTitleEmail
-
- -
- 		- - - -
-
- -
- -
- -
- -
-
-
- - - - - -

@@ -134,10 +133,15 @@ if (isset($_GET['archived'])) { ?> - + + - + +
@@ -159,8 +163,11 @@ if (isset($_GET['archived'])) { - + Edit @@ -186,12 +191,11 @@ if (isset($_GET['archived'])) {
-

" tabindex="-1"> -
-
-
-
Editing category:
- -
-
- - -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
-
- - -
-
-
-
- diff --git a/admin_custom_link.php b/admin_custom_link.php index 4797e882..b5e1ebf6 100644 --- a/admin_custom_link.php +++ b/admin_custom_link.php @@ -4,7 +4,7 @@ $sort = "custom_link_name"; $order = "ASC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -96,16 +96,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $custom_link_location = intval($row['custom_link_location']); if ($custom_link_location == 1) { $custom_link_location_display = "Main Side Nav"; - } else { + } elseif ($custom_link_location == 2) { $custom_link_location_display = "Top Nav"; + } elseif ($custom_link_location == 3) { + $custom_link_location_display = "Client Portal Nav"; } ?> - - - + + @@ -117,7 +122,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit
@@ -130,10 +135,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -141,13 +142,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- " tabindex="-1"> -
-
-
-
Editing link:
- -
-
- - - -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- / Open New Tab -
-
- -
- -
-
- > -
-
-
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
-
- - -
-
-
-
- diff --git a/admin_debug.php b/admin_debug.php index 894151c3..dcb11792 100644 --- a/admin_debug.php +++ b/admin_debug.php @@ -1,15 +1,16 @@ close(); - - + + - + + + + + + + + +
Current App VersionITFlow release version
Current DB Version
Current Code Commit
Current Branch
@@ -744,5 +753,5 @@ $mysqli->close();
- + Edit
@@ -119,8 +124,6 @@ @@ -129,12 +132,12 @@
- + - - + + + " tabindex="-1"> -
-
-
-
Editing template:
- -
-
- -
- -
- -
- -
- -
- -
- -
- -
-
- - -
-
-
-
- diff --git a/admin_legacy_debug.php b/admin_legacy_debug.php deleted file mode 100644 index 61591900..00000000 --- a/admin_legacy_debug.php +++ /dev/null @@ -1,335 +0,0 @@ - $count, - 'size' => $size - ]; -} - -// 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])) { - $diff[$key] = $value; - } else { - $recursiveDiff = arrayDiffRecursive($value, $array2[$key]); - if (!empty($recursiveDiff)) { - $diff[$key] = $recursiveDiff; - } - } - } else { - if (!isset($array2[$key]) || $array2[$key] !== $value) { - $diff[$key] = $value; - } - } - } - - return $diff; -} - -// Function to load the table structures from an SQL dump file URL -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]; - $tableStructure = $matches[2]; - $structure[$tableName] = array('structure' => $tableStructure); - } - } - } - - return $structure; -} - -// Function to fetch the database structure from the MySQL server -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]; - } - } - - return $tables; -} - -//function to get current crontab and return it as an array -function get_crontab() { - $crontab = shell_exec('crontab -l'); - $crontab = explode(PHP_EOL, $crontab); - return $crontab; -} - -// URL to the SQL dump file -$fileURL = "https://raw.githubusercontent.com/itflow-org/itflow/master/db.sql"; - -// Load the desired table structures from the SQL dump file URL -$desiredStructure = loadTableStructuresFromSQLDumpURL($fileURL); - -if ($desiredStructure === null) { - die("Failed to load the desired table structures from the SQL dump file URL."); -} - -// Fetch the current database structure from the MySQL server -$currentStructure = fetchDatabaseStructureFromServer(); - -if ($currentStructure === null) { - die("Failed to fetch the current database structure from the server."); -} - -// Compare the structures and display the differences -$differences = arrayDiffRecursive($desiredStructure, $currentStructure); - -//DB Stats -// Query to fetch the number of tables -$tablesQuery = "SHOW TABLES"; -$tablesResult = $mysqli->query($tablesQuery); - -$numTables = $tablesResult->num_rows; -$numFields = 0; -$numRows = 0; - -// Loop through each table -while ($row = $tablesResult->fetch_row()) { - $tableName = $row[0]; - - // Query to fetch the number of fields - $fieldsQuery = "DESCRIBE `$tableName`"; - $fieldsResult = $mysqli->query($fieldsQuery); - - // Check if the query was successful - if ($fieldsResult) { - $numFields += $fieldsResult->num_rows; - - // Query to fetch the number of rows - $rowsQuery = "SELECT COUNT(*) FROM `$tableName`"; - $rowsResult = $mysqli->query($rowsQuery); - - // Check if the query was successful - if ($rowsResult) { - $numRows += $rowsResult->fetch_row()[0]; - } else { - echo "Error executing query: " . $mysqli->error; - } - } else { - echo "Error executing query: " . $mysqli->error; - } -} - -//Get loaded PHP modules -$loadedModules = get_loaded_extensions(); - -//Get Server Info / Service versions -$phpVersion = phpversion(); -$databaseInfo = mysqli_get_server_info($mysqli) . " / " . $mysqli->server_version; -$operatingSystem = php_uname(); -$webServer = $_SERVER['SERVER_SOFTWARE']; -$errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log"; -$updates = fetchUpdates(); - -?> - -
-
-

Debug

-
-
- -

Debugging

- -
- -

Server Info

- - "; - echo "Database Version: " . $databaseInfo . "
"; - echo "Operating System: " . $operatingSystem . "
"; - echo "Web Server: " . $webServer . "
"; - echo "Apache/PHP Error Log: " . $errorLog - ?> - -
- -

File System

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

ITFlow app

- current_version . "
"; - echo "Cron enabled: " . $config_enable_cron . "
"; - echo "App Timezone: " . $config_timezone; - ?> - -
- -

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

- - - - - - - - - - - - - - - - -
Table NameNumber of FieldsNumber of Rows
- -
- -

PHP Modules Installed

- - "; - } - ?> - -
- -

PHP Info

- (.*).*$%ms', '$1', $phpinfo); - - //Remove everything after the body tag - $phpinfo = preg_replace('%^(.*).*$%ms', '$1', $phpinfo); - - //Remove the body tag itself - $phpinfo = preg_replace('%^(.*)$%ms', '$1', $phpinfo); - - //Output the result - echo $phpinfo; - ?> - -
-
-
- - - - - ID - - Queued @@ -137,7 +132,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Attempts - Action + Action @@ -175,15 +170,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - $email_from_name"?> $email_recipient_name"?> - - + + @@ -209,11 +208,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + - diff --git a/admin_role.php b/admin_role.php index 9d592db3..f79def74 100644 --- a/admin_role.php +++ b/admin_role.php @@ -4,7 +4,7 @@ $sort = "user_role_is_admin"; $order = "DESC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -21,7 +21,7 @@ $sql = mysqli_query( $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
Roles are still in development. Permissions may not be fully enforced.
+
Roles are still in development. Permissions may not be fully enforced.
@@ -54,22 +54,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - Name - - - - - Description + Role + Members Admin - - User count - Action @@ -87,16 +80,32 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(users.user_id) FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL"); $role_user_count = mysqli_fetch_row($sql_role_user_count)[0]; + $sql_users = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL"); + // Initialize an empty array to hold user names + $user_names = []; + + // Fetch each row and store the user_name in the array + while($row = mysqli_fetch_assoc($sql_users)) { + $user_names[] = nullable_htmlentities($row['user_name']); + } + + // Convert the array of user names to a comma-separated string + $user_names_string = implode(",", $user_names) ; + + if (empty($user_names_string)) { + $user_names_string = "-"; + } + ?> - -
+ + +
- + -
@@ -105,16 +114,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit -
- - - + + Archive +
@@ -125,9 +137,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -135,14 +144,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" tabindex="-1"> -
-
-
-
Editing role: -
- -
-
- - -
- - - -
- -
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- - -
- -
-
- -
- -
-
- -
- -
- - -
Module permissions do not apply to Admins.
- - - - -
- -
- -
- - -
- - - -
- -
- -
-
- - -
-
-
-
- diff --git a/admin_settings_ai.php b/admin_settings_ai.php index 91eba539..894859b8 100644 --- a/admin_settings_ai.php +++ b/admin_settings_ai.php @@ -1,6 +1,6 @@
@@ -73,5 +73,5 @@ require_once "inc_all_admin.php";
-
+

Company Details

-
- -
-
- -
- -
-
- -
-
- "> -
-
- -
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- +
+ + +
- -
-
+ +
+
+ +
+
+ +
+ +
+
-
- -
-
- +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
-
- -
- -
-
- -
- -
-
- -
- - -
-
@@ -120,5 +120,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
@@ -249,4 +249,4 @@ require_once "inc_all_admin.php";
@@ -39,5 +39,5 @@ require_once "inc_all_admin.php";
-
@@ -102,5 +102,5 @@ require_once "inc_all_admin.php";
@@ -327,5 +327,5 @@ require_once "inc_all_admin.php"; -
@@ -78,5 +78,5 @@ require_once "inc_all_admin.php";
@@ -19,19 +19,6 @@ require_once "inc_all_admin.php";
-
- -
-
- -
- -
- Regenerate -
-
-
- @@ -193,4 +180,4 @@ require_once "inc_all_admin.php"; @@ -12,9 +12,6 @@ require_once "inc_all_admin.php"; -
Currently, we only integrate with Stripe. Please see this forum post.
-
-
value="1" id="enableStripeSwitch"> @@ -25,7 +22,7 @@ require_once "inc_all_admin.php";
">
- +
@@ -35,7 +32,7 @@ require_once "inc_all_admin.php";
- +
@@ -45,7 +42,7 @@ require_once "inc_all_admin.php";
- +
@@ -140,6 +137,8 @@ require_once "inc_all_admin.php";
+
Currently, we only integrate with Stripe. Please see this forum post.
+
@@ -151,5 +150,5 @@ require_once "inc_all_admin.php";
+ +
+
+

Online Payment - Client info

+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
ClientStripe Customer IDStripe Payment IDAction
+
+ +
+ + + Delete payment method + + + + Reset Stripe + + +
+
+
+ + + + + +
@@ -41,4 +41,4 @@ require_once "inc_all_admin.php";
@@ -54,5 +54,5 @@ require_once "inc_all_admin.php";
@@ -44,7 +44,7 @@ require_once "inc_all_admin.php";
- +
@@ -62,5 +62,5 @@ require_once "inc_all_admin.php";
@@ -38,5 +38,5 @@ require_once "inc_all_admin.php";
@@ -63,5 +63,5 @@ require_once "inc_all_admin.php";
@@ -82,5 +82,5 @@ require_once "inc_all_admin.php";
- +
@@ -103,7 +103,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit @@ -119,8 +119,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -128,13 +126,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" tabindex="-1"> -
-
-
-
Editing template:
- -
- - -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- - - -
-
- - -
- -
-
-
diff --git a/admin_tag.php b/admin_tag.php index 2ac68281..64ec7193 100644 --- a/admin_tag.php +++ b/admin_tag.php @@ -4,7 +4,7 @@ $sort = "tag_name"; $order = "ASC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -87,7 +87,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - + @@ -98,7 +102,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit
@@ -112,9 +120,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -122,13 +127,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
" tabindex="-1"> -
-
-
-
Editing tag:
- -
-
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
-
- - -
-
-
-
- \ No newline at end of file diff --git a/admin_tax.php b/admin_tax.php index c6c891d2..bf8acbc5 100644 --- a/admin_tax.php +++ b/admin_tax.php @@ -4,7 +4,7 @@ $sort = "tax_name"; $order = "ASC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -56,7 +56,15 @@ $num_rows = mysqli_num_rows($sql); ?> - + + + + +
@@ -64,7 +72,11 @@ $num_rows = mysqli_num_rows($sql);
- + Edit
@@ -78,8 +90,6 @@ $num_rows = mysqli_num_rows($sql); " tabindex="-1"> -
-
-
-
Editing tax:
- -
-
- - - -
- -
- - -
- -
- - - -
- -
-
- - -
-
-
-
-
diff --git a/admin_ticket_status.php b/admin_ticket_status.php index d8ef22ca..6c687a0e 100644 --- a/admin_ticket_status.php +++ b/admin_ticket_status.php @@ -4,7 +4,7 @@ $sort = "ticket_status_name"; $order = "ASC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -21,115 +21,116 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
-
-

Tickets Statuses

-
- -
-
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
-
- - "> - - - - - - - - - Active"; - } else { - $ticket_status_display = "
Disabled
"; - } - - ?> - - - - - - - 5 ) { - require "admin_ticket_status_edit_modal.php"; - } - } - - ?> - - -
- - Name - - - - Color - - - - Status - - Action
- - - - - - - 5 ) { ?> -
- -
- - Edit - -
- - Delete - -
-
- -
-
- +
+
+

Tickets Statuses

+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+ + "> + + + + + + + + + Active"; + } else { + $ticket_status_display = "
Disabled
"; + } + + ?> + + + + + + + + + +
+ + Name + + + + Color + + + + Status + + Action
+ 5 ) { ?> + data-toggle="ajax-modal" data-ajax-url="ajax/ajax_custom_ticket_status_edit.php" data-ajax-id="" + + > + + + + + + 5 ) { ?> +
+ +
+ + Edit + +
+ + Delete + +
+
+ +
+
+ +
+
+ " tabindex="-1"> -
-
-
-
Editing Ticket Status:
- -
-
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
-
- - -
-
-
-
-
diff --git a/admin_ticket_template.php b/admin_ticket_template.php index 90743567..25f213be 100644 --- a/admin_ticket_template.php +++ b/admin_ticket_template.php @@ -4,7 +4,7 @@ $sort = "ticket_template_name"; $order = "ASC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -108,12 +108,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -29,6 +30,7 @@ $ticket_template_updated_at = nullable_htmlentities($row['ticket_template_update $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id ORDER BY task_template_order ASC, task_template_id ASC"); ?> +
  1. @@ -97,13 +99,17 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE while($row = mysqli_fetch_array($sql_task_templates)){ $task_id = intval($row['task_template_id']); $task_name = nullable_htmlentities($row['task_template_name']); - $task_order = intval($row['task_template_order']); $task_completion_estimate = intval($row['task_template_completion_estimate']); $task_description = nullable_htmlentities($row['task_template_description']); ?> - + - m - + + + m + - + +
    @@ -111,7 +117,11 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
    - + Edit
    @@ -124,7 +134,6 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE @@ -136,8 +145,43 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
    + + Latest DB Version:
    - Branch: -
    FORCE Update App
    -

    Current Database Version:

    -

    Current App Version:

    -

    Branch:

    +

    Application Release Version:

    +

    Database Version:

    +

    Code Commit:

    You are up to date!
    Everything is going to be alright


    - data-toggle="modal" data-target="#editUserModal" > + + data-toggle="ajax-modal" + data-ajax-url="ajax/ajax_user_edit.php" + data-ajax-id="" + + > "> @@ -179,7 +185,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit 0) { ?> @@ -207,10 +217,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -230,14 +237,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); " tabindex="-1"> -
    -
    -
    -
    Editing user: -
    - -
    -
    - - -
    - - - -
    - -
    - -
    - -
    - - "> - - - - - - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - - -
    - -
    -
    - > - -
    -
    - - - -
    - -
    -
    - -
    - -
    -
    - - -
    - -
    - -
    - Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected. -
    - -
      -
    • -
      - - -
      -
      • - - - -
    • -
      - > - -
      -
      • - - - -
    - -
    - -
    - -
    -
    - - -
    -
    -
    -
    - diff --git a/admin_vendor_template.php b/admin_vendor_template.php index 02694440..0eef37a8 100644 --- a/admin_vendor_template.php +++ b/admin_vendor_template.php @@ -4,7 +4,7 @@ $sort = "vendor_name"; $order = "ASC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -98,7 +98,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - +
    - + Edit @@ -155,8 +163,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -164,13 +170,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - " tabindex="-1"> -
    -
    -
    -
    Editing vendor template:
    - -
    -
    - -
    - - - -
    - -
    Check the fields you would like to update globally
    - -
    - -
    - - -
    - -
    -
    - -
    - " required> -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - - -
    -
    - -
    - -
    - - -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - - -
    - -
    - -
    - -
    -
    - - -
    -
    -
    -
    - diff --git a/ajax.php b/ajax.php index 3a420b06..2143d9bb 100644 --- a/ajax.php +++ b/ajax.php @@ -7,18 +7,15 @@ */ require_once "config.php"; - require_once "functions.php"; - require_once "check_login.php"; - -require_once "rfc6238.php"; - +require_once "plugins/totp/totp.php"; /* * Fetches SSL certificates from remote hosts & returns the relevant info (issuer, expiry, public key) */ if (isset($_GET['certificate_fetch_parse_json_details'])) { + enforceUserPermission('module_support'); // PHP doesn't appreciate attempting SSL sockets to non-existent domains if (empty($_GET['domain'])) { @@ -43,59 +40,11 @@ if (isset($_GET['certificate_fetch_parse_json_details'])) { } -/* - * Looks up info for a given certificate ID from the database, used to dynamically populate modal fields - */ -if (isset($_GET['certificate_get_json_details'])) { - validateTechRole(); - - $certificate_id = intval($_GET['certificate_id']); - $client_id = intval($_GET['client_id']); - - // Individual certificate lookup - $cert_sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_id = $certificate_id AND certificate_client_id = $client_id"); - while ($row = mysqli_fetch_array($cert_sql)) { - $response['certificate'][] = $row; - } - - // Get all domains for this client that could be linked to this certificate - $domains_sql = mysqli_query($mysqli, "SELECT domain_id, domain_name FROM domains WHERE domain_client_id = $client_id"); - while ($row = mysqli_fetch_array($domains_sql)) { - $response['domains'][] = $row; - } - - echo json_encode($response); -} - -/* - * Looks up info for a given domain ID from the database, used to dynamically populate modal fields - */ -if (isset($_GET['domain_get_json_details'])) { - validateTechRole(); - - $domain_id = intval($_GET['domain_id']); - $client_id = intval($_GET['client_id']); - - // Individual domain lookup - $cert_sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_id = $domain_id AND domain_client_id = $client_id"); - while ($row = mysqli_fetch_array($cert_sql)) { - $response['domain'][] = $row; - } - - // Get all registrars/webhosts (vendors) for this client that could be linked to this domain - $vendor_sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL ORDER BY vendor_name ASC"); - while ($row = mysqli_fetch_array($vendor_sql)) { - $response['vendors'][] = $row; - } - - echo json_encode($response); -} - /* * Looks up info on the ticket number provided, used to populate the ticket merge modal */ if (isset($_GET['merge_ticket_get_json_details'])) { - validateTechRole(); + enforceUserPermission('module_support'); $merge_into_ticket_number = intval($_GET['merge_into_ticket_number']); @@ -116,35 +65,9 @@ if (isset($_GET['merge_ticket_get_json_details'])) { } } -/* - * Looks up info for a given network ID from the database, used to dynamically populate modal fields - */ -if (isset($_GET['network_get_json_details'])) { - validateTechRole(); - - $network_id = intval($_GET['network_id']); - $client_id = intval($_GET['client_id']); - - // Individual network lookup - $network_sql = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_id = $network_id AND network_client_id = $client_id"); - while ($row = mysqli_fetch_array($network_sql)) { - $response['network'][] = $row; - } - - // Lookup all client locations, as networks can be associated with any client location - $locations_sql = mysqli_query( - $mysqli, - "SELECT location_id, location_name FROM locations - WHERE location_client_id = '$client_id'" - ); - while ($row = mysqli_fetch_array($locations_sql)) { - $response['locations'][] = $row; - } - - echo json_encode($response); -} - if (isset($_POST['client_set_notes'])) { + enforceUserPermission('module_client', 2); + $client_id = intval($_POST['client_id']); $notes = sanitizeInput($_POST['notes']); @@ -157,6 +80,8 @@ if (isset($_POST['client_set_notes'])) { } if (isset($_POST['contact_set_notes'])) { + enforceUserPermission('module_client', 2); + $contact_id = intval($_POST['contact_id']); $notes = sanitizeInput($_POST['notes']); @@ -177,6 +102,8 @@ if (isset($_POST['contact_set_notes'])) { } if (isset($_POST['asset_set_notes'])) { + enforceUserPermission('module_support', 2); + $asset_id = intval($_POST['asset_id']); $notes = sanitizeInput($_POST['notes']); @@ -197,7 +124,7 @@ if (isset($_POST['asset_set_notes'])) { } /* - * Collision Detection/Avoidance + * Ticketing Collision Detection/Avoidance * Called upon loading a ticket, and every 2 mins thereafter * Is used in conjunction with ticket_query_views to show who is currently viewing a ticket */ @@ -208,7 +135,7 @@ if (isset($_GET['ticket_add_view'])) { } /* - * Collision Detection/Avoidance + * Ticketing Collision Detection/Avoidance * Returns formatted text of the agents currently viewing a ticket * Called upon loading a ticket, and every 2 mins thereafter */ @@ -241,7 +168,7 @@ if (isset($_GET['ticket_query_views'])) { * Generates public/guest links for sharing logins/docs */ if (isset($_GET['share_generate_link'])) { - validateTechRole(); + enforceUserPermission('module_support', 2); $item_encrypted_username = ''; // Default empty $item_encrypted_credential = ''; // Default empty @@ -306,10 +233,10 @@ if (isset($_GET['share_generate_link'])) { // Return URL if ($item_type == "Login") { - $url = "https://$config_base_url/guest_view_item.php?id=$share_id&key=$item_key&ek=$login_encryption_key"; + $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key&ek=$login_encryption_key"; } else { - $url = "https://$config_base_url/guest_view_item.php?id=$share_id&key=$item_key"; + $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key"; } $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); @@ -346,7 +273,7 @@ if (isset($_GET['share_generate_link'])) { ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } @@ -357,97 +284,11 @@ if (isset($_GET['share_generate_link'])) { } -/* - * Looks up info for a given recurring (was scheduled) ticket ID from the database, used to dynamically populate modal edit fields - */ -if (isset($_GET['recurring_ticket_get_json_details'])) { - validateTechRole(); - - $client_id = intval($_GET['client_id']); - $ticket_id = intval($_GET['ticket_id']); - - // Get all contacts, to allow tickets to be raised under a specific contact - $contact_sql = mysqli_query($mysqli, "SELECT contact_id, contact_name FROM contacts - WHERE contact_client_id = $client_id - AND contact_archived_at IS NULL - ORDER BY contact_primary DESC, contact_technical DESC, contact_name ASC" - ); - while ($row = mysqli_fetch_array($contact_sql)) { - $response['contacts'][] = $row; - } - - // Get ticket details - $ticket_sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets - WHERE scheduled_ticket_id = $ticket_id - AND scheduled_ticket_client_id = $client_id LIMIT 1"); - while ($row = mysqli_fetch_array($ticket_sql)) { - $response['ticket'][] = $row; - } - - // Get assets - $asset_sql = mysqli_query($mysqli, "SELECT asset_id, asset_name FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL"); - while ($row = mysqli_fetch_array($asset_sql)) { - $response['assets'][] = $row; - } - - // Get technicians to auto assign the ticket to - $sql_agents = mysqli_query( - $mysqli, - "SELECT users.user_id, user_name FROM users - LEFT JOIN user_settings on users.user_id = user_settings.user_id - WHERE user_role > 1 - AND user_status = 1 - AND user_archived_at IS NULL - ORDER BY user_name ASC" - ); - while ($row = mysqli_fetch_array($sql_agents)) { - $response['agents'][] = $row; - } - - echo json_encode($response); - -} - -/* - * Looks up info for a given quote ID from the database, used to dynamically populate modal fields - */ -if (isset($_GET['quote_get_json_details'])) { - $quote_id = intval($_GET['quote_id']); - - // Get quote details - $quote_sql = mysqli_query( - $mysqli, - "SELECT * FROM quotes - LEFT JOIN clients ON quote_client_id = client_id - WHERE quote_id = $quote_id LIMIT 1" - ); - - while ($row = mysqli_fetch_array($quote_sql)) { - $response['quote'][] = $row; - } - - - // Get all income-related categories for quoting - $quote_created_at = $response['quote'][0]['quote_created_at']; - $category_sql = mysqli_query( - $mysqli, - "SELECT category_id, category_name FROM categories - WHERE category_type = 'Income' AND (category_archived_at > '$quote_created_at' OR category_archived_at IS NULL) - ORDER BY category_name" - ); - - while ($row = mysqli_fetch_array($category_sql)) { - $response['categories'][] = $row; - } - - echo json_encode($response); - -} - /* * Returns sorted list of active clients */ if (isset($_GET['get_active_clients'])) { + enforceUserPermission('module_client'); $client_sql = mysqli_query( $mysqli, @@ -467,6 +308,8 @@ if (isset($_GET['get_active_clients'])) { * Returns ordered list of active contacts for a specified client */ if (isset($_GET['get_client_contacts'])) { + enforceUserPermission('module_client'); + $client_id = intval($_GET['client_id']); $contact_sql = mysqli_query( @@ -488,7 +331,7 @@ if (isset($_GET['get_client_contacts'])) { * When provided with a login ID, checks permissions and returns the 6-digit code */ if (isset($_GET['get_totp_token_via_id'])) { - validateTechRole(); + enforceUserPermission('module_credential'); $login_id = intval($_GET['login_id']); @@ -515,3 +358,245 @@ if (isset($_GET['get_totp_token_via_id'])) { if (isset($_GET['get_readable_pass'])) { echo json_encode(GenerateReadablePassword(4)); } + +/* + * ITFlow - POST request handler for client tickets + */ +if (isset($_POST['update_kanban_status_position'])) { + // Update multiple ticket status kanban orders + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + + foreach ($positions as $position) { + $status_id = intval($position['status_id']); + $kanban = intval($position['status_kanban']); + + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_order = $kanban WHERE ticket_status_id = $status_id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + +if (isset($_POST['update_kanban_ticket'])) { + // Update ticket kanban order and status + enforceUserPermission('module_support', 2); + + // all tickets on the column + $positions = $_POST['positions']; + + foreach ($positions as $position) { + $ticket_id = intval($position['ticket_id']); + $kanban = intval($position['ticket_order']); // ticket kanban position + $status = intval($position['ticket_status']); // ticket statuses + $oldStatus = intval($position['ticket_oldStatus']); // ticket old status if moved + + $statuses['Closed'] = 5; + $statuses['Resolved'] = 4; + + // Continue if status is null / Closed + if ($status === null || $status === $statuses['Closed']) { + continue; + } + + + if ($oldStatus === false) { + // if ticket was not moved, just uptdate the order on kanban + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } else { + // If the ticket was moved from a resolved status to another status, we need to update ticket_resolved_at + if ($oldStatus === $statuses['Resolved']) { + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status, ticket_resolved_at = NULL WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } elseif ($status === $statuses['Resolved']) { + // If the ticket was moved to a resolved status, we need to update ticket_resolved_at + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status, ticket_resolved_at = NOW() WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + + // Client notification email + if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) { + + // Get details + $ticket_sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject, ticket_status_name, ticket_assigned_to, ticket_url_key, ticket_client_id FROM tickets + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE ticket_id = $ticket_id + "); + $row = mysqli_fetch_array($ticket_sql); + + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $ticket_prefix = sanitizeInput($row['ticket_prefix']); + $ticket_number = intval($row['ticket_number']); + $ticket_subject = sanitizeInput($row['ticket_subject']); + $client_id = intval($row['ticket_client_id']); + $ticket_assigned_to = intval($row['ticket_assigned_to']); + $ticket_status = sanitizeInput($row['ticket_status_name']); + $url_key = sanitizeInput($row['ticket_url_key']); + + // Sanitize Config vars from get_settings.php + $config_ticket_from_name = sanitizeInput($config_ticket_from_name); + $config_ticket_from_email = sanitizeInput($config_ticket_from_email); + $config_base_url = sanitizeInput($config_base_url); + + // Get Company Info + $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); + $company_name = sanitizeInput($row['company_name']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); + + // EMAIL + $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)"; + $body = "##- Please type your reply above this line -##

    Hello $contact_name,

    Your ticket regarding $ticket_subject has been marked as solved and is pending closure.

    If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

    Ticket: $ticket_prefix$ticket_number
    Subject: $ticket_subject
    Status: $ticket_status
    Portal: View ticket

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + + // Check email valid + if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { + + $data = []; + + // Email Ticket Contact + // Queue Mail + + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + } + + // Also Email all the watchers + $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); + $body .= "

    ----------------------------------------
    YOU ARE A COLLABORATOR ON THIS TICKET"; + while ($row = mysqli_fetch_array($sql_watchers)) { + $watcher_email = sanitizeInput($row['watcher_email']); + + // Queue Mail + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $watcher_email, + 'recipient_name' => $watcher_email, + 'subject' => $subject, + 'body' => $body + ]; + } + addToMailQueue($data); + } + //End Mail IF + + } else { + // If the ticket was moved from any status to another status + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } + } + + } + + // return a response + echo json_encode(['status' => 'success','payload' => $positions]); + exit; +} + +if (isset($_POST['update_ticket_tasks_order'])) { + // Update multiple ticket tasks order + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + $ticket_id = intval($_POST['ticket_id']); + + foreach ($positions as $position) { + $id = intval($position['id']); + $order = intval($position['order']); + + mysqli_query($mysqli, "UPDATE tasks SET task_order = $order WHERE task_ticket_id = $ticket_id AND task_id = $id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + +if (isset($_POST['update_task_templates_order'])) { + // Update multiple task templates order + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + $ticket_template_id = intval($_POST['ticket_template_id']); + + foreach ($positions as $position) { + $id = intval($position['id']); + $order = intval($position['order']); + + mysqli_query($mysqli, "UPDATE task_templates SET task_template_order = $order WHERE task_template_ticket_template_id = $ticket_template_id AND task_template_id = $id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + +if (isset($_POST['update_quote_items_order'])) { + // Update multiple quote items order + enforceUserPermission('module_sales', 2); + + $positions = $_POST['positions']; + $quote_id = intval($_POST['quote_id']); + + foreach ($positions as $position) { + $id = intval($position['id']); + $order = intval($position['order']); + + mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_quote_id = $quote_id AND item_id = $id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + +if (isset($_POST['update_invoice_items_order'])) { + // Update multiple invoice items order + enforceUserPermission('module_sales', 2); + + $positions = $_POST['positions']; + $invoice_id = intval($_POST['invoice_id']); + + foreach ($positions as $position) { + $id = intval($position['id']); + $order = intval($position['order']); + + mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_invoice_id = $invoice_id AND item_id = $id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + +if (isset($_POST['update_recurring_invoice_items_order'])) { + // Update multiple recurring invoice items order + enforceUserPermission('module_sales', 2); + + $positions = $_POST['positions']; + $recurring_id = intval($_POST['recurring_id']); + + foreach ($positions as $position) { + $id = intval($position['id']); + $order = intval($position['order']); + + mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_recurring_id = $recurring_id AND item_id = $id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + diff --git a/ajax/ajax_account_edit.php b/ajax/ajax_account_edit.php new file mode 100644 index 00000000..d535d638 --- /dev/null +++ b/ajax/ajax_account_edit.php @@ -0,0 +1,51 @@ + + +
    +
    Editing account:
    + +
    +
    + + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    +
    + + +
    +
    + +Tell your admin: Your role does not have admin access."); +} + +$email_id = intval($_GET['id']); //Initialize the HTML Purifier to prevent XSS -require "plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); +$purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); -if (isset($_GET['email_id'])) { - $email_id = intval($_GET['email_id']); -} else { - echo "You dont belong here"; - exit(); -} - -$sql = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_id = $email_id"); - +$sql = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_id = $email_id LIMIT 1"); $row = mysqli_fetch_array($sql); $email_from = nullable_htmlentities($row['email_from']); @@ -41,37 +40,40 @@ if ($email_status == 0) { $email_status_display = "
    Sent
    $email_sent_at"; } +// Generate the HTML form content using output buffering. +ob_start(); ?> - -
      -
    1. - Admin -
      2. -
    2. - Mail Queue -
      3. -
      4. -
    - -
    - -
    -
    -
    -
    From: ($email_from)"; ?>
    -
    To: ($email_recipient)"; ?>
    -
    Subject:
    -
    -
    - -
    +
    +
    + +
    +
    +
    +
    + From: +
    +
    + $email_from_name ($email_from)"; ?> +
    +
    +
    +
    +
    + To: +
    +
    + $email_recipient_name ($email_recipient)"; ?> +
    +
    +
    +
    +
    -
    -
    - + + +
    +
    Copying asset:
    + +
    +
    + + + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    + +
    +
    +
    + + +
    +
    + +$contact_name"; +} else { + $contact_name_display = $contact_name; +} +$location_name = nullable_htmlentities($row['location_name']); +if (empty($location_name)) { + $location_name = "-"; +} +$location_archived_at = nullable_htmlentities($row['location_archived_at']); +if ($location_archived_at) { + $location_name_display = "$location_name"; +} else { + $location_name_display = $location_name; +} + +// Network Interfaces +$sql_related_interfaces = mysqli_query($mysqli, " + SELECT + ai.interface_id, + ai.interface_name, + ai.interface_description, + ai.interface_type, + ai.interface_mac, + ai.interface_ip, + ai.interface_nat_ip, + ai.interface_ipv6, + ai.interface_primary, + ai.interface_notes, + n.network_name, + n.network_id, + connected_interfaces.interface_id AS connected_interface_id, + connected_interfaces.interface_name AS connected_interface_name, + connected_assets.asset_name AS connected_asset_name, + connected_assets.asset_id AS connected_asset_id, + connected_assets.asset_type AS connected_asset_type + FROM asset_interfaces AS ai + LEFT JOIN networks AS n + ON n.network_id = ai.interface_network_id + LEFT JOIN asset_interface_links AS ail + ON (ail.interface_a_id = ai.interface_id OR ail.interface_b_id = ai.interface_id) + LEFT JOIN asset_interfaces AS connected_interfaces + ON ( + (ail.interface_a_id = ai.interface_id AND ail.interface_b_id = connected_interfaces.interface_id) + OR + (ail.interface_b_id = ai.interface_id AND ail.interface_a_id = connected_interfaces.interface_id) + ) + LEFT JOIN assets AS connected_assets + ON connected_assets.asset_id = connected_interfaces.interface_asset_id + WHERE + ai.interface_asset_id = $asset_id + AND ai.interface_archived_at IS NULL + ORDER BY ai.interface_name ASC +"); +$interface_count = mysqli_num_rows($sql_related_interfaces); + +// Related Credentials Query +$sql_related_credentials = mysqli_query($mysqli, " + SELECT + logins.login_id AS login_id, + logins.login_name, + logins.login_description, + logins.login_uri, + logins.login_username, + logins.login_password, + logins.login_otp_secret, + logins.login_note, + logins.login_important, + logins.login_contact_id, + logins.login_vendor_id, + logins.login_asset_id, + logins.login_software_id + FROM logins + LEFT JOIN login_tags ON login_tags.login_id = logins.login_id + LEFT JOIN tags ON tags.tag_id = login_tags.tag_id + WHERE login_asset_id = $asset_id + AND login_archived_at IS NULL + GROUP BY logins.login_id + ORDER BY login_name DESC +"); +$credential_count = mysqli_num_rows($sql_related_credentials); + +// Related Tickets Query +$sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets + LEFT JOIN users on ticket_assigned_to = user_id + LEFT JOIN ticket_statuses ON ticket_status_id = ticket_status + WHERE ticket_asset_id = $asset_id + ORDER BY ticket_number DESC" +); +$ticket_count = mysqli_num_rows($sql_related_tickets); + +// Related Recurring Tickets Query +$sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets + WHERE scheduled_ticket_asset_id = $asset_id + ORDER BY scheduled_ticket_next_run DESC" +); +$recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); + +// Related Documents +$sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents + LEFT JOIN documents ON asset_documents.document_id = documents.document_id + WHERE asset_documents.asset_id = $asset_id + AND document_archived_at IS NULL + ORDER BY document_name DESC" +); +$document_count = mysqli_num_rows($sql_related_documents); + +// Related Files +$sql_related_files = mysqli_query($mysqli, "SELECT * FROM asset_files + LEFT JOIN files ON asset_files.file_id = files.file_id + WHERE asset_files.asset_id = $asset_id + AND file_archived_at IS NULL + ORDER BY file_name DESC" +); +$file_count = mysqli_num_rows($sql_related_files); + +// Related Software Query +$sql_related_software = mysqli_query( + $mysqli, + "SELECT * FROM software_assets + LEFT JOIN software ON software_assets.software_id = software.software_id + WHERE software_assets.asset_id = $asset_id + AND software_archived_at IS NULL + ORDER BY software_name DESC" +); + +$software_count = mysqli_num_rows($sql_related_software); + +if (isset($_GET['client_id'])) { + $client_url = "client_id=$client_id&"; +} else { + $client_url = ''; +} + +// Generate the HTML form content using output buffering. +ob_start(); +?> +
    +
    + +
    + +
    + + + +
    + +
    + +
    +
    +
    +

    + + asset_photo"> + + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    +
    +
    Primary Network Interface
    +
    +
    + +
    + + +
    + +
    + +
    Link
    + +
    Link 2
    + +
    +
    + + +
    +
    +
    Assignment
    +
    +
    + +
    + +
    + +
    + +
    + +
    + + +
    +
    + +
    +
    +
    Additional Notes
    +
    + +
    + +
    + + + + +
    + +
    + + "> + + + + + + + + + + + + $network_name" + : '-'; + + // Connected interface details + $connected_asset_id = intval($row['connected_asset_id']); + $connected_asset_name = nullable_htmlentities($row['connected_asset_name']); + $connected_asset_type = nullable_htmlentities($row['connected_asset_type']); + $connected_asset_icon = getAssetIcon($connected_asset_type); + $connected_interface_name = nullable_htmlentities($row['connected_interface_name']); + + + // Show either "-" or "AssetName - Port" + if ($connected_asset_name) { + $connected_to_display = + " + $connected_asset_name - $connected_interface_name + + "; + } else { + $connected_to_display = "-"; + } + ?> + + + + + + + + + + +
    Name / PortTypeMACIPNetworkConnected To
    + + (Primary)"; } ?> +
    +
    +
    + + + +
    +
    + + + + + + + + + + + + Hover.."; + } + $login_note = nullable_htmlentities($row['login_note']); + $login_important = intval($row['login_important']); + $login_contact_id = intval($row['login_contact_id']); + $login_vendor_id = intval($row['login_vendor_id']); + $login_asset_id = intval($row['login_asset_id']); + $login_software_id = intval($row['login_software_id']); + + // Tags + $login_tag_name_display_array = array(); + $login_tag_id_array = array(); + $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_login_tags)) { + + $login_tag_id = intval($row['tag_id']); + $login_tag_name = nullable_htmlentities($row['tag_name']); + $login_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($login_tag_color)) { + $login_tag_color = "dark"; + } + $login_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($login_tag_icon)) { + $login_tag_icon = "tag"; + } + + $login_tag_id_array[] = $login_tag_id; + $login_tag_name_display_array[] = "$login_tag_name"; + } + $login_tags_display = implode('', $login_tag_name_display_array); + + ?> + + + + + + + + + + + +
    NameUsernamePasswordOTPURI
    + + + + +
    +
    +
    + + + + + +
    +
    + + + + + + + + + + + + + Never

    "; + } else { + $ticket_updated_at_display = "

    Never

    "; + } + } else { + $ticket_updated_at_display = $ticket_updated_at; + } + $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); + + if ($ticket_priority == "High") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Medium") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Low") { + $ticket_priority_display = "$ticket_priority"; + } else { + $ticket_priority_display = "-"; + } + $ticket_assigned_to = intval($row['ticket_assigned_to']); + if (empty($ticket_assigned_to)) { + if ($ticket_status == 5) { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } else { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } + } else { + $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); + } + + ?> + + + + + + + + + + + + + +
    NumberSubjectPriorityStatusAssignedLast Response
    + + + + + +
    +
    +
    + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    SubjectPriorityFrequencyNext Run
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    SoftwareTypeKeySeats
    $software_version"; ?>
    +
    +
    + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    Document TitleByCreatedUpdated
    + + + +
    +
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + +
    NameTypeUploaded
    " target="_blank" >$file_description"; ?>
    +
    +
    + + +
    + +
    + +
    + More Details + +
    + + +
    +
    Editing asset:
    + +
    +
    + + + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    + + asset_photo"> + +
    + +
    + + +
    + +
    + +
    + +

    Asset ID:

    + +
    + + +
    + +
    + +
      + $asset_history_created_at
      $asset_history_description"; + } + ?> +
    + +
    + +
    + +
    +
    +
    + + +
    +
    + + +
    +
    Editing Interface: -
    + +
    +
    + + + +
    > + + + +
    + +
    + +
    + + +
    + +
    +
    + +
    + +
    +
    + title="Mark Interface as primary"> +
    +
    +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + + > +
    +
    +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    +
    + + +
    + +
    + +
    + + +
    +
    + + + +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    + +
    + +
    + + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + + +
    + +
    + + + + + +
    + +
    +
    + +
    + +
    +
    + + + + +
    + + +
    + + +
    + +
    + +
    +
    + Delete + + +
    +
    + + +
    +
    Editing category:
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing certificate:
    + +
    +
    + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    +  https:// +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + + +
    +
    + + +
    +
    Editing Client:
    + +
    + +
    + + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + + +
    + +
    + +
    + +
    + +
    +
    +
    + + +
    +
    + +$contact_tag_name"; +} +$contact_tags_display = implode('', $contact_tag_name_display_array); + +// Notes - 1 to 1 relationship +$sql_related_notes = mysqli_query($mysqli, "SELECT * FROM contact_notes LEFT JOIN users ON contact_note_created_by = user_id WHERE contact_note_contact_id = $contact_id AND contact_note_archived_at IS NULL ORDER BY contact_note_created_at DESC"); +$note_count = mysqli_num_rows($sql_related_notes); + + // Linked Services +$sql_linked_services = mysqli_query($mysqli, "SELECT * FROM service_contacts, services + WHERE service_contacts.contact_id = $contact_id + AND service_contacts.service_id = services.service_id + ORDER BY service_name ASC" +); +$service_count = mysqli_num_rows($sql_linked_services); + +$linked_services = array(); + +// Linked Documents +$sql_linked_documents = mysqli_query($mysqli, "SELECT * FROM contact_documents, documents + LEFT JOIN users ON document_created_by = user_id + WHERE contact_documents.contact_id = $contact_id + AND contact_documents.document_id = documents.document_id + AND document_template = 0 + AND document_archived_at IS NULL + ORDER BY document_name ASC" +); +$document_count = mysqli_num_rows($sql_linked_documents); + +$linked_documents = array(); + +// Linked Files +$sql_linked_files = mysqli_query($mysqli, "SELECT * FROM contact_files, files + WHERE contact_files.contact_id = $contact_id + AND contact_files.file_id = files.file_id + AND file_archived_at IS NULL + ORDER BY file_name ASC" +); +$file_count = mysqli_num_rows($sql_linked_files); + +$linked_files = array(); + +if (isset($_GET['client_id'])) { + $client_url = "client_id=$client_id&"; +} else { + $client_url = ''; +} + +// Generate the HTML form content using output buffering. +ob_start(); +?> +
    +
    + +
    + +
    + + + +
    + +
    + +
    +
    +
    +

    + +
    + + +
    + + contact_photo"> + + + + + + +
    + +
    + +
    + +
    + +
    + +
    + +
    ">
    + +
    x
    + +
    + +
    + +
    Primary Contact
    + +
    Important
    + +
    Technical
    + +
    Billing
    + +
    + +
    +
    + +
    +
    +
    Notes
    +
    + +
    +
    + + + + +
    + +
    + + + + + + + + + + + + + "; + } + $asset_nat_ip = nullable_htmlentities($row['interface_nat_ip']); + $asset_ipv6 = nullable_htmlentities($row['interface_ipv6']); + $asset_mac = nullable_htmlentities($row['interface_mac']); + $asset_status = nullable_htmlentities($row['asset_status']); + $asset_purchase_date = nullable_htmlentities($row['asset_purchase_date']); + $asset_warranty_expire = nullable_htmlentities($row['asset_warranty_expire']); + $asset_install_date = nullable_htmlentities($row['asset_install_date']); + if (empty($asset_install_date)) { + $asset_install_date_display = "-"; + } else { + $asset_install_date_display = $asset_install_date; + } + $asset_uri = nullable_htmlentities($row['asset_uri']); + $asset_uri_2 = nullable_htmlentities($row['asset_uri_2']); + $asset_photo = nullable_htmlentities($row['asset_photo']); + $asset_physical_location = nullable_htmlentities($row['asset_physical_location']); + $asset_notes = nullable_htmlentities($row['asset_notes']); + $asset_created_at = nullable_htmlentities($row['asset_created_at']); + $device_icon = getAssetIcon($asset_type); + + ?> + + + + + + + + + + + + +
    Name/DescriptionTypeMake/ModelSerial NumberInstall DateStatus
    + + + + +
    + +
    +     		+ +
    + +
    +
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + Hover.."; + } + $login_note = nullable_htmlentities($row['login_note']); + $login_important = intval($row['login_important']); + $login_contact_id = intval($row['login_contact_id']); + $login_vendor_id = intval($row['login_vendor_id']); + $login_asset_id = intval($row['login_asset_id']); + $login_software_id = intval($row['login_software_id']); + + // Tags + $login_tag_name_display_array = array(); + $login_tag_id_array = array(); + $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_login_tags)) { + + $login_tag_id = intval($row['tag_id']); + $login_tag_name = nullable_htmlentities($row['tag_name']); + $login_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($login_tag_color)) { + $login_tag_color = "dark"; + } + $login_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($login_tag_icon)) { + $login_tag_icon = "tag"; + } + + $login_tag_id_array[] = $login_tag_id; + $login_tag_name_display_array[] = "$login_tag_name"; + } + $login_tags_display = implode('', $login_tag_name_display_array); + + ?> + + + + + + + + + + + + +
    NameDescriptionUsernamePasswordOTPURI
    + +
    +
    +
    + + + + + +
    +
    + + + + + + + + + + + + + + Never

    "; + } else { + $ticket_updated_at_display = "

    Never

    "; + } + } else { + $ticket_updated_at_display = $ticket_updated_at; + } + $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); + + if ($ticket_priority == "High") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Medium") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Low") { + $ticket_priority_display = "$ticket_priority"; + } else { + $ticket_priority_display = "-"; + } + $ticket_assigned_to = intval($row['ticket_assigned_to']); + if (empty($ticket_assigned_to)) { + if ($ticket_status == "Closed") { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } else { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } + } else { + $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); + } + + ?> + + + + + + + + + + + + + + +
    NumberSubjectPriorityStatusAssignedLast ResponseCreated
    +
    +
    + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    SubjectPriorityFrequencyNext Run
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    SoftwareTypeKeySeats
    +
    +
    + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    Document TitleByCreatedUpdated
    + + + +
    +
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    File NameTypeSizeUploaded
    +
    +
    +     		KB
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    TypeNoteByCreated
    +
    +
    + + +
    + +
    + +
    + More Details + +
    + + +
    +
    Editing Contact:
    + +
    +
    + + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    + + + + + +
    + +
    +
    +
    + > + +

    Pin Top

    +
    +
    +
    +
    +
    +
    + > + +

    Receives Invoices

    +
    +
    +
    +
    +
    +
    + > + +
    +
    +
    + +
    + +
    + +
    + +
    + + contact_photo"> + + + + + + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +

    Contact ID:

    + +
    + +
    + +
    +
    + + +
    +
    + + + + + + diff --git a/ajax/ajax_contact_note_create.php b/ajax/ajax_contact_note_create.php new file mode 100644 index 00000000..f668e23a --- /dev/null +++ b/ajax/ajax_contact_note_create.php @@ -0,0 +1,54 @@ + + +
    +
    Creating note:
    + +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + + +
    +
    + + + +
    +
    Editing credential:
    + +
    + +
    + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    + + +
    +
    + + + +
    +
    Editing link:
    + +
    +
    + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + / Open New Tab +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing Ticket Status:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing document:
    + +
    +
    + + + + +
    + +
    + +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    Moving document:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    Renaming document:
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing template:
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + + +
    +
    + +set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one +$purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); +$purifier = new HTMLPurifier($purifier_config); + +$document_id = intval($_GET['id']); + +$sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_id = $document_id LIMIT 1"); + +$row = mysqli_fetch_array($sql); +$document_name = nullable_htmlentities($row['document_name']); +$document_content = $purifier->purify($row['document_content']); + + +// Generate the HTML form content using output buffering. +ob_start(); +?> + +
    +
    + +
    +
    + +
    + + + +
    +
    Editing domain:
    + +
    +
    + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + +
    DateFieldBeforeAfter
    +
    +
    + +
    + +
    +
    + + +
    +
    + + + +
    +
    Copying expense
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + + + + +
    + +
    +
    + +
    + +
    +
    + + + +
    + +
    + + +
    + +
    + +
    + + +
    +
    + + + diff --git a/ajax/ajax_expense_edit.php b/ajax/ajax_expense_edit.php new file mode 100644 index 00000000..5793ff39 --- /dev/null +++ b/ajax/ajax_expense_edit.php @@ -0,0 +1,241 @@ + + +
    +
    Editing expense
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + + + + + +
    + +
    +
    + +
    + +
    +
    + + + +
    + +
    + + +
    + + +
    + " + download=""> + + + + +
    +
    + + +
    +
    + + + diff --git a/ajax/ajax_expense_refund.php b/ajax/ajax_expense_refund.php new file mode 100644 index 00000000..cbf8d619 --- /dev/null +++ b/ajax/ajax_expense_refund.php @@ -0,0 +1,94 @@ + + +
    +
    Refunding expense
    + +
    + +
    +
    + + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    +
    + + +
    +
    + + + diff --git a/ajax/ajax_file_move.php b/ajax/ajax_file_move.php new file mode 100644 index 00000000..fb242065 --- /dev/null +++ b/ajax/ajax_file_move.php @@ -0,0 +1,132 @@ + +
    +
    Moving File:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    Renaming file:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    Renaming folder:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Copying invoice: -
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + " required> +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing invoice: -
    + +
    +
    + + +
    > + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing Line Item:
    + +
    +
    + + +
    +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    + +
    + + +
    +
    + + + +
    +
    Editing location:
    + +
    +
    + + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + "> + +
    + +
    + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +

    Location ID:

    + +
    + +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing network:
    + +
    +
    + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +

    +
    + +
    + +
    +
    + + +
    +
    + + + +
    +
    Notifications
    + +
    + +
    + + + + + + +
    + + + + + + +
    + +     + + +
    + +

    No Notifications

    +
    + +
    +
    + + + Dismiss all + + + + See Dismissed Notifications + + + +
    + + + +
    +
    Editing product:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    + +
    + + +
    + +
    + +
    + + +
    +
    + + + +
    +
    + Editing Project: +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    + + +
    +
    + + + +
    +
    Copying quote: -
    + +
    +
    + +
    + + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + " required> +
    +
    + +
    + +
    +
    + +
    + " max="2999-12-31" value="" required> +
    +
    + +
    +
    + + +
    +
    + + + + +
    +
    Editing quote: -
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    Adding Device to Rack
    + +
    + +
    + + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    Editing rack:
    + +
    + +
    + + + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + + rack_photo"> + + +
    + + +
    + +
    + +
    + +
    + +
    +
    +
    + + +
    +
    + + + +
    +
    Editing recurring expense
    + +
    +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + + + + + +
    + +
    +
    + +
    + +
    +
    + + + +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing Recur Invoice:
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing Recurring Ticket:
    + +
    +
    + + + +
    + + + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + value="1" + > + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + +
    +
    + + + +
    +
    Edit Revenue
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    Editing role: +
    + +
    +
    + + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    Module permissions do not apply to Admins.
    + + + + +
    + +
    + +
    + + +
    + + + +
    + +
    + +
    +
    + + +
    +
    + +$service_importance"; +} elseif ($service_importance == "Medium") { + $service_importance_display = "$service_importance"; +} elseif ($service_importance == "Low") { + $service_importance_display = "$service_importance"; +} else { + $service_importance_display = "-"; +} + +// Associated Assets (and their logins/networks/locations) +$sql_assets = mysqli_query( + $mysqli, + "SELECT * FROM service_assets + LEFT JOIN assets ON service_assets.asset_id = assets.asset_id + LEFT JOIN asset_interfaces ON interface_asset_id = assets.asset_id AND interface_primary = 1 + LEFT JOIN logins ON service_assets.asset_id = logins.login_asset_id + LEFT JOIN networks ON interface_network_id = networks.network_id + LEFT JOIN locations ON assets.asset_location_id = locations.location_id + WHERE service_id = $service_id" +); + +// Associated logins +$sql_logins = mysqli_query( + $mysqli, + "SELECT * FROM service_logins + LEFT JOIN logins ON service_logins.login_id = logins.login_id + WHERE service_id = $service_id" +); + +// Associated Domains +$sql_domains = mysqli_query( + $mysqli, + "SELECT * FROM service_domains + LEFT JOIN domains ON service_domains.domain_id = domains.domain_id + WHERE service_id = $service_id" +); +// Associated Certificates +$sql_certificates = mysqli_query( + $mysqli, + "SELECT * FROM service_certificates + LEFT JOIN certificates ON service_certificates.certificate_id = certificates.certificate_id + WHERE service_id = $service_id" +); + +// Associated URLs ---- REMOVED for now +//$sql_urls = mysqli_query($mysqli, "SELECT * FROM service_urls +//WHERE service_id = '$service_id'"); + +// Associated Vendors +$sql_vendors = mysqli_query( + $mysqli, + "SELECT * FROM service_vendors + LEFT JOIN vendors ON service_vendors.vendor_id = vendors.vendor_id + WHERE service_id = $service_id" +); + +// Associated Contacts +$sql_contacts = mysqli_query( + $mysqli, + "SELECT * FROM service_contacts + LEFT JOIN contacts ON service_contacts.contact_id = contacts.contact_id + WHERE service_id = $service_id" +); + +// Associated Documents +$sql_docs = mysqli_query( + $mysqli, + "SELECT * FROM service_documents + LEFT JOIN documents ON service_documents.document_id = documents.document_id + WHERE service_id = $service_id" +); + +// Generate the HTML form content using output buffering. +ob_start(); +?> +
    +
    + +
    +
    +
    + + +
    +
    +

    Service Overview:

    + Description:
    + Backup Info:

    + +
    Notes
    +
    +
    + + + 0) { ?> +
    Assets
    + + + + + +
    Networks
    + + + + + +
    Locations
    + + + + + 0) { ?> +
    Domains
    + + + + + 0) { ?> +
    Certificates
    + + + +
    +
    + + + +
    +
    +

    Additional Related Items

    +
    + + + 0) { ?> +
    Vendors
    + + + + + 0) { ?> +
    Contacts
    + + + + + 0 || mysqli_num_rows($sql_logins) > 0) { ?> +
    Logins
    +
      + $row[login_name]"; + } + } + + // Showing explicitly linked logins + while ($row = mysqli_fetch_array($sql_logins)) { + if (!empty($row['login_name'])) { + echo "
    • $row[login_name]
      • "; + } + } + ?> +
    + + + + +
    URLs
    +
      + $row[login_uri]"; + } + } + + // Reset the $sql_assets pointer to the start + mysqli_data_seek($sql_assets, 0); + + // Show URLs linked to assets, that also have logins + while ($row = mysqli_fetch_array($sql_assets)) { + if (!empty($row['login_uri'])) { + echo "
    • $row[login_uri]
      • "; + } + } + ?> +
    + + + + 0) { ?> +
    Documents
    + + + + + + + + +
    +
    +
    +
    + + +
    +
    Editing service:
    + +
    + +
    + + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    +
    + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + + + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    + +
    +
    +
    + + +
    +
    + + +
    +
    Editing license:
    + +
    +
    + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
      + +
    • +
      + + +
      +
      • + + + '$software_created_at' OR asset_archived_at IS NULL) AND asset_client_id = $client_id ORDER BY asset_archived_at ASC, asset_name ASC"); + + while ($row = mysqli_fetch_array($sql_assets_select)) { + $asset_id_select = intval($row['asset_id']); + $asset_name_select = nullable_htmlentities($row['asset_name']); + $asset_type_select = nullable_htmlentities($row['asset_type']); + $asset_archived_at = nullable_htmlentities($row['asset_archived_at']); + if (empty($asset_archived_at)) { + $asset_archived_display = ""; + } else { + $asset_archived_display = "Archived - "; + } + $contact_name_select = nullable_htmlentities($row['contact_name']); + + ?> +
    • +
      + > + +
      +
      • + + + +
    + +
    + +
    + +
      + +
    • +
      + + +
      +
      • + + '$software_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_archived_at ASC, contact_name ASC"); + + while ($row = mysqli_fetch_array($sql_contacts_select)) { + $contact_id_select = intval($row['contact_id']); + $contact_name_select = nullable_htmlentities($row['contact_name']); + $contact_email_select = nullable_htmlentities($row['contact_email']); + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if (empty($contact_archived_at)) { + $contact_archived_display = ""; + } else { + $contact_archived_display = "Archived - "; + } + + ?> +
    • +
      + > + +
      +
      • + + + +
    + +
    + +
    + + + +
    + +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing template:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + + +
    +
    + + +
    +
    + + +
    +
    Editing tag:
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing tax:
    + +
    +
    + + + +
    + +
    + + +
    + +
    + + +
    + +
    +
    + + +
    +
    + + + +
    +
    Assigning Ticket: -
    + +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    + +
    + + + +
    +
    + + Edit Billable Status for +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    + +
    + + + +
    +
    Changing contact: -
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    +
    + > + +
    +
    + + +
    + +
    + + +
    + +
    + + +
    +
    Editing ticket: -
    + +
    +
    + + +
    + + + +
    + +
    > + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    + + = 2) { ?> +
    +
    + value="1" id="billableSwitch"> + +
    +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + + +
    + +
    + + + +
    +
    Editing ticket priority: -
    + +
    +
    + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    + +
    + + + +
    +
    Editing Ticket Reply
    + +
    +
    + + + +
    + +
    +
    + + +
    +
    + +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + + +
    +
    Editing task
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    + +
    + + + +
    +
    Editing task
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    + +
    + + + +
    +
    Editing Transfer
    + +
    +
    + + + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    +
    + + + +
    +
    Copying Trip
    + +
    +
    +
    + +
    + +
    + +
    +
    + +
    + " required> +
    +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + + + + + +
    + +
    +
    + +
    + +
    +
    + + + +
    +
    + + +
    +
    + + + +
    +
    Editing Trip
    + +
    +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + > +
    +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + + + + + +
    + +
    +
    + +
    + +
    +
    + + + +
    + +
    + + +
    +
    + + +
    +
    Editing user: +
    + +
    +
    + + +
    + + + +
    + +
    + +
    + +
    + + "> + + + + + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    +
    + > + +
    +
    + + + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    + Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected. +
    + +
      +
    • +
      + + +
      +
      • + + + +
    • +
      + > + +
      +
      • + + + +
    + +
    + +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing vendor:
    + +
    +
    + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + " required> +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +

    Vendor ID:

    + +
    + +
    + +
    +
    + + +
    +
    + + + +
    +
    Editing vendor template:
    + +
    +
    + +
    + + + +
    + +
    Check the fields you would like to update globally
    + +
    + +
    + + +
    + +
    +
    + +
    + " required> +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + + +
    +
    + +
    + +
    + + +
    +
    +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    +
    + + +
    +
    + +
    @@ -155,7 +225,10 @@ if (isset($_GET['asset_id'])) {
    -

    @@ -193,7 +266,7 @@ if (isset($_GET['asset_id'])) {
    -
    Network
    +
    Primary Network Interface
    @@ -241,13 +314,11 @@ if (isset($_GET['asset_id'])) {
    -
    Notes
    +
    Additional Notes
    - -
    @@ -260,7 +331,7 @@ if (isset($_GET['asset_id'])) {
  2. - Assets + Assets
@@ -317,110 +388,134 @@ if (isset($_GET['asset_id'])) {
-

Network Interfaces

+

Network Interfaces

- +
+ + +
+ + Add Multiple + +
+ + Import + +
+ + Export + +
+
- +
"> - - - - - - - - + + + + + + + + + - + $network_name"; - } else { - $network_name_display = "-"; - } - $interface_notes = nullable_htmlentities($row['interface_notes']); - + // Prepare display text + $interface_mac_display = $interface_mac ?: '-'; + $interface_ip_display = $interface_ip ?: '-'; + $interface_type_display = $interface_type ?: '-'; + $network_name_display = $network_name + ? "$network_name" + : '-'; + // Connected interface details + $connected_asset_id = intval($row['connected_asset_id']); + $connected_asset_name = nullable_htmlentities($row['connected_asset_name']); + $connected_asset_type = nullable_htmlentities($row['connected_asset_type']); + $connected_asset_icon = getAssetIcon($connected_asset_type); + $connected_interface_name = nullable_htmlentities($row['connected_interface_name']); + + + // Show either "-" or "AssetName - Port" + if ($connected_asset_name) { + $connected_to_display = " + $connected_asset_name - $connected_interface_name + "; + } else { + $connected_to_display = "-"; + } ?> + - + - - - +
NameMACIPPortConnected ToAction
Name / PortTypeMACIPNetworkConnected ToAction
- - - + + + (Primary)"; } ?>
- + Edit - +
- + Delete - +
-
">
-

Passwords

+

Credentials

@@ -447,7 +542,7 @@ if (isset($_GET['asset_id'])) { if (empty($login_uri)) { $login_uri_display = "-"; } else { - $login_uri_display = "$login_uri"; + $login_uri_display = "$login_uri"; } $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); if (empty($login_username)) { @@ -461,7 +556,7 @@ if (isset($_GET['asset_id'])) { if (empty($login_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); @@ -496,14 +591,18 @@ if (isset($_GET['asset_id'])) { - + - + @@ -513,7 +612,11 @@ if (isset($_GET['asset_id'])) {
- + Edit )"> @@ -532,8 +635,6 @@ if (isset($_GET['asset_id'])) { @@ -602,7 +703,15 @@ if (isset($_GET['asset_id'])) { ?> - $software_version"; ?> + + + $software_version"; ?> + + @@ -620,6 +729,75 @@ if (isset($_GET['asset_id'])) {
+
"> +
+

Documents

+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
Document TitleByCreatedUpdatedAction
+
+
+ 		+ + + + +
+
+
+
+
">

Files

@@ -728,7 +906,15 @@ if (isset($_GET['asset_id'])) { ?> - + + + + + @@ -742,10 +928,17 @@ if (isset($_GET['asset_id'])) {
- + Edit +
+ + Force Reoccur +
@@ -860,13 +1053,12 @@ if (isset($_GET['asset_id'])) { - - - + + 0) { + while ($row = mysqli_fetch_array($os_sql)) { + $os_arr[] = $row; + } + $json_os = json_encode($os_arr); +} + +?> + +
+
+
+ + All Assets + + 0) { ?> + Workstations + 0) { ?> + Servers + 0) { ?> + Virtual + 0) { ?> + Network + 0) { ?> + Other + +
+
+
+ +
+
+

Assets

+
+ = 2) { ?> +
+ + +
+ + + Import + + + 0) { ?> +
+ + Export + + +
+
+ +
+
+
+
+ + + + + +
+
+
+ s"> +
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ "> + Archived + + +
+
+ +
+
+
+
+ + +
+ + "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $asset_physical_location"; + } else { + $asset_physical_location_display = ""; + } + $asset_notes = nullable_htmlentities($row['asset_notes']); + $asset_created_at = nullable_htmlentities($row['asset_created_at']); + $asset_archived_at = nullable_htmlentities($row['asset_archived_at']); + $asset_vendor_id = intval($row['asset_vendor_id']); + $asset_location_id = intval($row['asset_location_id']); + $asset_contact_id = intval($row['asset_contact_id']); + $asset_network_id = intval($row['interface_network_id']); + + $device_icon = getAssetIcon($asset_type); + + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if ($contact_archived_at) { + $contact_archive_display = "(Archived)"; + } else { + $contact_archive_display = ''; + } + $contact_name = nullable_htmlentities($row['contact_name']); + if ($contact_name) { + $contact_name_display = " + $contact_name $contact_archive_display + "; + } else { + $contact_name_display = "-"; + } + + $location_name = nullable_htmlentities($row['location_name']); + if (empty($location_name)) { + $location_name = "-"; + } + $location_archived_at = nullable_htmlentities($row['location_archived_at']); + if ($location_archived_at) { + $location_name_display = "
$location_name
"; + } else { + $location_name_display = $location_name; + } + + $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_asset_id = $asset_id"); + $login_count = mysqli_num_rows($sql_logins); + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ 		+ + Name + + + + Type + + + + Model + + + + Serial + + + + OS + + + + IP + + + + Purchase Date + + + + Install Date + + + + Warranty Expire + + + + Assigned To + + + + Location + + + + Status + + + + Client + + Action
+
+ +
+ 		+ +
+ +
+
+
+
+
+ + 		+ +
+ +
+ 		+ + + +
+ +
+ +
+ + + + + + +
+ + + + +
+
+ +
+ +
+ + Edit + + + Copy + + 2) { ?> + + + Unarchive + + + Delete + + + + Archive + + + + +
+
+
+
+
+ + + + + + + +
+
+ + + + + + + + + diff --git a/base32static.php b/base32static.php deleted file mode 100644 index a59feaff..00000000 --- a/base32static.php +++ /dev/null @@ -1,96 +0,0 @@ -'0', 'B'=>'1', 'C'=>'2', 'D'=>'3', 'E'=>'4', 'F'=>'5', 'G'=>'6', 'H'=>'7', - 'I'=>'8', 'J'=>'9', 'K'=>'10', 'L'=>'11', 'M'=>'12', 'N'=>'13', 'O'=>'14', 'P'=>'15', - 'Q'=>'16', 'R'=>'17', 'S'=>'18', 'T'=>'19', 'U'=>'20', 'V'=>'21', 'W'=>'22', 'X'=>'23', - 'Y'=>'24', 'Z'=>'25', '2'=>'26', '3'=>'27', '4'=>'28', '5'=>'29', '6'=>'30', '7'=>'31' - ); - - /** - * Use padding false when encoding for urls - * - * @return base32 encoded string - * @author Bryan Ruiz - **/ - public static function encode($input, $padding = true) { - if (empty($input)) return ""; - - $input = str_split($input); - $binaryString = ""; - - for ($i = 0; $i < count($input); $i++) { - $binaryString .= str_pad(base_convert(ord($input[$i]), 10, 2), 8, '0', STR_PAD_LEFT); - } - - $fiveBitBinaryArray = str_split($binaryString, 5); - $base32 = ""; - $i=0; - - while($i < count($fiveBitBinaryArray)) { - $base32 .= self::$map[base_convert(str_pad($fiveBitBinaryArray[$i], 5, '0'), 2, 10)]; - $i++; - } - - if ($padding && ($x = strlen($binaryString) % 40) != 0) { - if ($x == 8) $base32 .= str_repeat(self::$map[32], 6); - else if ($x == 16) $base32 .= str_repeat(self::$map[32], 4); - else if ($x == 24) $base32 .= str_repeat(self::$map[32], 3); - else if ($x == 32) $base32 .= self::$map[32]; - } - - return $base32; - } - - public static function decode($input) { - if (empty($input)) return; - - $paddingCharCount = substr_count($input, self::$map[32]); - $allowedValues = array(6,4,3,1,0); - - if (!in_array($paddingCharCount, $allowedValues)) return false; - - for ($i=0; $i<4; $i++){ - if ($paddingCharCount == $allowedValues[$i] && - substr($input, -($allowedValues[$i])) != str_repeat(self::$map[32], $allowedValues[$i])) return false; - } - - $input = str_replace('=', '', $input); - $input = str_split($input); - $binaryString = ""; - - for ($i=0; $i < count($input); $i = $i+8) { - $x = ""; - - if (!in_array($input[$i], self::$map)) return false; - - for ($j=0; $j < 8; $j++) { - $x .= str_pad(base_convert(@self::$flippedMap[@$input[$i + $j]], 10, 2), 5, '0', STR_PAD_LEFT); - } - - $eightBits = str_split($x, 8); - - for ($z = 0; $z < count($eightBits); $z++) { - $binaryString .= (($y = chr(base_convert($eightBits[$z], 2, 10))) || ord($y) == 48) ? $y:""; - } - } - - return $binaryString; - } -} diff --git a/blank.php b/blank.php index 2e83e0bf..b5cf1f1d 100644 --- a/blank.php +++ b/blank.php @@ -1,4 +1,4 @@ - +
    @@ -52,4 +52,4 @@ echo "Current Date and Time: $date_time"; - diff --git a/budget_edit.php b/budget_edit.php index 76051bd0..c4b09abc 100644 --- a/budget_edit.php +++ b/budget_edit.php @@ -1,6 +1,6 @@ diff --git a/calendar_events.php b/calendar.php similarity index 81% rename from calendar_events.php rename to calendar.php index 1b7ee7ef..54c84859 100644 --- a/calendar_events.php +++ b/calendar.php @@ -1,7 +1,17 @@
    - +
    @@ -69,13 +84,12 @@ if (isset($_GET['calendar_id'])) { - @@ -131,7 +143,16 @@ while ($row = mysqli_fetch_array($sql)) { selectMirror: true, eventClick: function(editEvent) { - $('#editEventModal' + editEvent.event.id).modal(); + var $link = $('    ', { + href: '#', + 'data-toggle': 'ajax-modal', + 'data-ajax-url': 'ajax/ajax_calendar_event_edit.php?', + 'data-ajax-id': editEvent.event.id + }); + + $('body').append($link); // Append to the body + $link.trigger('click'); // Trigger the modal + $link.remove(); // Cleanup }, dayMaxEvents: true, // allow "more" link when too many events views: { @@ -149,7 +170,7 @@ while ($row = mysqli_fetch_array($sql)) { }, events: [ ], diff --git a/calendar_edit_modal.php b/calendar_edit_modal.php deleted file mode 100644 index c0ead624..00000000 --- a/calendar_edit_modal.php +++ /dev/null @@ -1,42 +0,0 @@ - diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php deleted file mode 100644 index da0bd3d8..00000000 --- a/calendar_event_edit_modal.php +++ /dev/null @@ -1,174 +0,0 @@ - diff --git a/client_certificates.php b/certificates.php similarity index 81% rename from client_certificates.php rename to certificates.php index c606fdf0..4755ee93 100644 --- a/client_certificates.php +++ b/certificates.php @@ -4,7 +4,16 @@ $sort = "certificate_name"; $order = "ASC"; -require_once "inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND certificate_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); @@ -12,11 +21,14 @@ enforceUserPermission('module_support'); //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM certificates - WHERE certificate_archived_at IS NULL - AND certificate_client_id = $client_id - AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by LIKE '%$q%') - ORDER BY $sort $order LIMIT $record_from, $record_to"); +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM certificates + LEFT JOIN clients ON client_id = certificate_client_id + WHERE certificate_archived_at IS NULL + AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by LIKE '%$q%' OR client_name LIKE '%$q%') + $access_permission_query + $client_query + ORDER BY $sort $order LIMIT $record_from, $record_to" +); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -41,7 +53,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+ +
@@ -105,6 +119,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Expire + + + + Client + + + Action @@ -112,6 +133,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - )" data-target="#editCertificateModal"> +
@@ -166,14 +193,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + + +
- )" data-target="#editCertificateModal"> + Edit @@ -200,23 +233,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- - +getMessage()); - $access_permission_query = ""; // Ensure safe default if query fails +$client_access_array = []; +while ($row = mysqli_fetch_assoc($user_client_access_result)) { + $client_access_array[] = $row['client_id']; } +$client_access_string = implode(',', $client_access_array); + +// Client access permission check +// Default allow, if a list of allowed clients is set & the user isn't an admin, restrict them +$access_permission_query = ""; +if ($client_access_string && !$session_is_admin) { + $access_permission_query = "AND clients.client_id IN ($client_access_string)"; +} // Include the settings vars require_once "get_settings.php"; - //Detects if using an Apple device and uses Apple Maps instead of google $iPod = stripos($_SERVER['HTTP_USER_AGENT'], "iPod"); $iPhone = stripos($_SERVER['HTTP_USER_AGENT'], "iPhone"); @@ -116,17 +109,5 @@ if ($iPod || $iPhone || $iPad) { $session_map_source = "google"; } - // Check if mobile device $session_mobile = isMobile(); - - -// 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/client/autopay.php b/client/autopay.php new file mode 100644 index 00000000..e7953dde --- /dev/null +++ b/client/autopay.php @@ -0,0 +1,134 @@ + + +

AutoPay

+
+ +
+ + + + + Save card details
+ In order to set up automatic payments, you must create a customer record in Stripe.
+ First, you must authorize Stripe to store your card details for the purpose of automatic payment. +

+ +
+
+ +
+
+ + +
+
+ +
+ +
+
+
+ + + elseif (empty($stripe_pm)) { ?> + + Save card details
+ Please add the payment details you would like to save.
+ By adding payment details here, you grant consent for future automatic payments of invoices.

+ + + + +
+ +
+ + + + Manage saved payment methods + + customers->retrievePaymentMethod( + $stripe_id, + $stripe_pm, + [] + ); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when fetching payment method info for $stripe_pm: $error"); + logApp("Stripe", "error", "Exception when fetching payment method info for $stripe_pm: $error"); + } + + $card_name = nullable_htmlentities($payment_method->billing_details->name); + $card_brand = nullable_htmlentities($payment_method->card->display_brand); + $card_last4 = nullable_htmlentities($payment_method->card->last4); + $card_expires = nullable_htmlentities($payment_method->card->exp_month) . "/" . nullable_htmlentities($payment_method->card->exp_year); + + ?> + +
+ +
+ Actions
+ - Remove saved payment method + + + + +
+ +
+ + +
-
+ @@ -93,4 +93,4 @@ if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
- + @@ -126,4 +126,4 @@ if ($row) {
-

Contacts

-
+
+

Contacts

+
+
New Contact
@@ -75,4 +77,4 @@ $contacts_sql = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_
set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -41,7 +42,7 @@ if ($row) { $document_name = nullable_htmlentities($row['document_name']); $document_content = $purifier->purify($row['document_content']); } else { - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } @@ -67,4 +68,4 @@ if ($row) {
- + diff --git a/portal/portal_header.php b/client/includes/header.php similarity index 58% rename from portal/portal_header.php rename to client/includes/header.php index 1e6f6c55..f06abcdc 100644 --- a/portal/portal_header.php +++ b/client/includes/header.php @@ -27,10 +27,8 @@ header("X-Frame-Options: DENY"); // Legacy - + - - @@ -52,28 +50,57 @@ header("X-Frame-Options: DENY"); // Legacy -
  • - " href="invoices.php">Invoices -
    • -
  • - " href="quotes.php">Quotes +
  • + +
    + Invoices + Quotes + Auto Payment +
    • + -
  • - " href="documents.php">Documents -
    • -
  • - " href="contacts.php">Contacts -
    • -
  • - " href="domains.php">Domains -
    • -
  • - " href="certificates.php">Certificates +
  • + +
    + Contacts + Documents + Domains + Certificates + All tickets +
    • - + + + +
  • + class="nav-link "> +
    • + + + + @@ -102,7 +129,6 @@ header("X-Frame-Options: DENY"); // Legacy " alt="..." height="50" width="50" class="img-circle img-responsive"> - diff --git a/portal/inc_portal.php b/client/includes/inc_all.php similarity index 72% rename from portal/inc_portal.php rename to client/includes/inc_all.php index acee6648..d0ea5d15 100644 --- a/portal/inc_portal.php +++ b/client/includes/inc_all.php @@ -5,13 +5,8 @@ */ require_once '../config.php'; - require_once '../get_settings.php'; - require_once '../functions.php'; - require_once 'check_login.php'; - -require_once 'portal_functions.php'; - -require_once "portal_header.php"; +require_once 'functions.php'; +require_once "header.php"; diff --git a/portal/index.php b/client/index.php similarity index 54% rename from portal/index.php rename to client/index.php index c76f1899..856a36bf 100644 --- a/portal/index.php +++ b/client/index.php @@ -4,14 +4,13 @@ * Landing / Home page for the client portal */ -header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com"); - -require_once "inc_portal.php"; +header("Content-Security-Policy: default-src 'self'"); +require_once "includes/inc_all.php"; ?>
    New ticket
    - + diff --git a/portal/invoices.php b/client/invoices.php similarity index 90% rename from portal/invoices.php rename to client/invoices.php index a6ed0bce..654a4bd3 100644 --- a/portal/invoices.php +++ b/client/invoices.php @@ -4,13 +4,13 @@ * Invoices for PTC */ -header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com"); +header("Content-Security-Policy: default-src 'self'"); -require_once "inc_portal.php"; +require_once "includes/inc_all.php"; if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } @@ -76,7 +76,7 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie ?> - "> + "> @@ -99,5 +99,5 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie - + - - @@ -217,7 +215,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) { - + diff --git a/portal/login_microsoft.php b/client/login_microsoft.php similarity index 98% rename from portal/login_microsoft.php rename to client/login_microsoft.php index 54306c85..80e77a23 100644 --- a/portal/login_microsoft.php +++ b/client/login_microsoft.php @@ -29,7 +29,7 @@ $settings = mysqli_fetch_array($sql_settings); $client_id = $settings['config_azure_client_id']; $client_secret = $settings['config_azure_client_secret']; -$redirect_uri = "https://$config_base_url/portal/login_microsoft.php"; +$redirect_uri = "https://$config_base_url/client/login_microsoft.php"; # https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow $auth_code_url = "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize"; diff --git a/portal/login_reset.php b/client/login_reset.php similarity index 95% rename from portal/login_reset.php rename to client/login_reset.php index 428a7c29..43f17c7b 100644 --- a/portal/login_reset.php +++ b/client/login_reset.php @@ -4,7 +4,7 @@ * Password reset page */ -header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com"); +header("Content-Security-Policy: default-src 'self'"); require_once '../config.php'; require_once '../functions.php'; @@ -73,7 +73,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $client = intval($row['contact_client_id']); $token = randomString(156); - $url = "https://$config_base_url/portal/login_reset.php?email=$email&token=$token&client=$client"; + $url = "https://$config_base_url/client/login_reset.php?email=$email&token=$token&client=$client"; mysqli_query($mysqli, "UPDATE users SET user_password_reset_token = '$token' WHERE user_id = $user_id LIMIT 1"); mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Modify', log_description = 'Sent a portal password reset e-mail for $email.', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client"); @@ -91,7 +91,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); // Error handling if ($mail !== true) { @@ -147,7 +147,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); // Error handling if ($mail !== true) { @@ -193,10 +193,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { - + - - @@ -296,7 +294,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { - + diff --git a/portal/portal_post.php b/client/post.php similarity index 60% rename from portal/portal_post.php rename to client/post.php index 37855e0d..4dff9ee9 100644 --- a/portal/portal_post.php +++ b/client/post.php @@ -4,13 +4,17 @@ * Process GET/POST requests */ -require_once "inc_portal.php"; - +require_once '../config.php'; +require_once '../get_settings.php'; +require_once '../functions.php'; +require_once 'check_login.php'; +require_once 'functions.php'; if (isset($_POST['add_ticket'])) { $subject = sanitizeInput($_POST['subject']); $details = mysqli_real_escape_string($mysqli, ($_POST['details'])); + $category = intval($_POST['category']); // Get settings from get_settings.php $config_ticket_prefix = sanitizeInput($config_ticket_prefix); @@ -34,7 +38,7 @@ if (isset($_POST['add_ticket'])) { $new_config_ticket_next_number = $config_ticket_next_number + 1; mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); - 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 = 1, ticket_created_by = 0, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_billable = $config_ticket_default_billable, ticket_created_by = 0, ticket_contact_id = $session_contact_id, ticket_url_key = '$url_key', ticket_client_id = $session_client_id"); $ticket_id = mysqli_insert_id($mysqli); // Notify agent DL of the new ticket, if populated with a valid email @@ -57,7 +61,7 @@ if (isset($_POST['add_ticket'])) { 'body' => $email_body, ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // Custom action/notif handler @@ -122,7 +126,7 @@ if (isset($_POST['add_ticket_comment'])) { ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } @@ -171,7 +175,7 @@ if (isset($_POST['add_ticket_comment'])) { } else { // The client does not have access to this ticket - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } } @@ -200,7 +204,7 @@ if (isset($_POST['add_ticket_feedback'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } else { // The client does not have access to this ticket - header("Location: portal_post.php?logout"); + header("Location: post.php?logout"); exit(); } @@ -327,6 +331,12 @@ if (isset($_POST['edit_profile'])) { } if (isset($_POST['add_contact'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) { + header("Location: post.php?logout"); + exit(); + } + $contact_name = sanitizeInput($_POST['contact_name']); $contact_email = sanitizeInput($_POST['contact_email']); $contact_technical = intval($_POST['contact_technical']); @@ -368,6 +378,12 @@ if (isset($_POST['add_contact'])) { } if (isset($_POST['edit_contact'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) { + header("Location: post.php?logout"); + exit(); + } + $contact_id = intval($_POST['contact_id']); $contact_name = sanitizeInput($_POST['contact_name']); $contact_email = sanitizeInput($_POST['contact_email']); @@ -413,3 +429,258 @@ if (isset($_POST['edit_contact'])) { customAction('contact_update', $contact_id); } + +if (isset($_POST['create_stripe_customer'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + // Include stripe SDK + require_once '../plugins/stripe-php/init.php'; + + // Get client's StripeID from database (should be none) + $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT stripe_id FROM client_stripe WHERE client_id = $session_client_id LIMIT 1")); + if (!$stripe_client_details) { + + try { + // Initiate Stripe + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Create customer + $customer = $stripe->customers->create([ + 'name' => $session_client_name, + 'email' => $session_contact_email, + 'metadata' => [ + 'itflow_client_id' => $session_client_id, + 'consent' => $session_contact_name + ] + ]); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when creating customer record for $session_client_name: $error"); + logApp("Stripe", "error", "Exception creating customer $session_client_name: $error"); + } + + // Get & Store customer ID + $stripe_id = sanitizeInput($customer->id); + + mysqli_query($mysqli, "INSERT INTO client_stripe SET client_id = $session_client_id, stripe_id = '$stripe_id'"); + + // Logging + logAction("Stripe", "Create", "$session_contact_name created Stripe customer for $session_client_name as $stripe_id and authorised future automatic payments", $session_client_id, $session_client_id); + + $_SESSION['alert_message'] = "Stripe customer created, thank you for your consent"; + + } else { + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "Stripe customer already exists"; + } + + header('Location: autopay.php'); +} + +if (isset($_GET['create_stripe_checkout'])) { + + // This page is called by the autopay_setup_stripe.js, it returns a checkout session client secret + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + // Client Currency + $client_currency_details = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT client_currency_code FROM clients WHERE client_id = $session_client_id LIMIT 1")); + $client_currency = $client_currency_details['client_currency_code']; + + // Define return URL that user is redirected to once payment method is verified by Stripe + $return_url = "https://$config_base_url/client/post.php?stripe_save_card&session_id={CHECKOUT_SESSION_ID}"; + + try { + // Initialize stripe + require_once '../plugins/stripe-php/init.php'; + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Create checkout session (server side) + $checkout_session = $stripe->checkout->sessions->create([ + 'currency' => $client_currency, + 'mode' => 'setup', + 'ui_mode' => 'embedded', + 'return_url' => $return_url, + ]); + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when creating checkout session: $error"); + logApp("Stripe", "error", "Exception creating checkout: $error"); + } + + // Return the client secret to the js script + echo json_encode(array('clientSecret' => $checkout_session->client_secret)); + + // No redirect & no point logging this +} + +if (isset($_GET['stripe_save_card'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + // Get session ID from URL + $checkout_session_id = sanitizeInput($_GET['session_id']); + + // Get client's StripeID from database + $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT stripe_id FROM client_stripe WHERE client_id = $session_client_id LIMIT 1")); + $client_stripe_id = sanitizeInput($stripe_client_details['stripe_id']); + + try { + // Initialize stripe + require_once '../plugins/stripe-php/init.php'; + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Retrieve checkout session + $checkout_session = $stripe->checkout->sessions->retrieve($checkout_session_id,[]); + + // Get setup intent + $setup_intent_id = $checkout_session->setup_intent; + + // Retrieve the setup intent details + $setup_intent = $stripe->setupIntents->retrieve($setup_intent_id, []); + + // Get the payment method token + $payment_method = sanitizeInput($setup_intent->payment_method); + + // Attach the payment method to the client in Stripe + $stripe->paymentMethods->attach($payment_method, ['customer' => $client_stripe_id]); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when adding payment method info: $error"); + logApp("Stripe", "error", "Exception adding payment method: $error"); + } + + // Update ITFlow + mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = '$payment_method' WHERE client_id = $session_client_id LIMIT 1"); + + // Get some card/payment method details for the email/logging + $payment_method_details = $stripe->paymentMethods->retrieve($payment_method); + $card_info = sanitizeInput($payment_method_details->card->display_brand) . " " . sanitizeInput($payment_method_details->card->last4); + + // Send email confirmation + + // Company Details & Settings + $sql_settings = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); + $row = mysqli_fetch_array($sql_settings); + $company_name = sanitizeInput($row['company_name']); + $config_smtp_host = $row['config_smtp_host']; + $config_smtp_port = intval($row['config_smtp_port']); + $config_smtp_encryption = $row['config_smtp_encryption']; + $config_smtp_username = $row['config_smtp_username']; + $config_smtp_password = $row['config_smtp_password']; + $config_invoice_from_name = sanitizeInput($row['config_invoice_from_name']); + $config_invoice_from_email = sanitizeInput($row['config_invoice_from_email']); + $config_base_url = sanitizeInput($config_base_url); + + if (!empty($config_smtp_host)) { + $subject = "Payment method saved"; + $body = "Hello $session_contact_name,

    We’re writing to confirm that your payment details have been securely stored with Stripe, our trusted payment processor.

    By agreeing to save your payment information, you have authorized us to automatically bill your card ($card_info) for any future invoices. The payment details you’ve provided are securely stored with Stripe and will be used solely for invoices. We do not have access to your full card details.

    You may update or remove your payment information at any time using the portal.

    Thank you for your business!

    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + + $data = [ + [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $session_contact_email, + 'recipient_name' => $session_contact_name, + 'subject' => $subject, + 'body' => $body, + ] + ]; + + $mail = addToMailQueue($data); + + } + + // Logging + logAction("Stripe", "Update", "$session_contact_name saved payment method ($card_info) for future automatic payments (PM: $payment_method)", $session_client_id, $session_client_id); + + // Redirect + $_SESSION['alert_message'] = "Payment method saved - thank you"; + header('Location: autopay.php'); + +} + +if (isset($_GET['stripe_remove_pm'])) { + + if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { + header("Location: post.php?logout"); + exit(); + } + + // Get Stripe vars + $stripe_vars = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_publishable, config_stripe_secret FROM settings WHERE company_id = 1")); + $config_stripe_enable = intval($stripe_vars['config_stripe_enable']); + $config_stripe_secret = nullable_htmlentities($stripe_vars['config_stripe_secret']); + + if (!$config_stripe_enable) { + header("Location: autopay.php"); + exit(); + } + + $payment_method = sanitizeInput($_GET['pm']); + + try { + // Initialize stripe + require_once '../plugins/stripe-php/init.php'; + $stripe = new \Stripe\StripeClient($config_stripe_secret); + + // Detach PM + $stripe->paymentMethods->detach($payment_method, []); + + } catch (Exception $e) { + $error = $e->getMessage(); + error_log("Stripe payment error - encountered exception when removing payment method info for $payment_method: $error"); + logApp("Stripe", "error", "Exception removing payment method for $payment_method: $error"); + } + + // Remove payment method from ITFlow + mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $session_client_id LIMIT 1"); + + // Logging & Redirect + logAction("Stripe", "Update", "$session_contact_name deleted saved Stripe payment method (PM: $payment_method)", $session_client_id, $session_client_id); + + $_SESSION['alert_message'] = "Payment method removed"; + header('Location: autopay.php'); +} \ No newline at end of file diff --git a/portal/profile.php b/client/profile.php similarity index 88% rename from portal/profile.php rename to client/profile.php index e77afeaa..6209fed5 100644 --- a/portal/profile.php +++ b/client/profile.php @@ -4,9 +4,9 @@ * User profile */ -header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com"); +header("Content-Security-Policy: default-src 'self'"); -require_once 'inc_portal.php'; +require_once 'includes/inc_all.php'; ?> @@ -30,7 +30,7 @@ require_once 'inc_portal.php';

    Password

    - +
    @@ -46,5 +46,5 @@ require_once 'inc_portal.php'; - "> + "> @@ -88,4 +88,4 @@ $quotes_sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_client_id
    set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -18,25 +19,21 @@ $allowed_extensions = array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', ' if (isset($_GET['id']) && intval($_GET['id'])) { $ticket_id = intval($_GET['id']); + $ticket_contact_snippet = "AND ticket_contact_id = $session_contact_id"; + // Bypass ticket contact being session_id for a primary / technical contact viewing all tickets if ($session_contact_primary == 1 || $session_contact_is_technical_contact) { - // For a primary / technical contact viewing all tickets - $ticket_sql = mysqli_query($mysqli, - "SELECT * FROM tickets - LEFT JOIN users on ticket_assigned_to = user_id - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - WHERE ticket_id = $ticket_id AND ticket_client_id = $session_client_id" - ); - - } else { - // For a user viewing their own ticket - $ticket_sql = mysqli_query($mysqli, - "SELECT * FROM tickets - LEFT JOIN users on ticket_assigned_to = user_id - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - WHERE ticket_id = $ticket_id AND ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id" - ); + $ticket_contact_snippet = ''; } + $ticket_sql = mysqli_query($mysqli, + "SELECT * FROM tickets + LEFT JOIN users on ticket_assigned_to = user_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + LEFT JOIN categories ON ticket_category = category_id + WHERE ticket_id = $ticket_id AND ticket_client_id = $session_client_id + $ticket_contact_snippet" + ); + $ticket_row = mysqli_fetch_array($ticket_sql); if ($ticket_row) { @@ -51,7 +48,15 @@ if (isset($_GET['id']) && intval($_GET['id'])) { $ticket_resolved_at = nullable_htmlentities($ticket_row['ticket_resolved_at']); $ticket_closed_at = nullable_htmlentities($ticket_row['ticket_closed_at']); $ticket_feedback = nullable_htmlentities($ticket_row['ticket_feedback']); + $ticket_category = nullable_htmlentities($ticket_row['category_name']); + // Get Ticket Attachments (not associated with a specific reply) + $sql_ticket_attachments = mysqli_query( + $mysqli, + "SELECT * FROM ticket_attachments + WHERE ticket_attachment_reply_id IS NULL + AND ticket_attachment_ticket_id = $ticket_id" + ); // Get Tasks $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_id ORDER BY task_order ASC, task_id ASC"); @@ -83,29 +88,43 @@ if (isset($_GET['id']) && intval($_GET['id'])) { Ticket - Resolve ticket + Resolve ticket
    Subject:
    -

    - State: -
    - Priority: -
    + State:
    + Priority:
    + + Category:
    + + Tasks:
    - Assigned to: + + + Assigned to: + +

    +
    + + $name | View"; + } + ?>
    @@ -116,7 +135,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { - +
    @@ -135,11 +154,11 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
    - Reopen ticket + Reopen ticket
    - Close ticket + Close ticket
    @@ -149,7 +168,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {

    Ticket closed. Please rate your ticket

    - + + + +
    + +
    - diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php deleted file mode 100644 index 109b1e0b..00000000 --- a/client_asset_copy_modal.php +++ /dev/null @@ -1,393 +0,0 @@ - diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php deleted file mode 100644 index 2083d5a9..00000000 --- a/client_asset_edit_modal.php +++ /dev/null @@ -1,429 +0,0 @@ - diff --git a/client_asset_interface_edit_modal.php b/client_asset_interface_edit_modal.php deleted file mode 100644 index 62aef022..00000000 --- a/client_asset_interface_edit_modal.php +++ /dev/null @@ -1,102 +0,0 @@ - diff --git a/client_asset_transfer_modal.php b/client_asset_transfer_modal.php deleted file mode 100644 index 76ecb451..00000000 --- a/client_asset_transfer_modal.php +++ /dev/null @@ -1,48 +0,0 @@ - diff --git a/client_assets.php b/client_assets.php deleted file mode 100644 index ad713306..00000000 --- a/client_assets.php +++ /dev/null @@ -1,648 +0,0 @@ - 0) { - while ($row = mysqli_fetch_array($os_sql)) { - $os_arr[] = $row; - } - $json_os = json_encode($os_arr); -} - -?> - -
    -
    - Workstations - - Servers - - Virtual - - Network - - Other -
    -
    - -
    -
    -

    Assets

    -
    - = 2) { ?> -
    - - -
    - - Import - - 0) { ?> -
    - - Export - - -
    -
    - -
    -
    -
    -
    - - - -
    -
    -
    - s"> -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - "> - Archived - - -
    -
    - -
    -
    -
    -
    - - -
    - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $asset_physical_location"; - } else { - $asset_physical_location_display = ""; - } - $asset_notes = nullable_htmlentities($row['asset_notes']); - $asset_created_at = nullable_htmlentities($row['asset_created_at']); - $asset_archived_at = nullable_htmlentities($row['asset_archived_at']); - $asset_vendor_id = intval($row['asset_vendor_id']); - $asset_location_id = intval($row['asset_location_id']); - $asset_contact_id = intval($row['asset_contact_id']); - $asset_network_id = intval($row['interface_network_id']); - - $device_icon = getAssetIcon($asset_type); - - $contact_name = nullable_htmlentities($row['contact_name']); - if (empty($contact_name)) { - $contact_name = "-"; - } - $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); - if ($contact_archived_at) { - $contact_name_display = "
    $contact_name
    "; - } else { - $contact_name_display = $contact_name; - } - - $location_name = nullable_htmlentities($row['location_name']); - if (empty($location_name)) { - $location_name = "-"; - } - $location_archived_at = nullable_htmlentities($row['location_archived_at']); - if ($location_archived_at) { - $location_name_display = "
    $location_name
    "; - } else { - $location_name_display = $location_name; - } - - $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_asset_id = $asset_id"); - $login_count = mysqli_num_rows($sql_logins); - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - -
    -     		- - Name - - - - Type - - - - Model - - - - Serial - - - - OS - - - - IP - - - - Purchase Date - - - - Install Date - - - - Warranty Expire - - - - Assigned To - - - - Location - - - - Status - - Action
    -
    - -
    -     		- -
    - -
    -
    -
    -
    -
    -     -     		- -
    - -
    -     		- - - -
    - 0) { ?> - - - - - - -
    - -
    - - - - - - -
    - - - - -
    -
    - -
    - -
    - - Edit - - - Copy - - 2) { ?> - - - Unarchive - - - Delete - - - - Transfer - - - Archive - - - - -
    -
    -
    -
    -
    - - - - -
    - -
    -
    - - - - - - - - - diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php deleted file mode 100644 index 737ed6f9..00000000 --- a/client_certificate_edit_modal.php +++ /dev/null @@ -1,132 +0,0 @@ - diff --git a/client_contact_bulk_email_modal.php b/client_contact_bulk_email_modal.php deleted file mode 100644 index df04478b..00000000 --- a/client_contact_bulk_email_modal.php +++ /dev/null @@ -1,57 +0,0 @@ - \ No newline at end of file diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php deleted file mode 100644 index ff78a295..00000000 --- a/client_contact_edit_modal.php +++ /dev/null @@ -1,288 +0,0 @@ - \ No newline at end of file diff --git a/client_document_details.php b/client_document_details.php index 89b96128..ce3d29ba 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -1,12 +1,13 @@ set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -37,6 +38,9 @@ $document_folder_id = intval($row['document_folder_id']); $document_parent = intval($row['document_parent']); $document_client_visible = intval($row['document_client_visible']); +// Override Tab Title // No Sanitizing needed as this var will opnly be used in the tab title +$page_title = $row['document_name']; + ?>
      @@ -161,7 +165,12 @@ $document_client_visible = intval($row['document_client_visible']);
      - -
      -
      - - - - -
      - -
      - -
      - -
      - -
      - -
      -
      -
      - -
      - -
      -
      - -
      - -
      - -
      -
      - - -
      -
      -
      -
      -
    diff --git a/client_document_move_modal.php b/client_document_move_modal.php deleted file mode 100644 index 9586c6fe..00000000 --- a/client_document_move_modal.php +++ /dev/null @@ -1,95 +0,0 @@ - diff --git a/client_document_rename_modal.php b/client_document_rename_modal.php deleted file mode 100644 index fbfb1e76..00000000 --- a/client_document_rename_modal.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/client_document_view_modal.php b/client_document_view_modal.php deleted file mode 100644 index 758afffc..00000000 --- a/client_document_view_modal.php +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/client_documents.php b/client_documents.php index a017d4ab..c9220134 100644 --- a/client_documents.php +++ b/client_documents.php @@ -4,7 +4,7 @@ $sort = "document_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -87,395 +87,410 @@ while ($folder_id > 0) { ?> +
    +
    +

    + Documents +

    +
    - -
    -
    -

    - Documents -

    -
    - -
    - - -
    - - New Folder - -
    - From Template -
    +
    + + +
    + + New Folder + +
    + From Template
    -
    - - -
    -
    - - -
    -
    -
    - "> -
    - -
    +
    +
    + + + +
    +
    +
    + "> +
    + +
    + +
    +
    +
    +
    +
    -
    -
    - +
    + + +
    + + +
    +
    +

    Folders

    +
    +
    - - -
    - - -
    -
    -

    Folders

    -
    -
    '; + + if ($subfolder_count > 0) { + // Display subfolders + echo '
      '; + display_folders($folder_id, $client_id, $indent + 1); + echo '
    '; + } + + echo ''; + } + } + + // Start displaying folders from the root (parent_folder = 0) + display_folders(0, $client_id); + ?> + + +
    + +
    + +
    + + +
    +
    -
    -
    -
    -
    Editing domain:
    - -
    -
    - - -
    - - - -
    - -
    > - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    - -
    - -
    -
    - - -
    -
    -
    -
    -
    diff --git a/client_edit_modal.php b/client_edit_modal.php deleted file mode 100644 index eedaa4ea..00000000 --- a/client_edit_modal.php +++ /dev/null @@ -1,222 +0,0 @@ - \ No newline at end of file diff --git a/client_events.php b/client_events.php deleted file mode 100644 index 61031c59..00000000 --- a/client_events.php +++ /dev/null @@ -1,282 +0,0 @@ - - - - - -
    -
    -
    - - - - - - - - - - -" tabindex="-1"> -
    -
    -
    -
    Moving File:
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    - - -
    -
    -
    -
    -
    diff --git a/client_file_rename_modal.php b/client_file_rename_modal.php deleted file mode 100644 index 8f50485f..00000000 --- a/client_file_rename_modal.php +++ /dev/null @@ -1,42 +0,0 @@ - diff --git a/client_files.php b/client_files.php index 5cbe6d15..3898c829 100644 --- a/client_files.php +++ b/client_files.php @@ -4,7 +4,7 @@ $sort = "file_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Folder @@ -195,7 +195,11 @@ while ($folder_id > 0) {
    - + Rename 0) { echo '
    '; echo '
    '; - // Include the rename and create subfolder modals - require "folder_rename_modal.php"; - if ($subfolder_count > 0) { // Display subfolders echo '
      '; @@ -230,7 +231,7 @@ while ($folder_id > 0) { display_folders(0, $client_id); ?>
    - +
    @@ -360,10 +361,18 @@ while ($folder_id > 0) { )"> Share - + Rename - + Move @@ -386,7 +395,7 @@ while ($folder_id > 0) {
    @@ -559,10 +568,18 @@ while ($folder_id > 0) { )"> Share - + Rename - + Move @@ -583,11 +600,7 @@ while ($folder_id > 0) { @@ -595,12 +608,12 @@ while ($folder_id > 0) {
    - + -
    @@ -634,10 +647,7 @@ function prevFile() { -
    -
    -
    -
    Export Invoices to CSV
    - -
    -
    - -
    - -
    -
    - - -
    -
    -
    -
    -
    diff --git a/client_invoices.php b/client_invoices.php deleted file mode 100644 index 7685317e..00000000 --- a/client_invoices.php +++ /dev/null @@ -1,228 +0,0 @@ - - -
    -
    -

    Invoices

    -
    -
    - - 0) { ?> - -
    - - Export - -
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    -
    - 0) { ?> - - -
    -
    -
    - -
    -
    -
    -
    - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Number - - - - Scope - - - - Amount - - - - Date - - - - Due - - - - Category - - - - Status - - Action
    -
    -     		- - - - -
    - -
    - - - Send - -
    - - - Edit - - - Copy - -
    - - Delete - -
    -
    -
    -
    - -
    -
    - -" tabindex="-1"> -
    -
    -
    -
    Editing location:
    - -
    -
    - - - -
    - - - -
    - -
    > - -
    - -
    - -
    -
    - -
    - -
    -
    - > -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - - "> - -
    - -
    - - -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -

    Location ID:

    - -
    - -
    - -
    -
    - - -
    -
    -
    -
    -
    diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php deleted file mode 100644 index 947bd505..00000000 --- a/client_login_edit_modal.php +++ /dev/null @@ -1,269 +0,0 @@ - diff --git a/client_network_add_modal.php b/client_network_add_modal.php deleted file mode 100644 index 5f35b82f..00000000 --- a/client_network_add_modal.php +++ /dev/null @@ -1,172 +0,0 @@ - diff --git a/client_networks.php b/client_networks.php deleted file mode 100644 index 1257160b..00000000 --- a/client_networks.php +++ /dev/null @@ -1,247 +0,0 @@ - $sort, 'order' => $order))); - -$sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM networks - LEFT JOIN locations ON location_id = network_location_id - WHERE network_client_id = $client_id - AND network_archived_at IS NULL - AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_subnet LIKE '%$q%' OR network_primary_dns LIKE '%$q%' OR network_secondary_dns LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') - ORDER BY $sort $order LIMIT $record_from, $record_to" -); - -$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - -?> - -
    -
    -

    Networks

    -
    -
    - - 0) { ?> - -
    - - Export - -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    - - - - "> - - - - - - - - - - - - - - $network_secondary_dns"; - } else { - $network_dns_display = "-"; - } - $network_dhcp_range = nullable_htmlentities($row['network_dhcp_range']); - if (empty($network_dhcp_range)) { - $network_dhcp_range_display = "-"; - } else { - $network_dhcp_range_display = $network_dhcp_range; - } - $network_location_id = intval($row['network_location_id']); - $location_name = nullable_htmlentities($row['location_name']); - if (empty($location_name)) { - $location_name_display = "-"; - } else { - $location_name_display = $location_name; - } - - ?> - - - - - - - - - - - - - - - -
    -
    - -
    -     		- - Name - - - - vLAN - - - - IP / Network - - - - Gateway - - - - DNS - - - - DHCP Range - - - - Location - - Action
    -
    - - -
    -     		- )" data-target="#editNetworkModal"> -
    - -
    -
    -
    -
    -
    -     -     		- -
    -     		-
    - -
    - )" data-target="#editNetworkModal"> - Edit - - -
    - - Archive - -
    - - Delete - - -
    -
    -
    - -
    -
    - -
    -
    - - - - - - - NOW() ORDER BY item_created_at ASC LIMIT 5" ); @@ -241,7 +239,13 @@ $sql_asset_retired = mysqli_query( ?> - + + +
    @@ -410,7 +414,7 @@ $sql_asset_retired = mysqli_query( ?>

    - + --

    @@ -430,7 +434,7 @@ $sql_asset_retired = mysqli_query( ?>

    - + --

    @@ -528,7 +532,7 @@ $sql_asset_retired = mysqli_query( ?>

    - + --

    @@ -548,7 +552,7 @@ $sql_asset_retired = mysqli_query( ?>

    - + --

    @@ -691,5 +695,5 @@ $sql_asset_retired = mysqli_query( - -
    -
    -

    Payments

    - 0) { ?> -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Payment Date - - - - Invoice Date - - - - Invoice - - - - Invoice Amount - - - - Payment Amount - - - - Method - - - - Reference - - - - Account - -
    -
    - -
    -
    - - - -
    -
    -

    Quotes

    -
    -
    - - 0) { ?> - -
    - - Export - -
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Number - - - - Scope - - - - Amount - - - - Date - - - - Expire - - - - Category - - - - Status - - Action
    - - - - -
    - -
    - - Edit - - - Copy - -
    - - - Send - -
    - - - Delete - -
    -
    -
    -
    - -
    -
    - -" tabindex="-1"> -
    -
    -
    -
    Editing rack:
    - -
    - -
    - - - - -
    - - - -
    - -
    > - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - - - rack_photo"> - - -
    - - -
    - -
    - -
    - -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    diff --git a/client_rack_unit_add_modal.php b/client_rack_unit_add_modal.php deleted file mode 100644 index c01225ad..00000000 --- a/client_rack_unit_add_modal.php +++ /dev/null @@ -1,78 +0,0 @@ - diff --git a/client_racks.php b/client_racks.php index f81407db..7e36c79a 100644 --- a/client_racks.php +++ b/client_racks.php @@ -4,7 +4,7 @@ $sort = "rack_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -101,11 +101,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Add Device
    - + Edit @@ -126,14 +134,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - rack_photo"> + rack_photo"> - +
    - - + + + + @@ -168,7 +178,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + + @@ -176,61 +188,160 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    DescriptionDescription
    NotesNotes
    - +
    + + + + + + + + = 1; $i--) { + // Keep track of which device_ids we've already printed + $printedDevices = []; + + for ($i = $rack_units; $i >= 1; $i--) { + + // Find all devices that occupy the current unit $i $unit_devices = []; foreach ($rack_units_data as $unit_data) { - if ($i >= $unit_data['unit_start_number'] && $i <= $unit_data['unit_end_number']) { + $start = (int) $unit_data['unit_start_number']; + $end = (int) $unit_data['unit_end_number']; + + // If $i is between start and end, device occupies this unit + if ($i >= $start && $i <= $end) { $unit_devices[] = [ - 'unit_id' => intval($unit_data['unit_id']), - 'device' => nullable_htmlentities($unit_data['unit_device']), - 'asset_id' => intval($unit_data['asset_id']), - 'asset_name' => nullable_htmlentities($unit_data['asset_name']), - 'asset_type' => nullable_htmlentities($unit_data['asset_type']), - 'icon' => getAssetIcon($unit_data['asset_type']) + 'unit_id' => (int) $unit_data['unit_id'], + 'unit_device' => nullable_htmlentities($unit_data['unit_device']), + 'unit_start_number'=> $start, + 'unit_end_number' => $end, + 'asset_id' => (int) $unit_data['asset_id'], + 'asset_name' => nullable_htmlentities($unit_data['asset_name']), + 'asset_type' => nullable_htmlentities($unit_data['asset_type']), + 'icon' => getAssetIcon($unit_data['asset_type']) ]; } } + ?> - - + + + + + + 1) { + // If your data might have multiple devices in the same row, + // you have to decide how to handle them. + // For now, we can fallback to older logic or display them all in one cell, etc. + ?> + - - + + - + + + + + - + +
    UDevice
    - - - - - + + + + + + + + + + + + + + +
    + +
    + + Remove + +
    +
    +     		+ +
    + - -     		-
    - -
    - - - Remove - - +
    		+
    + +
    + + + Remove + + +
    - -     		No device
    +
    - - +
    @@ -241,6 +352,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +require_once "modals/client_rack_add_modal.php"; +require_once "includes/footer.php"; diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php deleted file mode 100644 index 9395cb3d..00000000 --- a/client_recurring_invoices.php +++ /dev/null @@ -1,200 +0,0 @@ - - -
    -
    -

    Recurring Invoices

    -
    -
    - - 0) { ?> - -
    - - Export - -
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Number - - - - Scope - - - - Amount - - - - Frequency - - - - Last Sent - - - - Next Date - - - - Category - - - - Status - - Action
    ly - - - - -
    - -
    - - Edit - - -
    - - Delete - - -
    -
    -
    -
    - -
    -
    - - - -
    -
    -

    Recurring Tickets

    -
    - -
    -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    - -
    - - - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - -
    -     		- - Subject - - - - Priority - - - - Frequency - - - - Next Run Date - - Action
    -
    - -
    -     		-
    - -
    - - Edit - - -
    - - Delete - -
    - -
    -
    - -
    - -
    - - - -
    -
    - - - - -
    -
    -
    -
    New Service
    - -
    - -
    - - -
    - - - -
    - -
    - - - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - - -
    -
    - -
    -
    - - -
    - -
    - - -
    - -
    - - -
    - - - -
    - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php deleted file mode 100644 index c2fa6bd6..00000000 --- a/client_service_edit_modal.php +++ /dev/null @@ -1,275 +0,0 @@ - diff --git a/client_service_view_modal.php b/client_service_view_modal.php deleted file mode 100644 index 4d8cb8e2..00000000 --- a/client_service_view_modal.php +++ /dev/null @@ -1,294 +0,0 @@ - diff --git a/client_trips.php b/client_trips.php deleted file mode 100644 index 6ff02c3f..00000000 --- a/client_trips.php +++ /dev/null @@ -1,186 +0,0 @@ - - -
    -
    -

    Trips

    -
    -
    - - 0) { ?> - -
    - - Export - -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - - "> - - - - - - - - - - - - "; - } else { - $round_trip_display = ""; - } - $user_name = nullable_htmlentities($row['user_name']); - if (empty($user_name)) { - $user_name_display = "-"; - } else { - $user_name_display = $user_name; - } - - ?> - - - - - - - - - - - - - -
    - - Date - - - - Driver - - - - Purpose - - - - From - - - - To - - - - Miles - - Action
    -
    - -
    - - Map it - -
    - - Edit - - - Copy - -
    - - Delete - -
    -
    -
    -
    - -
    -
    - - - -
    -
    -

    - Vendors -

    -
    -
    - - -
    - - Create from Template - - 0) { ?> -
    - - Export - - -
    -
    -
    -
    -
    -
    - - -
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    - "> - Archived - - -
    -
    - -
    -
    -
    -
    - - -
    - - "> - - - - - - - - - - - Account #: $vendor_account_number"; - } else { - $vendor_account_number_display = ''; - } - $vendor_contact_name = nullable_htmlentities($row['vendor_contact_name']); - if ($vendor_contact_name) { - $vendor_contact_name_display = $vendor_contact_name; - } else { - $vendor_contact_name_display = "-"; - } - $vendor_phone = formatPhoneNumber($row['vendor_phone']); - $vendor_extension = nullable_htmlentities($row['vendor_extension']); - $vendor_email = nullable_htmlentities($row['vendor_email']); - $vendor_website = nullable_htmlentities($row['vendor_website']); - if ($vendor_website) { - $vendor_website_display = "$vendor_website "; - } else { - $vendor_website_display = "-"; - } - $vendor_hours = nullable_htmlentities($row['vendor_hours']); - $vendor_sla = nullable_htmlentities($row['vendor_sla']); - $vendor_code = nullable_htmlentities($row['vendor_code']); - $vendor_notes = nullable_htmlentities($row['vendor_notes']); - $vendor_created_at = nullable_htmlentities($row['vendor_created_at']); - $vendor_archived_at = nullable_htmlentities($row['vendor_archived_at']); - $vendor_template_id = intval($row['vendor_template_id']); - - - ?> - - - - - - - - - - - -
    -
    - -
    -     		- - Vendor - - - - Description - - - - Contact - - - - Website - - Action
    -
    - -
    -     		- -
    - -
    -
    - -
    -
    -     -     		- - - - -
    - - -
    - - -
    - -     		-
    - -
    - - Edit - - - -
    - - Unarchive - - -
    - - Delete - - - -
    - - Archive - - - -
    -
    -
    -
    -
    - -
    -
    - - - -
    -

    Management

    +

    = 2) { ?>
    @@ -119,12 +111,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    - " autofocus> + " autofocus>
    @@ -134,8 +126,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - ">Clients - ">Leads + ">Clients + ">Leads
    @@ -152,8 +144,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + - + @@ -312,6 +304,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $client_archived_at = nullable_htmlentities($row['client_archived_at']); $client_is_lead = intval($row['client_lead']); + // Abbreviation + if (empty($client_abbreviation)) { + $client_abbreviation = shortenClient($client_name); + } + // Client Tags $client_tag_name_display_array = array(); @@ -387,7 +384,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - Created: + Abbreviation:
    + Created:
    @@ -400,7 +398,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (!empty($contact_name)) { ?>
    - +
    - + Edit @@ -469,26 +470,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    -

    @@ -210,9 +228,6 @@ if (isset($_GET['contact_id'])) {
    - -
    @@ -232,7 +247,7 @@ if (isset($_GET['contact_id'])) {
  • - Contacts + Contacts
    • @@ -249,8 +264,11 @@ if (isset($_GET['contact_id'])) { New Recurring Ticket
    - - New Note + + New Note
    @@ -351,22 +369,19 @@ if (isset($_GET['contact_id'])) { $asset_physical_location = nullable_htmlentities($row['asset_physical_location']); $asset_notes = nullable_htmlentities($row['asset_notes']); $asset_created_at = nullable_htmlentities($row['asset_created_at']); - $asset_vendor_id = intval($row['asset_vendor_id']); - $asset_location_id = intval($row['asset_location_id']); - $asset_network_id = intval($row['interface_network_id']); - $asset_contact_id = intval($row['asset_contact_id']); - - $login_id = $row['login_id']; - $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - $device_icon = getAssetIcon($asset_type); ?> - + + +
    @@ -386,10 +401,16 @@ if (isset($_GET['contact_id'])) {
    - + Edit - + Copy
    @@ -414,11 +435,6 @@ if (isset($_GET['contact_id'])) { @@ -432,7 +448,7 @@ if (isset($_GET['contact_id'])) {
    ">
    -

    Related Logins

    +

    Credentials

    @@ -459,7 +475,7 @@ if (isset($_GET['contact_id'])) { if (empty($login_uri)) { $login_uri_display = "-"; } else { - $login_uri_display = "$login_uri"; + $login_uri_display = "$login_uri"; } $login_uri_2 = nullable_htmlentities($row['login_uri_2']); $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); @@ -474,7 +490,7 @@ if (isset($_GET['contact_id'])) { if (empty($login_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); @@ -509,14 +525,18 @@ if (isset($_GET['contact_id'])) { - + - + @@ -526,7 +546,10 @@ if (isset($_GET['contact_id'])) {
    - + Edit )"> @@ -551,8 +574,6 @@ if (isset($_GET['contact_id'])) { @@ -672,24 +693,35 @@ if (isset($_GET['contact_id'])) { ?> - - + + + + + - - -
    - + Edit +
    + + Force Reoccur +
    @@ -905,6 +937,14 @@ if (isset($_GET['contact_id'])) { + + + @@ -988,7 +1028,10 @@ if (isset($_GET['contact_id'])) {

    Notes

    -
    @@ -1063,7 +1106,7 @@ if (isset($_GET['contact_id'])) { @@ -1121,20 +1164,19 @@ if (isset($_GET['contact_id'])) { }); - + +
    + +
    @@ -107,10 +132,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    + +
    +
    + +
    +
    +
    - "> Archived @@ -215,6 +262,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Location + + + + Client + + + Action @@ -222,6 +276,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $contact_tag_name"; + $contact_tag_name_display_array[] = "$contact_tag_name"; } $contact_tags_display = implode('', $contact_tag_name_display_array); @@ -340,23 +396,25 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    - + "> - -
    -
    ">
    +
    ">
    + +     +
    - + Details - + Make Note - + Edit @@ -418,10 +485,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -429,14 +492,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - - - - - - + + + + + + -
    @@ -482,12 +545,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + +
    @@ -102,11 +124,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + +
    + +
    +
    + +
    +
    +
    @@ -141,7 +185,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -204,6 +248,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + + + Client + + + Action @@ -211,6 +262,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $login_tag_name"; + $login_tag_name_display_array[] = "$login_tag_name"; } $login_tags_display = implode('', $login_tag_name_display_array); @@ -303,7 +356,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    @@ -336,6 +393,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + +     +
    @@ -363,7 +423,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit
    @@ -391,12 +455,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    +
    @@ -404,29 +468,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + -
    - - + - - +
    - +

    New Assets

    @@ -625,7 +625,7 @@ if ($user_config_dashboard_technical_enable == 1) {
    - +

    Expiring Domains

    @@ -699,12 +699,12 @@ if ($user_config_dashboard_technical_enable == 1) { $contact_name = nullable_htmlentities($row['contact_name']); $ticket_priority_color = $ticket_priority == "High" ? "danger" : ($ticket_priority == "Medium" ? "warning" : "info"); - $contact_display = empty($contact_name) ? "-" : "    $contact_name"; + $contact_display = empty($contact_name) ? "-" : "$contact_name"; ?> - + @@ -722,7 +722,7 @@ if ($user_config_dashboard_technical_enable == 1) { - + diff --git a/database_updates.php b/database_updates.php index 0b5925cc..de2b81ad 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2376,12 +2376,142 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.3'"); } - // if (CURRENT_DATABASE_VERSION == '1.7.3') { - // // Insert queries here required to update to DB version 1.7.4 + if (CURRENT_DATABASE_VERSION == '1.7.3') { + + // Add Recurring Payments + mysqli_query($mysqli, "CREATE TABLE `recurring_payments` ( + `recurring_payment_id` INT(11) NOT NULL AUTO_INCREMENT, + `recurring_payment_amount` DECIMAL(15,2) NOT NULL, + `recurring_payment_currency_code` VARCHAR(10) NOT NULL, + `recurring_payment_method` VARCHAR(200) NOT NULL, + `recurring_payment_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `recurring_payment_updated_at` DATETIME DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `recurring_payment_archived_at` DATETIME DEFAULT NULL, + `recurring_payment_account_id` INT(11) NOT NULL, + `recurring_payment_recurring_expense_id` INT(11) NOT NULL DEFAULT 0, + `recurring_payment_recurring_invoice_id` INT(11) NOT NULL, + PRIMARY KEY (`recurring_payment_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.4'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.4') { + + // Remove Recurring Payment Amount as it will use the Recurring Invoice Amount and is unessessary + mysqli_query($mysqli, "ALTER TABLE `recurring_payments` DROP `recurring_payment_amount`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.5'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.5') { + mysqli_query($mysqli, "CREATE TABLE `client_stripe` (`client_id` INT(11) NOT NULL, `stripe_id` VARCHAR(255) NOT NULL, `stripe_pm` varchar(255) NULL) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci; "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.6'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.6') { + // Create a field to show connected interface of a foreign asset + mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` ADD `interface_connected_asset_interface` INT(11) NOT NULL DEFAULT 0 AFTER `interface_network_id`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.7'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.7') { + // Domain history + mysqli_query($mysqli, "CREATE TABLE `domain_history` (`domain_history_id` INT(11) NOT NULL AUTO_INCREMENT , `domain_history_column` VARCHAR(200) NOT NULL , `domain_history_old_value` TEXT NOT NULL , `domain_history_new_value` TEXT NOT NULL , `domain_history_domain_id` INT(11) NOT NULL , `domain_history_modified_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP , PRIMARY KEY (`domain_history_id`)) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.8'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.8') { + + // Use a seperate table for Interface connections / links. This will make it easier to manage. + $createInterfaceLinksTable = " + CREATE TABLE IF NOT EXISTS `asset_interface_links` ( + `interface_link_id` INT AUTO_INCREMENT PRIMARY KEY, + `interface_a_id` INT NOT NULL, + `interface_b_id` INT NOT NULL, + `interface_link_type` VARCHAR(100) NULL, + `interface_link_status` VARCHAR(50) NULL, + `interface_link_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `interface_link_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP, + + CONSTRAINT `fk_interface_a` + FOREIGN KEY (`interface_a_id`) + REFERENCES `asset_interfaces` (`interface_id`) + ON DELETE CASCADE + ON UPDATE CASCADE, + + CONSTRAINT `fk_interface_b` + FOREIGN KEY (`interface_b_id`) + REFERENCES `asset_interfaces` (`interface_id`) + ON DELETE CASCADE + ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + "; + mysqli_query($mysqli, $createInterfaceLinksTable) or die(mysqli_error($mysqli)); + + // Drop the old column from asset_interfaces if it exists + $dropConnectedColumn = " + ALTER TABLE `asset_interfaces` + DROP COLUMN IF EXISTS `interface_connected_asset_interface` + "; + mysqli_query($mysqli, $dropConnectedColumn) or die(mysqli_error($mysqli)); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.9'"); + } + + if (CURRENT_DATABASE_VERSION == '1.7.9') { + + mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_cron_key`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.0'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.0') { + + mysqli_query($mysqli, "ALTER TABLE `ticket_statuses` ADD `ticket_status_order` int(11) NOT NULL DEFAULT 0"); + + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_order` int(11) NOT NULL DEFAULT 0"); + + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_default_view` tinyint(1) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_ordering` tinyint(1) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_moving_columns` tinyint(1) NOT NULL DEFAULT 1"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.1') { + mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` CHANGE `interface_port` `interface_description` VARCHAR(200) DEFAULT NULL AFTER `interface_name`"); + + mysqli_query($mysqli, "ALTER TABLE `asset_interfaces` ADD `interface_type` VARCHAR(50) DEFAULT NULL AFTER `interface_description`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.2'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.2') { + mysqli_query($mysqli, "CREATE TABLE `quote_files` ( + `quote_id` INT(11) NOT NULL, + `file_id` INT(11) NOT NULL, + PRIMARY KEY (`quote_id`, `file_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.3'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.3') { + mysqli_query($mysqli, "ALTER TABLE `assets` ADD `asset_purchase_reference` VARCHAR(200) DEFAULT NULL AFTER `asset_status`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.4'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.8.4') { + // // Insert queries here required to update to DB version 1.8.5 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.4'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.5'"); // } } else { // Up-to-date } + diff --git a/db.sql b/db.sql index 3675dc53..15f49327 100644 --- a/db.sql +++ b/db.sql @@ -134,6 +134,29 @@ CREATE TABLE `asset_history` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `asset_interface_links` +-- + +DROP TABLE IF EXISTS `asset_interface_links`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `asset_interface_links` ( + `interface_link_id` int(11) NOT NULL AUTO_INCREMENT, + `interface_a_id` int(11) NOT NULL, + `interface_b_id` int(11) NOT NULL, + `interface_link_type` varchar(100) DEFAULT NULL, + `interface_link_status` varchar(50) DEFAULT NULL, + `interface_link_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `interface_link_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + PRIMARY KEY (`interface_link_id`), + KEY `fk_interface_a` (`interface_a_id`), + KEY `fk_interface_b` (`interface_b_id`), + CONSTRAINT `fk_interface_a` FOREIGN KEY (`interface_a_id`) REFERENCES `asset_interfaces` (`interface_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk_interface_b` FOREIGN KEY (`interface_b_id`) REFERENCES `asset_interfaces` (`interface_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `asset_interfaces` -- @@ -144,11 +167,12 @@ DROP TABLE IF EXISTS `asset_interfaces`; CREATE TABLE `asset_interfaces` ( `interface_id` int(11) NOT NULL AUTO_INCREMENT, `interface_name` varchar(200) NOT NULL, + `interface_description` varchar(200) DEFAULT NULL, + `interface_type` varchar(50) DEFAULT NULL, `interface_mac` varchar(200) DEFAULT NULL, `interface_ip` varchar(200) DEFAULT NULL, `interface_nat_ip` varchar(200) DEFAULT NULL, `interface_ipv6` varchar(200) DEFAULT NULL, - `interface_port` varchar(200) DEFAULT NULL, `interface_notes` text DEFAULT NULL, `interface_primary` tinyint(1) DEFAULT 0, `interface_created_at` datetime NOT NULL DEFAULT current_timestamp(), @@ -199,6 +223,7 @@ CREATE TABLE `assets` ( `asset_uri` varchar(500) DEFAULT NULL, `asset_uri_2` varchar(500) DEFAULT NULL, `asset_status` varchar(200) DEFAULT NULL, + `asset_purchase_reference` varchar(200) DEFAULT NULL, `asset_purchase_date` date DEFAULT NULL, `asset_warranty_expire` date DEFAULT NULL, `asset_install_date` date DEFAULT NULL, @@ -342,6 +367,21 @@ CREATE TABLE `client_notes` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `client_stripe` +-- + +DROP TABLE IF EXISTS `client_stripe`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `client_stripe` ( + `client_id` int(11) NOT NULL, + `stripe_id` varchar(255) NOT NULL, + `stripe_pm` varchar(255) DEFAULT NULL, + PRIMARY KEY (`client_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `client_tags` -- @@ -636,6 +676,24 @@ CREATE TABLE `documents` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `domain_history` +-- + +DROP TABLE IF EXISTS `domain_history`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `domain_history` ( + `domain_history_id` int(11) NOT NULL AUTO_INCREMENT, + `domain_history_column` varchar(200) NOT NULL, + `domain_history_old_value` text NOT NULL, + `domain_history_new_value` text NOT NULL, + `domain_history_domain_id` int(11) NOT NULL, + `domain_history_modified_at` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`domain_history_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `domains` -- @@ -1222,6 +1280,20 @@ CREATE TABLE `projects` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `quote_files` +-- + +DROP TABLE IF EXISTS `quote_files`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `quote_files` ( + `quote_id` int(11) NOT NULL, + `file_id` int(11) NOT NULL, + PRIMARY KEY (`quote_id`,`file_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `quotes` -- @@ -1383,6 +1455,27 @@ CREATE TABLE `recurring_expenses` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `recurring_payments` +-- + +DROP TABLE IF EXISTS `recurring_payments`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `recurring_payments` ( + `recurring_payment_id` int(11) NOT NULL AUTO_INCREMENT, + `recurring_payment_currency_code` varchar(10) NOT NULL, + `recurring_payment_method` varchar(200) NOT NULL, + `recurring_payment_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `recurring_payment_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `recurring_payment_archived_at` datetime DEFAULT NULL, + `recurring_payment_account_id` int(11) NOT NULL, + `recurring_payment_recurring_expense_id` int(11) NOT NULL DEFAULT 0, + `recurring_payment_recurring_invoice_id` int(11) NOT NULL, + PRIMARY KEY (`recurring_payment_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `remember_tokens` -- @@ -1628,7 +1721,6 @@ CREATE TABLE `settings` ( `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, `config_enable_alert_domain_expire` tinyint(1) NOT NULL DEFAULT 1, `config_send_invoice_reminders` tinyint(1) NOT NULL DEFAULT 1, @@ -1664,6 +1756,9 @@ CREATE TABLE `settings` ( `config_phone_mask` tinyint(1) NOT NULL DEFAULT 1, `config_whitelabel_enabled` int(11) NOT NULL DEFAULT 0, `config_whitelabel_key` text DEFAULT NULL, + `config_ticket_default_view` tinyint(1) NOT NULL DEFAULT 0, + `config_ticket_ordering` tinyint(1) NOT NULL DEFAULT 0, + `config_ticket_moving_columns` 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 */; @@ -1943,6 +2038,7 @@ CREATE TABLE `ticket_statuses` ( `ticket_status_name` varchar(200) NOT NULL, `ticket_status_color` varchar(200) NOT NULL, `ticket_status_active` tinyint(1) NOT NULL DEFAULT 1, + `ticket_status_order` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_status_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2037,6 +2133,7 @@ CREATE TABLE `tickets` ( `ticket_asset_id` int(11) NOT NULL DEFAULT 0, `ticket_invoice_id` int(11) NOT NULL DEFAULT 0, `ticket_project_id` int(11) NOT NULL DEFAULT 0, + `ticket_order` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2266,4 +2363,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-12-13 15:11:31 +-- Dump completed on 2025-02-18 17:21:45 diff --git a/client_domains.php b/domains.php similarity index 84% rename from client_domains.php rename to domains.php index 299ec05c..38f565a2 100644 --- a/client_domains.php +++ b/domains.php @@ -4,7 +4,16 @@ $sort = "domain_name"; $order = "ASC"; -require_once "inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND domain_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); @@ -12,19 +21,21 @@ enforceUserPermission('module_support'); //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*, +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*, clients.*, registrar.vendor_name AS registrar_name, dnshost.vendor_name AS dnshost_name, mailhost.vendor_name AS mailhost_name, webhost.vendor_name AS webhost_name FROM domains + LEFT JOIN clients ON client_id = domain_client_id LEFT JOIN vendors AS registrar ON domains.domain_registrar = registrar.vendor_id LEFT JOIN vendors AS dnshost ON domains.domain_dnshost = dnshost.vendor_id LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id - WHERE domain_client_id = $client_id + WHERE (domains.domain_name LIKE '%$q%' OR domains.domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%' OR client_name LIKE '%$q%') AND domain_$archive_query - AND (domains.domain_name LIKE '%$q%' OR domains.domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%') + $access_permission_query + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -51,7 +62,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + +
    @@ -64,7 +77,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -101,8 +114,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + - + "> @@ -141,6 +155,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Expires + + + @@ -154,7 +175,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $domain_expire = nullable_htmlentities($row['domain_expire']); $domain_expire_ago = timeAgo($domain_expire); // Convert the expiry date to a timestamp - $domain_expire_timestamp = strtotime($row['domain_expire']); + $domain_expire_timestamp = strtotime($row['domain_expire'] ?? ''); $current_timestamp = time(); // Get current timestamp // Calculate the difference in days @@ -181,6 +202,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $domain_mailhost_name = nullable_htmlentities($row['mailhost_name']); $domain_created_at = nullable_htmlentities($row['domain_created_at']); $domain_archived_at = nullable_htmlentities($row['domain_archived_at']); + $client_id = intval($row['domain_client_id']); + $client_name = nullable_htmlentities($row['client_name']); // Add - if empty on the table $domain_registrar_name_display = $domain_registrar_name ? $domain_registrar_name : "-"; $domain_webhost_name_display = $domain_webhost_name ? $domain_webhost_name : "-"; @@ -195,7 +218,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + + - + @@ -326,14 +332,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit - + Copy
    - + Refund
    @@ -346,26 +364,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + + Client + + Action
    - )" data-target="#editDomainModal"> +
    @@ -213,13 +241,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - )" data-target="#editDomainModal"> + Edit @@ -228,12 +264,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Unarchive -
    Delete -
    @@ -255,21 +289,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    - -" tabindex="-1"> -
    -
    -
    -
    Copying expense
    - -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - - - - - -
    - -
    -
    - -
    - -
    -
    - - - -
    - -
    - - -
    - -
    - -
    - - -
    -
    -
    -
    - diff --git a/expense_edit_modal.php b/expense_edit_modal.php deleted file mode 100644 index 8b9f553f..00000000 --- a/expense_edit_modal.php +++ /dev/null @@ -1,208 +0,0 @@ -     diff --git a/expense_refund_modal.php b/expense_refund_modal.php deleted file mode 100644 index aa7e82e6..00000000 --- a/expense_refund_modal.php +++ /dev/null @@ -1,67 +0,0 @@ - diff --git a/expenses.php b/expenses.php index e3c7d7cc..6b330e12 100644 --- a/expenses.php +++ b/expenses.php @@ -4,7 +4,7 @@ $sort = "expense_date"; $order = "DESC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -12,36 +12,33 @@ enforceUserPermission('module_financial'); // Account Filter if (isset($_GET['account']) & !empty($_GET['account'])) { $account_query = 'AND (expense_account_id = ' . intval($_GET['account']) . ')'; - $account = intval($_GET['account']); + $account_filter = intval($_GET['account']); } else { // Default - any $account_query = ''; - $account = ''; + $account_filter = ''; } // Vendor Filter if (isset($_GET['vendor']) & !empty($_GET['vendor'])) { $vendor_query = 'AND (vendor_id = ' . intval($_GET['vendor']) . ')'; - $vendor = intval($_GET['vendor']); + $vendor_filter = intval($_GET['vendor']); } else { // Default - any $vendor_query = ''; - $vendor = ''; + $vendor_filter = ''; } // Category Filter if (isset($_GET['category']) & !empty($_GET['category'])) { $category_query = 'AND (category_id = ' . intval($_GET['category']) . ')'; - $category = intval($_GET['category']); + $category_filter = intval($_GET['category']); } else { // Default - any $category_query = ''; - $category = ''; + $category_filter = ''; } -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM expenses @@ -120,7 +117,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -154,7 +151,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + - + @@ -194,7 +191,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    		+ + + + +
    - - - + + + -
    @@ -373,7 +382,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); " tabindex="-1"> -
    -
    -
    -
    Renaming folder:
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    - - -
    -
    -
    -
    -
    diff --git a/force_mfa.php b/force_mfa.php deleted file mode 100644 index 05e6d1f2..00000000 --- a/force_mfa.php +++ /dev/null @@ -1,74 +0,0 @@ - - -
    -
    -

    2FA Setup

    -
    -
    - -
    - - - - - -

    You have set up 2FA. Your QR code is below.

    - - - -
    - "; - - echo "

    $session_token

    "; - } - - ?> -
    - - - -
    - - -
    -
    -
    -
    - -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -'fa-people-arrows', 'Note'=>'fa-sticky-note' ); + +$interface_types_array = array ( + 'Ethernet', + 'SFP', + 'WiFi' +); diff --git a/global.css b/global.css deleted file mode 100644 index 73e10a53..00000000 --- a/global.css +++ /dev/null @@ -1,172 +0,0 @@ -/* Variables */ -* { - box-sizing: border-box; -} - -body { - font-family: -apple-system, BlinkMacSystemFont, sans-serif; - font-size: 16px; - -webkit-font-smoothing: antialiased; - display: flex; - justify-content: center; - align-content: center; - height: 100vh; - width: 100vw; -} - -form { - width: 30vw; - min-width: 500px; - align-self: center; - box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1), - 0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07); - border-radius: 7px; - padding: 40px; -} - -input { - border-radius: 6px; - margin-bottom: 6px; - padding: 12px; - border: 1px solid rgba(50, 50, 93, 0.1); - height: 44px; - font-size: 16px; - width: 100%; - background: white; -} - -.result-message { - line-height: 22px; - font-size: 16px; -} - -.result-message a { - color: rgb(89, 111, 214); - font-weight: 600; - text-decoration: none; -} - -.hidden { - display: none; -} - -#card-error { - color: rgb(105, 115, 134); - text-align: left; - font-size: 13px; - line-height: 17px; - margin-top: 12px; -} - -#card-element { - border-radius: 4px 4px 0 0 ; - padding: 12px; - border: 1px solid rgba(50, 50, 93, 0.1); - height: 44px; - width: 100%; - background: white; -} - -#payment-request-button { - margin-bottom: 32px; -} - -/* Buttons and links */ -button { - background: #5469d4; - color: #ffffff; - font-family: Courier, monospace; - border-radius: 0 0 4px 4px; - border: 0; - padding: 12px 16px; - font-size: 16px; - font-weight: 600; - cursor: pointer; - display: block; - transition: all 0.2s ease; - box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07); - width: 100%; -} -button:hover { - filter: contrast(115%); -} -button:disabled { - opacity: 0.5; - cursor: default; -} - -/* spinner/processing state, errors */ -.spinner, -.spinner:before, -.spinner:after { - border-radius: 50%; -} -.spinner { - color: #ffffff; - font-size: 22px; - text-indent: -99999px; - margin: 0px auto; - position: relative; - width: 20px; - height: 20px; - box-shadow: inset 0 0 0 2px; - -webkit-transform: translateZ(0); - -ms-transform: translateZ(0); - transform: translateZ(0); -} -.spinner:before, -.spinner:after { - position: absolute; - content: ""; -} -.spinner:before { - width: 10.4px; - height: 20.4px; - background: #5469d4; - border-radius: 20.4px 0 0 20.4px; - top: -0.2px; - left: -0.2px; - -webkit-transform-origin: 10.4px 10.2px; - transform-origin: 10.4px 10.2px; - -webkit-animation: loading 2s infinite ease 1.5s; - animation: loading 2s infinite ease 1.5s; -} -.spinner:after { - width: 10.4px; - height: 10.2px; - background: #5469d4; - border-radius: 0 10.2px 10.2px 0; - top: -0.1px; - left: 10.2px; - -webkit-transform-origin: 0px 10.2px; - transform-origin: 0px 10.2px; - -webkit-animation: loading 2s infinite ease; - animation: loading 2s infinite ease; -} - -@-webkit-keyframes loading { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - transform: rotate(360deg); - } -} -@keyframes loading { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - transform: rotate(360deg); - } -} - -@media only screen and (max-width: 600px) { - form { - width: 80vw; - } -} diff --git a/global_search.php b/global_search.php index b4de3ce2..9e1d01e4 100644 --- a/global_search.php +++ b/global_search.php @@ -1,6 +1,6 @@ +
    +
    +

    Global Search

    +
    + +
    - -
    -

    Global Search

    -
    -
    - 0) { ?>
    -
    +
    -
    Clients
    +
    Clients
    @@ -196,9 +196,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Contacts
    +
    Contacts
    @@ -228,7 +228,7 @@ if (isset($_GET['query'])) { ?> - @@ -252,9 +252,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Vendors
    +
    Vendors
    +
    @@ -281,7 +281,7 @@ if (isset($_GET['query'])) { - + @@ -299,9 +299,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Domains
    +
    Domains
    @@ -324,7 +324,7 @@ if (isset($_GET['query'])) { ?> - @@ -343,9 +343,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Products
    +
    Products
    +
    @@ -382,9 +382,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Documents
    +
    Documents
    @@ -426,9 +426,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Files
    +
    Files
    @@ -476,9 +476,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Tickets
    +
    Tickets
    @@ -507,7 +507,7 @@ if (isset($_GET['query'])) { - + @@ -526,9 +526,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Recurring Tickets
    +
    Recurring Tickets
    @@ -556,7 +556,7 @@ if (isset($_GET['query'])) { - + @@ -575,9 +575,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Credentials
    +

    Credentials

    @@ -604,12 +604,12 @@ if (isset($_GET['query'])) { ?> - + - + @@ -628,9 +628,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Invoices
    +
    Invoices
    @@ -679,9 +679,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Assets
    +
    Assets
    @@ -698,6 +698,8 @@ if (isset($_GET['query'])) { $contact_name"; + $contact_name_display = "$contact_name"; } $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); if (empty($contact_archived_at)) { @@ -737,9 +739,6 @@ if (isset($_GET['query'])) { $contact_archived_display = "Archived - "; } - $client_id = intval($row['asset_client_id']); - $client_name = nullable_htmlentities($row['client_name']); - ?> - + @@ -771,9 +770,9 @@ if (isset($_GET['query'])) {
    -
    +
    -
    Ticket Replies
    +
    Ticket Replies
    @@ -838,16 +837,21 @@ if (isset($_GET['query'])) {
    +
    + + + + diff --git a/guest_ajax.php b/guest/guest_ajax.php similarity index 95% rename from guest_ajax.php rename to guest/guest_ajax.php index cec4ecc7..523e5208 100644 --- a/guest_ajax.php +++ b/guest/guest_ajax.php @@ -6,14 +6,12 @@ * Always returns data in JSON format, unless otherwise specified */ -require_once "config.php"; +require_once "../config.php"; // Set Timezone -require_once "inc_set_timezone.php"; - -require_once "functions.php"; - -require_once "rfc6238.php"; +require_once "../inc_set_timezone.php"; +require_once "../functions.php"; +require_once "../plugins/totp/totp.php"; /* @@ -74,7 +72,7 @@ if (isset($_GET['stripe_create_pi'])) { } // Setup Stripe - require_once 'vendor/stripe-php-10.5.0/init.php'; + require_once '../plugins/stripe-php/init.php'; $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_secret, config_stripe_account FROM settings WHERE company_id = 1")); diff --git a/guest_download_file.php b/guest/guest_download_file.php similarity index 93% rename from guest_download_file.php rename to guest/guest_download_file.php index e3671975..f083d429 100644 --- a/guest_download_file.php +++ b/guest/guest_download_file.php @@ -1,11 +1,11 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/guest_header.php b/guest/guest_header.php similarity index 70% rename from guest_header.php rename to guest/guest_header.php index 8ce55023..d82f5eac 100644 --- a/guest_header.php +++ b/guest/guest_header.php @@ -1,12 +1,12 @@ - - + + - + - + - - - - + + + + diff --git a/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php similarity index 90% rename from guest_pay_invoice_stripe.php rename to guest/guest_pay_invoice_stripe.php index 3be52d31..9f3c9a6e 100644 --- a/guest_pay_invoice_stripe.php +++ b/guest/guest_pay_invoice_stripe.php @@ -168,7 +168,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent - +
    We have received your payment in the amount of " . $pi_currency . $pi_amount_paid . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $pi_amount_paid, $invoice_currency_code) . "
    Balance: " . numfmt_format_currency($currency_format, '0', $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + $body = "Hello $contact_name,

    We have received online payment for the amount of " . $pi_currency . $pi_amount_paid . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $pi_amount_paid, $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; $data = [ [ @@ -330,7 +330,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent // Email the internal notification address too if (!empty($config_invoice_paid_notification_email)) { $subject = "Payment Received - $client_name - Invoice $invoice_prefix$invoice_number"; - $body = "Hello,

    This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-

    --------

    Hello $contact_name,

    We have received your payment in the amount of " . $pi_currency . $pi_amount_paid . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $pi_amount_paid, $invoice_currency_code) . "
    Balance: " . numfmt_format_currency($currency_format, '0', $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + $body = "Hello,

    This is a notification that an invoice has been paid in ITFlow. Below is a copy of the receipt sent to the client:-

    --------

    Hello $contact_name,

    We have received online payment for the amount of " . $pi_currency . $pi_amount_paid . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $pi_amount_paid, $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; $data[] = [ 'from' => $config_invoice_from_email, @@ -342,7 +342,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent ]; } - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); // Email logging mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Receipt!', history_invoice_id = $invoice_id"); @@ -350,7 +350,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent } // Redirect user to invoice - header('Location: //' . $config_base_url . '/guest_view_invoice.php?invoice_id=' . $pi_invoice_id . '&url_key=' . $invoice_url_key); + header('Location: //' . $config_base_url . '/guest/guest_view_invoice.php?invoice_id=' . $pi_invoice_id . '&url_key=' . $invoice_url_key); } else { exit(WORDING_PAYMENT_FAILED); diff --git a/guest_post.php b/guest/guest_post.php similarity index 59% rename from guest_post.php rename to guest/guest_post.php index 85c17323..406f31e5 100644 --- a/guest_post.php +++ b/guest/guest_post.php @@ -1,11 +1,11 @@
    This is a notification that a quote has been accepted in ITFlow.

    Client: $client_name
    Quote: $quote_prefix$quote_number

    ~
    $company_name - Billing
    $config_quote_from_email"; - $data[] = [ - 'from' => $config_quote_from_email, - 'from_name' => $config_quote_from_name, - 'recipient' => $config_quote_notification_email, - 'subject' => $subject, - 'body' => $body, - ]; + $data[] = [ + 'from' => $config_quote_from_email, + 'from_name' => $config_quote_from_name, + 'recipient' => $config_quote_notification_email, + 'subject' => $subject, + 'body' => $body, + ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); } $_SESSION['alert_message'] = "Quote Accepted"; @@ -119,7 +119,7 @@ if (isset($_GET['decline_quote'], $_GET['url_key'])) { 'body' => $body, ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); } $_SESSION['alert_type'] = "danger"; @@ -183,11 +183,20 @@ if (isset($_GET['add_ticket_feedback'], $_GET['url_key'])) { if (mysqli_num_rows($sql) == 1) { // Add feedback mysqli_query($mysqli, "UPDATE tickets SET ticket_feedback = '$feedback' WHERE ticket_id = $ticket_id AND ticket_url_key = '$url_key'"); + // Notify on bad feedback if ($feedback == "Bad") { - appNotify("Feedback", "Guest rated ticket ID $ticket_id as bad!", "ticket.php?ticket_id=$ticket_id"); + $ticket_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); + $ticket_prefix = sanitizeInput($ticket_details['ticket_prefix']); + $ticket_number = intval($ticket_details['ticket_number']); + + appNotify("Feedback", "Guest rated ticket number $ticket_prefix$ticket_number (ID: $ticket_id) as bad", "ticket.php?ticket_id=$ticket_id"); } else { - appNotify("Feedback", "Guest rated ticket ID $ticket_id as good. Fuck ya bud!", "ticket.php?ticket_id=$ticket_id"); + $ticket_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number FROM tickets WHERE ticket_id = $ticket_id LIMIT 1")); + $ticket_prefix = sanitizeInput($ticket_details['ticket_prefix']); + $ticket_number = intval($ticket_details['ticket_number']); + + appNotify("Feedback", "Guest rated ticket number $ticket_prefix$ticket_number (ID: $ticket_id) as good. Fuck ya bud!", "ticket.php?ticket_id=$ticket_id"); } $_SESSION['alert_message'] = "Feedback recorded - thank you"; @@ -197,4 +206,95 @@ if (isset($_GET['add_ticket_feedback'], $_GET['url_key'])) { echo "Invalid!!"; } } + +if (isset($_POST['guest_quote_upload_file'])) { + $quote_id = intval($_POST['quote_id']); + $url_key = sanitizeInput($_POST['url_key']); + + // Select only the necessary fields + $sql = mysqli_query($mysqli, "SELECT quote_prefix, quote_number, client_id FROM quotes LEFT JOIN clients ON quote_client_id = client_id WHERE quote_id = $quote_id AND quote_url_key = '$url_key'"); + + if (mysqli_num_rows($sql) == 1) { + $row = mysqli_fetch_array($sql); + $quote_prefix = sanitizeInput($row['quote_prefix']); + $quote_number = intval($row['quote_number']); + $client_id = intval($row['client_id']); + + // Define & create directories, as required + $upload_file_dir = "../uploads/clients/$client_id/"; + mkdirMissing($upload_file_dir); + + // Store attached any file + if (!empty($_FILES)) { + + for ($i = 0; $i < count($_FILES['file']['name']); $i++) { + // Extract file details for this iteration + $single_file = [ + 'name' => $_FILES['file']['name'][$i], + 'type' => $_FILES['file']['type'][$i], + 'tmp_name' => $_FILES['file']['tmp_name'][$i], + 'error' => $_FILES['file']['error'][$i], + 'size' => $_FILES['file']['size'][$i] + ]; + + if ($file_reference_name = checkFileUpload($single_file, array('pdf'))) { + + $file_tmp_path = $_FILES['file']['tmp_name'][$i]; + + $file_name = sanitizeInput($_FILES['file']['name'][$i]); + $extarr = explode('.', $_FILES['file']['name'][$i]); + $file_extension = sanitizeInput(strtolower(end($extarr))); + + // Extract the file mime type and size + $file_mime_type = sanitizeInput($single_file['type']); + $file_size = intval($single_file['size']); + + // Define destination file path + $dest_path = $upload_file_dir . $file_reference_name; + + // Get/Create a top-level folder called Client Uploads + $folder_sql = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_name = 'Client Uploads' AND parent_folder = 0 AND folder_client_id = $client_id LIMIT 1"); + if (mysqli_num_rows($folder_sql) == 1) { + // Get + $row = mysqli_fetch_array($folder_sql); + $folder_id = $row['folder_id']; + } else { + // Create + mysqli_query($mysqli,"INSERT INTO folders SET folder_name = 'Client Uploads', parent_folder = 0, folder_location = 1, folder_client_id = $client_id"); + $folder_id = mysqli_insert_id($mysqli); + logAction("Folder", "Create", "Automatically created folder Client Uploads", $client_id, $folder_id); + } + + // Do move/upload + move_uploaded_file($file_tmp_path, $dest_path); + + // Create reference in files + mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_description = 'Uploaded via $quote_prefix$quote_number', file_ext = '$file_extension', file_mime_type = '$file_mime_type', file_size = $file_size, file_folder_id = $folder_id, file_client_id = $client_id"); + $file_id = mysqli_insert_id($mysqli); + + // Associate file with quote + mysqli_query($mysqli, "INSERT INTO quote_files SET quote_id = $quote_id, file_id = $file_id"); + + // Logging & feedback + $_SESSION['alert_message'] = 'File uploaded!'; + appNotify("Quote File", "$file_name was uploaded to quote $quote_prefix$quote_number", "quote.php?quote_id=$quote_id", $client_id); + mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Upload', history_description = 'Client uploaded file $file_name', history_quote_id = $quote_id"); + logAction("File", "Upload", "Guest uploaded file $file_name to quote $quote_prefix$quote_number", $client_id); + + } else { + $_SESSION['alert_type'] = 'error'; + $_SESSION['alert_message'] = 'Something went wrong uploading the file - please let the support team know.'; + logApp("Guest", "error", "Error uploading file to invoice"); + } + + } + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + + } else { + echo "Invalid!!"; + } +} + ?> diff --git a/guest/guest_quote_upload_file_modal.php b/guest/guest_quote_upload_file_modal.php new file mode 100644 index 00000000..ba861230 --- /dev/null +++ b/guest/guest_quote_upload_file_modal.php @@ -0,0 +1,27 @@ + diff --git a/guest_view_invoice.php b/guest/guest_view_invoice.php similarity index 99% rename from guest_view_invoice.php rename to guest/guest_view_invoice.php index 712d3886..ca1c4765 100644 --- a/guest_view_invoice.php +++ b/guest/guest_view_invoice.php @@ -74,7 +74,7 @@ $company_email = nullable_htmlentities($row['company_email']); $company_website = nullable_htmlentities($row['company_website']); $company_logo = nullable_htmlentities($row['company_logo']); if (!empty($company_logo)) { - $company_logo_base64 = base64_encode(file_get_contents("uploads/settings/$company_logo")); + $company_logo_base64 = base64_encode(file_get_contents("../uploads/settings/$company_logo")); } $company_locale = nullable_htmlentities($row['company_locale']); $config_invoice_footer = nullable_htmlentities($row['config_invoice_footer']); @@ -169,7 +169,7 @@ if ($balance > 0) {
    - "> + ">
    @@ -343,8 +343,8 @@ if ($balance > 0) {
    - - + + - + + set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); @@ -55,17 +56,7 @@ if ($ticket_row) { ?> -
      -
    1. - Portal Home -
      2. -
    2. - Tickets -
      3. -
    3. Ticket
      4. -
    - -
    +

    Ticket @@ -80,7 +71,7 @@ if ($ticket_row) {
    Priority:
    - + Assigned to:

    @@ -94,7 +85,7 @@ if ($ticket_row) { -

    Please log in or reply to the ticket via email to respond
    +
    Please log in or reply to the ticket via email to respond
    diff --git a/guest/index.php b/guest/index.php new file mode 100644 index 00000000..f403a675 --- /dev/null +++ b/guest/index.php @@ -0,0 +1,3 @@ + -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/admin_side_nav.php b/includes/admin_side_nav.php similarity index 57% rename from admin_side_nav.php rename to includes/admin_side_nav.php index c93cec27..02e83152 100644 --- a/admin_side_nav.php +++ b/includes/admin_side_nav.php @@ -33,15 +33,8 @@

    API Keys

    -
  • - "> - -

    Bulk Mail

    -     -
    • -
  • TAGS & CATEGORIES
    • - +
  • @@ -54,18 +47,22 @@

    Categories
    • -
  • - - -

    Taxes

    -     -
    • -
  • - - -

    Ticket Statuses

    -     -
    • + +
  • + + +

    Taxes

    +     +
    • + + +
  • + + +

    Ticket Statuses

    +     +
    • +
  • @@ -73,43 +70,45 @@
    • -
  • TEMPLATES
    • + +
  • TEMPLATES
    • -
  • - - -

    Project Templates

    -     -
    • -
  • - - -

    Ticket Templates

    -     -
    • -
  • - - -

    Vendor Templates

    -     -
    • -
  • - - -

    License Templates

    -     -
    • -
  • - - -

    Document Templates

    -     -
    • +
  • + + +

    Project Templates

    +     +
    • +
  • + + +

    Ticket Templates

    +     +
    • +
  • + + +

    Vendor Templates

    +     +
    • +
  • + + +

    License Templates

    +     +
    • +
  • + + +

    Document Templates

    +     +
    • +
  • MAINTENANCE
  • - +

    Mail Queue

     @@ -146,7 +145,7 @@
    • -
  • +

  • SETTINGS @@ -196,48 +195,63 @@

    Defaults
    • -
  • - - -

    Invoice

    -     -
    • -
  • - - -

    Quote

    -     -
    • -
  • - - -

    Online Payment

    -     -
    • -
  • - - -

    Project

    -     -
    • -
  • - - -

    Ticket

    -     -
    • + +
  • + + +

    Invoice

    +     +
    • +
  • + + +

    Quote

    +     +
    • +
  • + + +

    Online Payment

    +     +
    • + +
  • + + +

    Payment/Stripe Clients

    +     +
    • + + + +
  • + + +

    Project

    +     +
    • +
  • + + +

    Ticket

    +     +
    • +

  • AI
    • -
  • - - -

    Integrations

    -     -
    • + + +
  • + + +

    Integrations

    +     +
    • +
  • diff --git a/includes/ajax_footer.php b/includes/ajax_footer.php new file mode 100644 index 00000000..4bbe5766 --- /dev/null +++ b/includes/ajax_footer.php @@ -0,0 +1,9 @@ + + + + $content]); +?> \ No newline at end of file diff --git a/includes/ajax_header.php b/includes/ajax_header.php new file mode 100644 index 00000000..5e768ec7 --- /dev/null +++ b/includes/ajax_header.php @@ -0,0 +1,13 @@ + 'ID missing.']); +// exit; +//} diff --git a/includes/app_version.php b/includes/app_version.php new file mode 100644 index 00000000..9f58170d --- /dev/null +++ b/includes/app_version.php @@ -0,0 +1,8 @@ + + diff --git a/client_side_nav.php b/includes/client_side_nav.php similarity index 79% rename from client_side_nav.php rename to includes/client_side_nav.php index 0dfba8ba..6610214c 100644 --- a/client_side_nav.php +++ b/includes/client_side_nav.php @@ -5,7 +5,7 @@

    - Back | + Back |

    @@ -26,7 +26,7 @@
  • - "> + ">

    Contacts @@ -39,7 +39,7 @@

  • - "> + ">

    Locations @@ -55,7 +55,7 @@

  • SUPPORT
  • - "> + ">

    Tickets @@ -69,7 +69,7 @@

  • - "> + ">

    Recurring Tickets @@ -85,7 +85,7 @@

  • - "> + ">

    Vendors @@ -98,7 +98,7 @@

  • - "> + ">

    Calendar @@ -116,7 +116,7 @@ = 1) { ?>

  • - "> + ">

    Assets @@ -129,7 +129,7 @@

  • - "> + ">

    Licenses @@ -142,7 +142,7 @@

  • - "> + ">

    Credentials @@ -155,7 +155,7 @@

  • - "> + ">

    Networks @@ -181,7 +181,7 @@

  • - "> + ">

    Certificates @@ -195,7 +195,7 @@

  • - "> + ">

    Domains @@ -209,7 +209,7 @@

  • - "> + ">

    Services @@ -254,12 +254,12 @@ -

  • FINANCE
    • +
  • BILLING
    • = 1) { ?>
  • - "> + ">

    Invoices @@ -272,7 +272,7 @@

  • - "> + ">

    Recurring Invoices @@ -285,7 +285,7 @@

  • - "> + ">

    Quotes @@ -301,7 +301,7 @@ = 1) { ?>

  • - "> + ">

    Payments @@ -315,7 +315,7 @@

  • - "> + ">

    Trips diff --git a/database_version.php b/includes/database_version.php similarity index 75% rename from database_version.php rename to includes/database_version.php index d959034c..40929937 100644 --- a/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.7.3"); +DEFINE("LATEST_DATABASE_VERSION", "1.8.4"); diff --git a/pagination.php b/includes/filter_footer.php similarity index 77% rename from pagination.php rename to includes/filter_footer.php index 88b91444..4a4d821c 100644 --- a/pagination.php +++ b/includes/filter_footer.php @@ -18,9 +18,9 @@ if ($total_found_rows > 5) {

    -
    +
    - @@ -30,10 +30,35 @@ if ($total_found_rows > 5) {
    -
    -

    + + $total_found_rows) { + $end = $total_found_rows; + } + + // Now output something like "Showing X to Y of Z records" + ?> + +
    +

    + Showing to of records +

    + + +
    -
    +
    + + + @@ -33,9 +36,11 @@ if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?> - + + + diff --git a/inc_all.php b/includes/get_side_nav_counts.php similarity index 75% rename from inc_all.php rename to includes/get_side_nav_counts.php index d2280fec..c448632c 100644 --- a/inc_all.php +++ b/includes/get_side_nav_counts.php @@ -1,27 +1,16 @@ diff --git a/header.php b/includes/header.php similarity index 87% rename from header.php rename to includes/header.php index 7d8bd8bf..8c6aee12 100644 --- a/header.php +++ b/includes/header.php @@ -30,7 +30,7 @@ header("X-Frame-Options: DENY"); - + @@ -39,6 +39,8 @@ header("X-Frame-Options: DENY"); + + diff --git a/inc_alert_feedback.php b/includes/inc_alert_feedback.php similarity index 100% rename from inc_alert_feedback.php rename to includes/inc_alert_feedback.php diff --git a/includes/inc_all.php b/includes/inc_all.php new file mode 100644 index 00000000..088bff38 --- /dev/null +++ b/includes/inc_all.php @@ -0,0 +1,13 @@ +Tell your admin: Your role does not have admin access."); +} require_once "header.php"; - require_once "top_nav.php"; - require_once "admin_side_nav.php"; - require_once "inc_wrapper.php"; - require_once "inc_alert_feedback.php"; - require_once "filter_header.php"; +require_once "app_version.php"; diff --git a/inc_all_client.php b/includes/inc_all_client.php similarity index 97% rename from inc_all_client.php rename to includes/inc_all_client.php index d8337b29..2588e9fa 100644 --- a/inc_all_client.php +++ b/includes/inc_all_client.php @@ -1,10 +1,9 @@ window.history.back();"; - exit(); } @@ -43,7 +42,6 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_array($sql); $client_name = nullable_htmlentities($row['client_name']); - $client_name_title = $row['client_name']; $client_is_lead = intval($row['client_lead']); $client_type = nullable_htmlentities($row['client_type']); $client_website = nullable_htmlentities($row['client_website']); @@ -77,6 +75,9 @@ if (isset($_GET['client_id'])) { $location_phone = formatPhoneNumber($row['location_phone']); $location_primary = intval($row['location_primary']); + // Tab Title // No Sanitizing needed + $tab_title = $row['client_name']; + // Client Tags $client_tag_name_display_array = array(); @@ -294,20 +295,9 @@ 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"; - require_once "inc_alert_feedback.php"; - require_once "inc_client_top_head.php"; - require_once "filter_header.php"; - -?> - - - \ No newline at end of file diff --git a/inc_all_reports.php b/includes/inc_all_reports.php similarity index 93% rename from inc_all_reports.php rename to includes/inc_all_reports.php index 51bb53ad..37354007 100644 --- a/inc_all_reports.php +++ b/includes/inc_all_reports.php @@ -1,24 +1,16 @@
    - + Edit Client = 3) { ?> @@ -167,8 +170,5 @@ + diff --git a/side_nav.php b/includes/side_nav.php similarity index 89% rename from side_nav.php rename to includes/side_nav.php index a35f21a3..7d30cc8a 100644 --- a/side_nav.php +++ b/includes/side_nav.php @@ -27,7 +27,7 @@

    Clients - +

    @@ -43,7 +43,7 @@

    Tickets - +

    @@ -54,7 +54,7 @@

    Recurring Tickets - +

    @@ -65,7 +65,7 @@

    Projects - +

    @@ -74,20 +74,20 @@
  • - "> + ">

    Calendar
    • = 1) { ?> -
  • SALES
    • +
  • BILLING
  • ">

    Quotes - +

    @@ -98,7 +98,7 @@

    Invoices - +

    @@ -109,7 +109,7 @@

    Recurring Invoices - +

    @@ -153,7 +153,7 @@

    Recurring Expenses - +

    @@ -184,9 +184,19 @@
    • + = 1) { ?> +
  • + + +

    Client Overview

    + +     +
    • + + = 1) { ?>
  • - "> +

    Reports

    diff --git a/top_nav.php b/includes/top_nav.php similarity index 57% rename from top_nav.php rename to includes/top_nav.php index 504a4d6c..ef40b79e 100644 --- a/top_nav.php +++ b/includes/top_nav.php @@ -97,82 +97,29 @@ shuffle($placeholder); - 0) { ?> -
  • - +
  • + - - -
    - - - - Notifications - -
    - -
    - -

    - - -

    - -     -
    - + + + + - -
    - Dismiss all Notifications -
    -
    • - - -
  • - -
    - No Notifications -
    -
    - -
    -
    - See Dismissed - Notifications -
    • - - - -
  • - + " class="user-image img-circle"> @@ -196,8 +143,8 @@ shuffle($placeholder);
  • - - Administration + + Administration Account Logout @@ -209,6 +156,6 @@ shuffle($placeholder); diff --git a/user_side_nav.php b/includes/user_side_nav.php similarity index 100% rename from user_side_nav.php rename to includes/user_side_nav.php diff --git a/index.php b/index.php index cb69e797..ab0d6145 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@
      @@ -16,7 +16,7 @@ if (file_exists("config.php")) {
      Nothing to see here'; - require_once "footer.php"; + require_once "includes/footer.php"; exit(); } @@ -59,6 +64,10 @@ if (isset($_GET['invoice_id'])) { $client_net_terms = $config_default_net_terms; } + // Override Tab Title // No Sanitizing needed as this var will opnly be used in the tab title + $tab_title = $row['client_name']; + $page_title = "{$row['invoice_prefix']}{$row['invoice_number']}"; + $sql = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = 1"); $row = mysqli_fetch_array($sql); $company_id = intval($row['company_id']); @@ -141,7 +150,19 @@ if (isset($_GET['invoice_id'])) { $json_products = json_encode($products); } + // Payment with saved card (auto-pay) + if ($config_stripe_enable) { + $stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $client_id LIMIT 1")); + if ($stripe_client_details) { + $stripe_id = sanitizeInput($stripe_client_details['stripe_id']); + $stripe_pm = sanitizeInput($stripe_client_details['stripe_pm']); + } + } + + + ?> +
        @@ -149,14 +170,14 @@ if (isset($_GET['invoice_id'])) {
      1. - Invoices + Invoices
      2. Invoices
      3. - +
        5. @@ -193,14 +214,19 @@ if (isset($_GET['invoice_id'])) { Add Payment + + + Pay via saved card + + - + Mark Non-Billable - +
    • @@ -210,10 +236,18 @@ if (isset($_GET['invoice_id'])) {
    - + Edit - + Copy @@ -231,7 +265,7 @@ if (isset($_GET['invoice_id'])) { Send Email - "> + "> Guest URL @@ -310,7 +344,7 @@ if (isset($_GET['invoice_id'])) {
    -
    @@ -750,7 +749,7 @@ if (isset($_GET['query'])) {
    +
    @@ -340,20 +374,8 @@ if (isset($_GET['invoice_id'])) { $tax_id = intval($row['item_tax_id']); $total_tax = $item_tax + $total_tax; $sub_total = $item_price * $item_quantity + $sub_total; - $item_order = intval($row['item_order']); - // Logic to check if top or bottom arrow should be hidden - if ($item_order == 1) { - $up_hidden = "hidden"; - } else { - $up_hidden = ""; - } - if ($item_order == mysqli_num_rows($sql_invoice_items)) { - $down_hidden = "hidden"; - } else { - $down_hidden = ""; - } ?> - + - + @@ -386,9 +405,6 @@ if (isset($_GET['invoice_id'])) { > @@ -660,22 +676,14 @@ if (isset($_GET['invoice_id'])) { @@ -684,7 +692,7 @@ require_once "footer.php"; + + + diff --git a/invoice_copy_modal.php b/invoice_copy_modal.php deleted file mode 100644 index 4f6427cb..00000000 --- a/invoice_copy_modal.php +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php deleted file mode 100644 index 29cb268c..00000000 --- a/invoice_edit_modal.php +++ /dev/null @@ -1,92 +0,0 @@ - diff --git a/invoices.php b/invoices.php index de38e53e..aaf133bb 100644 --- a/invoices.php +++ b/invoices.php @@ -4,55 +4,64 @@ $sort = "invoice_number"; $order = "DESC"; -require_once "inc_all.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND invoice_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_sales'); -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' $client_query")); $sent_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' $client_query")); $viewed_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' $client_query")); $partial_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' $client_query")); $draft_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled'")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled' $client_query")); $cancelled_count = $row['num']; -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE()")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE() $client_query")); $overdue_count = $row['num']; -$sql_total_draft_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft_amount FROM invoices WHERE invoice_status = 'Draft'"); +$sql_total_draft_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft_amount FROM invoices WHERE invoice_status = 'Draft' $client_query"); $row = mysqli_fetch_array($sql_total_draft_amount); $total_draft_amount = floatval($row['total_draft_amount']); -$sql_total_sent_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_sent_amount FROM invoices WHERE invoice_status = 'Sent'"); +$sql_total_sent_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_sent_amount FROM invoices WHERE invoice_status = 'Sent' $client_query"); $row = mysqli_fetch_array($sql_total_sent_amount); $total_sent_amount = floatval($row['total_sent_amount']); -$sql_total_viewed_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_viewed_amount FROM invoices WHERE invoice_status = 'Viewed'"); +$sql_total_viewed_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_viewed_amount FROM invoices WHERE invoice_status = 'Viewed' $client_query"); $row = mysqli_fetch_array($sql_total_viewed_amount); $total_viewed_amount = floatval($row['total_viewed_amount']); -$sql_total_cancelled_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_cancelled_amount FROM invoices WHERE invoice_status = 'Cancelled'"); +$sql_total_cancelled_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_cancelled_amount FROM invoices WHERE invoice_status = 'Cancelled' $client_query"); $row = mysqli_fetch_array($sql_total_cancelled_amount); $total_cancelled_amount = floatval($row['total_cancelled_amount']); -$sql_total_partial_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial'"); +$sql_total_partial_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' $client_query"); $row = mysqli_fetch_array($sql_total_partial_amount); $total_partial_amount = floatval($row['total_partial_amount']); $total_partial_count = mysqli_num_rows($sql_total_partial_amount); -$sql_total_overdue_partial_amount = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_overdue_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE()"); +$sql_total_overdue_partial_amount = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_overdue_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE() $client_query"); $row = mysqli_fetch_array($sql_total_overdue_partial_amount); $total_overdue_partial_amount = floatval($row['total_overdue_partial_amount']); -$sql_total_overdue_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_overdue_amount FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE()"); +$sql_total_overdue_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_overdue_amount FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE() $client_query"); $row = mysqli_fetch_array($sql_total_overdue_amount); $total_overdue_amount = floatval($row['total_overdue_amount']); @@ -85,6 +94,8 @@ $sql = mysqli_query( $overdue_query AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt' AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%' OR category_name LIKE '%$q%') + $access_permission_query + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -156,6 +167,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + + +
    @@ -219,11 +233,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Scope +
    + - + - + + + @@ -313,10 +335,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit - + Copy
    @@ -336,12 +366,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -349,14 +373,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    @@ -361,16 +383,13 @@ if (isset($_GET['invoice_id'])) {
    -
    - - - - -
    '; }?> - - -
    - Edit + + Edit +
    Delete
    @@ -378,7 +397,7 @@ if (isset($_GET['invoice_id'])) {
    Client Amount @@ -295,9 +311,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
    + + + +
    -
    + + + +*/ +$(document).on('click', '[data-toggle="ajax-modal"]', function (e) { + e.preventDefault(); + + // Get the URL and ID from the element's data attributes. + var $trigger = $(this); + var ajaxUrl = $trigger.data('ajax-url'); + var ajaxId = $trigger.data('ajax-id'); + var modalSize = $trigger.data('modal-size') || 'md'; + + // Make the AJAX call to fetch modal content. + $.ajax({ + url: ajaxUrl, + method: 'GET', + data: { id: ajaxId }, + dataType: 'json', + cache: false, // Prevent caching if necessary + success: function (response) { + if (response.error) { + alert(response.error); + return; + } + + // Create a modal ID by appending the ajaxId. + var modalId = 'ajaxModal_' + ajaxId + '_' + new Date().getTime(); + + // Remove any existing modal with this ID. + $('#' + modalId).remove(); + + // Build the modal HTML using the returned title and content. + var modalHtml = + '
    ' + + '
    ' + + '
    ' + + response.content + + '
    ' + + '
    ' + + '
    '; + + // Append the modal to the body and show it. + $('body').append(modalHtml); + var $modal = $('#' + modalId); + $modal.modal('show'); + + // Remove the modal from the DOM once it's hidden. + $modal.on('hidden.bs.modal', function () { + $(this).remove(); + }); + }, + error: function () { + alert('Error loading modal content.'); + } + }); +}); diff --git a/js/app.js b/js/app.js index ca1e78a3..06b96dd7 100644 --- a/js/app.js +++ b/js/app.js @@ -10,7 +10,7 @@ $("#alert").fadeTo(5000, 500).slideUp(500, function(){ // Initialize Select2 Elements $('.select2').select2({ - theme: 'bootstrap4' + theme: 'bootstrap4', }); // Initialize TinyMCE @@ -40,6 +40,7 @@ tinymce.init({ toolbar: 'bold italic styles' }, plugins: 'link image lists table code codesample fullscreen autoresize', + license_key: 'gpl' }); // Initialize TinyMCE @@ -70,6 +71,7 @@ tinymce.init({ toolbar: 'bold italic styles' }, plugins: 'link image lists table code codesample fullscreen autoresize', + license_key: 'gpl', setup: function(editor) { var rewordButtonApi; @@ -167,7 +169,7 @@ tinymce.init({ toolbar: 'bold italic styles' }, plugins: 'link image lists table code fullscreen autoresize', - + license_key: 'gpl' }); // Initialize TinyMCE AI @@ -195,6 +197,7 @@ tinymce.init({ toolbar: 'bold italic styles' }, plugins: 'link image lists table code codesample fullscreen autoresize', + license_key: 'gpl', setup: function(editor) { var rewordButtonApi; @@ -279,6 +282,7 @@ tinymce.init({ statusbar: false, readonly: false, plugins: 'autoresize', + license_key: 'gpl', }); // DateTime diff --git a/js/autopay_setup_stripe.js b/js/autopay_setup_stripe.js new file mode 100644 index 00000000..0119616c --- /dev/null +++ b/js/autopay_setup_stripe.js @@ -0,0 +1,23 @@ +// Initialize Stripe.js +const stripe = Stripe(document.getElementById("stripe_publishable_key").value); + +initialize(); + +// Fetch Checkout Session and retrieve the client secret +async function initialize() { + const fetchClientSecret = async () => { + const response = await fetch("/client/post.php?create_stripe_checkout", { + method: "POST", + }); + const { clientSecret } = await response.json(); + return clientSecret; + }; + + // Initialize Checkout + const checkout = await stripe.initEmbeddedCheckout({ + fetchClientSecret, + }); + + // Mount Checkout + checkout.mount('#checkout'); +} diff --git a/js/certificate_edit_modal.js b/js/certificate_edit_modal.js deleted file mode 100644 index 4a64e321..00000000 --- a/js/certificate_edit_modal.js +++ /dev/null @@ -1,49 +0,0 @@ -function populateCertificateEditModal(client_id, certificate_id) { - - // Send a GET request to post.php as post.php?certificate_get_json_details=true&client_id=NUM&certificate_id=NUM - jQuery.get( - "ajax.php", - {certificate_get_json_details: 'true', client_id: client_id, certificate_id: certificate_id}, - function(data) { - - // If we get a response from post.php, parse it as JSON - const response = JSON.parse(data); - - // Access the certificate (one) and domains (multiple) - const certificate = response.certificate[0]; - const domains = response.domains; - - // Populate the cert modal fields - document.getElementById("editCertificateHeader").innerText = certificate.certificate_name; - document.getElementById("editCertificateId").value = certificate_id; - document.getElementById("editCertificateName").value = certificate.certificate_name; - document.getElementById("editCertificateDescription").value = certificate.certificate_description; - document.getElementById("editCertificateDomain").value = certificate.certificate_domain; - document.getElementById("editCertificateIssuedBy").value = certificate.certificate_issued_by; - document.getElementById("editCertificateExpire").value = certificate.certificate_expire; - document.getElementById("editCertificatePublicKey").value = certificate.certificate_public_key; - document.getElementById("editCertificateNotes").value = certificate.certificate_notes; - - // Select the domain dropdown - var domainDropdown = document.getElementById("editDomainId"); - - // Clear domain dropdown - var i, L = domainDropdown.options.length -1; - for(i = L; i >= 0; i--) { - domainDropdown.remove(i); - } - domainDropdown[domainDropdown.length] = new Option('- Domain -', '0'); - - // Populate domain dropdown - domains.forEach(domain => { - if (parseInt(domain.domain_id) == parseInt(certificate.certificate_domain_id)) { - // Selected domain - domainDropdown[domainDropdown.length] = new Option(domain.domain_name, domain.domain_id, true, true); - } - else{ - domainDropdown[domainDropdown.length] = new Option(domain.domain_name, domain.domain_id); - } - }); - } - ); -} diff --git a/js/logins_show_otp_via_id.js b/js/credential_show_otp_via_id.js similarity index 100% rename from js/logins_show_otp_via_id.js rename to js/credential_show_otp_via_id.js diff --git a/js/domain_edit_modal.js b/js/domain_edit_modal.js deleted file mode 100644 index a0206b33..00000000 --- a/js/domain_edit_modal.js +++ /dev/null @@ -1,117 +0,0 @@ -function populateDomainEditModal(client_id, domain_id) { - - // Send a GET request to post.php as post.php?domain_get_json_details=true&client_id=NUM&domain_id=NUM - jQuery.get( - "ajax.php", - {domain_get_json_details: 'true', client_id: client_id, domain_id: domain_id}, - function(data) { - - // If we get a response from post.php, parse it as JSON - const response = JSON.parse(data); - - // Access the domain info (one), registrars (multiple) and webhosts (multiple) - const domain = response.domain[0]; - const vendors = response.vendors; - - // Populate the domain modal fields - document.getElementById("editDomainHeader").innerText = domain.domain_name; - document.getElementById("editDomainId").value = domain_id; - document.getElementById("editDomainName").value = domain.domain_name; - document.getElementById("editDomainDescription").value = domain.domain_description; - document.getElementById("editDomainExpire").value = domain.domain_expire; - document.getElementById("editDomainNotes").value = domain.domain_notes; - document.getElementById("editDomainIP").value = domain.domain_ip; - document.getElementById("editDomainNameServers").value = domain.domain_name_servers; - document.getElementById("editDomainMailServers").value = domain.domain_mail_servers; - document.getElementById("editDomainTxtRecords").value = domain.domain_txt; - document.getElementById("editDomainRawWhois").value = domain.domain_raw_whois; - - /* DROPDOWNS */ - - // Registrar dropdown - var registrarDropdown = document.getElementById("editDomainRegistrarId"); - - // Clear registrar dropdown - var i, L = registrarDropdown.options.length -1; - for(i = L; i >= 0; i--) { - registrarDropdown.remove(i); - } - registrarDropdown[registrarDropdown.length] = new Option('- Vendor -', '0'); - - // Populate dropdown - vendors.forEach(vendor => { - if (parseInt(vendor.vendor_id) == parseInt(domain.domain_registrar)) { - // Selected domain - registrarDropdown[registrarDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true); - } - else{ - registrarDropdown[registrarDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id); - } - }); - - // Webhost dropdown - var webhostDropdown = document.getElementById("editDomainWebhostId"); - - // Clear registrar dropdown - var i, L = webhostDropdown.options.length -1; - for(i = L; i >= 0; i--) { - webhostDropdown.remove(i); - } - webhostDropdown[webhostDropdown.length] = new Option('- Vendor -', '0'); - - // Populate dropdown - vendors.forEach(vendor => { - if (parseInt(vendor.vendor_id) == parseInt(domain.domain_webhost)) { - // Selected domain - webhostDropdown[webhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true); - } - else{ - webhostDropdown[webhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id); - } - }); - - // DNS Host dropdown - var dnshostDropdown = document.getElementById("editDomainDNShostId"); - - // Clear registrar dropdown - var i, L = dnshostDropdown.options.length -1; - for(i = L; i >= 0; i--) { - dnshostDropdown.remove(i); - } - dnshostDropdown[dnshostDropdown.length] = new Option('- Vendor -', '0'); - - // Populate dropdown - vendors.forEach(vendor => { - if (parseInt(vendor.vendor_id) == parseInt(domain.domain_dnshost)) { - // Selected domain - dnshostDropdown[dnshostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true); - } - else{ - dnshostDropdown[dnshostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id); - } - }); - - // Mail Host dropdown - var mailhostDropdown = document.getElementById("editDomainMailhostId"); - - // Clear mailhost dropdown - var i, L = mailhostDropdown.options.length -1; - for(i = L; i >= 0; i--) { - mailhostDropdown.remove(i); - } - mailhostDropdown[mailhostDropdown.length] = new Option('- Vendor -', '0'); - - // Populate dropdown - vendors.forEach(vendor => { - if (parseInt(vendor.vendor_id) == parseInt(domain.domain_mailhost)) { - // Selected domain - mailhostDropdown[mailhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true); - } - else{ - mailhostDropdown[mailhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id); - } - }); - - } - ); -} diff --git a/js/logins_generate_password.js b/js/generate_password.js similarity index 100% rename from js/logins_generate_password.js rename to js/generate_password.js diff --git a/js/network_edit_modal.js b/js/network_edit_modal.js deleted file mode 100644 index cc3179d5..00000000 --- a/js/network_edit_modal.js +++ /dev/null @@ -1,52 +0,0 @@ -function populateNetworkEditModal(client_id, network_id) { - - // Send a GET request to post.php as post.php?network_get_json_details=true&client_id=NUM&network_id=NUM - jQuery.get( - "ajax.php", - {network_get_json_details: 'true', client_id: client_id, network_id: network_id}, - function(data) { - - // If we get a response from post.php, parse it as JSON - const response = JSON.parse(data); - - // Access the network (only one!) and locations (possibly multiple) - const network = response.network[0]; - const locations = response.locations; - - // Populate the network modal fields - document.getElementById("editNetworkHeader").innerText = network.network_name; - document.getElementById("editNetworkId").value = network_id; - document.getElementById("showNetworkId").innerText = "Network ID: " + network_id; - document.getElementById("editNetworkName").value = network.network_name; - document.getElementById("editNetworkDescription").value = network.network_description; - document.getElementById("editNetworkVlan").value = network.network_vlan; - document.getElementById("editNetworkCidr").value = network.network; - document.getElementById("editNetworkSubnet").value = network.network_subnet; - document.getElementById("editNetworkGw").value = network.network_gateway; - document.getElementById("editNetworkPrimaryDNS").value = network.network_primary_dns; - document.getElementById("editNetworkSecondaryDNS").value = network.network_secondary_dns; - document.getElementById("editNetworkDhcp").value = network.network_dhcp_range; - document.getElementById("editNetworkNotes").value = network.network_notes; - - // Select the location dropdown - var locationDropdown = document.getElementById("editNetworkLocation"); - - // Clear location dropdown - var i, L = locationDropdown.options.length -1; - for(i = L; i >= 0; i--) { - locationDropdown.remove(i); - } - locationDropdown[locationDropdown.length] = new Option('- Location -', '0'); - - // Populate location dropdown - locations.forEach(location => { - if (parseInt(location.location_id) == parseInt(network.network_location_id)) { - locationDropdown[locationDropdown.length] = new Option(location.location_name, location.location_id, true, true); - } - else{ - locationDropdown[locationDropdown.length] = new Option(location.location_name, location.location_id); - } - }); - } - ); -} diff --git a/js/quote_edit_modal.js b/js/quote_edit_modal.js deleted file mode 100644 index 4c4898fd..00000000 --- a/js/quote_edit_modal.js +++ /dev/null @@ -1,49 +0,0 @@ -function populateQuoteEditModal(quote_id) { - - // Send a GET request to ajax.php as ajax.php?quote_get_json_details=true"e_id=NUM - jQuery.get( - "ajax.php", - {quote_get_json_details: 'true', quote_id: quote_id}, - function(data) { - - // If we get a response from ajax.php, parse it as JSON - const response = JSON.parse(data); - - // Access the quote info (one) and categories (multiple) - const quote = response.quote[0]; - const categories = response.categories; - - // Populate the quote modal fields - document.getElementById("editQuoteHeaderID").innerText = quote.quote_prefix + quote.quote_number; - document.getElementById("editQuoteHeaderClient").innerText = quote.client_name; - document.getElementById("editQuoteID").value = quote.quote_id; - document.getElementById("editQuoteDate").value = quote.quote_date; - document.getElementById("editQuoteExpire").value = quote.quote_expire; - document.getElementById("editQuoteScope").value = quote.quote_scope; - - /* DROPDOWNS */ - - // Category dropdown - var categoryDropdown = document.getElementById("editQuoteCategory"); - - // Clear Category dropdown - var i, L = categoryDropdown.options.length -1; - for (i = L; i >= 0; i--) { - categoryDropdown.remove(i); - } - categoryDropdown[categoryDropdown.length] = new Option('- Category -', '0'); - - // Populate dropdown - categories.forEach(category => { - if (parseInt(category.category_id) == parseInt(quote.quote_category_id)) { - // Selected quote - categoryDropdown[categoryDropdown.length] = new Option(category.category_name, category.category_id, true, true); - } - else{ - categoryDropdown[categoryDropdown.length] = new Option(category.category_name, category.category_id); - } - }); - - } - ); -} diff --git a/js/recurring_tickets_edit_modal.js b/js/recurring_tickets_edit_modal.js deleted file mode 100644 index 39c56945..00000000 --- a/js/recurring_tickets_edit_modal.js +++ /dev/null @@ -1,112 +0,0 @@ -function populateRecurringTicketEditModal(client_id, ticket_id) { - - // Send a GET request to ajax.php as ajax.php?recurring_ticket_get_json_details=true&client_id=NUM&ticket_id=NUM - jQuery.get( - "ajax.php", - {recurring_ticket_get_json_details: 'true', client_id: client_id, ticket_id: ticket_id}, - function(data){ - - // If we get a response from post.php, parse it as JSON - const response = JSON.parse(data); - - // Access the ticket info, agents and all potential assets - const contacts = response.contacts; - const ticket = response.ticket[0]; - const agents = response.agents; - const assets = response.assets; - - // Populate the scheduled ticket modal fields - 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").checked = !!parseInt(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); - - // Agent assignment dropdown - var agentDropdown = document.getElementById("editTicketAgent"); - - // Clear agent dropdown - var i, L = agentDropdown.options.length -1; - for(i = L; i >= 0; i--) { - agentDropdown.remove(i); - } - agentDropdown[agentDropdown.length] = new Option('- Agent -', '0'); - - - // Populate dropdown - agents.forEach(agent => { - if(parseInt(agent.user_id) == parseInt(ticket.scheduled_ticket_assigned_to)){ - // Selected agent - agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id, true, true); - } - else{ - agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id); - } - }); - - // Contact dropdown - var contactDropdown = document.getElementById("editTicketContact"); - - // Clear contact dropdown - var i, L = contactDropdown.options.length -1; - for(i = L; i >= 0; i--) { - contactDropdown.remove(i); - } - contactDropdown[contactDropdown.length] = new Option('- Contact -', '0'); - - - // Populate dropdown - contacts.forEach(contact => { - if(parseInt(contact.contact_id) == parseInt(ticket.scheduled_ticket_contact_id)){ - // Selected contact - contactDropdown[contactDropdown.length] = new Option(contact.contact_name, contact.contact_id, true, true); - } - else{ - contactDropdown[contactDropdown.length] = new Option(contact.contact_name, contact.contact_id); - } - }); - - // Frequency dropdown - var frequencyDropdown = document.querySelector("#editTicketFrequency"); - Array.from(frequencyDropdown.options).forEach(function (option, index){ - if(option.id === ticket.scheduled_ticket_frequency){ - frequencyDropdown.selectedIndex = index; - } - }); - - // Priority dropdown - var priorityDropdown = document.querySelector("#editTicketPriority"); - Array.from(priorityDropdown.options).forEach(function (option, index){ - if(option.id === ticket.scheduled_ticket_priority){ - priorityDropdown.selectedIndex = index; - } - }); - - // Asset dropdown - if (assets && assets.length > 0) { - var assetDropdown = document.getElementById("editTicketAssetId"); - - // Clear asset dropdown - var i, L = assetDropdown.options.length -1; - for(i = L; i >= 0; i--) { - assetDropdown.remove(i); - } - assetDropdown[assetDropdown.length] = new Option('- Asset -', '0'); - - // Populate dropdown - assets.forEach(asset => { - if(parseInt(asset.asset_id) == parseInt(ticket.scheduled_ticket_asset_id)){ - // Selected asset - assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id, true, true); - } - else{ - assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id); - } - }); - } - - } - ); -} diff --git a/js/tickets_kanban.js b/js/tickets_kanban.js new file mode 100644 index 00000000..706ca9f9 --- /dev/null +++ b/js/tickets_kanban.js @@ -0,0 +1,118 @@ +$(document).ready(function() { + console.log('CONFIG_TICKET_MOVING_COLUMNS: ' + CONFIG_TICKET_MOVING_COLUMNS); + console.log('CONFIG_TICKET_ORDERING: ' + CONFIG_TICKET_ORDERING); + // Initialize Dragula for the Kanban board + let boardDrake = dragula([ + document.querySelector('#kanban-board') + ], { + moves: function(el, container, handle) { + return handle.classList.contains('panel-title'); + }, + accepts: function(el, target, source, sibling) { + return CONFIG_TICKET_MOVING_COLUMNS === 1; + } + }); + + // Log the event of moving the column panel-title + boardDrake.on('drag', function(el) { + //console.log('Dragging column:', el.querySelector('.panel-title').innerText); + }); + + boardDrake.on('drop', function(el, target, source, sibling) { + //console.log('Dropped column:', el.querySelector('.panel-title').innerText); + + // Get all columns and their positions + let columns = document.querySelectorAll('#kanban-board .kanban-column'); + let columnPositions = []; + + columns.forEach(function(column, index) { + let statusId = $(column).data('status-id'); // Assuming you have a data attribute for status ID + columnPositions.push({ + status_id: statusId, + status_kanban: index + }); + }); + + // Send AJAX request to update all column positions + $.ajax({ + url: 'ajax.php', + type: 'POST', + data: { + update_kanban_status_position: true, + positions: columnPositions + }, + success: function(response) { + console.log('Ticket status kanban orders updated successfully.'); + // Optionally, you can refresh the page or update the UI here + }, + error: function(xhr, status, error) { + console.error('Error updating ticket status kanban orders:', error); + } + }); + }); + + // Initialize Dragula for the Kanban Cards + let drake = dragula([ + ...document.querySelectorAll('#status') + ]); + + // Add event listener for the drop event + drake.on('drop', function (el, target, source, sibling) { + // Log the target ID to the console + //console.log('Dropped into:', target.getAttribute('data-column-name')); + + if (CONFIG_TICKET_ORDERING === 0 && source == target) { + drake.cancel(true); // Move the card back to its original position + return; + } + + // Get all cards in the target column and their positions + let cards = $(target).children('.task'); + let positions = []; + + //id of current status / column + let columnId = $(target).data('status-id'); + + let movedTicketId = $(el).data('ticket-id'); + let movedTicketStatusId = $(el).data('ticket-status-id'); + + cards.each(function(index, card) { + let ticketId = $(card).data('ticket-id'); + let statusId = $(card).data('ticket-status-id'); + + let oldStatus = false; + if (ticketId == movedTicketId) { + oldStatus = movedTicketStatusId; + } + + //update the status id of the card if needed + if (statusId != columnId) { + $(card).data('ticket-status-id', columnId); + statusId = columnId; + } + positions.push({ + ticket_id: ticketId, + ticket_order: index, + ticket_oldStatus: oldStatus, + ticket_status: statusId ?? null// Get the new status ID from the target column + }); + }); + + //console.log(positions); + // Send AJAX request to update all ticket kanban orders and statuses + $.ajax({ + url: 'ajax.php', + type: 'POST', + data: { + update_kanban_ticket: true, + positions: positions + }, + success: function(response) { + //console.log('Ticket kanban orders and statuses updated successfully.'); + }, + error: function(xhr, status, error) { + console.error('Error updating ticket kanban orders and statuses:', error); + } + }); + }); +}); \ No newline at end of file diff --git a/client_locations.php b/locations.php similarity index 86% rename from client_locations.php rename to locations.php index 2e2403f3..192f190a 100644 --- a/client_locations.php +++ b/locations.php @@ -4,7 +4,16 @@ $sort = "location_name"; $order = "ASC"; -require_once "inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND location_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Tags Filter if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { @@ -27,13 +36,15 @@ $url_query_strings_sort = http_build_query($get_copy); $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS locations.*, GROUP_CONCAT(tag_name) FROM locations + "SELECT SQL_CALC_FOUND_ROWS locations.*, clients.*, GROUP_CONCAT(tag_name) FROM locations + LEFT JOIN clients ON client_id = location_client_id LEFT JOIN location_tags ON location_tags.location_id = locations.location_id LEFT JOIN tags ON tags.tag_id = location_tags.tag_id - WHERE location_client_id = $client_id + WHERE location_$archive_query $tag_query - AND location_$archive_query - AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%' OR tag_name LIKE '%$q%') + AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%' OR tag_name LIKE '%$q%' OR client_name LIKE '%$q%') + $access_permission_query + $client_query GROUP BY location_id ORDER BY location_primary DESC, $sort $order LIMIT $record_from, $record_to" ); @@ -67,7 +78,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + +
    @@ -97,7 +110,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -167,6 +180,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Hours + + + + Client + + + Action @@ -174,6 +194,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $location_tag_name"; + $location_tag_name_display_array[] = "$location_tag_name"; } $location_tags_display = implode('', $location_tag_name_display_array); @@ -243,7 +265,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    @@ -266,13 +292,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
    - + Edit @@ -297,8 +330,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - @@ -307,9 +338,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + -
    @@ -318,11 +349,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $body ] ]; - addToMailQueue($mysqli, $data); + addToMailQueue($data); } // Logging @@ -201,8 +201,7 @@ if (isset($_POST['login'])) { // Forcing MFA if ($force_mfa == 1 && $token == NULL) { - $secretMFA = key32gen(); - $config_start_page = "post.php?enable_2fa_force&token=$secretMFA&csrf_token=$_SESSION[csrf_token]"; + $config_start_page = "mfa_enforcement.php"; } // Setup encryption session key @@ -262,7 +261,7 @@ if (isset($_POST['login'])) { 'body' => $body ] ]; - $mail = addToMailQueue($mysqli, $data); + $mail = addToMailQueue($data); } // HTML feedback for incorrect 2FA code @@ -315,9 +314,8 @@ if (isset($_POST['login'])) { - - - + + @@ -326,7 +324,7 @@ if (isset($_POST['login'])) { <?=nullable_htmlentities($company_name)?> logo"> - ITFlow + ITFlow
    @@ -334,7 +332,7 @@ if (isset($_POST['login'])) {
    diff --git a/admin_api_key_add_modal.php b/modals/admin_api_key_add_modal.php similarity index 98% rename from admin_api_key_add_modal.php rename to modals/admin_api_key_add_modal.php index 208593cc..61510e4d 100644 --- a/admin_api_key_add_modal.php +++ b/modals/admin_api_key_add_modal.php @@ -37,7 +37,7 @@ $decryptPW = randomString(160);
    - +
    diff --git a/admin_category_add_modal.php b/modals/admin_category_add_modal.php similarity index 96% rename from admin_category_add_modal.php rename to modals/admin_category_add_modal.php index 7390793a..bf193e38 100644 --- a/admin_category_add_modal.php +++ b/modals/admin_category_add_modal.php @@ -18,7 +18,7 @@
    - +
    diff --git a/admin_custom_link_add_modal.php b/modals/admin_custom_link_add_modal.php similarity index 93% rename from admin_custom_link_add_modal.php rename to modals/admin_custom_link_add_modal.php index b10a3a4a..45b2c3a6 100644 --- a/admin_custom_link_add_modal.php +++ b/modals/admin_custom_link_add_modal.php @@ -17,7 +17,7 @@
    - +
    @@ -37,7 +37,7 @@
    - +
    @@ -52,7 +52,7 @@
    - +
    @@ -65,6 +65,7 @@
    diff --git a/admin_document_template_add_modal.php b/modals/admin_document_template_add_modal.php similarity index 97% rename from admin_document_template_add_modal.php rename to modals/admin_document_template_add_modal.php index 521d0a67..083e0ce0 100644 --- a/admin_document_template_add_modal.php +++ b/modals/admin_document_template_add_modal.php @@ -11,7 +11,7 @@
    - +
    diff --git a/admin_project_template_add_modal.php b/modals/admin_project_template_add_modal.php similarity index 95% rename from admin_project_template_add_modal.php rename to modals/admin_project_template_add_modal.php index bf881aee..259e506a 100644 --- a/admin_project_template_add_modal.php +++ b/modals/admin_project_template_add_modal.php @@ -16,7 +16,7 @@
    - +
    diff --git a/admin_project_template_edit_modal.php b/modals/admin_project_template_edit_modal.php similarity index 94% rename from admin_project_template_edit_modal.php rename to modals/admin_project_template_edit_modal.php index 149f1294..5cbca4df 100644 --- a/admin_project_template_edit_modal.php +++ b/modals/admin_project_template_edit_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/admin_project_template_ticket_template_add_modal.php b/modals/admin_project_template_ticket_template_add_modal.php similarity index 100% rename from admin_project_template_ticket_template_add_modal.php rename to modals/admin_project_template_ticket_template_add_modal.php diff --git a/admin_role_add_modal.php b/modals/admin_role_add_modal.php similarity index 95% rename from admin_role_add_modal.php rename to modals/admin_role_add_modal.php index e860128f..0112960d 100644 --- a/admin_role_add_modal.php +++ b/modals/admin_role_add_modal.php @@ -18,7 +18,7 @@
    - +
    @@ -28,7 +28,7 @@
    - +
    diff --git a/admin_software_template_add_modal.php b/modals/admin_software_template_add_modal.php similarity index 96% rename from admin_software_template_add_modal.php rename to modals/admin_software_template_add_modal.php index 2454dfb1..e0881339 100644 --- a/admin_software_template_add_modal.php +++ b/modals/admin_software_template_add_modal.php @@ -16,7 +16,7 @@
    - +
    @@ -26,7 +26,7 @@
    - +
    diff --git a/admin_tag_add_modal.php b/modals/admin_tag_add_modal.php similarity index 97% rename from admin_tag_add_modal.php rename to modals/admin_tag_add_modal.php index 4406de2e..91e6dd78 100644 --- a/admin_tag_add_modal.php +++ b/modals/admin_tag_add_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/admin_tax_add_modal.php b/modals/admin_tax_add_modal.php similarity index 95% rename from admin_tax_add_modal.php rename to modals/admin_tax_add_modal.php index 59cfadb7..95bf4f78 100644 --- a/admin_tax_add_modal.php +++ b/modals/admin_tax_add_modal.php @@ -13,7 +13,7 @@
    - +
    diff --git a/admin_ticket_status_add_modal.php b/modals/admin_ticket_status_add_modal.php similarity index 96% rename from admin_ticket_status_add_modal.php rename to modals/admin_ticket_status_add_modal.php index 595a162e..ceb78a24 100644 --- a/admin_ticket_status_add_modal.php +++ b/modals/admin_ticket_status_add_modal.php @@ -17,7 +17,7 @@
    - +
    diff --git a/admin_ticket_template_add_modal.php b/modals/admin_ticket_template_add_modal.php similarity index 80% rename from admin_ticket_template_add_modal.php rename to modals/admin_ticket_template_add_modal.php index c95fd372..84dbb430 100644 --- a/admin_ticket_template_add_modal.php +++ b/modals/admin_ticket_template_add_modal.php @@ -16,7 +16,7 @@
    - +
    @@ -26,25 +26,14 @@
    - +
    - -
    - +
    +
    -
    - - -
    - -
    - -
    - -
    diff --git a/admin_ticket_template_edit_modal.php b/modals/admin_ticket_template_edit_modal.php similarity index 72% rename from admin_ticket_template_edit_modal.php rename to modals/admin_ticket_template_edit_modal.php index 1555057b..76678dc1 100644 --- a/admin_ticket_template_edit_modal.php +++ b/modals/admin_ticket_template_edit_modal.php @@ -18,7 +18,7 @@
    - +
    @@ -28,25 +28,14 @@
    - +
    -
    - +
    -
    - - -
    - -
    - -
    - -
    diff --git a/admin_user_add_modal.php b/modals/admin_user_add_modal.php similarity index 97% rename from admin_user_add_modal.php rename to modals/admin_user_add_modal.php index 9d54bb0b..954b5b7d 100644 --- a/admin_user_add_modal.php +++ b/modals/admin_user_add_modal.php @@ -32,7 +32,7 @@
    - +
    @@ -42,7 +42,7 @@
    - +
    @@ -52,7 +52,7 @@
    - +
    diff --git a/admin_user_all_reset_password_modal.php b/modals/admin_user_all_reset_password_modal.php similarity index 96% rename from admin_user_all_reset_password_modal.php rename to modals/admin_user_all_reset_password_modal.php index 746bfaa1..a68dfdc5 100644 --- a/admin_user_all_reset_password_modal.php +++ b/modals/admin_user_all_reset_password_modal.php @@ -15,7 +15,7 @@
    - +
    diff --git a/admin_user_archive_modal.php b/modals/admin_user_archive_modal.php similarity index 100% rename from admin_user_archive_modal.php rename to modals/admin_user_archive_modal.php diff --git a/admin_user_export_modal.php b/modals/admin_user_export_modal.php similarity index 100% rename from admin_user_export_modal.php rename to modals/admin_user_export_modal.php diff --git a/admin_user_invite_modal.php b/modals/admin_user_invite_modal.php similarity index 89% rename from admin_user_invite_modal.php rename to modals/admin_user_invite_modal.php index 4feb00ba..21c93356 100644 --- a/admin_user_invite_modal.php +++ b/modals/admin_user_invite_modal.php @@ -17,7 +17,7 @@
    - +
    @@ -29,9 +29,7 @@ diff --git a/admin_vendor_template_add_modal.php b/modals/admin_vendor_template_add_modal.php similarity index 92% rename from admin_vendor_template_add_modal.php rename to modals/admin_vendor_template_add_modal.php index f7b014ad..4e5f5dcb 100644 --- a/admin_vendor_template_add_modal.php +++ b/modals/admin_vendor_template_add_modal.php @@ -37,7 +37,7 @@
    - + @@ -47,7 +47,7 @@
    - + @@ -57,7 +57,7 @@
    - + @@ -67,7 +67,7 @@
    - + @@ -83,12 +83,12 @@
    - +
    - +
    @@ -98,7 +98,7 @@
    - + @@ -108,7 +108,7 @@
    - + @@ -118,7 +118,7 @@
    - + @@ -128,7 +128,7 @@
    - + @@ -138,7 +138,7 @@
    - + diff --git a/client_asset_add_modal.php b/modals/asset_add_modal.php similarity index 85% rename from client_asset_add_modal.php rename to modals/asset_add_modal.php index 83032aa7..128ffb7d 100644 --- a/client_asset_add_modal.php +++ b/modals/asset_add_modal.php @@ -10,7 +10,6 @@
    -
    @@ -41,13 +40,40 @@
    + + + + +
    + +
    +
    + +
    + +
    +
    + + +
    - +
    @@ -57,7 +83,7 @@
    - +
    @@ -68,7 +94,7 @@ + @@ -94,7 +120,7 @@
    - + @@ -104,7 +130,7 @@
    - + @@ -116,7 +142,7 @@
    - + @@ -124,7 +150,7 @@
    - +
    @@ -132,7 +158,7 @@
    +
    @@ -180,7 +207,7 @@
    - + @@ -190,7 +217,7 @@
    - + @@ -200,7 +227,7 @@
    - + @@ -210,7 +237,7 @@
    - + @@ -224,10 +251,11 @@
    - + +
    @@ -235,7 +263,7 @@
    - +
    +
    @@ -280,7 +309,7 @@
    - + + +
    + +
    +
    + +
    + +
    +
    +
    - +
    diff --git a/client_asset_bulk_add_ticket_modal.php b/modals/asset_bulk_add_ticket_modal.php similarity index 99% rename from client_asset_bulk_add_ticket_modal.php rename to modals/asset_bulk_add_ticket_modal.php index 1749e902..941b3f6b 100644 --- a/client_asset_bulk_add_ticket_modal.php +++ b/modals/asset_bulk_add_ticket_modal.php @@ -18,7 +18,7 @@
    - +
    diff --git a/client_asset_bulk_assign_contact_modal.php b/modals/asset_bulk_assign_contact_modal.php similarity index 100% rename from client_asset_bulk_assign_contact_modal.php rename to modals/asset_bulk_assign_contact_modal.php diff --git a/client_asset_bulk_assign_location_modal.php b/modals/asset_bulk_assign_location_modal.php similarity index 100% rename from client_asset_bulk_assign_location_modal.php rename to modals/asset_bulk_assign_location_modal.php diff --git a/client_asset_bulk_edit_status_modal.php b/modals/asset_bulk_edit_status_modal.php similarity index 100% rename from client_asset_bulk_edit_status_modal.php rename to modals/asset_bulk_edit_status_modal.php diff --git a/modals/asset_bulk_transfer_client_modal.php b/modals/asset_bulk_transfer_client_modal.php new file mode 100644 index 00000000..c469d395 --- /dev/null +++ b/modals/asset_bulk_transfer_client_modal.php @@ -0,0 +1,48 @@ + diff --git a/client_asset_export_modal.php b/modals/asset_export_modal.php similarity index 81% rename from client_asset_export_modal.php rename to modals/asset_export_modal.php index be26f8fd..8860ba99 100644 --- a/client_asset_export_modal.php +++ b/modals/asset_export_modal.php @@ -9,13 +9,15 @@ + +
    - +
    diff --git a/client_asset_import_modal.php b/modals/asset_import_modal.php similarity index 77% rename from client_asset_import_modal.php rename to modals/asset_import_modal.php index cc10bd7b..512958e9 100644 --- a/client_asset_import_modal.php +++ b/modals/asset_import_modal.php @@ -9,7 +9,10 @@
    + + +

    Format csv file with headings & data:
    Name, Description, Type, Make, Model, Serial, OS, Assigned To, Location

    @@ -17,10 +20,10 @@
    -
    Download sample csv template
    +
    Download sample csv template
    - +
    diff --git a/modals/asset_interface_add_modal.php b/modals/asset_interface_add_modal.php new file mode 100644 index 00000000..a5826367 --- /dev/null +++ b/modals/asset_interface_add_modal.php @@ -0,0 +1,224 @@ + diff --git a/modals/asset_interface_export_modal.php b/modals/asset_interface_export_modal.php new file mode 100644 index 00000000..f8b6f182 --- /dev/null +++ b/modals/asset_interface_export_modal.php @@ -0,0 +1,24 @@ + diff --git a/modals/asset_interface_import_modal.php b/modals/asset_interface_import_modal.php new file mode 100644 index 00000000..3df676e3 --- /dev/null +++ b/modals/asset_interface_import_modal.php @@ -0,0 +1,28 @@ + diff --git a/client_asset_interface_add_modal.php b/modals/asset_interface_multiple_add_modal.php similarity index 53% rename from client_asset_interface_add_modal.php rename to modals/asset_interface_multiple_add_modal.php index b2183a7c..18958b52 100644 --- a/client_asset_interface_add_modal.php +++ b/modals/asset_interface_multiple_add_modal.php @@ -1,8 +1,8 @@ - @@ -81,7 +107,7 @@
     https://
    - +
    @@ -94,7 +120,7 @@
    - + diff --git a/client_certificate_export_modal.php b/modals/certificate_export_modal.php similarity index 79% rename from client_certificate_export_modal.php rename to modals/certificate_export_modal.php index 0c0b0077..632312cb 100644 --- a/client_certificate_export_modal.php +++ b/modals/certificate_export_modal.php @@ -8,12 +8,14 @@ + +
    - +
    diff --git a/client_add_modal.php b/modals/client_add_modal.php similarity index 77% rename from client_add_modal.php rename to modals/client_add_modal.php index 8e58f766..082b7428 100644 --- a/client_add_modal.php +++ b/modals/client_add_modal.php @@ -2,7 +2,7 @@
    -
    Creating New
    +
    Creating New
    @@ -22,9 +22,9 @@ Contact -
  • - Billing -
    • +
  • + Billing +
  • Notes @@ -43,10 +43,10 @@
    - +
    - > + >
    • @@ -68,7 +68,7 @@
    - +
    @@ -76,10 +76,10 @@
    - +
    +
    @@ -108,7 +108,7 @@
    - - + @@ -143,7 +143,7 @@
    - + @@ -153,7 +153,7 @@
    - + @@ -163,7 +163,7 @@
    - + @@ -173,7 +173,7 @@
    - + @@ -183,7 +183,7 @@
    - + @@ -194,7 +194,7 @@ + @@ -222,7 +222,7 @@
    - + @@ -234,12 +234,12 @@
    - +
    - +
    @@ -250,7 +250,7 @@
    - + @@ -260,7 +260,7 @@
    - + @@ -268,58 +268,58 @@ -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    + ">
    - ">
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    -
    +
    diff --git a/client_asset_documents_modal.php b/modals/client_asset_documents_modal.php similarity index 100% rename from client_asset_documents_modal.php rename to modals/client_asset_documents_modal.php diff --git a/client_delete_modal.php b/modals/client_delete_modal.php similarity index 100% rename from client_delete_modal.php rename to modals/client_delete_modal.php diff --git a/client_document_add_file_relation_modal.php b/modals/client_document_add_file_relation_modal.php similarity index 100% rename from client_document_add_file_relation_modal.php rename to modals/client_document_add_file_relation_modal.php diff --git a/client_document_add_from_template_modal.php b/modals/client_document_add_from_template_modal.php similarity index 100% rename from client_document_add_from_template_modal.php rename to modals/client_document_add_from_template_modal.php diff --git a/client_document_add_modal.php b/modals/client_document_add_modal.php similarity index 98% rename from client_document_add_modal.php rename to modals/client_document_add_modal.php index f493fb11..e4010942 100644 --- a/client_document_add_modal.php +++ b/modals/client_document_add_modal.php @@ -12,7 +12,7 @@
    - +
    diff --git a/client_document_bulk_move_modal.php b/modals/client_document_bulk_move_modal.php similarity index 100% rename from client_document_bulk_move_modal.php rename to modals/client_document_bulk_move_modal.php diff --git a/client_document_link_asset_modal.php b/modals/client_document_link_asset_modal.php similarity index 100% rename from client_document_link_asset_modal.php rename to modals/client_document_link_asset_modal.php diff --git a/client_document_link_contact_modal.php b/modals/client_document_link_contact_modal.php similarity index 100% rename from client_document_link_contact_modal.php rename to modals/client_document_link_contact_modal.php diff --git a/client_document_link_file_modal.php b/modals/client_document_link_file_modal.php similarity index 100% rename from client_document_link_file_modal.php rename to modals/client_document_link_file_modal.php diff --git a/client_document_link_software_modal.php b/modals/client_document_link_software_modal.php similarity index 100% rename from client_document_link_software_modal.php rename to modals/client_document_link_software_modal.php diff --git a/client_document_link_vendor_modal.php b/modals/client_document_link_vendor_modal.php similarity index 100% rename from client_document_link_vendor_modal.php rename to modals/client_document_link_vendor_modal.php diff --git a/client_download_pdf_modal.php b/modals/client_download_pdf_modal.php similarity index 99% rename from client_download_pdf_modal.php rename to modals/client_download_pdf_modal.php index da046487..4344a699 100644 --- a/client_download_pdf_modal.php +++ b/modals/client_download_pdf_modal.php @@ -7,13 +7,13 @@ ×
    -
    +
      - +
    • @@ -98,7 +98,7 @@
      - +
    • @@ -170,7 +170,7 @@
      • - +
    diff --git a/client_export_modal.php b/modals/client_export_modal.php similarity index 100% rename from client_export_modal.php rename to modals/client_export_modal.php diff --git a/client_file_bulk_move_modal.php b/modals/client_file_bulk_move_modal.php similarity index 100% rename from client_file_bulk_move_modal.php rename to modals/client_file_bulk_move_modal.php diff --git a/client_file_delete_modal.php b/modals/client_file_delete_modal.php similarity index 100% rename from client_file_delete_modal.php rename to modals/client_file_delete_modal.php diff --git a/client_file_link_asset_modal.php b/modals/client_file_link_asset_modal.php similarity index 100% rename from client_file_link_asset_modal.php rename to modals/client_file_link_asset_modal.php diff --git a/client_file_upload_modal.php b/modals/client_file_upload_modal.php similarity index 98% rename from client_file_upload_modal.php rename to modals/client_file_upload_modal.php index 10b8967f..965f1d6a 100644 --- a/client_file_upload_modal.php +++ b/modals/client_file_upload_modal.php @@ -18,7 +18,7 @@
    - +
    @@ -64,7 +64,7 @@
    - +
    Up to 20 files can be uploaded at once by holding down CTRL and selecting files diff --git a/client_file_view_modal.php b/modals/client_file_view_modal.php similarity index 100% rename from client_file_view_modal.php rename to modals/client_file_view_modal.php diff --git a/client_import_modal.php b/modals/client_import_modal.php similarity index 100% rename from client_import_modal.php rename to modals/client_import_modal.php diff --git a/client_rack_add_modal.php b/modals/client_rack_add_modal.php similarity index 97% rename from client_rack_add_modal.php rename to modals/client_rack_add_modal.php index 8f66ea33..54225372 100644 --- a/client_rack_add_modal.php +++ b/modals/client_rack_add_modal.php @@ -35,7 +35,7 @@
    - +
    @@ -70,7 +70,7 @@
    - +
    @@ -80,7 +80,7 @@
    - +
    @@ -100,7 +100,7 @@
    - +
    diff --git a/client_recurring_export_modal.php b/modals/client_recurring_export_modal.php similarity index 100% rename from client_recurring_export_modal.php rename to modals/client_recurring_export_modal.php diff --git a/client_contact_add_modal.php b/modals/contact_add_modal.php similarity index 84% rename from client_contact_add_modal.php rename to modals/contact_add_modal.php index 486447df..4e55037a 100644 --- a/client_contact_add_modal.php +++ b/modals/contact_add_modal.php @@ -8,7 +8,6 @@ -
    - +
    @@ -90,7 +116,7 @@
    - + @@ -100,10 +126,11 @@
    - + +
    @@ -111,7 +138,7 @@
    +
    - +
    diff --git a/client_contact_archive_modal.php b/modals/contact_archive_modal.php similarity index 100% rename from client_contact_archive_modal.php rename to modals/contact_archive_modal.php diff --git a/client_contact_bulk_assign_location_modal.php b/modals/contact_bulk_assign_location_modal.php similarity index 96% rename from client_contact_bulk_assign_location_modal.php rename to modals/contact_bulk_assign_location_modal.php index 404a545a..7b08ba3b 100644 --- a/client_contact_bulk_assign_location_modal.php +++ b/modals/contact_bulk_assign_location_modal.php @@ -17,7 +17,7 @@
    + diff --git a/client_contact_bulk_edit_phone_modal.php b/modals/contact_bulk_edit_phone_modal.php similarity index 95% rename from client_contact_bulk_edit_phone_modal.php rename to modals/contact_bulk_edit_phone_modal.php index cc27c317..8f1df37c 100644 --- a/client_contact_bulk_edit_phone_modal.php +++ b/modals/contact_bulk_edit_phone_modal.php @@ -16,7 +16,7 @@
    - + diff --git a/client_contact_bulk_edit_role_modal.php b/modals/contact_bulk_edit_role_modal.php similarity index 100% rename from client_contact_bulk_edit_role_modal.php rename to modals/contact_bulk_edit_role_modal.php diff --git a/modals/contact_bulk_email_modal.php b/modals/contact_bulk_email_modal.php new file mode 100644 index 00000000..5d9e4e4c --- /dev/null +++ b/modals/contact_bulk_email_modal.php @@ -0,0 +1,61 @@ + \ No newline at end of file diff --git a/client_contact_create_note_modal.php b/modals/contact_create_note_modal.php similarity index 100% rename from client_contact_create_note_modal.php rename to modals/contact_create_note_modal.php diff --git a/client_contact_export_modal.php b/modals/contact_export_modal.php similarity index 80% rename from client_contact_export_modal.php rename to modals/contact_export_modal.php index 87efd742..aff19968 100644 --- a/client_contact_export_modal.php +++ b/modals/contact_export_modal.php @@ -8,12 +8,14 @@ + +
    - +
    diff --git a/client_contact_import_modal.php b/modals/contact_import_modal.php similarity index 81% rename from client_contact_import_modal.php rename to modals/contact_import_modal.php index bc567b60..d126d4f4 100644 --- a/client_contact_import_modal.php +++ b/modals/contact_import_modal.php @@ -8,7 +8,9 @@
    + +

    Format csv file with headings & data:
    Name, Title, Department, Email, Phone, Extension, Mobile, Location

    @@ -16,10 +18,10 @@
    -
    Download: sample csv template
    +
    Download: sample csv template
    - +
    diff --git a/client_contact_invite_modal.php b/modals/contact_invite_modal.php similarity index 98% rename from client_contact_invite_modal.php rename to modals/contact_invite_modal.php index baa87a27..0ea124c3 100644 --- a/client_contact_invite_modal.php +++ b/modals/contact_invite_modal.php @@ -19,7 +19,7 @@
    - + @@ -81,4 +81,4 @@ - + \ No newline at end of file diff --git a/client_contact_link_asset_modal.php b/modals/contact_link_asset_modal.php similarity index 100% rename from client_contact_link_asset_modal.php rename to modals/contact_link_asset_modal.php diff --git a/client_contact_link_credential_modal.php b/modals/contact_link_credential_modal.php similarity index 100% rename from client_contact_link_credential_modal.php rename to modals/contact_link_credential_modal.php diff --git a/client_contact_link_document_modal.php b/modals/contact_link_document_modal.php similarity index 100% rename from client_contact_link_document_modal.php rename to modals/contact_link_document_modal.php diff --git a/client_contact_link_file_modal.php b/modals/contact_link_file_modal.php similarity index 100% rename from client_contact_link_file_modal.php rename to modals/contact_link_file_modal.php diff --git a/client_contact_link_service_modal.php b/modals/contact_link_service_modal.php similarity index 100% rename from client_contact_link_service_modal.php rename to modals/contact_link_service_modal.php diff --git a/client_contact_link_software_modal.php b/modals/contact_link_software_modal.php similarity index 100% rename from client_contact_link_software_modal.php rename to modals/contact_link_software_modal.php diff --git a/client_login_add_modal.php b/modals/credential_add_modal.php similarity index 86% rename from client_login_add_modal.php rename to modals/credential_add_modal.php index 8ce5edd0..e9a64b93 100644 --- a/client_login_add_modal.php +++ b/modals/credential_add_modal.php @@ -8,7 +8,6 @@
    -
    @@ -16,9 +15,11 @@
  • Details
    • +
  • Relation
    • +
  • Notes
    • @@ -30,13 +31,40 @@
    + + + + +
    + +
    +
    + +
    + +
    +
    + + +
    - +
    @@ -51,7 +79,7 @@
    - +
    @@ -61,7 +89,7 @@
    - +
    @@ -71,7 +99,7 @@
    - +
    @@ -87,7 +115,7 @@
    - +
    @@ -100,7 +128,7 @@
    - +
    @@ -110,12 +138,13 @@
    - + +
    @@ -222,6 +251,7 @@
    +
    diff --git a/client_login_bulk_assign_tags_modal.php b/modals/credential_bulk_assign_tags_modal.php similarity index 100% rename from client_login_bulk_assign_tags_modal.php rename to modals/credential_bulk_assign_tags_modal.php diff --git a/client_login_export_modal.php b/modals/credential_export_modal.php similarity index 79% rename from client_login_export_modal.php rename to modals/credential_export_modal.php index 13bb0a7e..4dbeb453 100644 --- a/client_login_export_modal.php +++ b/modals/credential_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/client_login_import_modal.php b/modals/credential_import_modal.php similarity index 82% rename from client_login_import_modal.php rename to modals/credential_import_modal.php index 566ccdda..cdbbe15c 100644 --- a/client_login_import_modal.php +++ b/modals/credential_import_modal.php @@ -8,7 +8,9 @@
    + +

    Format csv file with headings & data:
    Name, Description, Username, Password, URL

    @@ -16,10 +18,10 @@
    -
    Download sample csv template
    +
    Download sample csv template
    - +
    diff --git a/custom_field_create_modal.php b/modals/custom_field_create_modal.php similarity index 95% rename from custom_field_create_modal.php rename to modals/custom_field_create_modal.php index a2b2ff54..d0b9916e 100644 --- a/custom_field_create_modal.php +++ b/modals/custom_field_create_modal.php @@ -14,7 +14,7 @@
    - +
    diff --git a/custom_field_edit_modal.php b/modals/custom_field_edit_modal.php similarity index 96% rename from custom_field_edit_modal.php rename to modals/custom_field_edit_modal.php index b86595a6..da542351 100644 --- a/custom_field_edit_modal.php +++ b/modals/custom_field_edit_modal.php @@ -13,7 +13,7 @@
    - +
    diff --git a/document_edit_visibility_modal.php b/modals/document_edit_visibility_modal.php similarity index 100% rename from document_edit_visibility_modal.php rename to modals/document_edit_visibility_modal.php diff --git a/client_domain_add_modal.php b/modals/domain_add_modal.php similarity index 82% rename from client_domain_add_modal.php rename to modals/domain_add_modal.php index abe56508..a420f9bd 100644 --- a/client_domain_add_modal.php +++ b/modals/domain_add_modal.php @@ -8,7 +8,6 @@
    -
      @@ -27,13 +26,40 @@
      + + + + +
      + +
      +
      + +
      + +
      +
      + + +
      - +
      @@ -47,6 +73,7 @@
    +
    @@ -130,6 +157,7 @@
    +
    diff --git a/client_domain_export_modal.php b/modals/domain_export_modal.php similarity index 79% rename from client_domain_export_modal.php rename to modals/domain_export_modal.php index cb743669..7b985881 100644 --- a/client_domain_export_modal.php +++ b/modals/domain_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/expense_add_modal.php b/modals/expense_add_modal.php similarity index 99% rename from expense_add_modal.php rename to modals/expense_add_modal.php index 5689f88d..8b5e3dbe 100644 --- a/expense_add_modal.php +++ b/modals/expense_add_modal.php @@ -112,7 +112,7 @@
    - +
    diff --git a/expense_bulk_edit_account_modal.php b/modals/expense_bulk_edit_account_modal.php similarity index 100% rename from expense_bulk_edit_account_modal.php rename to modals/expense_bulk_edit_account_modal.php diff --git a/expense_bulk_edit_category_modal.php b/modals/expense_bulk_edit_category_modal.php similarity index 100% rename from expense_bulk_edit_category_modal.php rename to modals/expense_bulk_edit_category_modal.php diff --git a/expense_bulk_edit_client_modal.php b/modals/expense_bulk_edit_client_modal.php similarity index 100% rename from expense_bulk_edit_client_modal.php rename to modals/expense_bulk_edit_client_modal.php diff --git a/expense_export_modal.php b/modals/expense_export_modal.php similarity index 86% rename from expense_export_modal.php rename to modals/expense_export_modal.php index acc4befc..d24b0212 100644 --- a/expense_export_modal.php +++ b/modals/expense_export_modal.php @@ -18,7 +18,7 @@ - + - + @@ -66,7 +66,7 @@ + diff --git a/invoice_add_modal.php b/modals/invoice_add_modal.php similarity index 98% rename from invoice_add_modal.php rename to modals/invoice_add_modal.php index ba8f6dec..392a8b71 100644 --- a/invoice_add_modal.php +++ b/modals/invoice_add_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/invoice_add_ticket_modal.php b/modals/invoice_add_ticket_modal.php similarity index 100% rename from invoice_add_ticket_modal.php rename to modals/invoice_add_ticket_modal.php diff --git a/invoice_export_modal.php b/modals/invoice_export_modal.php similarity index 92% rename from invoice_export_modal.php rename to modals/invoice_export_modal.php index 930dc762..efe941fb 100644 --- a/invoice_export_modal.php +++ b/modals/invoice_export_modal.php @@ -8,6 +8,9 @@
    + + +
    diff --git a/invoice_note_modal.php b/modals/invoice_note_modal.php similarity index 100% rename from invoice_note_modal.php rename to modals/invoice_note_modal.php diff --git a/invoice_payment_add_bulk_modal.php b/modals/invoice_payment_add_bulk_modal.php similarity index 99% rename from invoice_payment_add_bulk_modal.php rename to modals/invoice_payment_add_bulk_modal.php index aa036489..6e4c030c 100644 --- a/invoice_payment_add_bulk_modal.php +++ b/modals/invoice_payment_add_bulk_modal.php @@ -123,7 +123,7 @@
    - +
    diff --git a/invoice_payment_add_modal.php b/modals/invoice_payment_add_modal.php similarity index 99% rename from invoice_payment_add_modal.php rename to modals/invoice_payment_add_modal.php index e86ca5b6..9b5d4d98 100644 --- a/invoice_payment_add_modal.php +++ b/modals/invoice_payment_add_modal.php @@ -118,7 +118,7 @@
    - + diff --git a/invoice_recurring_add_modal.php b/modals/invoice_recurring_add_modal.php similarity index 100% rename from invoice_recurring_add_modal.php rename to modals/invoice_recurring_add_modal.php diff --git a/item_edit_modal.php b/modals/item_edit_modal.php similarity index 98% rename from item_edit_modal.php rename to modals/item_edit_modal.php index 136f974f..41c88a68 100644 --- a/item_edit_modal.php +++ b/modals/item_edit_modal.php @@ -25,7 +25,7 @@
    - + diff --git a/client_location_add_modal.php b/modals/location_add_modal.php similarity index 82% rename from client_location_add_modal.php rename to modals/location_add_modal.php index 541a0527..b9fce811 100644 --- a/client_location_add_modal.php +++ b/modals/location_add_modal.php @@ -8,7 +8,6 @@ -
    @@ -33,6 +32,33 @@
    + + + + + +
    + +
    +
    + +
    + +
    +
    + +
    @@ -40,7 +66,7 @@
    - +
    @@ -74,7 +100,7 @@
    - +
    @@ -84,7 +110,7 @@
    - +
    @@ -94,7 +120,7 @@
    - +
    @@ -104,7 +130,7 @@
    - + @@ -126,7 +152,7 @@
    - +
    @@ -148,6 +174,7 @@
    +
    @@ -155,7 +182,7 @@
    - +
    @@ -165,7 +192,7 @@
    - + @@ -175,7 +202,7 @@
    - + diff --git a/client_location_bulk_assign_tags_modal.php b/modals/location_bulk_assign_tags_modal.php similarity index 100% rename from client_location_bulk_assign_tags_modal.php rename to modals/location_bulk_assign_tags_modal.php diff --git a/client_location_export_modal.php b/modals/location_export_modal.php similarity index 79% rename from client_location_export_modal.php rename to modals/location_export_modal.php index 42f2699c..b9bda966 100644 --- a/client_location_export_modal.php +++ b/modals/location_export_modal.php @@ -8,12 +8,14 @@ + +
    - +
    diff --git a/client_location_import_modal.php b/modals/location_import_modal.php similarity index 81% rename from client_location_import_modal.php rename to modals/location_import_modal.php index 579d82b9..bbc14fa3 100644 --- a/client_location_import_modal.php +++ b/modals/location_import_modal.php @@ -8,7 +8,9 @@
    + +

    Format csv file with headings & data:
    Name, Description, Address, City, State, Postal Code, Phone, Hours

    @@ -16,10 +18,10 @@
    -
    Download: sample csv template
    +
    Download: sample csv template
    - +
    diff --git a/client_network_edit_modal.php b/modals/network_add_modal.php similarity index 63% rename from client_network_edit_modal.php rename to modals/network_add_modal.php index 7a251adc..d23f8609 100644 --- a/client_network_edit_modal.php +++ b/modals/network_add_modal.php @@ -1,37 +1,62 @@ - - -
    - + +
    - +
    @@ -139,26 +176,22 @@
    - +
    - - -
    - + +
    - +
    - -

    - +
    diff --git a/client_network_export_modal.php b/modals/network_export_modal.php similarity index 79% rename from client_network_export_modal.php rename to modals/network_export_modal.php index e2849ba9..47b32e61 100644 --- a/client_network_export_modal.php +++ b/modals/network_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/client_payment_export_modal.php b/modals/payment_export_modal.php similarity index 79% rename from client_payment_export_modal.php rename to modals/payment_export_modal.php index a76f2c93..bd618abd 100644 --- a/client_payment_export_modal.php +++ b/modals/payment_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/product_add_modal.php b/modals/product_add_modal.php similarity index 98% rename from product_add_modal.php rename to modals/product_add_modal.php index 20901ed1..8df44e19 100644 --- a/product_add_modal.php +++ b/modals/product_add_modal.php @@ -16,7 +16,7 @@
    - + diff --git a/product_bulk_edit_category_modal.php b/modals/product_bulk_edit_category_modal.php similarity index 100% rename from product_bulk_edit_category_modal.php rename to modals/product_bulk_edit_category_modal.php diff --git a/product_export_modal.php b/modals/product_export_modal.php similarity index 100% rename from product_export_modal.php rename to modals/product_export_modal.php diff --git a/project_add_modal.php b/modals/project_add_modal.php similarity index 98% rename from project_add_modal.php rename to modals/project_add_modal.php index 8e7fbc49..463c2a7b 100644 --- a/project_add_modal.php +++ b/modals/project_add_modal.php @@ -18,7 +18,7 @@
    - + diff --git a/project_ticket_add_modal.php b/modals/project_ticket_add_modal.php similarity index 100% rename from project_ticket_add_modal.php rename to modals/project_ticket_add_modal.php diff --git a/quote_add_modal.php b/modals/quote_add_modal.php similarity index 98% rename from quote_add_modal.php rename to modals/quote_add_modal.php index 95b7962e..cbacc62a 100644 --- a/quote_add_modal.php +++ b/modals/quote_add_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/client_quote_export_modal.php b/modals/quote_export_modal.php similarity index 79% rename from client_quote_export_modal.php rename to modals/quote_export_modal.php index e64c6283..9fa53607 100644 --- a/client_quote_export_modal.php +++ b/modals/quote_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/quote_note_modal.php b/modals/quote_note_modal.php similarity index 100% rename from quote_note_modal.php rename to modals/quote_note_modal.php diff --git a/quote_to_invoice_modal.php b/modals/quote_to_invoice_modal.php similarity index 100% rename from quote_to_invoice_modal.php rename to modals/quote_to_invoice_modal.php diff --git a/recurring_expense_create_modal.php b/modals/recurring_expense_create_modal.php similarity index 99% rename from recurring_expense_create_modal.php rename to modals/recurring_expense_create_modal.php index 04448ee6..a6e27710 100644 --- a/recurring_expense_create_modal.php +++ b/modals/recurring_expense_create_modal.php @@ -154,7 +154,7 @@
    - + diff --git a/recurring_invoice_add_modal.php b/modals/recurring_invoice_add_modal.php similarity index 98% rename from recurring_invoice_add_modal.php rename to modals/recurring_invoice_add_modal.php index 92e9ebdc..54cad7ff 100644 --- a/recurring_invoice_add_modal.php +++ b/modals/recurring_invoice_add_modal.php @@ -17,7 +17,7 @@
    - + diff --git a/recurring_invoice_note_modal.php b/modals/recurring_invoice_note_modal.php similarity index 100% rename from recurring_invoice_note_modal.php rename to modals/recurring_invoice_note_modal.php diff --git a/modals/recurring_payment_add_modal.php b/modals/recurring_payment_add_modal.php new file mode 100644 index 00000000..7366c390 --- /dev/null +++ b/modals/recurring_payment_add_modal.php @@ -0,0 +1,80 @@ + \ No newline at end of file diff --git a/recurring_ticket_add_modal.php b/modals/recurring_ticket_add_modal.php similarity index 99% rename from recurring_ticket_add_modal.php rename to modals/recurring_ticket_add_modal.php index f1eb7a27..e905d559 100644 --- a/recurring_ticket_add_modal.php +++ b/modals/recurring_ticket_add_modal.php @@ -40,7 +40,7 @@
    - + @@ -130,7 +130,7 @@
    - diff --git a/revenue_add_modal.php b/modals/revenue_add_modal.php similarity index 89% rename from revenue_add_modal.php rename to modals/revenue_add_modal.php index 477d2f3d..29a96a0a 100644 --- a/revenue_add_modal.php +++ b/modals/revenue_add_modal.php @@ -22,21 +22,6 @@ -
    - -
    -
    - -
    - -
    -
    -
    @@ -157,7 +142,7 @@
    - +
    diff --git a/modals/service_add_modal.php b/modals/service_add_modal.php new file mode 100644 index 00000000..5d4e0f6b --- /dev/null +++ b/modals/service_add_modal.php @@ -0,0 +1,247 @@ + diff --git a/share_modal.php b/modals/share_modal.php similarity index 99% rename from share_modal.php rename to modals/share_modal.php index d9963ed7..852fa342 100644 --- a/share_modal.php +++ b/modals/share_modal.php @@ -68,7 +68,7 @@
    - +
    diff --git a/client_software_add_from_template_modal.php b/modals/software_add_from_template_modal.php similarity index 100% rename from client_software_add_from_template_modal.php rename to modals/software_add_from_template_modal.php diff --git a/client_software_add_modal.php b/modals/software_add_modal.php similarity index 85% rename from client_software_add_modal.php rename to modals/software_add_modal.php index 6a240715..8dc810c2 100644 --- a/client_software_add_modal.php +++ b/modals/software_add_modal.php @@ -8,7 +8,6 @@
    -
    @@ -115,7 +143,7 @@
    - + @@ -141,6 +169,8 @@ + +
    + +
    diff --git a/client_software_export_modal.php b/modals/software_export_modal.php similarity index 100% rename from client_software_export_modal.php rename to modals/software_export_modal.php diff --git a/ticket_add_modal.php b/modals/ticket_add_modal.php similarity index 99% rename from ticket_add_modal.php rename to modals/ticket_add_modal.php index 1bcb80e6..7de8a529 100644 --- a/ticket_add_modal.php +++ b/modals/ticket_add_modal.php @@ -106,7 +106,7 @@
    - +
    diff --git a/ticket_add_watcher_modal.php b/modals/ticket_add_watcher_modal.php similarity index 100% rename from ticket_add_watcher_modal.php rename to modals/ticket_add_watcher_modal.php diff --git a/ticket_bulk_add_project_modal.php b/modals/ticket_bulk_add_project_modal.php similarity index 100% rename from ticket_bulk_add_project_modal.php rename to modals/ticket_bulk_add_project_modal.php diff --git a/ticket_bulk_assign_modal.php b/modals/ticket_bulk_assign_modal.php similarity index 100% rename from ticket_bulk_assign_modal.php rename to modals/ticket_bulk_assign_modal.php diff --git a/modals/ticket_bulk_edit_category_modal.php b/modals/ticket_bulk_edit_category_modal.php new file mode 100644 index 00000000..421e851d --- /dev/null +++ b/modals/ticket_bulk_edit_category_modal.php @@ -0,0 +1,42 @@ + diff --git a/ticket_bulk_edit_priority_modal.php b/modals/ticket_bulk_edit_priority_modal.php similarity index 100% rename from ticket_bulk_edit_priority_modal.php rename to modals/ticket_bulk_edit_priority_modal.php diff --git a/ticket_bulk_merge_modal.php b/modals/ticket_bulk_merge_modal.php similarity index 100% rename from ticket_bulk_merge_modal.php rename to modals/ticket_bulk_merge_modal.php diff --git a/ticket_bulk_reply_modal.php b/modals/ticket_bulk_reply_modal.php similarity index 100% rename from ticket_bulk_reply_modal.php rename to modals/ticket_bulk_reply_modal.php diff --git a/ticket_bulk_resolve_modal.php b/modals/ticket_bulk_resolve_modal.php similarity index 100% rename from ticket_bulk_resolve_modal.php rename to modals/ticket_bulk_resolve_modal.php diff --git a/ticket_change_client_modal.php b/modals/ticket_change_client_modal.php similarity index 100% rename from ticket_change_client_modal.php rename to modals/ticket_change_client_modal.php diff --git a/ticket_edit_asset_modal.php b/modals/ticket_edit_asset_modal.php similarity index 100% rename from ticket_edit_asset_modal.php rename to modals/ticket_edit_asset_modal.php diff --git a/ticket_edit_schedule_modal.php b/modals/ticket_edit_schedule_modal.php similarity index 100% rename from ticket_edit_schedule_modal.php rename to modals/ticket_edit_schedule_modal.php diff --git a/ticket_edit_vendor_modal.php b/modals/ticket_edit_vendor_modal.php similarity index 100% rename from ticket_edit_vendor_modal.php rename to modals/ticket_edit_vendor_modal.php diff --git a/client_ticket_export_modal.php b/modals/ticket_export_modal.php similarity index 79% rename from client_ticket_export_modal.php rename to modals/ticket_export_modal.php index 7253df50..1ad30ce4 100644 --- a/client_ticket_export_modal.php +++ b/modals/ticket_export_modal.php @@ -8,12 +8,14 @@ + +
    - +
    diff --git a/ticket_invoice_add_modal.php b/modals/ticket_invoice_add_modal.php similarity index 100% rename from ticket_invoice_add_modal.php rename to modals/ticket_invoice_add_modal.php diff --git a/ticket_merge_modal.php b/modals/ticket_merge_modal.php similarity index 100% rename from ticket_merge_modal.php rename to modals/ticket_merge_modal.php diff --git a/top_nav_tickets_modal.php b/modals/top_nav_tickets_modal.php similarity index 100% rename from top_nav_tickets_modal.php rename to modals/top_nav_tickets_modal.php diff --git a/transfer_add_modal.php b/modals/transfer_add_modal.php similarity index 100% rename from transfer_add_modal.php rename to modals/transfer_add_modal.php diff --git a/trip_add_modal.php b/modals/trip_add_modal.php similarity index 98% rename from trip_add_modal.php rename to modals/trip_add_modal.php index f05d3047..88491f3f 100644 --- a/trip_add_modal.php +++ b/modals/trip_add_modal.php @@ -44,7 +44,7 @@
    - + @@ -76,7 +76,7 @@
    - +
    diff --git a/trip_export_modal.php b/modals/trip_export_modal.php similarity index 92% rename from trip_export_modal.php rename to modals/trip_export_modal.php index cbdbe8b2..9f074c0d 100644 --- a/trip_export_modal.php +++ b/modals/trip_export_modal.php @@ -8,6 +8,9 @@
    + + +
    diff --git a/modals/user_mfa_modal.php b/modals/user_mfa_modal.php new file mode 100644 index 00000000..7808299d --- /dev/null +++ b/modals/user_mfa_modal.php @@ -0,0 +1,53 @@ + + + diff --git a/vendor_add_from_template_modal.php b/modals/vendor_add_from_template_modal.php similarity index 100% rename from vendor_add_from_template_modal.php rename to modals/vendor_add_from_template_modal.php diff --git a/vendor_add_modal.php b/modals/vendor_add_modal.php similarity index 90% rename from vendor_add_modal.php rename to modals/vendor_add_modal.php index 80622856..7676c91a 100644 --- a/vendor_add_modal.php +++ b/modals/vendor_add_modal.php @@ -37,7 +37,7 @@
    - +
    @@ -47,7 +47,7 @@
    - + @@ -57,7 +57,7 @@
    - + @@ -67,7 +67,7 @@
    - + @@ -83,12 +83,12 @@
    - +
    - +
    @@ -98,7 +98,7 @@
    - + @@ -108,7 +108,7 @@
    - + @@ -118,7 +118,7 @@
    - + @@ -128,7 +128,7 @@
    - + @@ -138,7 +138,7 @@
    - + diff --git a/vendor_contact_add_modal.php b/modals/vendor_contact_add_modal.php similarity index 90% rename from vendor_contact_add_modal.php rename to modals/vendor_contact_add_modal.php index ec11e89e..834a9a29 100644 --- a/vendor_contact_add_modal.php +++ b/modals/vendor_contact_add_modal.php @@ -17,7 +17,7 @@
    - + @@ -27,7 +27,7 @@
    - + @@ -37,7 +37,7 @@
    - + @@ -49,12 +49,12 @@
    - +
    - +
    @@ -64,7 +64,7 @@
    - + @@ -74,7 +74,7 @@
    - + diff --git a/vendor_contact_edit_modal.php b/modals/vendor_contact_edit_modal.php similarity index 86% rename from vendor_contact_edit_modal.php rename to modals/vendor_contact_edit_modal.php index f1e24cbc..4ed8b37f 100644 --- a/vendor_contact_edit_modal.php +++ b/modals/vendor_contact_edit_modal.php @@ -18,7 +18,7 @@
    - + @@ -28,7 +28,7 @@
    - + @@ -38,7 +38,7 @@
    - + @@ -50,12 +50,12 @@
    - +
    - +
    @@ -65,7 +65,7 @@
    - + @@ -75,7 +75,7 @@
    - + diff --git a/client_vendor_export_modal.php b/modals/vendor_export_modal.php similarity index 79% rename from client_vendor_export_modal.php rename to modals/vendor_export_modal.php index 7cb1cf69..ab904b19 100644 --- a/client_vendor_export_modal.php +++ b/modals/vendor_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/networks.php b/networks.php new file mode 100644 index 00000000..03c18a69 --- /dev/null +++ b/networks.php @@ -0,0 +1,273 @@ + $sort, 'order' => $order))); + +$sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM networks + LEFT JOIN clients ON client_id = network_client_id + LEFT JOIN locations ON location_id = network_location_id + WHERE network_$archive_query + AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_subnet LIKE '%$q%' OR network_primary_dns LIKE '%$q%' OR network_secondary_dns LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%') + $access_permission_query + $client_query + ORDER BY $sort $order LIMIT $record_from, $record_to" +); + +$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + +?> + +
    +
    +

    Networks

    +
    +
    + + 0) { ?> + +
    + + Export + +
    + +
    + +
    +
    +
    +
    + + + +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + + + "> + + + + + + + + + + + + + + + + + $network_secondary_dns"; + } else { + $network_dns_display = "-"; + } + $network_dhcp_range = nullable_htmlentities($row['network_dhcp_range']); + if (empty($network_dhcp_range)) { + $network_dhcp_range_display = "-"; + } else { + $network_dhcp_range_display = $network_dhcp_range; + } + $network_location_id = intval($row['network_location_id']); + $location_name = nullable_htmlentities($row['location_name']); + if (empty($location_name)) { + $location_name_display = "-"; + } else { + $location_name_display = $location_name; + } + + ?> + + + + + + + + + + + + + + + + + + +
    +
    + +
    +     		+ + Name + + + + vLAN + + + + IP / Network + + + + Gateway + + + + DNS + + + + DHCP Range + + + + Location + + + + Client + + Action
    +
    + +
    +     		+ +
    + +
    +
    +
    +
    +
    +     +     		+ +
    +     		+
    + +
    + + Edit + + +
    + + Archive + +
    + + Delete + + +
    +
    +
    + +
    +
    + +
    +
    + + + + + + - +
    -
    -

    Payments

    +
    +

    Payments

    + 0) { ?> +
    + +
    +
    + + +
    @@ -69,7 +87,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + - + @@ -158,14 +176,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Invoice + Client + + + + Invoice Amount + + - Amount + Payment Amount @@ -183,6 +208,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Account + @@ -193,7 +219,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $invoice_prefix = nullable_htmlentities($row['invoice_prefix']); $invoice_number = intval($row['invoice_number']); $invoice_status = nullable_htmlentities($row['invoice_status']); + $invoice_amount = floatval($row['invoice_amount']); + $invoice_currency_code = nullable_htmlentities($row['invoice_currency_code']); $invoice_date = nullable_htmlentities($row['invoice_date']); + $payment_id = intval($row['payment_id']); $payment_date = nullable_htmlentities($row['payment_date']); $payment_method = nullable_htmlentities($row['payment_method']); $payment_amount = floatval($row['payment_amount']); @@ -219,23 +248,46 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - + + + + + + + + + + +
    + +
    + + Delete + +
    +
    + - +
    - +
    - +').appendTo($this); } oSettings.nTHead = thead[0]; - $('tr', thead).addClass(oClasses.thead.row); var tbody = $this.children('tbody'); if ( tbody.length === 0 ) { @@ -456,7 +437,6 @@ tfoot = $('').appendTo($this); } oSettings.nTFoot = tfoot[0]; - $('tr', tfoot).addClass(oClasses.tfoot.row); // Copy the data index array oSettings.aiDisplay = oSettings.aiDisplayMaster.slice(); @@ -539,7 +519,7 @@ * * @type string */ - builder: "bs4/dt-2.1.8", + builder: "bs4/dt-2.2.1", /** @@ -2173,6 +2153,10 @@ var width = _fnColumnsSumWidth(settings, [i], false, false); cols[i].colEl.css('width', width); + + if (settings.oScroll.sX) { + cols[i].colEl.css('min-width', width); + } } } @@ -3240,9 +3224,13 @@ // Add the number of cells needed to make up to the number of columns if (row.length === 1) { - var cells = $('td, th', row); + var cellCount = 0; + + $('td, th', row).each(function () { + cellCount += this.colSpan; + }); - for ( i=cells.length, ien=columns.length ; i') .html( columns[i][titleProp] || '' ) .appendTo( row ); @@ -3254,9 +3242,11 @@ if (side === 'header') { settings.aoHeader = detected; + $('tr', target).addClass(classes.thead.row); } else { settings.aoFooter = detected; + $('tr', target).addClass(classes.tfoot.row); } // Every cell needs to be passed through the renderer @@ -4519,7 +4509,7 @@ // So the array reference doesn't break set the results into the // existing array displayRows.length = 0; - displayRows.push.apply(displayRows, rows); + _fnArrayApply(displayRows, rows); } } @@ -5247,8 +5237,11 @@ // [].find, but it wasn't supported in Chrome until Sept 2015, and DT has 10 year // browser support var firstTr = null; + var start = _fnDataSource( settings ) !== 'ssp' + ? settings._iDisplayStart + : 0; - for (i=settings._iDisplayStart ; i col is set to and correct if needed @@ -5273,6 +5266,10 @@ if (colWidth !== colSizes[i].width) { colEl.style.width = colSizes[i].width + 'px'; + + if (scroll.sX) { + colEl.style.minWidth = colSizes[i].width + 'px'; + } } } } @@ -5365,6 +5362,14 @@ i, column, columnIdx; var styleWidth = table.style.width; + var containerWidth = _fnWrapperWidth(settings); + + // Don't re-run for the same width as the last time + if (containerWidth === settings.containerWidth) { + return false; + } + + settings.containerWidth = containerWidth; // If there is no width applied as a CSS style or as an attribute, we assume that // the width is intended to be 100%, which is usually is in CSS, but it is very @@ -5422,6 +5427,8 @@ // browser will collapse it. If this width is smaller than the // width the column requires, then it will have no effect if ( scrollX ) { + this.style.minWidth = width; + $( this ).append( $('
    ').css( { width: width, margin: 0, @@ -5490,15 +5497,15 @@ // If there is no width attribute or style, then allow the table to // collapse - if ( tmpTable.width() < tableContainer.clientWidth && tableWidthAttr ) { - tmpTable.width( tableContainer.clientWidth ); + if ( tmpTable.outerWidth() < tableContainer.clientWidth && tableWidthAttr ) { + tmpTable.outerWidth( tableContainer.clientWidth ); } } else if ( scrollY ) { - tmpTable.width( tableContainer.clientWidth ); + tmpTable.outerWidth( tableContainer.clientWidth ); } else if ( tableWidthAttr ) { - tmpTable.width( tableWidthAttr ); + tmpTable.outerWidth( tableWidthAttr ); } // Get the width of each column in the constructed table @@ -5531,20 +5538,55 @@ } if ( (tableWidthAttr || scrollX) && ! settings._reszEvt ) { - var bindResize = function () { - $(window).on('resize.DT-'+settings.sInstance, DataTable.util.throttle( function () { - if (! settings.bDestroying) { - _fnAdjustColumnSizing( settings ); - } - } ) ); - }; + var resize = DataTable.util.throttle( function () { + var newWidth = _fnWrapperWidth(settings); - bindResize(); + // Don't do it if destroying or the container width is 0 + if (! settings.bDestroying && newWidth !== 0) { + _fnAdjustColumnSizing( settings ); + } + } ); + + // For browsers that support it (~2020 onwards for wide support) we can watch for the + // container changing width. + if (window.ResizeObserver) { + // This is a tricky beast - if the element is visible when `.observe()` is called, + // then the callback is immediately run. Which we don't want. If the element isn't + // visible, then it isn't run, but we want it to run when it is then made visible. + // This flag allows the above to be satisfied. + var first = $(settings.nTableWrapper).is(':visible'); + + settings.resizeObserver = new ResizeObserver(function (e) { + if (first) { + first = false; + } + else { + resize(); + } + }); + + settings.resizeObserver.observe(settings.nTableWrapper); + } + else { + // For old browsers, the best we can do is listen for a window resize + $(window).on('resize.DT-'+settings.sInstance, resize); + } settings._reszEvt = true; } } + /** + * Get the width of the DataTables wrapper element + * + * @param {*} settings DataTables settings object + * @returns Width + */ + function _fnWrapperWidth(settings) { + return $(settings.nTableWrapper).is(':visible') + ? $(settings.nTableWrapper).width() + : 0; + } /** * Get the maximum strlen for each data column @@ -6153,15 +6195,26 @@ return; } + // Sort state saving uses [[idx, order]] structure. + var sorting = []; + _fnSortResolve(settings, sorting, settings.aaSorting ); + /* Store the interesting variables */ + var columns = settings.aoColumns; var state = { time: +new Date(), start: settings._iDisplayStart, length: settings._iDisplayLength, - order: $.extend( true, [], settings.aaSorting ), + order: sorting.map(function (sort) { + // If a column name is available, use it + return columns[sort[0]] && columns[sort[0]].sName + ? [ columns[sort[0]].sName, sort[1] ] + : sort.slice(); + } ), search: $.extend({}, settings.oPreviousSearch), columns: settings.aoColumns.map( function ( col, i ) { return { + name: col.sName, visible: col.bVisible, search: $.extend({}, settings.aoPreSearchCols[i]) }; @@ -6209,6 +6262,8 @@ function _fnImplementState ( settings, s, callback) { var i, ien; var columns = settings.aoColumns; + var currentNames = _pluck(settings.aoColumns, 'sName'); + settings._bLoadingState = true; // When StateRestore was introduced the state could now be implemented at any time @@ -6238,13 +6293,6 @@ return; } - // Number of columns have changed - all bets are off, no restore of settings - if ( s.columns && columns.length !== s.columns.length ) { - settings._bLoadingState = false; - callback(); - return; - } - // Store the saved state so it might be accessed at any time settings.oLoadedState = $.extend( true, {}, s ); @@ -6278,10 +6326,23 @@ if ( s.order !== undefined ) { settings.aaSorting = []; $.each( s.order, function ( i, col ) { - settings.aaSorting.push( col[0] >= columns.length ? - [ 0, col[1] ] : - col - ); + var set = [ col[0], col[1] ]; + + // A column name was stored and should be used for restore + if (typeof col[0] === 'string') { + var idx = currentNames.indexOf(col[0]); + + // Find the name from the current list of column names, or fallback to index 0 + set[0] = idx >= 0 + ? idx + : 0; + } + else if (set[0] >= columns.length) { + // If a column name, but it is out of bounds, set to 0 + set[0] = 0; + } + + settings.aaSorting.push(set); } ); } @@ -6292,31 +6353,65 @@ // Columns if ( s.columns ) { - for ( i=0, ien=s.columns.length ; i= 0) { + set.push(s.columns[idx]); + } + else { + // No matching column name in the state's columns, so this might be a new + // column and thus can't have a state already. + set.push({}); + } } else { - columns[i].bVisible = col.visible; + // If no name, but other columns did have a name, then there is no knowing + // where this one came from originally so it can't be restored. + set.push({}); + } + } + } + + // If the number of columns to restore is different from current, then all bets are off. + if (set.length === columns.length) { + for ( i=0, ien=set.length ; i 1 && // prevent infinite - $(host).height() >= ($(buttonEls[0]).outerHeight() * 2) - 10 - ) { - _pagingDraw(settings, host, $.extend({}, opts, { buttons: opts.buttons - 2 })); + if (buttonEls.length) { + var outerHeight = $(buttonEls[0]).outerHeight(); + + if ( + opts.buttons > 1 && // prevent infinite + outerHeight > 0 && // will be 0 if hidden + $(host).height() >= (outerHeight * 2) - 10 + ) { + _pagingDraw(settings, host, $.extend({}, opts, { buttons: opts.buttons - 2 })); + } } } @@ -13336,7 +13548,6 @@ switch ( button ) { case 'ellipsis': o.display = '…'; - o.disabled = true; break; case 'first': @@ -13523,7 +13734,7 @@ // Save text node content for macro updating var textNodes = []; - Array.from(div.find('label')[0].childNodes).forEach(function (el) { + Array.prototype.slice.call(div.find('label')[0].childNodes).forEach(function (el) { if (el.nodeType === Node.TEXT_NODE) { textNodes.push({ el: el, @@ -13541,7 +13752,6 @@ // Next, the select itself, along with the options var select = $(' -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    - -
    -
    -
    -
    - -
    - - -
    - -
    - -
    - - -
    - -
    -
    -
    diff --git a/products.php b/products.php index 8da75d9f..86e8729c 100644 --- a/products.php +++ b/products.php @@ -4,7 +4,7 @@ $sort = "product_name"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_sales'); @@ -12,11 +12,11 @@ enforceUserPermission('module_sales'); // Category Filter if (isset($_GET['category']) & !empty($_GET['category'])) { $category_query = 'AND (category_id = ' . intval($_GET['category']) . ')'; - $category = intval($_GET['category']); + $category_filter = intval($_GET['category']); } else { // Default - any $category_query = ''; - $category = ''; + $category_filter = ''; } //Rebuild URL @@ -70,7 +70,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + + + + + @@ -218,7 +226,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit @@ -247,9 +259,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -257,9 +266,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + -
    @@ -268,7 +277,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit @@ -404,12 +410,11 @@ if (isset($_GET['project_id'])) { diff --git a/project_edit_modal.php b/project_edit_modal.php deleted file mode 100644 index 95293bc6..00000000 --- a/project_edit_modal.php +++ /dev/null @@ -1,77 +0,0 @@ - diff --git a/projects.php b/projects.php index 1eab6989..3f5965e9 100644 --- a/projects.php +++ b/projects.php @@ -4,7 +4,7 @@ $sort = "project_name"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_support'); @@ -266,7 +266,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit @@ -295,8 +299,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -304,13 +306,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    Nothing to see here'; - require_once "footer.php"; + require_once "includes/footer.php"; exit(); } @@ -59,6 +64,10 @@ if (isset($_GET['quote_id'])) { $client_net_terms = $config_default_net_terms; } + // Override Tab Title // No Sanitizing needed as this var will only be used in the tab title + $tab_title = $row['client_name']; + $page_title = "{$row['quote_prefix']}{$row['quote_number']}"; + $sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); $row = mysqli_fetch_array($sql); @@ -104,7 +113,14 @@ if (isset($_GET['quote_id'])) { $json_products = json_encode($products); } + // Quote File Attachments + $sql_quote_files = mysqli_query( + $mysqli, + "SELECT file_reference_name, file_name, file_created_at FROM quote_files LEFT JOIN files ON quote_files.file_id = files.file_id WHERE quote_id = $quote_id" + ); + ?> +
      @@ -112,14 +128,14 @@ if (isset($_GET['quote_id'])) {
    1. - Quotes + Quotes
    2. - Quotes + Global Quotes
    3. - + Quotes
      5. @@ -136,12 +152,7 @@ if (isset($_GET['quote_id'])) { Send
      - - - Send Email - -
      - + Mark Sent @@ -171,11 +182,19 @@ if (isset($_GET['quote_id'])) {
      - + Edit = 2) { ?> - + Copy @@ -191,7 +210,7 @@ if (isset($_GET['quote_id'])) { Send Email - "> + "> Guest URL = 3) { ?> @@ -269,7 +288,7 @@ if (isset($_GET['quote_id'])) {
      - +
      @@ -291,7 +310,6 @@ if (isset($_GET['quote_id'])) { $item_id = intval($row['item_id']); $item_name = nullable_htmlentities($row['item_name']); $item_description = nullable_htmlentities($row['item_description']); - $item_order = intval($row['item_order']); $item_quantity = floatval($row['item_quantity']); $item_price = floatval($row['item_price']); $item_tax = floatval($row['item_tax']); @@ -300,29 +318,9 @@ if (isset($_GET['quote_id'])) { $tax_id = intval($row['item_tax_id']); $total_tax = $item_tax + $total_tax; $sub_total = $item_price * $item_quantity + $sub_total; + ?> - // Logic to check if top or bottom arrow should be hidden by looking at max and min of item_order - $sql = mysqli_query($mysqli, "SELECT MAX(item_order) AS item_order FROM invoice_items WHERE item_quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); - $max_item_order = intval($row['item_order']); - - $sql = mysqli_query($mysqli, "SELECT MIN(item_order) AS item_order FROM invoice_items WHERE item_quote_id = $quote_id"); - $row = mysqli_fetch_array($sql); - $min_item_order = intval($row['item_order']); - - if ($item_order == $max_item_order) { - $down_hidden = "hidden"; - } else { - $down_hidden = ""; - } - - if ($item_order == $min_item_order) { - $up_hidden = "hidden"; - } else { - $up_hidden = ""; - } ?> - - + - + @@ -362,9 +353,6 @@ if (isset($_GET['quote_id'])) { @@ -479,6 +467,54 @@ if (isset($_GET['quote_id'])) { + 0) { ?> +
      +
      +
      +
      + Attachments +
      + + +
      +
      +
      +
      = 2) { ?>
      @@ -330,18 +328,11 @@ if (isset($_GET['quote_id'])) {
      -
      - - - - -
      '; - } ?> - - -
      - + Edit
      @@ -352,7 +343,7 @@ if (isset($_GET['quote_id'])) {
      + + + + + + + + + + + + + + + +
      File NameUpload date
      +
      +
      +
      +
      + +
      @@ -528,16 +564,11 @@ if (isset($_GET['quote_id'])) {
      @@ -548,7 +579,7 @@ require_once "footer.php"; + + + diff --git a/quote_copy_modal.php b/quote_copy_modal.php deleted file mode 100644 index 59ba19ae..00000000 --- a/quote_copy_modal.php +++ /dev/null @@ -1,64 +0,0 @@ - \ No newline at end of file diff --git a/quote_edit_modal.php b/quote_edit_modal.php deleted file mode 100644 index 4c718240..00000000 --- a/quote_edit_modal.php +++ /dev/null @@ -1,79 +0,0 @@ - - diff --git a/quotes.php b/quotes.php index c8388e40..b37e40c3 100644 --- a/quotes.php +++ b/quotes.php @@ -4,14 +4,20 @@ $sort = "quote_number"; $order = "DESC"; -require_once "inc_all.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND quote_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_sales'); -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM quotes @@ -19,233 +25,261 @@ $sql = mysqli_query( LEFT JOIN categories ON quote_category_id = category_id WHERE (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%' OR quote_amount LIKE '%$q%' OR client_name LIKE '%$q%') AND DATE(quote_date) BETWEEN '$dtf' AND '$dtt' - ORDER BY $sort $order LIMIT $record_from, $record_to"); + $access_permission_query + $client_query + ORDER BY $sort $order LIMIT $record_from, $record_to" +); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> -
      -
      -

      Quotes

      -
      - = 2) { ?> +
      +
      +

      Quotes

      +
      + = 2) { ?> +
      - + 0) { ?> + +
      + + Export + +
      +
      +
      +
      -
      -
      +
      + + + + +
      +
      +
      + +
      + + +
      +
      +
      +
      +
      + +
      +
      +
      +
      " id="advancedFilter">
      -
      -
      - -
      - - -
      +
      +
      + +
      -
      -
      - +
      +
      + + +
      +
      +
      +
      + +
      -
      " id="advancedFilter"> -
      -
      -
      - - -
      -
      -
      -
      - - -
      -
      -
      -
      - - -
      -
      -
      -
      - -
      -
      - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
      +
      +
      - - Number - - - - Scope - - - - Client - - - - Amount - - - - Date - - - - Expire - - - - Category - - - - Status - - Action
      - - - - -
      - -
      - - Edit - - = 2) { ?> - - Copy - - -
      - - Email - - - = 3) { ?> -
      - - Delete - - - -
      -
      -
      + "> + + + + + + + + + + + + + + + + - -
      + + Number + + + + Scope + + + + Client + + + + Amount + + + + Date + + + + Expire + + + + Category + + + + Status + + Action
      -
      - + + + + + + + + + + + + + + + + + + + + + + +
      + +
      + + Edit + + = 2) { ?> + + Copy + + +
      + + Email + + + = 3) { ?> +
      + + Delete + + + +
      +
      + + + + + + +
      +
      +
      " tabindex="-1"> -
      -
      -
      -
      Editing recurring expense
      - -
      -
      -
      - - -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      -
      - -
      - -
      -
      -
      - -
      -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      - -
      -
      -
      - -
      - -
      - - -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      - -
      -
      - -
      - -
      - -
      -
      -
      - - - - - -
      - -
      -
      - -
      - -
      -
      - - - -
      - -
      -
      - - -
      -
      -
      -
      -
      diff --git a/recurring_expenses.php b/recurring_expenses.php index ca2a3d4b..33ebad6f 100644 --- a/recurring_expenses.php +++ b/recurring_expenses.php @@ -4,7 +4,7 @@ $sort = "recurring_expense_next_date"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -182,7 +182,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - + + + + + @@ -197,7 +206,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + Edit
      @@ -211,9 +225,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -221,13 +232,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      -
      ">
    5. - Recurring Invoices + Recurring Invoices
    6. Recurring Invoices
    7. - +
      9. @@ -121,6 +129,18 @@ if (isset($_GET['recurring_id'])) { Email Notify + + + + Disable AutoPay () + + + + Create AutoPay + + + +
      @@ -129,7 +149,11 @@ if (isset($_GET['recurring_id'])) {
      - + Edit
      @@ -211,7 +235,7 @@ if (isset($_GET['recurring_id'])) {
      - +
      @@ -241,47 +265,22 @@ if (isset($_GET['recurring_id'])) { $tax_id = intval($row['item_tax_id']); $total_tax = $item_tax + $total_tax; $sub_total = $item_price * $item_quantity + $sub_total; - $item_order = intval($row['item_order']); - - // Logic to check if top or bottom arrow should be hidden by looking at max and min of item_order - $sql = mysqli_query($mysqli, "SELECT MAX(item_order) AS item_order FROM invoice_items WHERE item_recurring_id = $recurring_id"); - $row = mysqli_fetch_array($sql); - $max_item_order = intval($row['item_order']); - - $sql = mysqli_query($mysqli, "SELECT MIN(item_order) AS item_order FROM invoice_items WHERE item_recurring_id = $recurring_id"); - $row = mysqli_fetch_array($sql); - $min_item_order = intval($row['item_order']); - - if ($item_order == $max_item_order) { - $down_hidden = "hidden"; - } else { - $down_hidden = ""; - } - - if ($item_order == $min_item_order) { - $up_hidden = "hidden"; - } else { - $up_hidden = ""; - } ?> - + - + @@ -299,9 +298,6 @@ if (isset($_GET['recurring_id'])) { @@ -455,14 +451,11 @@ if (isset($_GET['recurring_id'])) { @@ -486,3 +479,40 @@ require_once "footer.php"; }); }); + + + + diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php deleted file mode 100644 index 4d4504f9..00000000 --- a/recurring_invoice_edit_modal.php +++ /dev/null @@ -1,111 +0,0 @@ - diff --git a/recurring_invoices.php b/recurring_invoices.php index 11af4e44..a94f1f24 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -4,7 +4,16 @@ $sort = "recurring_next_date"; $order = "ASC"; -require_once "inc_all.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND recurring_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_sales'); @@ -17,8 +26,10 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM recurring LEFT JOIN clients ON recurring_client_id = client_id LEFT JOIN categories ON recurring_category_id = category_id + LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_id WHERE (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') AND DATE(recurring_created_at) BETWEEN '$dtf' AND '$dtt' + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -35,6 +46,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      + + +
      @@ -103,11 +117,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Scope +
      + - + - + + + +
      -
      - - - - -
      '; }?> - - -
      - Edit + + Edit +
      Delete @@ -289,7 +288,7 @@ if (isset($_GET['recurring_id'])) {
      		Client Amount @@ -123,12 +139,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Last Sent Category + + Auto Pay + + Status @@ -168,20 +188,42 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $status = "Inactive"; $status_badge_color = "secondary"; } + $recurring_payment_id = intval($row['recurring_payment_id']); + $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); + if ($recurring_payment_recurring_invoice_id) { + $auto_pay_display = " + Yes + + + + "; + } else { + $auto_pay_display = " + + Create + + "; + require "modals/recurring_payment_add_modal.php"; + } ?>
      - + + + ly @@ -194,7 +236,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + Edit @@ -209,22 +255,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      -
      -
      -
      -
      -
      - -
      - - - - -
      - - - -
      > - -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      - - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      > -
      - - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      - - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      - -
      -
      - - -
      - -
      -
      -
      diff --git a/recurring_tickets.php b/recurring_tickets.php index 73a19725..08c17716 100644 --- a/recurring_tickets.php +++ b/recurring_tickets.php @@ -4,7 +4,16 @@ $sort = "scheduled_ticket_subject"; $order = "ASC"; -require_once "inc_all.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND scheduled_ticket_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); @@ -25,7 +34,20 @@ $sql = mysqli_query( LEFT JOIN clients on scheduled_ticket_client_id = client_id WHERE scheduled_tickets.scheduled_ticket_subject LIKE '%$q%' $rec_ticket_permission_snippet - ORDER BY $sort $order LIMIT $record_from, $record_to" + $client_query + ORDER BY + CASE + WHEN '$sort' = 'scheduled_ticket_priority' THEN + CASE scheduled_ticket_priority + WHEN 'High' THEN 1 + WHEN 'Medium' THEN 2 + WHEN 'Low' THEN 3 + ELSE 4 -- Optional: for unexpected priority values + END + ELSE NULL + END $order, + $sort $order -- Apply normal sorting by $sort and $order + LIMIT $record_from, $record_to" ); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -47,6 +69,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      + + +
      @@ -92,11 +117,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      + Client + Subject @@ -144,11 +171,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - + + + - )"> + + @@ -165,7 +200,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - )"> + Edit
      @@ -195,18 +235,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      -
      - - -
      -
      -

      All Assets

      -
      -
      -
      -
      - - - -
      -
      -
      -
      - - All Assets - - 0) { ?> - Workstations - 0) { ?> - Servers - 0) { ?> - Virtual - 0) { ?> - Network - 0) { ?> - Other - -
      -
      -
      - -
      -
      - s"> -
      - -
      -
      -
      -
      -
      - -
      -
      -
      -
      - -
      -
      - -
      -
      - "> - Archived - - -
      -
      - - -
      - -
      -
      - - -
      - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $contact_name"; - } else { - $contact_name_display = $contact_name; - } - - $location_name = nullable_htmlentities($row['location_name']); - if (empty($location_name)) { - $location_name = "-"; - } - $location_archived_at = nullable_htmlentities($row['location_archived_at']); - if ($location_archived_at) { - $location_name_display = "
      $location_name
      "; - } else { - $location_name_display = $location_name; - } - - $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_asset_id = $asset_id"); - $login_count = mysqli_num_rows($sql_logins); - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      - -
      -       		- - Name - - - - Type - - - - Model - - - - Serial - - - - OS - - - - IP - - - - Purchase Date - - - - Install Date - - - - Warranty Expire - - - - Assigned To - - - - Location - - - - Physical Location - - - - Status - - - - Client - - Action
      -
      - -
      -       		- -
      - -
      -
      -
      -
      -
      -       -       		- -
      - -
      -       		-
      - 0) { ?> - - - - - - -
      - -
      - - - - - - -
      - - - - -
      -
      - -
      - -
      - - Edit - - 2) { ?> - - - Unarchive - - - - Transfer - - - Archive - - - - - Delete - - - - -
      -
      -
      -
      -
      - -
      - -
      -
      - - - -
      - \ No newline at end of file diff --git a/report_clients_with_balance.php b/report_clients_with_balance.php index 61f29d22..f9fc7bad 100644 --- a/report_clients_with_balance.php +++ b/report_clients_with_balance.php @@ -1,8 +1,8 @@ @@ -80,5 +80,5 @@ validateAccountantRole();
      -

      Login entry passwords not changed/rotated in the last 90 days

      +

      Client credentials not changed/rotated in the last 90 days

      @@ -35,9 +35,9 @@ $passwords_not_rotated_sql = mysqli_query($mysqli, Client - Login Name - Login Description - Login Password Last Changed + Credential Name + Credential Description + Credential Password Last Changed @@ -71,5 +71,5 @@ $passwords_not_rotated_sql = mysqli_query($mysqli,
      - -
      -
      -

      Domain Management

      -
      -
      - -
      -
      -
      - -
      -
      -
      -
      -
      - -
      - -
      -
      -
      - -
      -
      - -
      -
      - -
      -
      -
      -
      - -
      - - - - "> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      - -
      -       		- - Domain - - - - Registrar - - - - Web Host - - - - DNS Host - - - - Mail Host - - - - Expires - - - - Client - - Action
      -
      - - -
      -       		- -
      - -
      -
      -
      -
      -
      -       -       		-
      -
      -       		-
      - -
      - 1) { ?> - - Archive - - - -
      - - Delete - - -
      -
      -
      - -
      -
      - -
      -
      - - - -
      - diff --git a/report_expense_summary.php b/report_expense_summary.php index 03332254..09555e9f 100644 --- a/report_expense_summary.php +++ b/report_expense_summary.php @@ -1,8 +1,8 @@
      - - + diff --git a/client_software.php b/software.php similarity index 82% rename from client_software.php rename to software.php index 118f1ba7..70ea7b5e 100644 --- a/client_software.php +++ b/software.php @@ -4,21 +4,29 @@ $sort = "software_name"; $order = "ASC"; -require_once "inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND software_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM software - WHERE software_client_id = $client_id - AND software_template = 0 + LEFT JOIN clients ON client_id = software_client_id + WHERE software_template = 0 AND software_$archive_query - AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') + AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%' OR client_name LIKE '%$q%') + $access_permission_query + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -50,7 +58,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      + +
      @@ -65,7 +75,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - "> Archived @@ -104,6 +114,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Expire + + + + Client + + + Action @@ -111,6 +128,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
      @@ -188,13 +212,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
      - + Edit
      @@ -214,8 +245,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -223,17 +252,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      -
      " tabindex="-1"> -
      -
      -
      -
      Editing task
      - -
      - - - - - -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      - - -
      - - - -
      -
      -
      diff --git a/temp_bulk_close_bugfix.php b/temp_bulk_close_bugfix.php index 6561ad10..f277099f 100644 --- a/temp_bulk_close_bugfix.php +++ b/temp_bulk_close_bugfix.php @@ -1,4 +1,4 @@ - +
        @@ -25,4 +25,4 @@ foreach ($sql_tickets as $row) { ?> -set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); $purifier = new HTMLPurifier($purifier_config); -// Ticket client access snippet -$ticket_permission_snippet = ''; -if (!empty($client_access_string)) { - $ticket_permission_snippet = "AND ticket_client_id IN ($client_access_string)"; -} - if (isset($_GET['ticket_id'])) { $ticket_id = intval($_GET['ticket_id']); @@ -41,14 +38,14 @@ if (isset($_GET['ticket_id'])) { LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id LEFT JOIN categories ON ticket_category = category_id WHERE ticket_id = $ticket_id - $ticket_permission_snippet + $access_permission_query LIMIT 1" ); if (mysqli_num_rows($sql) == 0) { echo "

        Nothing to see here

        Go Back
        "; - include_once "footer.php"; + include_once "includes/footer.php"; } else { $row = mysqli_fetch_array($sql); @@ -116,6 +113,10 @@ if (isset($_GET['ticket_id'])) { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } + // Tab Title // No Sanitizing needed + $page_title = $row['ticket_subject']; + $tab_title = "{$row['ticket_prefix']}{$row['ticket_number']}"; + $contact_id = intval($row['contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); $contact_title = nullable_htmlentities($row['contact_title']); @@ -274,14 +275,6 @@ if (isset($_GET['ticket_id'])) { ORDER BY ticket_history_id DESC" ); - - // Get past tickets for selected asset - if ($asset_id) { - $sql_asset_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_asset_id = $asset_id ORDER BY ticket_number DESC"); - $ticket_asset_count = mysqli_num_rows($sql_asset_tickets); - } - - // Get Technicians to assign the ticket to $sql_assign_to_select = mysqli_query( $mysqli, @@ -340,6 +333,7 @@ if (isset($_GET['ticket_id'])) { $ticket_collaborators = nullable_htmlentities($row['user_names']); ?> +
          @@ -348,14 +342,14 @@ if (isset($_GET['ticket_id'])) {
        1. - Tickets + Tickets
        2. Tickets
        3. - +
          5. @@ -415,8 +409,13 @@ if (isset($_GET['ticket_id'])) { -
          - +
          + Edit @@ -424,7 +423,11 @@ if (isset($_GET['ticket_id'])) {
          - + Add Contact @@ -494,7 +497,10 @@ if (isset($_GET['ticket_id'])) {
          - +
          @@ -504,7 +510,16 @@ if (isset($_GET['ticket_id'])) {
          = 1) { ?>
          Ticket is - + Billable"; @@ -769,7 +788,12 @@ if (isset($_GET['ticket_id'])) {
          - + Edit
          @@ -804,13 +828,10 @@ if (isset($_GET['ticket_id'])) { ?>
          - - @@ -824,7 +845,10 @@ if (isset($_GET['ticket_id'])) {
          Contact
          @@ -854,37 +878,20 @@ if (isset($_GET['ticket_id'])) {
          - $ticket_id ORDER BY ticket_id DESC LIMIT 1"; - $prev_ticket_row = mysqli_fetch_assoc(mysqli_query($mysqli, $sql_prev_ticket)); - - if ($prev_ticket_row) { - $prev_ticket_id = intval($prev_ticket_row['ticket_id']); - $prev_ticket_subject = nullable_htmlentities($prev_ticket_row['ticket_subject']); - $prev_ticket_status = nullable_htmlentities( getTicketStatusName($prev_ticket_row['ticket_status'])); - ?> - -
          -
          - Previous ticket: - -
          -
          - Status: - -
          - -
          Contact
          @@ -893,9 +900,10 @@ if (isset($_GET['ticket_id'])) { -
          + 0)) { ?> +
          - = 2) { ?> + = 2) { ?>
          @@ -916,12 +924,11 @@ if (isset($_GET['ticket_id'])) { while($row = mysqli_fetch_array($sql_tasks)){ $task_id = intval($row['task_id']); $task_name = nullable_htmlentities($row['task_name']); - $task_order = intval($row['task_order']); //$task_description = nullable_htmlentities($row['task_description']); // not in db yet $task_completion_estimate = intval($row['task_completion_estimate']); $task_completed_at = nullable_htmlentities($row['task_completed_at']); ?> - + @@ -931,16 +938,25 @@ if (isset($_GET['ticket_id'])) { - m - + + + m + - + +
          - = 2) { ?> + = 2) { ?>
          - + Edit @@ -958,13 +974,12 @@ if (isset($_GET['ticket_id'])) {
          - - +
          + @@ -999,88 +1014,14 @@ if (isset($_GET['ticket_id'])) {
          Asset
          - + + +
          - - -
          - -
          - -
          - -
          - -
          - Model: -
          - -
          - Service Tag: -
          - -
          - Warranty expires: -
          - -
          - Access -
          - 0) { ?> - - - - - -
          @@ -1154,40 +1095,26 @@ if (isset($_GET['ticket_id'])) { = 2 && empty($ticket_closed_at)) { - require_once "ticket_edit_modal.php"; - - require_once "ticket_assign_modal.php"; - - require_once "ticket_edit_contact_modal.php"; - - require_once "ticket_edit_asset_modal.php"; - - require_once "ticket_edit_vendor_modal.php"; - - require_once "ticket_add_watcher_modal.php"; - - require_once "ticket_edit_priority_modal.php"; - - require_once "ticket_change_client_modal.php"; - - require_once "ticket_edit_schedule_modal.php"; - - require_once "ticket_merge_modal.php"; + require_once "modals/ticket_edit_asset_modal.php"; + require_once "modals/ticket_edit_vendor_modal.php"; + require_once "modals/ticket_add_watcher_modal.php"; + require_once "modals/ticket_change_client_modal.php"; + require_once "modals/ticket_edit_schedule_modal.php"; + require_once "modals/ticket_merge_modal.php"; } if (lookupUserPermission("module_support") >= 2 && lookupUserPermission("module_sales") >= 2 && $config_module_enable_accounting) { - require_once "ticket_edit_billable_modal.php"; - require_once "ticket_invoice_add_modal.php"; + require_once "modals/ticket_invoice_add_modal.php"; } } } -require_once "footer.php"; +require_once "includes/footer.php"; ?> -