Merge pull request InvoicePlane#411 from InvoicePlane/v1.4.9

.dockerignore

@@ -0,0 +1,5 @@
+.gitignore
+CONTRIBUTING.md
+Dockerfile
+license.txt
+README.md

.gitignore

@@ -23,15 +23,12 @@
 /application/views/quote_templates/public/
 !/application/views/quote_templates/public/InvoicePlane*
 
-# Uploads folder
-/uploads/temp/*
-!/uploads/temp/remove.txt
-/uploads/archive/*
-/uploads/customer_files/*
-/uploads/import/*
-/uploads/*.jpg
+# Composer
+/vendor/
+composer.lock
 
 /.htaccess
 .idea
 .sass-cache
 adminer.php
+/nbproject/

Dockerfile

@@ -0,0 +1,22 @@
+FROM php:5.6-apache
+
+# Install and enable PHP extensions
+# https://wiki.invoiceplane.com/en/1.0/getting-started/requirements
+RUN \
+  apt-get update && apt-get install -y \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libmcrypt-dev \
+    libpng12-dev \
+    librecode-dev \
+    libxml2-dev \
+  && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+  && docker-php-ext-install -j$(nproc) gd mcrypt mysqli recode xmlrpc
+
+# Copy InvoicePlane into public directory
+COPY . /var/www/html
+
+# Enable .htaccess, set permissions, and enable Apache mod_rewrite
+RUN mv /var/www/html/htaccess /var/www/html/.htaccess \
+  && chown -R www-data:www-data /var/www/html \
+  && a2enmod rewrite

README.md

@@ -1,14 +1,15 @@
 ![InvoicePlane](http://invoiceplane.com/content/logo/PNG/logo_300x150.png)
-#### _Version 1.4.8_
+#### _Version 1.4.9_
 
 InvoicePlane is a self-hosted open source application for managing your invoices, clients and payments.    
-For more information visit __[InvoicePlane.com](https://invoiceplane.com)__ or take a look at the __[demo](https://demo.invoiceplane.com)__
+For more information visit __[InvoicePlane.com](https://invoiceplane.com)__ or try the __[demo](https://demo.invoiceplane.com)__.
 
 ### Quick Installation
 
 1. Download the [latest version](https://invoiceplane.com/downloads)
 2. Extract the package and copy all files to your webserver / webspace.
-3. Open `http://your-invoiceplane-domain.com/index.php/setup` and follow the instructions.
+3. Set your URL in the `index.php` file.
+4. Open `http://your-invoiceplane-domain.com/index.php/setup` and follow the instructions.
 
 #### Remove `index.php` from the URL
 

application/config/config.php

@@ -14,8 +14,7 @@
 | path to your installation.
 |
 */
-$config['protocol'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://');
-$config['base_url'] = $config['protocol'] . ($_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']) . URL_SUBFOLDER;
+$config['base_url'] = IP_URL;
 
 /*
 |--------------------------------------------------------------------------
@@ -208,7 +207,7 @@
 |
 */
 
-$config['log_threshold'] = 1;
+$config['log_threshold'] = IP_DEBUG ? 2 : 1;
 
 /*
 |--------------------------------------------------------------------------

application/core/Base_Controller.php

@@ -56,14 +56,6 @@ public function __construct()
             $this->load->model('settings/mdl_settings');
             $this->mdl_settings->load_settings();
 
-            // Debug Mode
-            if ($this->mdl_settings->setting('enable_debug')) {
-                $this->config->set_item('log_threshold', 2);
-                defined('IP_DEBUG') ?: define('IP_DEBUG', true);
-            } else {
-                defined('IP_DEBUG') ?: define('IP_DEBUG', false);
-            }
-
             $this->lang->load('ip', $this->mdl_settings->setting('default_language'));
             $this->lang->load('form_validation', $this->mdl_settings->setting('default_language'));
             $this->lang->load('custom', $this->mdl_settings->setting('default_language'));

application/helpers/mailer_helper.php

@@ -45,6 +45,8 @@ function email_invoice($invoice_id, $invoice_template, $from, $to, $subject, $bo
     $bcc = parse_template($db_invoice, $bcc);
     $from = array(parse_template($db_invoice, $from[0]), parse_template($db_invoice, $from[1]));
 
+    $message = (empty($message) ? ' ' : $message);
+
     return phpmail_send($from, $to, $subject, $message, $invoice, $cc, $bcc, $attachments);
 }
 
@@ -66,6 +68,8 @@ function email_quote($quote_id, $quote_template, $from, $to, $subject, $body, $c
     $bcc = parse_template($db_quote, $bcc);
     $from = array(parse_template($db_quote, $from[0]), parse_template($db_quote, $from[1]));
 
+    $message = (empty($message) ? ' ' : $message);
+
     return phpmail_send($from, $to, $subject, $message, $quote, $cc, $bcc, $attachments);
 }