Merge pull request #779 from o-psi/clean-requires-and-includes

Update constructs to not have parenthesis.
This commit is contained in:
Johnny
2023-10-20 16:32:29 -04:00
committed by GitHub
209 changed files with 1591 additions and 800 deletions

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_category'])) {
require_once('post/category_model.php');
require_once 'post/category_model.php';
mysqli_query($mysqli,"INSERT INTO categories SET category_name = '$name', category_type = '$type', category_color = '$color'");
@@ -21,7 +22,8 @@ if (isset($_POST['add_category'])) {
if (isset($_POST['edit_category'])) {
require_once('post/category_model.php');
require_once 'post/category_model.php';
$category_id = intval($_POST['category_id']);

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_client'])) {
require_once('post/client_model.php');
require_once 'post/client_model.php';
validateAdminRole();
@@ -107,7 +108,8 @@ if (isset($_POST['add_client'])) {
if (isset($_POST['edit_client'])) {
require_once('post/client_model.php');
require_once 'post/client_model.php';
validateAdminRole();

View File

@@ -8,7 +8,8 @@ if (isset($_POST['add_contact'])) {
validateTechRole();
require_once('post/contact_model.php');
require_once 'post/contact_model.php';
// Set password
if (!empty($_POST['contact_password'])) {
@@ -65,7 +66,8 @@ if (isset($_POST['edit_contact'])) {
validateTechRole();
require_once('post/contact_model.php');
require_once 'post/contact_model.php';
$contact_id = intval($_POST['contact_id']);
$send_email = intval($_POST['send_email']);

View File

@@ -6,7 +6,8 @@
if(isset($_POST['create_custom_field'])){
require_once('post/custom_field_model.php');
require_once 'post/custom_field_model.php';
$table = sanitizeInput($_POST['table']);
@@ -23,7 +24,8 @@ if(isset($_POST['create_custom_field'])){
if(isset($_POST['edit_custom_field'])){
require_once('post/custom_field_model.php');
require_once 'post/custom_field_model.php';
$custom_field_id = intval($_POST['custom_field_id']);

View File

@@ -24,7 +24,8 @@ if (isset($_POST['add_calendar'])) {
if (isset($_POST['add_event'])) {
require_once('post/event_model.php');
require_once 'post/event_model.php';
mysqli_query($mysqli,"INSERT INTO events SET event_title = '$title', event_description = '$description', event_start = '$start', event_end = '$end', event_repeat = '$repeat', event_calendar_id = $calendar_id, event_client_id = $client");
@@ -86,7 +87,8 @@ if (isset($_POST['add_event'])) {
if (isset($_POST['edit_event'])) {
require_once('post/event_model.php');
require_once 'post/event_model.php';
$event_id = intval($_POST['event_id']);

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_expense'])) {
require_once('post/expense_model.php');
require_once 'post/expense_model.php';
mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$date', expense_amount = $amount, expense_currency_code = '$session_company_currency', expense_account_id = $account, expense_vendor_id = $vendor, expense_client_id = $client, expense_category_id = $category, expense_description = '$description', expense_reference = '$reference'");
@@ -43,7 +44,8 @@ if (isset($_POST['add_expense'])) {
if (isset($_POST['edit_expense'])) {
require_once('post/expense_model.php');
require_once 'post/expense_model.php';
$expense_id = intval($_POST['expense_id']);

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_invoice'])) {
require_once('post/invoice_model.php');
require_once 'post/invoice_model.php';
$client = intval($_POST['client']);
@@ -38,7 +39,8 @@ if (isset($_POST['add_invoice'])) {
if (isset($_POST['edit_invoice'])) {
require_once('post/invoice_model.php');
require_once 'post/invoice_model.php';
$invoice_id = intval($_POST['invoice_id']);
$due = sanitizeInput($_POST['due']);

View File

@@ -8,7 +8,8 @@ if(isset($_POST['add_location'])){
validateAdminRole();
require_once('post/client_locations_model.php');
require_once 'post/client_locations_model.php';
if(!file_exists("uploads/clients/$client_id")) {
mkdir("uploads/clients/$client_id");
@@ -58,7 +59,8 @@ if(isset($_POST['edit_location'])){
validateAdminRole();
require_once('post/client_locations_model.php');
require_once 'post/client_locations_model.php';
$location_id = intval($_POST['location_id']);

View File

@@ -8,7 +8,8 @@ if (isset($_POST['add_login'])) {
validateTechRole();
require_once('post/client_logins_model.php');
require_once 'post/client_logins_model.php';
mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id, login_client_id = $client_id");
@@ -27,7 +28,8 @@ if (isset($_POST['edit_login'])) {
validateTechRole();
require_once('post/client_logins_model.php');
require_once 'post/client_logins_model.php';
$login_id = intval($_POST['login_id']);

View File

@@ -7,7 +7,8 @@
// Products
if (isset($_POST['add_product'])) {
require_once('post/product_model.php');
require_once 'post/product_model.php';
mysqli_query($mysqli,"INSERT INTO products SET product_name = '$name', product_description = '$description', product_price = '$price', product_currency_code = '$session_company_currency', product_tax_id = $tax, product_category_id = $category");
@@ -22,7 +23,8 @@ if (isset($_POST['add_product'])) {
if (isset($_POST['edit_product'])) {
require_once('post/product_model.php');
require_once 'post/product_model.php';
$product_id = intval($_POST['product_id']);

View File

@@ -118,7 +118,8 @@ if (isset($_POST['edit_profile'])) {
if (isset($_POST['verify'])) {
require_once("rfc6238.php");
require_once "rfc6238.php";
$currentcode = intval($_POST['code']); //code to validate, for example received from device
if (TokenAuth6238::verify($session_token, $currentcode)) {

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_quote'])) {
require_once('post/quote_model.php');
require_once 'post/quote_model.php';
$client = intval($_POST['client']);
@@ -197,7 +198,8 @@ if (isset($_POST['quote_note'])) {
if (isset($_POST['edit_quote'])) {
require_once('post/quote_model.php');
require_once 'post/quote_model.php';
$quote_id = intval($_POST['quote_id']);

View File

@@ -1,6 +1,7 @@
<?php
// HTML Purifier
//require_once("plugins/htmlpurifier/HTMLPurifier.standalone.php");
//require_once "plugins/htmlpurifier/HTMLPurifier.standalone.php";
//$purifier_config = HTMLPurifier_Config::createDefault();
//$purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]);
//$purifier = new HTMLPurifier($purifier_config);

View File

@@ -8,7 +8,8 @@ if (isset($_POST['edit_company'])) {
validateAdminRole();
require_once('post/setting_company_model.php');
require_once 'post/setting_company_model.php';
$sql = mysqli_query($mysqli,"SELECT company_logo FROM companies WHERE company_id = 1");
$row = mysqli_fetch_array($sql);

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_tag'])) {
require_once('post/tag_model.php');
require_once 'post/tag_model.php';
mysqli_query($mysqli,"INSERT INTO tags SET tag_name = '$name', tag_type = $type, tag_color = '$color', tag_icon = '$icon'");
@@ -21,7 +22,8 @@ if (isset($_POST['add_tag'])) {
if (isset($_POST['edit_tag'])) {
require_once('post/tag_model.php');
require_once 'post/tag_model.php';
$tag_id = intval($_POST['tag_id']);

View File

@@ -920,7 +920,8 @@ if (isset($_POST['add_scheduled_ticket'])) {
validateTechRole();
require_once('post/scheduled_ticket_model.php');
require_once 'post/scheduled_ticket_model.php';
$start_date = sanitizeInput($_POST['start_date']);
// If no contact is selected automatically choose the primary contact for the client
@@ -948,7 +949,8 @@ if (isset($_POST['edit_scheduled_ticket'])) {
validateTechRole();
require_once('post/scheduled_ticket_model.php');
require_once 'post/scheduled_ticket_model.php';
$scheduled_ticket_id = intval($_POST['scheduled_ticket_id']);
$next_run_date = sanitizeInput($_POST['next_date']);

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_transfer'])) {
require_once('post/transfer_model.php');
require_once 'post/transfer_model.php';
mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$date', expense_amount = $amount, expense_currency_code = '$session_company_currency', expense_vendor_id = 0, expense_category_id = 0, expense_account_id = $account_from");
$expense_id = mysqli_insert_id($mysqli);
@@ -27,7 +28,8 @@ if (isset($_POST['add_transfer'])) {
if (isset($_POST['edit_transfer'])) {
require_once('post/transfer_model.php');
require_once 'post/transfer_model.php';
$transfer_id = intval($_POST['transfer_id']);
$expense_id = intval($_POST['expense_id']);

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_trip'])) {
require_once('post/trip_model.php');
require_once 'post/trip_model.php';
mysqli_query($mysqli,"INSERT INTO trips SET trip_date = '$date', trip_source = '$source', trip_destination = '$destination', trip_miles = $miles, round_trip = $roundtrip, trip_purpose = '$purpose', trip_user_id = $user_id, trip_client_id = $client_id");
@@ -21,7 +22,8 @@ if (isset($_POST['add_trip'])) {
if (isset($_POST['edit_trip'])) {
require_once('post/trip_model.php');
require_once 'post/trip_model.php';
$trip_id = intval($_POST['trip_id']);

View File

@@ -6,7 +6,8 @@
if (isset($_POST['add_user'])) {
require_once('post/user_model.php');
require_once 'post/user_model.php';
validateAdminRole();
validateCSRFToken($_POST['csrf_token']);
@@ -75,7 +76,8 @@ if (isset($_POST['add_user'])) {
if (isset($_POST['edit_user'])) {
require_once('post/user_model.php');
require_once 'post/user_model.php';
validateAdminRole();

View File

@@ -8,7 +8,8 @@
if (isset($_POST['add_vendor_template'])) {
require_once('post/vendor_model.php');
require_once 'post/vendor_model.php';
mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code', vendor_account_number = '$account_number', vendor_notes = '$notes', vendor_template = 1, vendor_client_id = 0");
@@ -24,7 +25,8 @@ if (isset($_POST['add_vendor_template'])) {
if (isset($_POST['edit_vendor_template'])) {
require_once('post/vendor_model.php');
require_once 'post/vendor_model.php';
$vendor_id = intval($_POST['vendor_id']);
$vendor_template_id = intval($_POST['vendor_template_id']);
@@ -158,7 +160,8 @@ if (isset($_POST['add_vendor_from_template'])) {
if (isset($_POST['add_vendor'])) {
require_once('post/vendor_model.php');
require_once 'post/vendor_model.php';
$client_id = intval($_POST['client_id']); // Used if this vendor is under a contact otherwise its 0 for under company
@@ -176,7 +179,8 @@ if (isset($_POST['add_vendor'])) {
if (isset($_POST['edit_vendor'])) {
require_once('post/vendor_model.php');
require_once 'post/vendor_model.php';
$vendor_id = intval($_POST['vendor_id']);
$vendor_template_id = intval($_POST['vendor_template_id']);