From a478a5148951a293fd263b4d8ebaf5ea57ad80e1 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Apr 2019 15:12:26 -0400 Subject: [PATCH] Moved most of the config vars to SQL settings table more work on settings --- client_nav.php | 26 ++++++------- config.php | 49 ++++++++++++------------ db.sql | 57 ++++++++++++++++++++++++++-- post.php | 61 +++++++++++++++++++++++++++++- settings-company.php | 88 ++++++++++++++++++++++++++++++++++++++++++++ settings-general.php | 74 ++++++++----------------------------- settings-invoice.php | 21 ++++------- settings-mail.php | 10 ++--- settings-nav.php | 8 ++++ 9 files changed, 272 insertions(+), 122 deletions(-) create mode 100644 settings-company.php diff --git a/client_nav.php b/client_nav.php index b7fbe624..514487b7 100644 --- a/client_nav.php +++ b/client_nav.php @@ -2,7 +2,7 @@ 0){ ?>
  • -
    +
    Contacts
     @@ -11,7 +11,7 @@ 0){ ?>
  • -
    +
    Locations
    @@ -21,7 +21,7 @@ 0){ ?>
  • -
    +
    Assets
     @@ -30,7 +30,7 @@ 0){ ?>
  • -
    +
    Vendors
     @@ -39,7 +39,7 @@ 0){ ?>
  • -
    +
    Logins
     @@ -48,7 +48,7 @@ 0){ ?>
  • -
    +
    Networks
     @@ -57,7 +57,7 @@ 0){ ?>
  • -
    +
    Domains
     @@ -66,7 +66,7 @@ 0){ ?>
  • -
    +
    Applications
     @@ -75,7 +75,7 @@ 0){ ?>
  • -
    +
    Invoices
     @@ -84,7 +84,7 @@ 0){ ?>
  • -
    +
    Recurring
     @@ -93,7 +93,7 @@ 0){ ?>
  • -
    +
    Quotes
     @@ -102,7 +102,7 @@ 0){ ?>
  • -
    +
    Files
     @@ -111,7 +111,7 @@ 0){ ?>
  • -
    +
    Notes
     diff --git a/config.php b/config.php index 4052b8f1..d536812d 100644 --- a/config.php +++ b/config.php @@ -13,38 +13,35 @@ $config_date_format = "Y-m-d"; $config_time_format = "h:ia"; $config_no_records = "There is nothing here!"; - $config_default_expenes_account = ""; - $config_default_invoice_account = ""; + $config_default_expense_account = ""; + $config_default_payment_account = ""; $config_default_net_terms = ""; - $config_start_page = "clients.php"; + $sql = mysqli_query($mysqli,"SELECT * FROM settings"); + $row = mysqli_fetch_array($sql); - $config_company_name = "PittPC"; - $config_company_address = "123 PittPC Street"; - $config_company_city = "Pittsburgh"; - $config_company_state = "PA"; - $config_company_zip = "15205"; - $config_company_phone = "412-500-9434"; - $config_company_site = "pittpc.com"; - - $config_invoice_logo = "/uploads/invoice_logo.png"; - $config_invoice_footer = "Please make checks payable to PittPC
    Visit us at pittpc.com"; - - //Mail Settings (Host must require TLS Support) - $config_smtp_host = "mail.pittpc.com"; - $config_smtp_username = ""; - $config_smtp_password = ""; - $config_smtp_port = 587; - $config_mail_from_email = ""; - $config_mail_from_name = "Automated Billing Department"; + $config_start_page = $row['config_start_page']; + $config_company_name = $row['config_company_name']; + $config_company_address = $row['config_company_address']; + $config_company_city = $row['config_company_city']; + $config_company_state = $row['config_company_state']; + $config_company_zip = $row['config_company_zip']; + $config_company_phone = $row['config_company_phone']; + $config_company_site = $row['config_company_site']; + $config_next_invoice_number = $row['config_next_invoice_number']; + $config_invoice_logo = $row['config_invoice_logo']; + $config_invoice_footer = $row['config_invoice_footer']; + $config_smtp_host = $row['config_smtp_host']; + $config_smtp_username = $row['config_smtp_username']; + $config_smtp_password = $row['config_smtp_password']; + $config_smtp_port = $row['config_smtp_port']; + $config_mail_from_email = $row['config_mail_from_email']; + $config_mail_from_name = $row['config_mail_from_name']; + $config_account_balance_threshold = $row['config_account_balance_threshold']; $_SESSION['alert_message'] = ''; $_SESSION['alert_type'] = "warning"; - $config_account_balance_threshold = 200; - - - $net_terms_array = array( '0'=>'On Reciept', '7'=>'7 Days', @@ -141,4 +138,4 @@ 'Other' ); -?> +?> \ No newline at end of file diff --git a/db.sql b/db.sql index eae7c025..21d4c906 100644 --- a/db.sql +++ b/db.sql @@ -44,7 +44,7 @@ CREATE TABLE `alerts` ( `alert_date` date NOT NULL, `alert_ack_date` date NOT NULL, PRIMARY KEY (`alert_id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -120,7 +120,7 @@ CREATE TABLE `client_contacts` ( `location_id` int(11) NOT NULL, `client_id` int(11) NOT NULL, PRIMARY KEY (`client_contact_id`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -214,7 +214,7 @@ CREATE TABLE `client_notes` ( `client_note_body` text NOT NULL, `client_id` int(11) NOT NULL, PRIMARY KEY (`client_note_id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -279,6 +279,23 @@ CREATE TABLE `expenses` ( ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `files` +-- + +DROP TABLE IF EXISTS `files`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `files` ( + `file_id` int(11) NOT NULL AUTO_INCREMENT, + `file_type` varchar(200) NOT NULL, + `reference_file_name` varchar(200) NOT NULL, + `file_name` varchar(200) NOT NULL, + `client_id` int(11) NOT NULL, + PRIMARY KEY (`file_id`) +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `invoice_history` -- @@ -435,6 +452,38 @@ CREATE TABLE `recurring_invoices` ( ) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `settings` +-- + +DROP TABLE IF EXISTS `settings`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `settings` ( + `config_default_expense_account` varchar(200) NOT NULL, + `config_default_payment_account` varchar(200) NOT NULL, + `config_default_net_terms` varchar(200) NOT NULL, + `config_start_page` varchar(200) NOT NULL, + `config_company_name` varchar(200) NOT NULL, + `config_company_address` varchar(200) NOT NULL, + `config_company_city` varchar(200) NOT NULL, + `config_company_state` varchar(200) NOT NULL, + `config_company_zip` varchar(200) NOT NULL, + `config_company_phone` varchar(200) NOT NULL, + `config_company_site` varchar(200) NOT NULL, + `config_smtp_host` varchar(200) NOT NULL, + `config_smtp_username` varchar(200) NOT NULL, + `config_smtp_password` varchar(200) NOT NULL, + `config_smtp_port` varchar(200) NOT NULL, + `config_mail_from_email` varchar(200) NOT NULL, + `config_mail_from_name` varchar(200) NOT NULL, + `config_account_balance_threshold` varchar(200) NOT NULL, + `config_invoice_logo` varchar(200) NOT NULL, + `config_invoice_footer` text NOT NULL, + `config_next_invoice_number` int(11) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `transfers` -- @@ -498,4 +547,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2019-04-19 16:03:26 +-- Dump completed on 2019-04-23 15:11:59 diff --git a/post.php b/post.php index ef0ce33d..2e9e42ab 100644 --- a/post.php +++ b/post.php @@ -13,10 +13,67 @@ require_once $mpdf_path . '/vendor/autoload.php'; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; - - $todays_date = date('Y-m-d'); +if(isset($_POST['edit_general_settings'])){ + + $config_start_page = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_start_page'])); + $config_account_balance_threshold = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_account_balance_threshold'])); + + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold'"); + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_POST['edit_company_settings'])){ + + $config_company_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_name'])); + $config_company_address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_address'])); + $config_company_city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_city'])); + $config_company_state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_state'])); + $config_company_zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_zip'])); + $config_company_phone = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_phone'])); + $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site'])); + if($_FILES['file']['tmp_name']!='') { + $path = "uploads/"; + $path = $path . basename( $_FILES['file']['name']); + $file_name = basename($path); + move_uploaded_file($_FILES['file']['tmp_name'], $path); + } + + + mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site' config_invoice_logo = '$path'"); + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_POST['edit_mail_settings'])){ + + $config_smtp_host = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_host'])); + $config_smtp_username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_username'])); + $config_smtp_password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_password'])); + + mysqli_query($mysqli,"UPDATE settings SET config_smtp_host = '$config_smtp_host', config_smtp_username = '$config_smtp_username', config_smtp_password = '$config_smtp_password'"); + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_POST['edit_invoice_settings'])){ + + $config_next_invoice_number = intval($_POST['config_next_invoice_number']); + $config_mail_from_email = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_mail_from_email'])); + $config_mail_from_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_mail_from_name'])); + $config_invoice_footer = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_footer'])); + + mysqli_query($mysqli,"UPDATE settings SET config_next_invoice_number = '$config_next_invoice_number', config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_invoice_footer = '$config_invoice_footer'"); + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_POST['add_user'])){ $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])); diff --git a/settings-company.php b/settings-company.php new file mode 100644 index 00000000..0eea017f --- /dev/null +++ b/settings-company.php @@ -0,0 +1,88 @@ + + + + +
    +
    +
    Company Settings
    +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + + +
    + + +
    + + + +
    + + + +
    +
    +
    + + - -
    -
    Company Settings
    +
    General Settings
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    + +
    -
    - - -
    - -
    - - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    - - + +
    +
    + +
    + +
    - +
    diff --git a/settings-invoice.php b/settings-invoice.php index e71af620..a3617af5 100644 --- a/settings-invoice.php +++ b/settings-invoice.php @@ -1,7 +1,5 @@ - -
    @@ -17,7 +15,7 @@
    - +
    @@ -27,7 +25,7 @@
    - + @@ -37,27 +35,24 @@
    - +
    - -
    -
    - -
    - -
    + +
    + +
    - + diff --git a/settings-mail.php b/settings-mail.php index 1b0c3815..5ade92db 100644 --- a/settings-mail.php +++ b/settings-mail.php @@ -1,7 +1,5 @@ - -
    @@ -16,7 +14,7 @@
    - +
    @@ -26,7 +24,7 @@
    - + @@ -36,12 +34,12 @@
    - +
    - + diff --git a/settings-nav.php b/settings-nav.php index 0591efca..8f4f5e9d 100644 --- a/settings-nav.php +++ b/settings-nav.php @@ -1,6 +1,14 @@