Added Docker Support

scottgriv · scottgriv · commit 1e380e526f51 · 2023-01-09T14:49:14.000-05:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,5 @@
+FROM php:8.1.6-apache
+
+ENV APACHE_DOCUMENT_ROOT /var/www/html
+
+RUN docker-php-ext-install pdo pdo_mysql mysqli
diff --git a/README.md b/README.md
@@ -81,8 +81,8 @@ Install with **Homebrew**:
 * PHP v8.1.6
 * jQuery v2.1.3 
 * Bootstrap v3.3.5
-* MariaDB v10.4.21
-* XAMPP v8.1.6
+* MySQL v8.0.31
+* Docker v20.10.21
 
 ## Dependencies: 
 
@@ -91,16 +91,6 @@ Install with **Homebrew**:
 
 ## Quick Start
 
-1. I'd recommend using the XAMPP stack to run this application (although, its not required).
-    * Download the latest version of **XAMPP** [here](https://www.apachefriends.org/download.html).
-    * XAMPP comes a Apache HTTP Server, PHP, and a MariaDB database stack already installed - everything you need to get Palm Tree up and running.
-2. Start the XAMPP MySQL and Apache Web Server Services.
-3. Import the provided database shell located in `Palm-Tree/sql/palm_tree.sql` into your MySQL database.
-4. Place Palm-Tree in the htdocs folder and reach it using your machines IP address i.e. `http://127.0.0.1/Palm-Tree` or ``http://localhost/Palm-Tree``.
-5. Upload the provided email templates in ``Palm-Tree/templates`` in the *Email Template* menu (adjust it according to your needs or create your own).
-6. Configure your Email Template and Business.
-7. Add Customers.
-
 * You're ready to go!  
 
 ## License
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.1
+1.1.0
diff --git a/commands.php b/commands.php
@@ -180,7 +180,7 @@
 		$mail_cc = $_POST['mail_cc'];
 		$mail_bcc = $_POST['mail_bcc'];
 		$mail_subject = $_POST['mail_subject'];
-		$mail_body = htmlspecialchars($_POST['mail_body']);
+		$mail_body = htmlspecialchars($_POST['mail_body'] ?? '');
 
 		if (empty($mail_from_password)) {
 			$encrypted_password = NULL;
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,42 @@
+version: '3.4'
+services:
+  db:
+    image: mysql:latest
+    environment: 
+      MYSQL_DATABASE: palm_tree
+      MYSQL_ROOT_PASSWORD:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
+    volumes:
+      - "./sql:/docker-entrypoint-initdb.d"
+    networks:
+      - palm-tree-docker
+  www:
+    depends_on:
+      - db
+    image: php:8.1.6-apache
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    volumes:
+      - "./:/var/www/html/Palm-Tree"
+    ports:
+      - 80:80
+      - 443:443
+    networks:
+      - palm-tree-docker
+  phpmyadmin:
+    depends_on:
+      - db
+    image: phpmyadmin/phpmyadmin
+    ports:
+      - 8001:80
+    environment:
+      - PMA_HOST=db
+      - PMA_PORT=3306
+    networks:
+      - palm-tree-docker
+networks:
+  palm-tree-docker:
+    driver: bridge
+
+
diff --git a/email.php b/email.php
@@ -60,7 +60,7 @@
 			<label style="font-size: 1rem;color: gray">This will be the Body of your Email</label><br>
 			<label style="font-size: 1rem;color: gray">You can save your HTML template directly in this box</label><br>
 			<label style="font-size: 1rem;color: gray">Depending on where this software sits, you may need to host email images using an outside source like <a target="_blank" rel="noopener noreferrer" href="https://imgur.com/">imgur.com</a> for the images to render properly in the Email</label><br>
-			<textarea id="mail_body" class="mailBodyText" name="mail_body" rows="20" cols="52" style="text-align: left;" placeholder="<!DOCTYPE html><br><html><br><body><br><p>You can use HTML for a more professional, responsive email.</p><p>Paste the entire HTML message here.</p></body></html>" data-mail-id="<?php echo $mail['mail_id']; ?>"><?php echo htmlspecialchars_decode($mail['mail_body']); ?></textarea><br>
+			<textarea id="mail_body" class="mailBodyText" name="mail_body" rows="20" cols="52" style="text-align: left;" placeholder="<!DOCTYPE html><br><html><br><body><br><p>You can use HTML for a more professional, responsive email.</p><p>Paste the entire HTML message here.</p></body></html>" data-mail-id="<?php echo $mail['mail_id']; ?>"><?php echo htmlspecialchars_decode($mail['mail_body'] ?? ''); ?></textarea><br>
 		<?php } ?>
 		<br>
 		<button type="submit" class="btn btn-default read-more" style="background:#000081;color:white;" name="command" value="updateEmailTemplate">Update Email Template</button>
diff --git a/encryption.php b/encryption.php
@@ -25,9 +25,9 @@ function encrypt_decrypt($action, $string)
     $iv = substr(hash('sha256', $secret_iv), 0, 16);
     if ($action == 'encrypt') {
         $output = openssl_encrypt($string, $encrypt_method, $key, 0, $iv);
-        $output = base64_encode($output);
+        $output = base64_encode($output ?? '');
     } else if ($action == 'decrypt') {
-        $output = openssl_decrypt(base64_decode($string), $encrypt_method, $key, 0, $iv);
+        $output = openssl_decrypt(base64_decode($string ?? '') ?? '', $encrypt_method, $key, 0, $iv);
     }
     return $output;
 }
diff --git a/phpinfo.php b/phpinfo.php
@@ -0,0 +1,2 @@
+<?php
+phpinfo();
diff --git a/send_email.php b/send_email.php
@@ -152,7 +152,7 @@ function sendEmail($cust_id, $flag, $type)
 
       // Set Email Subject and Body
       $email_subject = $email_build['mail_subject'];
-      $email_body = htmlspecialchars_decode($email_build['mail_body']);
+      $email_body = htmlspecialchars_decode($email_build['mail_body'] ?? '');
 
       // Replace Template Variables with Database Values
       foreach ($variables as $key => $value) {
diff --git a/sql/config.ini b/sql/config.ini
@@ -14,10 +14,10 @@ app_version = 1.0.0
 
 ;Database
 [database]
-db_host	   = localhost
+db_host	   = db
 db_name	   = palm_tree
 db_user    = root
 db_pass	   =
 db_port    = 3306
 db_charset = UTF-8
-db_host_ip = 10.0.1.7
+db_host_ip = localhost

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ function encrypt_decrypt($action, $string)`
`25`	`25`	`$iv = substr(hash('sha256', $secret_iv), 0, 16);`
`26`	`26`	`if ($action == 'encrypt') {`
`27`	`27`	`$output = openssl_encrypt($string, $encrypt_method, $key, 0, $iv);`
`28`		`- $output = base64_encode($output);`
	`28`	`+ $output = base64_encode($output ?? '');`
`29`	`29`	`} else if ($action == 'decrypt') {`
`30`		`- $output = openssl_decrypt(base64_decode($string), $encrypt_method, $key, 0, $iv);`
	`30`	`+ $output = openssl_decrypt(base64_decode($string ?? '') ?? '', $encrypt_method, $key, 0, $iv);`
`31`	`31`	`}`
`32`	`32`	`return $output;`
`33`	`33`	`}`