diff --git a/user/ajax/ajax_service_details.php b/user/ajax/ajax_service_details.php index 5099a9a3..e8884b00 100644 --- a/user/ajax/ajax_service_details.php +++ b/user/ajax/ajax_service_details.php @@ -234,7 +234,7 @@ ob_start(); while ($row = mysqli_fetch_array($sql_contacts)) { $contact_id = intval($row['contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); - echo "
  • $contact_name
    • "; + echo "
  • $contact_name
    • "; } echo ""; } @@ -298,7 +298,7 @@ ob_start(); while ($row = mysqli_fetch_array($sql_docs)) { $document_id = intval($row['document_id']); $document_name = nullable_htmlentities($row['document_name']); - echo "
  • $document_name
    • "; + echo "
  • $document_name
    • "; } echo ""; } diff --git a/user/asset_details.php b/user/asset_details.php index 1d023151..0466119d 100644 --- a/user/asset_details.php +++ b/user/asset_details.php @@ -798,7 +798,7 @@ if (isset($_GET['asset_id'])) {

    Documents

    -
    @@ -832,19 +832,16 @@ if (isset($_GET['asset_id'])) { -
    +
    - + data-modal-url="modals/document/document_view.php?id="> @@ -882,7 +879,7 @@ if (isset($_GET['asset_id'])) { } ?>
    - @@ -1237,10 +1234,10 @@ require_once "modals/asset/asset_interface_add.php"; require_once "modals/asset/asset_interface_multiple_add.php"; require_once "modals/asset/asset_interface_import.php"; require_once "modals/asset/asset_interface_export.php"; -require_once "modals/ticket_add_modal.php"; +require_once "modals/ticket/ticket_add.php"; require_once "modals/recurring_ticket_add_modal.php"; require_once "modals/credential_add_modal.php"; -require_once "modals/client_document_add_modal.php"; -require_once "modals/client_file_upload_modal.php"; +require_once "modals/document/document_add.php"; +require_once "modals/file/file_upload.php"; require_once "../includes/footer.php"; diff --git a/user/assets.php b/user/assets.php index aa8fadee..c5da6b73 100644 --- a/user/assets.php +++ b/user/assets.php @@ -548,7 +548,7 @@ if (mysqli_num_rows($os_sql) > 0) { } $contact_name = nullable_htmlentities($row['contact_name']); if ($contact_name) { - $contact_name_display = "$contact_name $contact_archive_display"; + $contact_name_display = "$contact_name $contact_archive_display"; } else { $contact_name_display = "-"; } diff --git a/user/client_overview.php b/user/client_overview.php index e883b887..cd5ff799 100644 --- a/user/client_overview.php +++ b/user/client_overview.php @@ -237,10 +237,9 @@ $sql_asset_retired = mysqli_query( ?> - + data-modal-url="modals/contact/contact_details.php?id=">
    diff --git a/user/contact_details.php b/user/contact_details.php index 967f0e3a..81652418 100644 --- a/user/contact_details.php +++ b/user/contact_details.php @@ -966,19 +966,16 @@ if (isset($_GET['contact_id'])) { -
    +
    - + data-modal-url="modals/document/document_view.php?id="> @@ -1205,11 +1202,11 @@ if (isset($_GET['contact_id'])) { contact_id="> Details - + Make Note - + Edit @@ -545,12 +545,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - - - - - - + + + + + + @@ -598,10 +598,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + data-modal-url='modals/contact/contact_details.php?id=$credential_contact_id'> "; } else { $credential_contact_display = ''; } if ($credential_asset_id) { - $credential_asset_display = "
  • - Documents + Documents
  • - +
    • @@ -163,12 +163,9 @@ $page_title = $row['document_name'];
    -
    - + Rename 0) { display_folders(0, $client_id); ?> - +
    @@ -370,18 +367,20 @@ while ($folder_id > 0) { LIMIT 1" ); $row = mysqli_fetch_array($sql_shared); - $item_id = intval($row['item_id']); - $item_active = nullable_htmlentities($row['item_active']); - $item_key = nullable_htmlentities($row['item_key']); - $item_type = nullable_htmlentities($row['item_type']); - $item_related_id = intval($row['item_related_id']); - $item_note = nullable_htmlentities($row['item_note']); - $item_recipient = nullable_htmlentities($row['item_recipient']); - $item_views = nullable_htmlentities($row['item_views']); - $item_view_limit = nullable_htmlentities($row['item_view_limit']); - $item_created_at = nullable_htmlentities($row['item_created_at']); - $item_expire_at = nullable_htmlentities($row['item_expire_at']); - $item_expire_at_human = timeAgo($row['item_expire_at']); + if($row) { + $item_id = intval($row['item_id']); + $item_active = nullable_htmlentities($row['item_active']); + $item_key = nullable_htmlentities($row['item_key']); + $item_type = nullable_htmlentities($row['item_type']); + $item_related_id = intval($row['item_related_id']); + $item_note = nullable_htmlentities($row['item_note']); + $item_recipient = nullable_htmlentities($row['item_recipient']); + $item_views = nullable_htmlentities($row['item_views']); + $item_view_limit = nullable_htmlentities($row['item_view_limit']); + $item_created_at = nullable_htmlentities($row['item_created_at']); + $item_expire_at = nullable_htmlentities($row['item_expire_at']); + $item_expire_at_human = timeAgo($row['item_expire_at']); + } ?> @@ -392,7 +391,7 @@ while ($folder_id > 0) {
    - +
    @@ -417,21 +416,15 @@ while ($folder_id > 0) {
    - + data-modal-url="modals/document/document_view.php?id="> Quick View
    - + data-modal-url="modals/document/document_edit.php?id="> Edit
    @@ -439,19 +432,13 @@ while ($folder_id > 0) { Share
    - + Rename
    - + Move @@ -479,7 +466,7 @@ while ($folder_id > 0) {
    - + @@ -492,6 +479,6 @@ while ($folder_id > 0) { 0) {
    - + Rename 0) { display_folders(0, $client_id); ?> - +
    @@ -351,18 +348,12 @@ while ($folder_id > 0) { )"> Share - + Rename - + Move @@ -385,7 +376,7 @@ while ($folder_id > 0) {
    @@ -556,18 +547,12 @@ while ($folder_id > 0) { )"> Share - + Rename - + Move @@ -588,7 +573,7 @@ while ($folder_id > 0) { @@ -596,7 +581,7 @@ while ($folder_id > 0) {
    - + @@ -635,7 +620,7 @@ function prevFile() { - + - + @@ -460,7 +460,7 @@ if (isset($_GET['query'])) { - + diff --git a/user/includes/client_side_nav.php b/user/includes/client_side_nav.php index 1e64499a..86a67ef5 100644 --- a/user/includes/client_side_nav.php +++ b/user/includes/client_side_nav.php @@ -182,7 +182,7 @@
  • - "> + ">

    Racks @@ -236,7 +236,7 @@

  • - "> + ">

    Documents @@ -252,7 +252,7 @@

  • - "> + ">

    Files diff --git a/user/modals/asset/asset_details.php b/user/modals/asset/asset_details.php index b52a7357..7af31114 100644 --- a/user/modals/asset/asset_details.php +++ b/user/modals/asset/asset_details.php @@ -759,12 +759,9 @@ ob_start(); - + data-modal-url="modals/document/document_view.php?id=">

    diff --git a/user/modals/contact_add_modal.php b/user/modals/contact/contact_add.php similarity index 100% rename from user/modals/contact_add_modal.php rename to user/modals/contact/contact_add.php diff --git a/user/modals/contact_archive_modal.php b/user/modals/contact/contact_archive.php similarity index 100% rename from user/modals/contact_archive_modal.php rename to user/modals/contact/contact_archive.php diff --git a/user/modals/contact_bulk_assign_location_modal.php b/user/modals/contact/contact_bulk_assign_location.php similarity index 100% rename from user/modals/contact_bulk_assign_location_modal.php rename to user/modals/contact/contact_bulk_assign_location.php diff --git a/user/modals/contact_bulk_assign_tags_modal.php b/user/modals/contact/contact_bulk_assign_tags.php similarity index 100% rename from user/modals/contact_bulk_assign_tags_modal.php rename to user/modals/contact/contact_bulk_assign_tags.php diff --git a/user/modals/contact_bulk_edit_department_modal.php b/user/modals/contact/contact_bulk_edit_department.php similarity index 100% rename from user/modals/contact_bulk_edit_department_modal.php rename to user/modals/contact/contact_bulk_edit_department.php diff --git a/user/modals/contact_bulk_edit_phone_modal.php b/user/modals/contact/contact_bulk_edit_phone.php similarity index 100% rename from user/modals/contact_bulk_edit_phone_modal.php rename to user/modals/contact/contact_bulk_edit_phone.php diff --git a/user/modals/contact_bulk_edit_role_modal.php b/user/modals/contact/contact_bulk_edit_role.php similarity index 100% rename from user/modals/contact_bulk_edit_role_modal.php rename to user/modals/contact/contact_bulk_edit_role.php diff --git a/user/modals/contact_bulk_email_modal.php b/user/modals/contact/contact_bulk_email.php similarity index 100% rename from user/modals/contact_bulk_email_modal.php rename to user/modals/contact/contact_bulk_email.php diff --git a/user/modals/contact_create_note_modal.php b/user/modals/contact/contact_create_note.php similarity index 100% rename from user/modals/contact_create_note_modal.php rename to user/modals/contact/contact_create_note.php diff --git a/user/ajax/ajax_contact_details.php b/user/modals/contact/contact_details.php similarity index 99% rename from user/ajax/ajax_contact_details.php rename to user/modals/contact/contact_details.php index ed749f44..c13dd7be 100644 --- a/user/ajax/ajax_contact_details.php +++ b/user/modals/contact/contact_details.php @@ -1,6 +1,6 @@ - + data-modal-url="modals/document/document_view.php?id=">
    @@ -855,4 +853,4 @@ ob_start();
    • diff --git a/user/modals/contact_export_modal.php b/user/modals/contact/contact_export.php similarity index 100% rename from user/modals/contact_export_modal.php rename to user/modals/contact/contact_export.php diff --git a/user/modals/contact_import_modal.php b/user/modals/contact/contact_import.php similarity index 100% rename from user/modals/contact_import_modal.php rename to user/modals/contact/contact_import.php diff --git a/user/modals/contact_invite_modal.php b/user/modals/contact/contact_invite.php similarity index 100% rename from user/modals/contact_invite_modal.php rename to user/modals/contact/contact_invite.php diff --git a/user/ajax/ajax_contact_link_asset.php b/user/modals/contact/contact_link_asset.php similarity index 95% rename from user/ajax/ajax_contact_link_asset.php rename to user/modals/contact/contact_link_asset.php index cbf4c641..ca0b8807 100644 --- a/user/ajax/ajax_contact_link_asset.php +++ b/user/modals/contact/contact_link_asset.php @@ -1,6 +1,6 @@ diff --git a/user/ajax/ajax_contact_link_credential.php b/user/modals/contact/contact_link_credential.php similarity index 95% rename from user/ajax/ajax_contact_link_credential.php rename to user/modals/contact/contact_link_credential.php index 7a3e6608..20905205 100644 --- a/user/ajax/ajax_contact_link_credential.php +++ b/user/modals/contact/contact_link_credential.php @@ -1,6 +1,6 @@ diff --git a/user/ajax/ajax_contact_link_document.php b/user/modals/contact/contact_link_document.php similarity index 96% rename from user/ajax/ajax_contact_link_document.php rename to user/modals/contact/contact_link_document.php index 684ef54f..e5df893a 100644 --- a/user/ajax/ajax_contact_link_document.php +++ b/user/modals/contact/contact_link_document.php @@ -1,6 +1,6 @@ diff --git a/user/ajax/ajax_contact_link_file.php b/user/modals/contact/contact_link_file.php similarity index 96% rename from user/ajax/ajax_contact_link_file.php rename to user/modals/contact/contact_link_file.php index fd6108d3..3cdd4400 100644 --- a/user/ajax/ajax_contact_link_file.php +++ b/user/modals/contact/contact_link_file.php @@ -1,6 +1,6 @@ diff --git a/user/ajax/ajax_contact_note_create.php b/user/modals/contact/contact_note_create.php similarity index 94% rename from user/ajax/ajax_contact_note_create.php rename to user/modals/contact/contact_note_create.php index a2c931e0..72a5d4b8 100644 --- a/user/ajax/ajax_contact_note_create.php +++ b/user/modals/contact/contact_note_create.php @@ -1,6 +1,6 @@ set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one @@ -36,4 +36,4 @@ ob_start(); set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one @@ -36,5 +36,4 @@ ob_start(); $document_name created from template"); - redirect("client_document_details.php?client_id=$client_id&document_id=$document_id"); + redirect("document_details.php?client_id=$client_id&document_id=$document_id"); } @@ -116,7 +116,7 @@ if (isset($_POST['edit_document'])) { flash_alert("Document $name edited, previous version kept"); - redirect("client_document_details.php?client_id=$client_id&document_id=$document_id"); + redirect("document_details.php?client_id=$client_id&document_id=$document_id"); } if (isset($_POST['move_document'])) { diff --git a/user/project_details.php b/user/project_details.php index 2326d1ea..04305f04 100644 --- a/user/project_details.php +++ b/user/project_details.php @@ -215,11 +215,8 @@ if (isset($_GET['project_id'])) {
    - + Edit @@ -489,12 +486,12 @@ if (isset($_GET['project_id'])) {
    - - - - - - + + + + + +
    @@ -544,7 +541,7 @@ if (isset($_GET['project_id'])) { require_once "modals/project_link_ticket_modal.php"; require_once "modals/project_link_closed_ticket_modal.php"; -require_once "modals/ticket_add_modal.php"; +require_once "modals/ticket/ticket_add.php"; } diff --git a/user/client_racks.php b/user/racks.php similarity index 97% rename from user/client_racks.php rename to user/racks.php index 4fe57b0f..aa18c7ea 100644 --- a/user/client_racks.php +++ b/user/racks.php @@ -98,19 +98,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Add Device
    - + Edit @@ -349,5 +343,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Edit @@ -438,12 +435,8 @@ if (isset($_GET['ticket_id'])) {
    - + Add Contact @@ -488,10 +481,8 @@ if (isset($_GET['ticket_id'])) {
    - +
    @@ -508,9 +499,8 @@ if (isset($_GET['ticket_id'])) { = 2 && empty($ticket_closed_at)) { ?> - data-toggle = "ajax-modal" - data-ajax-url = "ajax/ajax_ticket_priority.php" - data-ajax-id = "" + class="ajax-modal" + data-modal-url="modals/ticket/ticket_priority.php?id=" > @@ -541,11 +531,8 @@ if (isset($_GET['ticket_id'])) {
    Ticket is - + Billable"; @@ -772,22 +759,16 @@ if (isset($_GET['ticket_id'])) {
    - + data-modal-url="modals/ticket/ticket_reply_redact.php?id="> Redact
    - + data-modal-url="modals/ticket/ticket_reply_edit.php?id="> Edit
    @@ -942,7 +923,8 @@ if (isset($_GET['ticket_id'])) {
    Primary Contact
    = 2) { ?> - + @@ -951,10 +933,10 @@ if (isset($_GET['ticket_id'])) {
    @@ -1279,16 +1261,16 @@ if (isset($_GET['ticket_id'])) { = 2 && empty($ticket_closed_at)) { - 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"; + require_once "modals/ticket/ticket_edit_asset.php"; + require_once "modals/ticket/ticket_edit_vendor.php"; + require_once "modals/ticket/ticket_add_watcher.php"; + require_once "modals/ticket/ticket_change_client.php"; + require_once "modals/ticket/ticket_edit_schedule.php"; + require_once "modals/ticket/ticket_merge.php"; } if (lookupUserPermission("module_support") >= 2 && lookupUserPermission("module_sales") >= 2 && $config_module_enable_accounting) { - require_once "modals/ticket_invoice_add_modal.php"; + require_once "modals/ticket/ticket_invoice_add.php"; } } } diff --git a/user/tickets_kanban.php b/user/ticket_kanban.php similarity index 98% rename from user/tickets_kanban.php rename to user/ticket_kanban.php index 2236f315..9290afd2 100644 --- a/user/tickets_kanban.php +++ b/user/ticket_kanban.php @@ -1,4 +1,4 @@ - + Invoiced - + Yes"; @@ -253,9 +251,8 @@ = 2 && empty($ticket_closed_at)) { ?> - data-toggle = "ajax-modal" - data-ajax-url = "ajax/ajax_ticket_priority.php" - data-ajax-id = "" + class="ajax-modal" + data-modal-url = "modals/ticket/ticket_priority.php?id=" > @@ -267,16 +264,15 @@ - $ticket_scheduled_for
    "; } ?> + $ticket_scheduled_for
    "; } ?> = 2 && empty($ticket_closed_at)) { ?> - data-toggle = "ajax-modal" - data-ajax-url = "ajax/ajax_ticket_assign.php" - data-ajax-id = "" + class="ajax-modal" + data-modal-url="modals/ticket/ticket_assign.php?id=" > @@ -308,13 +304,13 @@
    - - - - - - - + + + + + + +
    diff --git a/user/tickets.php b/user/tickets.php index 1223748b..f4e12581 100644 --- a/user/tickets.php +++ b/user/tickets.php @@ -419,18 +419,18 @@ $sql_categories_filter = mysqli_query( if (isset($_GET["view"])) { if ($_GET["view"] == "list") { - require_once "tickets_list.php"; + require_once "ticket_list.php"; } elseif ($_GET["view"] == "kanban") { - require_once "tickets_kanban.php"; + require_once "ticket_kanban.php"; } } else { // here we have to get default view setting if ($config_ticket_default_view === 0) { - require_once "tickets_list.php"; + require_once "ticket_list.php"; } elseif ($config_ticket_default_view === 2) { - require_once "tickets_kanban.php"; + require_once "ticket_kanban.php"; } else { - require_once "tickets_list.php"; + require_once "ticket_list.php"; } } @@ -439,6 +439,6 @@ if (isset($_GET["view"])) {