Merge remote branch 'upstream-1.7/develop' into develop

Changes up to v1.7.3 released

Conflicts:
	WHATSNEW.md
	css/osticket.css
	scp/css/scp.css

UPGRADING.txt

@@ -86,5 +86,16 @@ care of:
       scp/js/datepicker.js
       scp/js/tabber.js
 
+    * Removed in v1.7.1
+      include/class.mcrypt.php
+      include/client/thankyou.inc.php
+      include/upgrader/sql/*
+
+    * Removed in v1.7.2
+      include/pear/Crypt/Random.php
+
+    * Removed in v1.7.3
+      include/index.html
+
   * Remove the setup/ folder. This contains code you won't need for a live
     ticketing system.

WHATSNEW.md

@@ -22,6 +22,75 @@ according to your liking. Fields can also be marked as required, whose input is
 required to submit the ticket, and internal, whose input is not visible to the
 end user.
 
+osTicket v1.7.3
+===============
+### Enhancements
+  * Ticket thread items are now available for email templates (#790)
+  * Support MySQL servers on a non-standard port number, which is also not set
+    in the `php.ini` file (#775)
+
+### Bugfixes
+  * Fix email handling where the character set advertised is `us-ascii` but
+    `iso-8859-1` was intended (#770)
+  * Ticket source is now editable (#772, #777)
+  * Email parsing would crash if `Reply-To` header was not found (#780)
+  * CSRF token creation would fail on some Windows installations (#771, #776)
+  * Tickets without an SLA set would never go overdue (#757, #767)
+  * FAQ search now hits category names (#781)
+  * FAQ search hits are sorted by article title now (#786)
+  * Email replies with nothing before the quoted response marker should remain
+    as is (#787)
+  * CAPTCHA responses are now considered case-insensitive (#823)
+  * `References` email header how includes the parent email `Message-Id` (#825)
+  * Email attachment parsing would crash if the `Content-Disposition` header
+    had no parameters (#828)
+  * Date format on the jQuery-UI datepicker is admin configurable now (#829)
+
+### Performance
+  * Scanning deleting orphaned files is much faster (#773, #778)
+
+osTicket v1.7.2
+===============
+### Enhancements
+  * The ticket number is no longer required in the subject line and staff can
+    reply to emails and create an internal note (*released in v1.7.1.2*)
+  * Show customized site logo on PDF output (#763)
+  * Support deployment for initial install with cli deploy script (#750)
+  * Require complete regression test pass before packaging new release (#751)
+  * Die with HTTP/500 for misconfiguration or database connect failure (#762)
+
+### Bug fixes
+  * Detect and import inline attachments without a Content-Disposition header
+    (#737)
+  * Show correct template description *again* (#742, #743)
+  * Import attachments from emails continuing a ticket thread (*regression
+    introduced in v1.7.1.2*) (#745)
+  * Support UTF-8 encoded filenames for fetched emails (#738)
+  * Disable Kerberos and NTLM authentication in mail fetching (#739)
+  * Forbid empty reply-separator setting (#752)
+  * Only email administrators for log messages that would be written to the
+    database (#754)
+  * Emails fetched and rejected by a ticket filter that are not deleted or
+    moved to a folder will not be re-fetched and re-rejected (#755)
+  * Workaround for some mail clients' inability to properly decode
+    quoted-printable encoded emails (#760)
+  * Inline text bodies are incorrectly detected as attachments without a
+    filename (#761)
+  * Properly decode and display some international chars in PDF printing (#765)
+  * Do not double encode XML entities in ticket thread titles (#718, #567)
+  * Display correct template description on edit (#724, #727)
+  * Fix download of attachments with commas (',') in the filename (#702)
+  * Fix incorrect content-type header for CAPTCHA (#699)
+
+### Security
+  * Require email address match if ticket number is matched in subject line and
+    neither references or in-reply-to headers match an existing ticket thread
+    item (*regression introduced in v1.7.1.2*) (#748)
+
+### Performance
+  * Address database performance issue scanning for orphaned file_chunk records
+    (#764)
+
 osTicket v1.7.1
 ===============
 ### Bugfixes

css/osticket.css

@@ -50,3 +50,7 @@ div.section-break {
     padding-top: 0.8em !important;
     border-top: 1px solid #ccc;
 }
+
+input.dp {
+    width: 10em;
+}

include/staff/ticket-edit.inc.php

@@ -2,6 +2,9 @@
 if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->canEditTickets() || !$ticket) die('Access Denied');
 
 $info=Format::htmlchars(($errors && $_POST)?$_POST:$ticket->getUpdateInfo());
+if ($_POST)
+    $info['duedate'] = Format::date($cfg->getDateFormat(),
+       strtotime($info['duedate']));
 ?>
 <form action="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit" method="post" id="save"  enctype="multipart/form-data">
  <?php csrf_token(); ?>

scp/css/scp.css

@@ -1484,3 +1484,7 @@ ul.progress li.no small {color:red;}
 input[type=text]:disabled, input[type=checkbox]:disabled {
     background-color: #eee;
 }
+
+input.dp {
+    width: 10em;
+}

scp/js/scp.js

@@ -297,7 +297,17 @@ $(document).ready(function(){
             buttonImage: './images/cal.png',
             showOn:'both',
             dateFormat: df,
-         });
+        });
+        $(document).on('submit', 'form', function() {
+            $('.dp', $(this)).each(function(i, e) {
+                var $e = $(e),
+                    d = $e.datepicker('getDate'),
+                    day = ('0'+d.getDate()).substr(-2),
+                    month = ('0'+(d.getMonth()+1)).substr(-2),
+                    year = d.getFullYear();
+                $e.val(year+'-'+month+'-'+day);
+            });
+        });
     });
 
     /* Typeahead tickets lookup */

setup/cli/cleanup-codebase.sh

@@ -100,4 +100,50 @@ scp/js/bsn.AutoSuggest_2.1.3.js
 scp/js/calendar.js
 scp/js/datepicker.js
 scp/js/tabber.js
+
+# Removed in v1.7.1
+include/class.mcrypt.php
+include/client/thankyou.inc.php
+include/upgrader/sql/00ff231f-9f3b454c.patch.sql
+include/upgrader/sql/02decaa2-60fcbee1.patch.sql
+include/upgrader/sql/15719536-dd0022fb.patch.sql
+include/upgrader/sql/15af7cd3-98ae1ed2.patch.sql
+include/upgrader/sql/15b30765-dd0022fb.cleanup.sql
+include/upgrader/sql/15b30765-dd0022fb.patch.sql
+include/upgrader/sql/1da1bcba-15b30765.patch.sql
+include/upgrader/sql/2e20a0eb-98ae1ed2.patch.sql
+include/upgrader/sql/2e7531a2-d0e37dca.patch.sql
+include/upgrader/sql/32de1766-852ca89e.patch.sql
+include/upgrader/sql/435c62c3-2e7531a2.cleanup.sql
+include/upgrader/sql/435c62c3-2e7531a2.patch.sql
+include/upgrader/sql/49478749-c2d2fabf.patch.sql
+include/upgrader/sql/522e5b78-02decaa2.patch.sql
+include/upgrader/sql/60fcbee1-f8856d56.patch.sql
+include/upgrader/sql/7be60a84-522e5b78.patch.sql
+include/upgrader/sql/852ca89e-740428f9.patch.sql
+include/upgrader/sql/98ae1ed2-e342f869.cleanup.sql
+include/upgrader/sql/98ae1ed2-e342f869.patch.sql
+include/upgrader/sql/9f3b454c-c0fd16f4.patch.sql
+include/upgrader/sql/a67ba35e-98ae1ed2.patch.sql
+include/upgrader/sql/aa4664af-b19dc97d.patch.sql
+include/upgrader/sql/abe9c0cb-bbb021fb.patch.sql
+include/upgrader/sql/aee589ab-98ae1ed2.patch.sql
+include/upgrader/sql/b19dc97d-435c62c3.patch.sql
+include/upgrader/sql/bbb021fb-49478749.patch.sql
+include/upgrader/sql/c00511c7-7be60a84.cleanup.sql
+include/upgrader/sql/c00511c7-7be60a84.patch.sql
+include/upgrader/sql/c0fd16f4-d959a00e.patch.sql
+include/upgrader/sql/c2d2fabf-aa4664af.patch.sql
+include/upgrader/sql/d0e37dca-1da1bcba.patch.sql
+include/upgrader/sql/d959a00e-32de1766.patch.sql
+include/upgrader/sql/dd0022fb-f4da0c9b.patch.sql
+include/upgrader/sql/e342f869-c00511c7.patch.sql
+include/upgrader/sql/f4da0c9b-00ff231f.patch.sql
+include/upgrader/sql/f8856d56-abe9c0cb.patch.sql
+
+# Removed in v1.7.2
+include/pear/Crypt/Random.php
+
+# Removed in v1.7.3
+include/index.html
 "