From 1282ea3287a9e38893da05684579e618c775e538 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Thu, 14 Oct 2021 14:40:53 -0400
Subject: [PATCH 01/11] PHP 8 Support

Support for PHP4 and PHP5 is dropped
Convert while (list($key, $var) = each($array)) to foreach()
Convert any array {} lookups to []
Upgrade libchart to 1.3 (final)
Upgrade Snoopy to 2.0.0 (final)
Upgrade PHPMailer to 5.2.28 (final before 6.x rewrite)
Upgrade PHPThumb to 1.7.17 (
Remove earlier libchart versions.
Fix many uninitialized values (fixes warnings in logs)

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 admin.php                                     |    4 +-
 admin/backup/index.php                        |    8 +-
 admin/config/index.php                        |   21 +-
 admin/patch_facility/index.php                |    4 +-
 admin/s_address_type/index.php                |    8 +-
 admin/s_attribute_type/index.php              |   33 +-
 admin/s_file_type/functions.php               |    4 +-
 admin/s_item_listing_conf/functions.php       |    2 +-
 admin/s_item_listing_conf/index.php           |    6 +-
 admin/s_item_type/functions.php               |    2 +-
 admin/s_item_type/index.php                   |    9 +-
 admin/s_language/index.php                    |   26 +-
 admin/s_role/functions.php                    |    4 +-
 .../InstallTableAjaxJobs.class.php            |   39 +-
 admin/s_site_plugin/ajaxjobs.php              |    6 +-
 admin/s_site_plugin/index.php                 |   10 +-
 admin/s_status_type/index.php                 |    4 +-
 borrow.php                                    |    4 +-
 email.php                                     |   10 +-
 export.php                                    |    2 +-
 include/begin.inc.php                         |   28 +-
 index.php                                     |    2 +-
 install.php                                   |   16 +-
 item_borrow.php                               |   53 +-
 item_display.php                              |   22 +-
 item_input.php                                |   97 +-
 javascript/date.js                            |    2 +-
 lib/AdminAjaxJobs.class.php                   |    4 +-
 lib/BooleanParser.class.php                   |   26 +-
 lib/DocTypeNameSpaceXMLParser.class.php       |    6 +-
 lib/HTML_Listing.class.php                    |    4 +-
 lib/Install_Table.class.php                   |    4 +-
 lib/ItemImportHandler.class.php               |   17 +-
 lib/Listing.class.php                         |   38 +-
 lib/{GDImage.class.php => ODImage.class.php}  |    8 +-
 lib/OpenDbBrowserSniffer.class.php            |    6 +-
 lib/OpenDbSnoopy.class.php                    |    2 +-
 lib/OpenDbUpgrader.class.php                  |    4 +-
 lib/RowImportPluginHandler.class.php          |    4 +-
 lib/SitePlugin.class.php                      |    8 +-
 lib/Snoopy.class.php                          | 1775 ++---
 lib/StringFileHandler.class.php               |    4 +-
 lib/TitleMask.class.php                       |   96 +-
 lib/WelcomeBlock.class.php                    |    4 +-
 lib/WrapperFileHandler.class.php              |    4 +-
 lib/XMLImportPlugin.class.php                 |    5 +-
 lib/XMLImportPluginHandler.class.php          |    2 +-
 lib/admin.php                                 |   16 +-
 lib/announcement.php                          |    4 +-
 lib/auth.php                                  |   75 +-
 lib/chart.php                                 |   25 +-
 lib/chart/JPGraphStatsChart.class.php         |   87 -
 lib/chart/LegacyStatsChart.class.php          |  282 -
 lib/chart/PhplotStatsChart.class.php          |   89 -
 lib/chart/StatsChart.class.php                |    6 +-
 ...rt12.class.php => StatsLibChart.class.php} |   14 +-
 lib/chart/StatsLibChart11.class.php           |   55 -
 lib/config.php                                |  159 +-
 lib/cssparser/cssparser.php                   |   14 +-
 lib/database.php                              |   19 +-
 lib/database/mysqli.inc.php                   |    6 +-
 lib/datetime.php                              |   34 +-
 lib/displayfields.php                         |   25 +-
 lib/export.php                                |    4 +-
 lib/export/CSVExportPlugin.class.php          |    7 +-
 lib/export/MARCExportPlugin.class.php         |    3 -
 lib/export/OpenDbExportPlugin.class.php       |    3 -
 lib/export/XMMMovieDatabasePlugin.class.php   |    8 +-
 lib/filecache.php                             |   12 +-
 lib/http.php                                  |   17 +-
 lib/inputfields.php                           |   38 +-
 lib/install.php                               |   26 +-
 lib/item.php                                  |  114 +-
 lib/item_attribute.php                        |    2 +-
 lib/item_display.php                          |    4 +-
 lib/language.php                              |   10 +-
 lib/libchart/COPYING                          |  525 +-
 lib/libchart/ChangeLog                        |   47 +-
 lib/libchart/README                           |    6 +-
 lib/libchart/classes/Axis.php                 |  167 -
 lib/libchart/classes/BarChart.php             |  172 -
 lib/libchart/classes/Chart.php                |  257 -
 lib/libchart/classes/Color.php                |   74 -
 lib/libchart/classes/HorizontalChart.php      |  166 -
 lib/libchart/classes/LineChart.php            |  168 -
 lib/libchart/classes/PieChart.php             |  375 -
 lib/libchart/classes/Point.php                |   68 -
 lib/libchart/classes/Primitive.php            |   59 -
 lib/libchart/classes/Text.php                 |  139 -
 lib/libchart/classes/VerticalChart.php        |  166 -
 lib/libchart/classes/libchart.php             |   43 +
 lib/libchart/classes/model/ChartConfig.php    |  112 +
 lib/libchart/classes/model/DataSet.php        |   28 +
 lib/libchart/classes/model/Point.php          |   59 +
 lib/libchart/classes/model/XYDataSet.php      |   56 +
 .../classes/model/XYSeriesDataSet.php         |   76 +
 lib/libchart/classes/view/axis/Axis.php       |  130 +
 lib/libchart/classes/view/axis/Bound.php      |  156 +
 lib/libchart/classes/view/caption/Caption.php |  112 +
 lib/libchart/classes/view/chart/BarChart.php  |  183 +
 lib/libchart/classes/view/chart/Chart.php     |  119 +
 .../classes/view/chart/HorizontalBarChart.php |  230 +
 lib/libchart/classes/view/chart/LineChart.php |  200 +
 lib/libchart/classes/view/chart/PieChart.php  |  264 +
 .../classes/view/chart/VerticalBarChart.php   |  229 +
 lib/libchart/classes/view/color/Color.php     |   99 +
 lib/libchart/classes/view/color/ColorSet.php  |   88 +
 lib/libchart/classes/view/color/Palette.php   |  156 +
 lib/libchart/classes/view/plot/Plot.php       |  445 ++
 .../classes/view/primitive/Padding.php        |   68 +
 .../classes/view/primitive/Primitive.php      |   70 +
 .../classes/view/primitive/Rectangle.php      |   80 +
 lib/libchart/classes/view/text/Text.php       |  129 +
 lib/libchart/doc/DEJAVU_LICENSE               |   51 +
 lib/libchart/doc/GNU_GPL_V3                   |  674 ++
 lib/libchart/images/PoweredBy.png             |  Bin 0 -> 1608 bytes
 lib/libchart/libchart.php                     |   33 -
 .../classes/view/chart/PieChart.php           |    6 +-
 lib/listutils.php                             |   25 +-
 lib/logging.php                               |   38 +-
 lib/menu.php                                  |   18 +-
 lib/opendbmailer.class.php                    |   16 +-
 lib/parseutils.php                            |   59 +-
 lib/phpmailer/LICENSE                         |  502 ++
 lib/phpmailer/PHPMailerAutoload.php           |   49 +
 lib/phpmailer/VERSION                         |    1 +
 lib/phpmailer/class.phpmailer.php             | 6322 +++++++++++------
 lib/phpmailer/class.phpmaileroauth.php        |  197 +
 lib/phpmailer/class.phpmaileroauthgoogle.php  |   77 +
 lib/phpmailer/class.pop3.php                  |  752 +-
 lib/phpmailer/class.smtp.php                  | 2090 +++---
 lib/phpmailer/get_oauth_token.php             |  162 +
 lib/phpmailer/language/phpmailer.lang-am.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-ar.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-az.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-ba.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-be.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-bg.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-ca.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-ch.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-cs.php  |   25 +
 lib/phpmailer/language/phpmailer.lang-da.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-de.php  |   25 +
 lib/phpmailer/language/phpmailer.lang-el.php  |   25 +
 lib/phpmailer/language/phpmailer.lang-en.php  |   23 -
 lib/phpmailer/language/phpmailer.lang-eo.php  |   25 +
 lib/phpmailer/language/phpmailer.lang-es.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-et.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-fa.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-fi.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-fo.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-fr.php  |   29 +
 lib/phpmailer/language/phpmailer.lang-gl.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-he.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-hr.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-hu.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-id.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-it.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-ja.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-ka.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-ko.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-lt.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-lv.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-ms.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-nb.php  |   25 +
 lib/phpmailer/language/phpmailer.lang-nl.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-pl.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-pt.php  |   26 +
 .../language/phpmailer.lang-pt_br.php         |   29 +
 lib/phpmailer/language/phpmailer.lang-ro.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-rs.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-ru.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-sk.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-sl.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-sv.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-tr.php  |   30 +
 lib/phpmailer/language/phpmailer.lang-uk.php  |   27 +
 lib/phpmailer/language/phpmailer.lang-vi.php  |   26 +
 lib/phpmailer/language/phpmailer.lang-zh.php  |   28 +
 .../language/phpmailer.lang-zh_cn.php         |   28 +
 lib/phpsniff/phpSniff.class.php               |   74 +-
 lib/phpthumb/.gitattributes                   |   22 +
 lib/phpthumb/.gitignore                       |  234 +
 lib/phpthumb/README.md                        |   12 +
 lib/phpthumb/composer.json                    |   28 +
 lib/phpthumb/fonts/readme.txt                 |    5 +
 lib/phpthumb/images/readme.txt                |    4 +
 lib/phpthumb/index.php                        |   10 +
 lib/phpthumb/license.txt                      |   29 +
 lib/phpthumb/licenses/license.gpl-10.txt      |  251 +
 lib/phpthumb/licenses/license.gpl-20.txt      |  339 +
 lib/phpthumb/licenses/license.gpl-30.txt      |  674 ++
 lib/phpthumb/licenses/license.lgpl-30.txt     |  165 +
 lib/phpthumb/licenses/license.mpl-20.txt      |  373 +
 lib/phpthumb/licenses/license.ptcl.txt        |   27 +
 lib/phpthumb/phpThumb.config.php.default      |  277 +
 lib/phpthumb/phpThumb.php                     |  711 ++
 lib/phpthumb/phpthumb.bmp.php                 |  156 +-
 lib/phpthumb/phpthumb.class.php               | 1849 +++--
 lib/phpthumb/phpthumb.filters.php             |  961 ++-
 lib/phpthumb/phpthumb.functions.php           |  389 +-
 lib/phpthumb/phpthumb.gif.php                 |  252 +-
 lib/phpthumb/phpthumb.ico.php                 |   69 +-
 lib/phpthumb/phpthumb.unsharp.php             |   54 +-
 lib/rss.php                                   |    8 +-
 lib/secretimage.php                           |    4 +-
 lib/site/amazon.class.php                     |   14 +-
 lib/site/amazonutils.php                      |    6 +-
 lib/site/cmbkdbt.class.php                    |    6 +-
 lib/site/dvdempire.class.php                  |    8 +-
 lib/site/dvdfr.class.php                      |    8 +-
 lib/site/emusic.class.php                     |    5 +-
 lib/site/freedb.class.php                     |   10 +-
 lib/site/gbooks.class.php                     |    4 +-
 lib/site/hminfo.class.php                     |    6 +-
 lib/site/iblist.class.php                     |    4 +-
 lib/site/imdbphp.class.php                    |   10 +-
 lib/site/mangaupdat.class.php                 |    4 +-
 lib/site/michaeld.class.php                   |    6 +-
 lib/site/mobygames.class.php                  |    4 +-
 lib/site/moviemeter.class.php                 |    4 +-
 lib/site/odbamazonecs.class.php               |   18 +-
 lib/site/tmdb.class.php                       |    4 +-
 lib/site_plugin.php                           |   10 +-
 lib/sortutils.php                             |    4 +-
 lib/statsdata.php                             |    4 +-
 lib/theme.php                                 |   54 +-
 lib/user.php                                  |    2 +-
 lib/utils.php                                 |   22 +-
 lib/welcome/CategoryStats.class.php           |    6 +-
 lib/welcome/LastItemsList.class.php           |    6 +-
 lib/welcome/WhatsNew.class.php                |   12 +-
 lib/whatsnew.php                              |   37 +-
 lib/widgets.php                               |   44 +-
 .../support/xajaxUserFunction.inc.php         |    2 +-
 .../plugin_layer/xajaxEventPlugin.inc.php     |    2 +-
 .../plugin_layer/xajaxFunctionPlugin.inc.php  |    2 +-
 .../plugin_layer/xajaxScriptPlugin.inc.php    |    2 +-
 .../xajax_core/xajaxArgumentManager.inc.php   |    3 -
 lib/xajax/xajax_core/xajaxRequest.inc.php     |    2 +-
 lib/xajax/xajax_core/xajaxResponse.inc.php    |    2 +-
 listings.php                                  |  119 +-
 login.php                                     |    3 +-
 quick_checkout.php                            |   18 +-
 rss.php                                       |    6 +-
 search.php                                    |    8 +-
 stats.php                                     |   12 +-
 test/GDImageTest.php                          |   16 +-
 user_admin.php                                |   12 +-
 welcome.php                                   |    7 +-
 250 files changed, 19113 insertions(+), 9862 deletions(-)
 rename lib/{GDImage.class.php => ODImage.class.php} (96%)
 delete mode 100644 lib/chart/JPGraphStatsChart.class.php
 delete mode 100644 lib/chart/LegacyStatsChart.class.php
 delete mode 100644 lib/chart/PhplotStatsChart.class.php
 rename lib/chart/{StatsLibChart12.class.php => StatsLibChart.class.php} (84%)
 delete mode 100644 lib/chart/StatsLibChart11.class.php
 delete mode 100644 lib/libchart/classes/Axis.php
 delete mode 100644 lib/libchart/classes/BarChart.php
 delete mode 100644 lib/libchart/classes/Chart.php
 delete mode 100644 lib/libchart/classes/Color.php
 delete mode 100644 lib/libchart/classes/HorizontalChart.php
 delete mode 100644 lib/libchart/classes/LineChart.php
 delete mode 100644 lib/libchart/classes/PieChart.php
 delete mode 100644 lib/libchart/classes/Point.php
 delete mode 100644 lib/libchart/classes/Primitive.php
 delete mode 100644 lib/libchart/classes/Text.php
 delete mode 100644 lib/libchart/classes/VerticalChart.php
 create mode 100644 lib/libchart/classes/libchart.php
 create mode 100644 lib/libchart/classes/model/ChartConfig.php
 create mode 100644 lib/libchart/classes/model/DataSet.php
 create mode 100644 lib/libchart/classes/model/Point.php
 create mode 100644 lib/libchart/classes/model/XYDataSet.php
 create mode 100644 lib/libchart/classes/model/XYSeriesDataSet.php
 create mode 100644 lib/libchart/classes/view/axis/Axis.php
 create mode 100644 lib/libchart/classes/view/axis/Bound.php
 create mode 100644 lib/libchart/classes/view/caption/Caption.php
 create mode 100644 lib/libchart/classes/view/chart/BarChart.php
 create mode 100644 lib/libchart/classes/view/chart/Chart.php
 create mode 100644 lib/libchart/classes/view/chart/HorizontalBarChart.php
 create mode 100644 lib/libchart/classes/view/chart/LineChart.php
 create mode 100644 lib/libchart/classes/view/chart/PieChart.php
 create mode 100644 lib/libchart/classes/view/chart/VerticalBarChart.php
 create mode 100644 lib/libchart/classes/view/color/Color.php
 create mode 100644 lib/libchart/classes/view/color/ColorSet.php
 create mode 100644 lib/libchart/classes/view/color/Palette.php
 create mode 100644 lib/libchart/classes/view/plot/Plot.php
 create mode 100644 lib/libchart/classes/view/primitive/Padding.php
 create mode 100644 lib/libchart/classes/view/primitive/Primitive.php
 create mode 100644 lib/libchart/classes/view/primitive/Rectangle.php
 create mode 100644 lib/libchart/classes/view/text/Text.php
 create mode 100644 lib/libchart/doc/DEJAVU_LICENSE
 create mode 100644 lib/libchart/doc/GNU_GPL_V3
 create mode 100644 lib/libchart/images/PoweredBy.png
 delete mode 100644 lib/libchart/libchart.php
 create mode 100644 lib/phpmailer/LICENSE
 create mode 100644 lib/phpmailer/PHPMailerAutoload.php
 create mode 100644 lib/phpmailer/VERSION
 create mode 100644 lib/phpmailer/class.phpmaileroauth.php
 create mode 100644 lib/phpmailer/class.phpmaileroauthgoogle.php
 create mode 100644 lib/phpmailer/get_oauth_token.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-am.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ar.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-az.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ba.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-be.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-bg.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ca.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ch.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-cs.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-da.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-de.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-el.php
 delete mode 100755 lib/phpmailer/language/phpmailer.lang-en.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-eo.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-es.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-et.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-fa.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-fi.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-fo.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-fr.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-gl.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-he.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-hr.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-hu.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-id.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-it.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ja.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ka.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ko.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-lt.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-lv.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ms.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-nb.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-nl.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-pl.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-pt.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-pt_br.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ro.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-rs.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-ru.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-sk.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-sl.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-sv.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-tr.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-uk.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-vi.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-zh.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-zh_cn.php
 create mode 100644 lib/phpthumb/.gitattributes
 create mode 100644 lib/phpthumb/.gitignore
 create mode 100644 lib/phpthumb/README.md
 create mode 100644 lib/phpthumb/composer.json
 create mode 100644 lib/phpthumb/fonts/readme.txt
 create mode 100644 lib/phpthumb/images/readme.txt
 create mode 100644 lib/phpthumb/index.php
 create mode 100644 lib/phpthumb/license.txt
 create mode 100644 lib/phpthumb/licenses/license.gpl-10.txt
 create mode 100644 lib/phpthumb/licenses/license.gpl-20.txt
 create mode 100644 lib/phpthumb/licenses/license.gpl-30.txt
 create mode 100644 lib/phpthumb/licenses/license.lgpl-30.txt
 create mode 100644 lib/phpthumb/licenses/license.mpl-20.txt
 create mode 100644 lib/phpthumb/licenses/license.ptcl.txt
 create mode 100644 lib/phpthumb/phpThumb.config.php.default
 create mode 100644 lib/phpthumb/phpThumb.php

diff --git a/admin.php b/admin.php
index 94f07ad8..3459d875 100644
--- a/admin.php
+++ b/admin.php
@@ -67,7 +67,7 @@
 				_theme_header($title);
 
 				// todo - this should really be in the <head>...</head> - does it matter?
-				if ($xajax) {
+				if (isset($xajax)) {
 					$xajax->printJavascript();
 				}
 
@@ -92,4 +92,4 @@
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/admin/backup/index.php b/admin/backup/index.php
index 8b587434..13dca4cf 100644
--- a/admin/backup/index.php
+++ b/admin/backup/index.php
@@ -106,13 +106,13 @@ function get_table_content($table, $crlf) {
 		unset($HTTP_VARS['tables']);
 
 		$opendb_tables_r = fetch_opendb_table_list_r();
-		while (list(, $value) = each($opendb_tables_r)) {
+		foreach ($opendb_tables_r as $value) {
 			$HTTP_VARS['tables'][] = $value;
 		}
 	}
 
 	@reset($HTTP_VARS['tables']);
-	while (list(, $table) = @each($HTTP_VARS['tables'])) {
+	foreach ($HTTP_VARS['tables'] as $table) {
 		echo $CRLF . "#" . $CRLF;
 		echo "# " . get_opendb_lang_var('dumping_data_for_table', 'table', $table) . $CRLF;
 		echo "#" . $CRLF . $CRLF;
@@ -126,7 +126,7 @@ function get_table_content($table, $crlf) {
 	echo ("<ul class=\"checkboxGridOptionsVertical\">");
 
 	$opendb_tables_r = fetch_opendb_table_list_r();
-	while (list(, $table) = each($opendb_tables_r)) {
+	foreach ($opendb_tables_r as $table) {
 		// the cache tables cannot be backed up as they might contain
 		// binary data, which we don't yet support.
 		if (!ends_with($table, '_cache') && $table != 'php_session') {
@@ -150,4 +150,4 @@ function get_table_content($table, $crlf) {
 	echo ("
 		</form>");
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/config/index.php b/admin/config/index.php
index d3fb45e2..6f447443 100755
--- a/admin/config/index.php
+++ b/admin/config/index.php
@@ -116,7 +116,7 @@ function get_group_block_input_field($config_group_item_r, $value) {
 
 			if (is_array($value)) {
 				reset($value);
-				while (list($key, $val) = each($value)) {
+				foreach ($value as $key => $val) {
 					$buffer .= "<option value=\"" . $val . "\" SELECTED>" . $val . "\n";
 				}
 			}
@@ -145,7 +145,7 @@ function get_group_block($config_group_r) {
 	global $PHP_SELF;
 	global $ADMIN_TYPE;
 
-	$buffer .= "<form name=\"config\" action=\"$PHP_SELF\" method=\"POST\">" . "<input type=\"hidden\" name=\"type\" value=\"" . $ADMIN_TYPE . "\">" . "<input type=\"hidden\" name=\"op\" value=\"save\">" . "<input type=\"hidden\" name=\"group_id\" value=\"" . $config_group_r['id'] . "\">";
+	$buffer = "<form name=\"config\" action=\"$PHP_SELF\" method=\"POST\">" . "<input type=\"hidden\" name=\"type\" value=\"" . $ADMIN_TYPE . "\">" . "<input type=\"hidden\" name=\"op\" value=\"save\">" . "<input type=\"hidden\" name=\"group_id\" value=\"" . $config_group_r['id'] . "\">";
 
 	$buffer .= "<ul class=\"saveButtons\">
 				<li><input type=\"submit\" class=\"submit\" value=\"Refresh\" onclick=\"this.form['op'].value='';\"></li>
@@ -259,9 +259,9 @@ function save_config($HTTP_VARS, &$errors) {
 function save_config_item($config_group_item_r, $HTTP_VARS, &$errors) {
 	$http_value = NULL;
 	if ($config_group_item_r['keyid'] != '0')
-		$http_value = $HTTP_VARS[$config_group_item_r['group_id']][$config_group_item_r['id']][$config_group_item_r['keyid']];
+		$http_value = $HTTP_VARS[$config_group_item_r['group_id']][$config_group_item_r['id']][$config_group_item_r['keyid']] ?? "";
 	else
-		$http_value = $HTTP_VARS[$config_group_item_r['group_id']][$config_group_item_r['id']];
+		$http_value = $HTTP_VARS[$config_group_item_r['group_id']][$config_group_item_r['id']] ?? "";
 
 	// if old values exist, and count of new values is the same, then no need to proceed.
 	if ($config_group_item_r['type'] == 'array') {
@@ -272,7 +272,7 @@ function save_config_item($config_group_item_r, $HTTP_VARS, &$errors) {
 
 		if (is_not_empty_array($http_value)) {
 			reset($http_value);
-			while (list($key, $value) = each($http_value)) {
+			foreach ($http_value as $key => $value) {
 				if ($value != 'NULL') {
 					if (!insert_s_config_group_item_var($config_group_item_r['group_id'], $config_group_item_r['id'], $key, $value)) {
 						$errors[] = array('error' => 'Config Group Item Var not inserted', 'detail' => db_error());
@@ -311,7 +311,7 @@ function save_config_item($config_group_item_r, $HTTP_VARS, &$errors) {
 
 @set_time_limit(0);
 
-if (strlen($HTTP_VARS['group_id']) == 0) {
+if (strlen($HTTP_VARS['group_id'] ?? "") == 0) {
 	$HTTP_VARS['group_id'] = 'site';
 }
 
@@ -321,7 +321,7 @@ function save_config_item($config_group_item_r, $HTTP_VARS, &$errors) {
 	save_config($HTTP_VARS, $errors);
 }
 
-if (is_not_empty_array($errors))
+if (is_not_empty_array($errors ?? ""))
 	echo format_error_block($errors);
 echo get_javascript("admin/config/select.js");
 
@@ -342,21 +342,20 @@ function save_config_item($config_group_item_r, $HTTP_VARS, &$errors) {
 	$first = TRUE;
 
 	reset($config_group_rs);
-	while (list(, $config_group_r) = each($config_group_rs)) {
+	foreach ($config_group_rs as $config_group_r) {
 		if ($config_group_r['id'] == $HTTP_VARS['group_id'])
 			echo "\n<li class=\"activetab " . ($first ? " first" : "") . "\">" . $config_group_r['name'] . "</li>";
 		else
 			echo "\n<li class=\"" . ($first ? "first" : "") . "\"><a href=\"$PHP_SELF?type=$ADMIN_TYPE&group_id=" . $config_group_r['id'] . "\">" . $config_group_r['name'] . "</a></li>";
 		$first = FALSE;
 	}
-	db_free_result($results);
 
 	echo ("\n</ul>");
 
 	echo ("<div id=\"tab-content\">");
 
 	reset($config_group_rs);
-	while (list(, $config_group_r) = each($config_group_rs)) {
+	foreach ($config_group_rs as $config_group_r) {
 		if ($config_group_r['id'] == $HTTP_VARS['group_id']) {
 			echo get_group_block($config_group_r);
 			break;
@@ -366,4 +365,4 @@ function save_config_item($config_group_item_r, $HTTP_VARS, &$errors) {
 }
 
 echo ("</div>");
-?>
\ No newline at end of file
+?>
diff --git a/admin/patch_facility/index.php b/admin/patch_facility/index.php
index 3ae08d99..2820902a 100644
--- a/admin/patch_facility/index.php
+++ b/admin/patch_facility/index.php
@@ -37,7 +37,7 @@ function echo_install_sql_file($sqlfile) {
 		return false;
 	}
 
-	while (list(, $line) = each($lines)) {
+	foreach ($lines as $line) {
 		if (strlen(trim($line)) === 0)
 			echo ("<br />");
 		else {
@@ -122,4 +122,4 @@ function validate_sql_script($patchdir, $sqlfile) {
 	display_patch_list('Customise for Country', 'country');
 	display_patch_list('Miscellaneous Updates', 'extras');
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_address_type/index.php b/admin/s_address_type/index.php
index 3ea9e4fd..7f6b4ce9 100644
--- a/admin/s_address_type/index.php
+++ b/admin/s_address_type/index.php
@@ -107,7 +107,7 @@ function display_s_addr_attribute_type_rltshp_row($s_address_type, $s_addr_attri
 
 		echo ("<td class=\"$class\">" . "<select name=\"s_attribute_type[$row]\">" . "\n<option value=\"\">");
 		reset($s_attribute_type_list_rs);
-		while (list(, $attribute_type_r) = each($s_attribute_type_list_rs)) {
+		foreach ($s_attribute_type_list_rs as $attribute_type_r) {
 			if (is_not_empty_array($s_addr_attribute_type_rltshp_r) && $s_addr_attribute_type_rltshp_r['s_attribute_type'] == $attribute_type_r['s_attribute_type'])
 				echo ("\n<option value=\"" . $attribute_type_r['s_attribute_type'] . "\" SELECTED>" . $attribute_type_r['s_attribute_type']);
 			else
@@ -302,7 +302,7 @@ function display_s_addr_attribute_type_rltshp_row($s_address_type, $s_addr_attri
 
 		// Now display records that could not be inserted.
 		if (is_not_empty_array($saatr_already_exists)) {
-			while (list(, $saatr_r) = each($saatr_already_exists)) {
+			foreach ($saatr_already_exists as $saatr_r) {
 				display_s_addr_attribute_type_rltshp_row($HTTP_VARS['s_address_type'], $saatr_r, $row, TRUE, $s_attribute_type_list_rs);
 				$row++;
 			}
@@ -365,7 +365,7 @@ function display_s_addr_attribute_type_rltshp_row($s_address_type, $s_addr_attri
 if (strlen($HTTP_VARS['op']) == 0 || $HTTP_VARS['op'] == 'edit_types' || $HTTP_VARS['op'] == 'update_types') {
 	echo ("<p>[<a href=\"${PHP_SELF}?type=${ADMIN_TYPE}&op=new_type\">New Address Type</a>]</p>");
 
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? ""))
 		echo format_error_block($errors);
 
 	$results = fetch_s_address_type_rs();
@@ -394,4 +394,4 @@ function display_s_addr_attribute_type_rltshp_row($s_address_type, $s_addr_attri
 		echo ("<p class=\"error\">No Address Types Installed</p>");
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_attribute_type/index.php b/admin/s_attribute_type/index.php
index d59ea2ed..36c3b631 100644
--- a/admin/s_attribute_type/index.php
+++ b/admin/s_attribute_type/index.php
@@ -29,7 +29,7 @@
 $input_type_functions_cats = array('lookup' => array('radio_grid', 'checkbox_grid', 'single_select', 'multi_select'), 'multi' => array('datetime', 'email', 'filtered', 'number', 'password', 'text', 'url'), 'normal' => array(), 'restricted' => array('review_options'));
 
 reset($input_type_functions);
-while (list($key, ) = each($input_type_functions)) {
+foreach($input_type_functions as $key => $_v) {
 	if (!in_array($key, $input_type_functions_cats['lookup']) && !in_array($key, $input_type_functions_cats['restricted'])) {
 		$input_type_functions_cats['normal'][] = $key;
 	}
@@ -57,7 +57,7 @@ function get_attribute_ind_type_function_list($type) {
 	$new_function_list = Array();
 
 	reset($input_type_functions);
-	while (list($key, $function) = each($input_type_functions)) {
+	foreach ($input_type_functions as $key => $function) {
 		if (in_array($key, $input_type_functions_cats[$type])) {
 			$new_function_list[$key] = $function;
 		}
@@ -74,7 +74,7 @@ function get_attribute_ind_type_function_list($type) {
 function build_function_list($name, $list_array, $function_type, $onchange_event = NULL) {
 	$select = "\n<select name=\"$name\" onchange=\"$onchange_event\">";
 
-	while (list($key, ) = each($list_array)) {
+	foreach($list_array as $key => $_v) {
 		if (strcasecmp($function_type, $key) === 0)
 			$select .= "\n<option value=\"$key\" SELECTED>$key";
 		else
@@ -94,7 +94,7 @@ function get_function_spec($type, $func_args) {
 	$args = "";
 
 	@reset($func_args);
-	while (list(, $value) = @each($func_args)) {
+	foreach ($func_args as $value) {
 		if (substr($value, -3) === '[Y]') {
 			$value = substr($value, 0, -3);
 			if (strlen($args) == 0)
@@ -124,13 +124,13 @@ function get_widget_tooltip_array() {
 
 	//name, type, description, spec, args
 	reset($input_type_functions);
-	while (list($name, $definition) = each($input_type_functions)) {
+	foreach ($input_type_functions as $name => $definition) {
 		$arrayOfAttributes .= "arrayOfWidgetTooltips[$count] = " . get_widget_js_entry($name, 'input', $definition);
 		$count++;
 	}
 
 	reset($display_type_functions);
-	while (list($name, $definition) = each($display_type_functions)) {
+	foreach ($display_type_functions as $name => $definition) {
 		$arrayOfAttributes .= "arrayOfWidgetTooltips[$count] = " . get_widget_js_entry($name, 'display', $definition);
 		$count++;
 	}
@@ -145,7 +145,7 @@ function get_widget_js_entry($name, $type, $definition) {
 	$spec = get_function_spec($name, $definition['args']);
 
 	$args = array();
-	while (list(, $value) = each($definition['args'])) {
+	foreach ($definition['args'] as $value) {
 		if (substr($value, -3) === "[Y]") {
 			$value = substr($value, 0, -3);
 		}
@@ -191,11 +191,13 @@ function display_attribute_type_form($HTTP_VARS) {
 	}
 
 	echo ("<div class=\"tabContainer\">" . "<form name=\"s_attribute_type_lookup\" action=\"$PHP_SELF\" method=\"POST\">" . "<input type=\"hidden\" name=\"type\" value=\"" . $ADMIN_TYPE . "\">" . "<input type=\"hidden\" name=\"op\" value=\"\">"
-			. "<input type=\"hidden\" name=\"s_attribute_type\" value=\"" . $HTTP_VARS['s_attribute_type'] . "\">");
+		  . "<input type=\"hidden\" name=\"s_attribute_type\" value=\"" . ($HTTP_VARS['s_attribute_type'] ?? "") . "\">");
 
 	$isFirst = true;
 	echo ("<ul class=\"tabMenu\" id=\"tab-menu\">");
-	while (list($letter, $attribute_type_rs) = each($alpha_attribute_type_rs)) {
+	if (!isset($HTTP_VARS['active_tab']))
+		$HTTP_VARS['active_tab'] = "";
+	foreach ($alpha_attribute_type_rs as $letter => $attribute_type_rs) {
 		$isFirst ? $class = "first" : $class = "";
 		if ($letter == $HTTP_VARS['active_tab'] || ($HTTP_VARS['active_tab'] == "" && $isFirst))
 			$class .= " activeTab";
@@ -207,14 +209,14 @@ function display_attribute_type_form($HTTP_VARS) {
 	reset($alpha_attribute_type_rs);
 	$isFirst = true;
 	echo ('<div id="tab-content">');
-	while (list($letter, $attribute_type_rs) = each($alpha_attribute_type_rs)) {
+	foreach ($alpha_attribute_type_rs as $letter => $attribute_type_rs) {
 		($isFirst && $HTTP_VARS['active_tab'] == "") ? $class = "tabContent" : $class = "tabContentHidden";
 		if ($letter == $HTTP_VARS['active_tab'])
 			$class = "tabContent";
 		echo ("<div id=\"pane$letter\" class=\"$class\">\n" . "\n<table>" . "<tr class=\"navbar\">" . "<th>Type</th>" . "<th>Description</th>" . "<th>Field Type</th>" . "<th colspan=\"2\"></th>" . "</tr>");
 
-		while (list(, $attribute_type_r) = each($attribute_type_rs)) {
-			echo (get_s_attribute_type_row($attribute_type_r, $row, $letter));
+		foreach ($attribute_type_rs as $attribute_type_r) {
+			echo (get_s_attribute_type_row($attribute_type_r, NULL, $letter));
 		}
 
 		echo ("</table></div>");
@@ -485,7 +487,7 @@ function build_roles_select($attribute_type_r) {
 function build_options_array($type, $input_type_functions_cats) {
 	$buffer = "inputOptions['$type'] = new Array(";
 	reset($input_type_functions_cats[$type]);
-	while (list(, $value) = each($input_type_functions_cats[$type])) {
+	foreach ($input_type_functions_cats[$type] as $value) {
 		$buffer .= "'$value',";
 	}
 
@@ -538,7 +540,7 @@ function build_attribute_ind_type_widget($attribute_ind_type, $HTTP_VARS) {
 	$options = array('lookup' => 'Lookup', 'normal' => 'Normal', 'multi' => 'Multi Value');
 
 	$field = '';
-	while (list($key, $value) = each($options)) {
+	foreach ($options as $key => $value) {
 		$field .= "<input type=\"radio\" class=\"radio\" name=\"attribute_ind_type\" value=\"$key\" onClick=\"populateInputSelect(this.form['input_type'], '$key');\"";
 		if ($key == $attribute_ind_type)
 			$field .= ' CHECKED';
@@ -835,8 +837,9 @@ function toggleChecked(element, name)
 	display_lookup_attribute_type_form($HTTP_VARS);
 
 	echo (format_help_block('Image(s) must be in a <i>theme search path</i> directory.'));
+
 } else if ($HTTP_VARS['op'] == '') {
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? ""))
 		echo format_error_block($errors);
 
 	echo ("<p>[<a href=\"${PHP_SELF}?type=${ADMIN_TYPE}&op=new\">New Attribute Type</a>]</p>");
diff --git a/admin/s_file_type/functions.php b/admin/s_file_type/functions.php
index dc9f6ef0..f076b584 100644
--- a/admin/s_file_type/functions.php
+++ b/admin/s_file_type/functions.php
@@ -135,7 +135,7 @@ function insert_s_file_type_extensions($content_type, $default_extension, $alt_e
 				else
 					$extensions_r[] = $default_extension;
 
-				while (list(, $extension) = each($extensions_r)) {
+				foreach ($extensions_r as $extension) {
 					$extension = strtolower(trim($extension));
 					if (strlen($extension) > 0) {
 						$query = "INSERT INTO s_file_type_extension ( content_type, extension, default_ind )" . "VALUES ('$content_type', '" . $extension . "', '" . ($extension == $default_extension ? 'Y' : 'N') . "')";
@@ -211,4 +211,4 @@ function delete_s_file_type_extensions($content_type) {
 		return FALSE;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_item_listing_conf/functions.php b/admin/s_item_listing_conf/functions.php
index 122be8d4..e29a1e20 100644
--- a/admin/s_item_listing_conf/functions.php
+++ b/admin/s_item_listing_conf/functions.php
@@ -240,7 +240,7 @@ function validate_item_column_conf(&$column_no, &$column_type, &$s_field_type, &
 function insert_new_column_conf_set($silc_id, $column_conf_rs) {
 	if (db_query("LOCK TABLES s_item_listing_column_conf WRITE, s_item_listing_conf WRITE")) {
 		if (delete_s_item_listing_column_conf($silc_id)) {
-			while (list(, $column_conf_r) = each($column_conf_rs)) {
+			foreach ($column_conf_rs as $column_conf_r) {
 				// there is not a whole lot we can do if this fails, so keep going
 				insert_s_item_listing_column_conf($silc_id, $column_conf_r['column_no'], $column_conf_r['column_type'], $column_conf_r['s_field_type'], $column_conf_r['s_attribute_type'], $column_conf_r['override_prompt'], $column_conf_r['printable_support_ind'],
 						$column_conf_r['orderby_support_ind'], $column_conf_r['orderby_datatype'], $column_conf_r['orderby_default_ind'], $column_conf_r['orderby_sort_order'], TRUE); //assumes validation already performed
diff --git a/admin/s_item_listing_conf/index.php b/admin/s_item_listing_conf/index.php
index 9d6ef3ac..13e0f5e8 100644
--- a/admin/s_item_listing_conf/index.php
+++ b/admin/s_item_listing_conf/index.php
@@ -42,7 +42,7 @@ function get_attribute_type_rs($attribute_type_rs) {
 	}
 
 	reset($_attribute_type_list_rs);
-	while (list(, $_attribute_type_list_r) = each($_attribute_type_list_rs)) {
+	foreach ($_attribute_type_list_rs as $_attribute_type_list_r) {
 		$attribute_type_rs[] = $_attribute_type_list_r;
 	}
 
@@ -175,7 +175,7 @@ function get_column_details($record_r, $row) {
 	// column_no hidden must be null for us to determine if a row has been populated
 	$buffer .= get_input_field("column_no[$row]", NULL, 'Column No', 'hidden', 'N', $record_r['column_no'], FALSE);
 
-	while (list(, $column_r) = each($columns_r)) {
+	foreach ($columns_r as $column_r) {
 		$buffer .= '<td class="' . $class . '" id="' . $column_r['column'] . '[' . $row . ']" nowrap>' . $column_r['field'] . '</td>';
 	}
 	$buffer .= '</tr>';
@@ -354,4 +354,4 @@ function get_column_details($record_r, $row) {
 
 	echo ("</form>");
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_item_type/functions.php b/admin/s_item_type/functions.php
index c4d4d527..66945339 100644
--- a/admin/s_item_type/functions.php
+++ b/admin/s_item_type/functions.php
@@ -25,7 +25,7 @@ function get_s_attribute_type_tooltip_array($s_attribute_type_list_rs) {
 	$arrayOfAttributes = "arrayOfSystemAttributeTypeTooptips = new Array(" . count($s_attribute_type_list_rs) . ");\n";
 	$count = 0;
 	reset($s_attribute_type_list_rs);
-	while (list(, $s_attribute_type_r) = each($s_attribute_type_list_rs)) {
+	foreach ($s_attribute_type_list_rs as $s_attribute_type_r) {
 		$arrayOfAttributes .= "arrayOfSystemAttributeTypeTooptips[$count] = new SystemAttributeTypeTooltip('" . addslashes($s_attribute_type_r['s_attribute_type']) . "', '" . addslashes($s_attribute_type_r['description']) . "', '" . addslashes($s_attribute_type_r['prompt']) . "', '"
 				. addslashes($s_attribute_type_r['input_type']) . "', '" . addslashes($s_attribute_type_r['display_type']) . "', '" . addslashes($s_attribute_type_r['s_field_type']) . "', '" . addslashes($s_attribute_type_r['site_type']) . "');\n";
 		$count++;
diff --git a/admin/s_item_type/index.php b/admin/s_item_type/index.php
index aa195faf..ced817b1 100644
--- a/admin/s_item_type/index.php
+++ b/admin/s_item_type/index.php
@@ -174,7 +174,7 @@ function display_s_item_attribute_type_row($s_item_type, $s_item_attribute_type_
 
 		echo ("<td class=\"$class\">" . "<select name=\"s_attribute_type[$row]\">" . "\n<option value=\"\">");
 		reset($s_attribute_type_list_rs);
-		while (list(, $attribute_type_r) = each($s_attribute_type_list_rs)) {
+		foreach ($s_attribute_type_list_rs as $attribute_type_r) {
 			if (is_not_empty_array($s_item_attribute_type_r) && $s_item_attribute_type_r['s_attribute_type'] == $attribute_type_r['s_attribute_type'])
 				echo ("\n<option value=\"" . $attribute_type_r['s_attribute_type'] . "\" SELECTED>" . $attribute_type_r['s_attribute_type']);
 			else
@@ -368,6 +368,7 @@ function delete_sitemtype_items($s_item_type) {
 	$sqlfile = generate_s_item_type_sql($HTTP_VARS['s_item_type']);
 	header("Content-Length: " . strlen($sqlfile));
 	echo ($sqlfile);
+
 } else if ($HTTP_VARS['op'] == 'delete_type') { // This is initiated from the main s_item_type form.
 	$item_type_r = fetch_s_item_type_r($HTTP_VARS['s_item_type']);
 	if ($item_type_r !== FALSE) {
@@ -648,7 +649,7 @@ function delete_sitemtype_items($s_item_type) {
 
 		// Now display records that could not be inserted.
 		if (is_not_empty_array($sait_already_exists)) {
-			while (list(, $sait_r) = each($sait_already_exists)) {
+			foreach ($sait_already_exists as $sait_r) {
 				display_s_item_attribute_type_row($HTTP_VARS['s_item_type'], $sait_r, $row, TRUE, $s_attribute_type_list_rs);
 				$row++;
 			}
@@ -712,7 +713,7 @@ function delete_sitemtype_items($s_item_type) {
 		|| $HTTP_VARS['op'] == 'edit_types' || $HTTP_VARS['op'] == 'update_types') {
 	echo ("<p>[<a href=\"${PHP_SELF}?type=${ADMIN_TYPE}&op=new_type\">New Item Type</a>]</p>");
 
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? ""))
 		echo format_error_block($errors);
 
 	$results = fetch_s_item_type_rs();
@@ -745,4 +746,4 @@ function is_not_exists_item_type($type) {
 	}
 	generate_sql_list($ADMIN_TYPE, 'Item Type', NULL, 'is_not_exists_item_type');
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_language/index.php b/admin/s_language/index.php
index 62284d7a..9f306efd 100644
--- a/admin/s_language/index.php
+++ b/admin/s_language/index.php
@@ -57,11 +57,11 @@ function generate_language_sql($language, $options = NULL) {
 				$sqlscript .= $CRLF . '#' . $CRLF . '# System Table Language Variables' . $CRLF . '#' . $CRLF;
 
 				reset($table_r);
-				while (list(, $table) = each($table_r)) {
+				foreach ($table_r as $table) {
 					$tableconf_r = get_system_table_config($table); // key, column
 					if (is_array($tableconf_r) && is_array($tableconf_r['columns'])) {
 						reset($tableconf_r['columns']);
-						while (list(, $column) = each($tableconf_r['columns'])) {
+						foreach ($tableconf_r['columns'] as $column) {
 							$results = fetch_system_table_column_langvar_rs($language, $table, $column, $options);
 							if ($results) {
 								while ($lang_var_r = db_fetch_assoc($results)) {
@@ -120,7 +120,7 @@ function build_langvar_page($language) {
 	echo ("<ul class=\"tabMenu\" id=\"tab-menu\">");
 
 	$isFirst = true;
-	while (list($letter, $lang_var_rs) = each($alpha_lang_var_rs)) {
+	foreach ($alpha_lang_var_rs as $letter => $lang_var_rs) {
 		echo ("<li id=\"menu-pane$letter\"" . ($isFirst ? " class=\"first activetab\" " : "") . " onclick=\"return activateTab('pane$letter')\">&nbsp;$letter&nbsp;</li>");
 		$isFirst = false;
 	}
@@ -132,7 +132,7 @@ function build_langvar_page($language) {
 	echo ("<ul class=\"saveButtons\"><li><input type=\"submit\" class=\"submit\" value=\"Update\"></li></ul>");
 
 	$isFirst = true;
-	while (list($letter, $lang_var_rs) = each($alpha_lang_var_rs)) {
+	foreach ($alpha_lang_var_rs as $letter => $lang_var_rs) {
 		echo ("<div id=\"pane$letter\" class=\"" . ($isFirst ? "tabContent" : "tabContentHidden") . "\">\n");
 
 		echo ('<table><tr class="navbar">');
@@ -143,7 +143,7 @@ function build_langvar_page($language) {
 		}
 
 		echo ('<th>Value</th></tr>');
-		while (list(, $lang_var_r) = each($lang_var_rs)) {
+		foreach ($lang_var_rs as $letter => $lang_var_r) {
 			echo ('<tr>');
 			echo ('<td class="prompt">' . $lang_var_r['varname'] . '</td>');
 			if (!is_default_language($language)) {
@@ -181,11 +181,11 @@ function build_table_page($language) {
 
 	$table_r = get_system_table_r();
 	reset($table_r);
-	while (list(, $table) = each($table_r)) {
+	foreach ($table_r as $table) {
 		$tableconf_r = get_system_table_config($table);
 		if (is_array($tableconf_r) && is_array($tableconf_r['columns'])) {
 			reset($tableconf_r['columns']);
-			while (list(, $column) = each($tableconf_r['columns'])) {
+			foreach ($tableconf_r['columns'] as $column) {
 				$results = fetch_system_table_column_langvar_rs($language, $table, $column, !is_default_language($language) ? OPENDB_LANG_INCLUDE_DEFAULT : NULL);
 				if ($results) {
 					$current_key1_value = NULL;
@@ -250,7 +250,7 @@ function build_div_table($language, $table, $column, $table_lang_rs, &$row) {
 
 	$block .= '<th>Default ' . $column . '</th><th>Language ' . $column . '</th></tr>';
 
-	while (list(, $table_lang_r) = each($table_lang_rs)) {
+	foreach ($table_lang_rs as $table_lang_r) {
 		$block .= '<tr>';
 
 		for ($i = 1; $i <= count($tableconf_r['key']); $i++) {
@@ -272,13 +272,13 @@ function build_div_table($language, $table, $column, $table_lang_rs, &$row) {
 function update_system_table_lang_vars($HTTP_VARS) {
 	if (is_array($HTTP_VARS['lang_var'])) {
 		reset($HTTP_VARS['lang_var']);
-		while (list($table, ) = each($HTTP_VARS['lang_var'])) {
+		foreach ($HTTP_VARS['lang_var'] as $table => $_v) {
 			if (is_array($HTTP_VARS['lang_var'][$table])) {
 				reset($HTTP_VARS['lang_var'][$table]);
-				while (list($column, ) = each($HTTP_VARS['lang_var'][$table])) {
+				foreach ($HTTP_VARS['lang_var'][$table] as $column => $_v) {
 					if (is_array($HTTP_VARS['lang_var'][$table][$column])) {
 						reset($HTTP_VARS['lang_var'][$table][$column]);
-						while (list(, $lang_conf_r) = each($HTTP_VARS['lang_var'][$table][$column])) {
+						foreach ($HTTP_VARS['lang_var'][$table][$column] as $lang_conf_r) {
 							if (strlen($lang_conf_r['langvar']) > 0) {
 								if (is_exists_system_table_language_var($HTTP_VARS['language'], $table, $column, $lang_conf_r['key1'], $lang_conf_r['key2'], $lang_conf_r['key3'])) {
 									update_s_table_language_var($HTTP_VARS['language'], $table, $column, $lang_conf_r['key1'], $lang_conf_r['key2'], $lang_conf_r['key3'], $lang_conf_r['langvar']);
@@ -299,7 +299,7 @@ function update_system_table_lang_vars($HTTP_VARS) {
 function update_lang_vars($HTTP_VARS) {
 	if (is_array($HTTP_VARS['lang_var'])) {
 		reset($HTTP_VARS['lang_var']);
-		while (list($varname, $value) = each($HTTP_VARS['lang_var'])) {
+		foreach ($HTTP_VARS['lang_var'] as $varname => $value) {
 			if (strlen($value) > 0) {
 				if (is_exists_language_var($HTTP_VARS['language'], $varname)) {
 					update_s_language_var($HTTP_VARS['language'], $varname, $value);
@@ -416,4 +416,4 @@ function is_not_exists_language($language) {
 	}
 	generate_sql_list($ADMIN_TYPE, 'Language', NULL, 'is_not_exists_language');
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_role/functions.php b/admin/s_role/functions.php
index b4951b44..9988cb45 100644
--- a/admin/s_role/functions.php
+++ b/admin/s_role/functions.php
@@ -48,7 +48,7 @@ function update_role_permissions($role_name, $permissions_r) {
 
 	if (strlen($role_name) > 0 && is_array($permissions_r)) {
 		reset($permissions_r);
-		while (list($permission_name, $permission_r) = each($permissions_r)) {
+		foreach ($permissions_r as $permission_name => $permission_r) {
 			$enabled_ind = validate_ind_column($permission_r['enabled_ind']);
 			$remember_me_ind = validate_ind_column($permission_r['remember_me_ind']);
 			
@@ -74,4 +74,4 @@ function update_role_permissions($role_name, $permissions_r) {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_site_plugin/InstallTableAjaxJobs.class.php b/admin/s_site_plugin/InstallTableAjaxJobs.class.php
index 38c9a965..ae0a64f8 100644
--- a/admin/s_site_plugin/InstallTableAjaxJobs.class.php
+++ b/admin/s_site_plugin/InstallTableAjaxJobs.class.php
@@ -8,8 +8,8 @@ class InstallTableAjaxJobs extends AdminAjaxJobs {
 	var $_uploadFile;
 	var $_totalItems;
 
-	function InstallTableAjaxJobs($job) {
-		parent::AdminAjaxJobs(get_class($this), $job, 1000);
+	function __construct($job) {
+		parent::__construct(get_class($this), $job, 1000);
 	}
 
 	function __executeJob() {
@@ -85,38 +85,5 @@ function __perform_install_table_batch() {
 			return FALSE;
 		}
 	}
-
-	//	function summary_details(&$installPlugin) {
-	//		$buffer .= "\n<h4>Summary Details</h4>";
-	//		$buffer .= "\n<table><tr class=\"navbar\">";
-	//		$buffer .= "\n<th>Processed</th><th>Inserted</th><th>Updated</th><th>Deleted</th></tr>";
-	//		$buffer .= "\n<tr>";
-	//		$buffer .= "<td class=\"oddRow\">".$installPlugin->getProcessedCount()."</td>";
-	//		$buffer .= "<td class=\"oddRow\">".$installPlugin->getInsertCount()."</td>";
-	//		$buffer .= "<td class=\"oddRow\">".$installPlugin->getUpdateCount()."</td>";
-	//		$buffer .= "<td class=\"oddRow\">".$installPlugin->getDeleteCount()."</td>";
-	//		$buffer .= "</tr></table>";
-	//		
-	//		$errors_r = $installPlugin->getErrors();
-	//		if(is_not_empty_array($errors_r))
-	//		{
-	//			$buffer .= "\n<h4>Error Details</h4>";
-	//			
-	//			$buffer .= "\n<table>";
-	//			reset($errors_r);
-	//			$buffer .= "\n<tr class=\"navbar\"><th>Row No.</th><th>Error</th><th>Details</th></tr>";
-	//			$toggle=TRUE;
-	//			while(list(,$error_r) = each($errors_r))
-	//			{
-	//				$color = ($toggle?"oddRow":"evenRow");
-	//				$toggle = !$toggle;
-	//	
-	//				$buffer .= "\n<tr><td class=\"$color\">".$error_r['rowcount']."</td><td class=\"$color\">".$error_r['error']."</td><td class=\"$color\">".$error_r['details']."</td></tr>";
-	//			}
-	//			$buffer .= "\n</table>";
-	//		}
-	//		
-	//		return $buffer;
-	//	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_site_plugin/ajaxjobs.php b/admin/s_site_plugin/ajaxjobs.php
index 677d1608..0327686d 100644
--- a/admin/s_site_plugin/ajaxjobs.php
+++ b/admin/s_site_plugin/ajaxjobs.php
@@ -3,7 +3,7 @@
 
 include_once("./admin/s_site_plugin/InstallTableAjaxJobs.class.php");
 
-$HTTP_VARS['import_file'] = basename($HTTP_VARS['import_file']);
-$jobObj = new InstallTableAjaxJobs($HTTP_VARS['site_type']);
+$HTTP_VARS['import_file'] = basename($HTTP_VARS['import_file'] ?? '');
+$jobObj = new InstallTableAjaxJobs($HTTP_VARS['site_type'] ?? "");
 $xajax->register(XAJAX_CALLABLE_OBJECT, $jobObj);
-?>
\ No newline at end of file
+?>
diff --git a/admin/s_site_plugin/index.php b/admin/s_site_plugin/index.php
index 0cd1d72c..20a1d871 100644
--- a/admin/s_site_plugin/index.php
+++ b/admin/s_site_plugin/index.php
@@ -542,7 +542,7 @@ function generate_site_plugin_sql($site_type_r) {
 		if (is_not_empty_array($site_attribute_type_r)) {
 			if (is_not_empty_array($HTTP_VARS['s_item_type'])) {
 				reset($HTTP_VARS['s_item_type']);
-				while (list($v_s_item_type, $value) = each($HTTP_VARS['s_item_type'])) {
+				foreach ($HTTP_VARS['s_item_type'] as $v_s_item_type => $value) {
 					if (is_exists_item_type($v_s_item_type)) {
 						// now we need to transfer in 
 						if ($value == 'exclude') {
@@ -558,7 +558,7 @@ function generate_site_plugin_sql($site_type_r) {
 
 							$delete = TRUE;
 							reset($site_item_attribute_type_rs);
-							while (list(, $site_item_attribute_type_r) = each($site_item_attribute_type_rs)) {
+							foreach ($site_item_attribute_type_rs as $site_item_attribute_type_r) {
 								if (!is_s_item_attribute_type_deletable($v_s_item_type, $site_item_attribute_type_r['s_attribute_type'], $site_item_attribute_type_r['order_no'])) {
 									$errors[] = array('error' => 'Dependent Item Attribute records exist', 'detail' => 's_item_type=' . $v_s_item_type . ', s_attribute_type=' . $site_item_attribute_type_r['s_attribute_type'] . ', order_no=' . $site_item_attribute_type_r['order_no']);
 									$delete = FALSE;
@@ -567,7 +567,7 @@ function generate_site_plugin_sql($site_type_r) {
 
 							if ($delete) {
 								reset($site_item_attribute_type_rs);
-								while (list(, $site_item_attribute_type_r) = each($site_item_attribute_type_rs)) {
+								foreach ($site_item_attribute_type_rs as $site_item_attribute_type_r) {
 									if (!delete_s_item_attribute_type($v_s_item_type, $site_item_attribute_type_r['s_attribute_type'], $site_item_attribute_type_r['order_no']))
 										$errors[] = array('error' => 'System Item Attribute Type (s_item_type=' . $v_s_item_type . ', s_attribute_type=' . $site_item_attribute_type_r['s_attribute_type'] . ', order_no=' . $site_item_attribute_type_r['order_no'] . ') not deleted', 'detail' => db_error());
 								}
@@ -1145,7 +1145,7 @@ function generate_site_plugin_sql($site_type_r) {
 			if (is_not_empty_array($file_list_r)) {
 				$toggle = TRUE;
 				reset($file_list_r);
-				while (list(, $file) = each($file_list_r)) {
+				foreach ($file_list_r as $file) {
 					$color = ($toggle ? "oddRow" : "evenRow");
 					$toggle = !$toggle;
 
@@ -1179,7 +1179,7 @@ function generate_site_plugin_sql($site_type_r) {
 if ($HTTP_VARS['op'] == 'list_site_plugins') {
 	echo ("<p>[<a href=\"${PHP_SELF}?type=${ADMIN_TYPE}&op=new_site_plugin\">New Site Plugin</a>]</p>");
 
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? ""))
 		echo format_error_block($errors);
 
 	$results = fetch_site_plugin_rs();
diff --git a/admin/s_status_type/index.php b/admin/s_status_type/index.php
index ee6a55f9..4418d3cf 100644
--- a/admin/s_status_type/index.php
+++ b/admin/s_status_type/index.php
@@ -245,7 +245,7 @@ function display_edit_form($status_type_r, $HTTP_VARS = NULL) {
 } else if (strlen($HTTP_VARS['op']) == 0) {
 	echo ("<p>[<a href=\"${PHP_SELF}?type=${ADMIN_TYPE}&op=new\">New Status Type</a>]</p>");
 
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? ""))
 		echo format_error_block($errors);
 
 	$results = fetch_status_type_rs();
@@ -274,4 +274,4 @@ function is_not_valid_s_status_type($type) {
 	}
 	generate_sql_list($ADMIN_TYPE, 'Status Type', "/([a-zA-Z]{1})-([^$]+)$/", 'is_not_valid_s_status_type');
 }
-?>
\ No newline at end of file
+?>
diff --git a/borrow.php b/borrow.php
index 0baa6777..7607b92e 100644
--- a/borrow.php
+++ b/borrow.php
@@ -188,14 +188,14 @@
  								insert_cart_item($HTTP_VARS['item_id'], $HTTP_VARS['instance_no'], get_opendb_session_var('user_id'));
 							}
 						} else if ($HTTP_VARS['op'] == 'update_my_reserve_basket' && is_not_empty_array($HTTP_VARS['item_id_instance_no'])) { // initiated from listings.php page!
- 							while (list(, $item_id_instance_no) = each($HTTP_VARS['item_id_instance_no'])) {
+							foreach ($HTTP_VARS['item_id_instance_no'] as $item_id_instance_no ) {
 								$item_r = get_item_id_and_instance_no($item_id_instance_no);
 								if (!is_item_in_reserve_basket($item_r['item_id'], $item_r['instance_no'], get_opendb_session_var('user_id'))) { // else add item to session array. 
  									insert_cart_item($item_r['item_id'], $item_r['instance_no'], get_opendb_session_var('user_id'));
 								}
 							}
 						} else if ($HTTP_VARS['op'] == 'delete_from_my_reserve_basket' && is_not_empty_array($HTTP_VARS['sequence_number'])) {
-							while (list(, $sequence_number) = each($HTTP_VARS['sequence_number'])) {
+							foreach ( $HTTP_VARS['sequence_number'] as $sequence_number ) {
 								delete_cart_item($sequence_number);
 							}
 						}
diff --git a/email.php b/email.php
index d0587290..560e6ebf 100644
--- a/email.php
+++ b/email.php
@@ -152,7 +152,7 @@ function send_email_to_userids($user_id_rs, $from_userid, $subject, $message, &$
 	}
 
 	reset($user_id_rs);
-	while (list(, $user_id) = each($user_id_rs)) {
+	foreach( $user_id_rs as $user_id) {
 		$touser_r = fetch_user_r($user_id);
 		if (is_not_empty_array($touser_r)) {
 			if (opendb_user_email($touser_r['user_id'], $from_userid, $subject, $message, $errors)) {
@@ -167,7 +167,7 @@ function send_email_to_userids($user_id_rs, $from_userid, $subject, $message, &$
 
 	if (is_not_empty_array($success)) {
 		echo ("<p class=\"success\">" . get_opendb_lang_var('message_sent_to') . ": <ul>");
-		while (list(, $touser) = each($success)) {
+		foreach ( $success as $touser) {
 			echo ("<li class=\"smsuccess\">" . $touser . "</li>");
 		}
 		echo ("</ul></p>");
@@ -175,7 +175,7 @@ function send_email_to_userids($user_id_rs, $from_userid, $subject, $message, &$
 
 	if (is_not_empty_array($failures)) {
 		echo ("<p class=\"error\">" . get_opendb_lang_var('message_not_sent_to') . ": <ul>");
-		while (list(, $failure_r) = each($failures)) {
+		foreach ( $failures as $failure_r) {
 			echo ("<li class=\smerror\">" . $failure_r['user'] . format_error_block($failure_r['error']) . "</li>");
 		}
 		echo ("</ul></p>");
@@ -202,7 +202,7 @@ function get_user_ids_tovalue($user_id_rs) {
 	$to = "";
 	if (is_not_empty_array($user_id_rs)) {
 		reset($user_id_rs);
-		while (list(, $user_id) = each($user_id_rs)) {
+		foreach ( $user_id_rs as $user_id) {
 			if (strlen($to) == 0)
 				$to = $user_id;
 			else
@@ -311,4 +311,4 @@ function get_user_ids_tovalue($user_id_rs) {
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/export.php b/export.php
index c8bc414a..8df63fc8 100644
--- a/export.php
+++ b/export.php
@@ -498,7 +498,7 @@ function get_row_export_column_form(&$exportPlugin, $HTTP_VARS) {
 				$field = "\n<select name=\"plugin\">\n";
 				$plugin_list_r = get_export_plugin_list_r();
 				if (is_array($plugin_list_r)) {
-					while (list(, $plugin_r) = @each($plugin_list_r)) {
+					foreach ($plugin_list_r as  $plugin_r) {
 						$field .= '<option value="' . $plugin_r['name'] . '"';
 
 						if ($plugin_r['name'] == 'OpenDbExportPlugin') {
diff --git a/include/begin.inc.php b/include/begin.inc.php
index 9e8db978..b066b94c 100644
--- a/include/begin.inc.php
+++ b/include/begin.inc.php
@@ -54,11 +54,6 @@
 
 include_once("./lib/OpenDbBrowserSniffer.class.php");
 
-// OpenDb will not work with this on!!!
-if (get_magic_quotes_runtime()) {
-	set_magic_quotes_runtime(false);
-}
-
 // Only if $PHP_SELF is not already defined.
 if (!isset($PHP_SELF)) {
 	// get_http_env is a OpenDb function!
@@ -74,12 +69,14 @@
 	$HTTP_VARS = strip_tags_array($_GET);
 } else if (!empty($_POST)) {
 	$HTTP_VARS = $_POST;
+} else {
+    $HTTP_VARS = array();
 }
 
-// Strip all slashes from this array.
-if (get_magic_quotes_gpc()) {
-	$HTTP_VARS = stripslashes_array($HTTP_VARS);
-}
+if (!isset($HTTP_VARS['op']))
+    $HTTP_VARS['op'] = "";
+if (!isset($HTTP_VARS['mode']))
+    $HTTP_VARS['mode'] = "";
 
 //define a global browser sniffer object for use by theme and elsewhere
 $_OpendbBrowserSniffer = new OpenDbBrowserSniffer();
@@ -122,14 +119,14 @@
 			handle_opendb_remember_me();
 			
 			//allows specific pages to overide themes
+			global $_OVRD_OPENDB_THEME;
 			if (is_exists_theme($_OVRD_OPENDB_THEME)) {
 				$_OPENDB_THEME = $_OVRD_OPENDB_THEME;
-			} else {
-				unset($_OPENDB_THEME);
 
-				if (strlen(get_opendb_session_var('user_id')) > 0 && get_opendb_config_var('user_admin', 'user_themes_support') !== FALSE) {
+			} else {
+				if ( strlen(get_opendb_session_var('user_id')) > 0 &&
+					 get_opendb_config_var('user_admin', 'user_themes_support') !== FALSE ) {
 					$user_theme = fetch_user_theme(get_opendb_session_var('user_id'));
-
 					if (is_exists_theme($user_theme))
 						$_OPENDB_THEME = $user_theme;
 				}
@@ -142,10 +139,11 @@
 				}
 			}
 
+			global $_OVRD_OPENDB_LANGUAGE;
 			if (is_exists_language($_OVRD_OPENDB_LANGUAGE)) {
 				$_OPENDB_LANGUAGE = $_OVRD_OPENDB_LANGUAGE;
 			} else {
-				unset($_OPENDB_LANGUAGE);
+				#unset($_OPENDB_LANGUAGE);
 
 				if (strlen(get_opendb_session_var('user_id')) > 0 && get_opendb_config_var('user_admin', 'user_language_support') !== FALSE) {
 					$user_language = fetch_user_language(get_opendb_session_var('user_id'));
@@ -164,7 +162,7 @@
 		}
 	}
 
-	if ($HTTP_VARS['mode'] == 'job') {
+	if (isset($HTTP_VARS["mode"]) && $HTTP_VARS['mode'] == 'job') {
 		$_OPENDB_THEME = '';
 	}
 
diff --git a/index.php b/index.php
index 1e8947ce..5371d3cf 100644
--- a/index.php
+++ b/index.php
@@ -48,4 +48,4 @@
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/install.php b/install.php
index ed5eaa39..724b4cfd 100644
--- a/install.php
+++ b/install.php
@@ -50,7 +50,7 @@ function install_check_directories(&$doContinue) {
 				</tr>";
 
 	reset($_opendb_install_required_writedirs);
-	while (list(, $directory) = each($_opendb_install_required_writedirs)) {
+	foreach ( $_opendb_install_required_writedirs as $directory ) {
 		$buffer .= "<tr><th class=\"prompt\">" . $directory . "</td>";
 
 		if (is_dir($directory)) {
@@ -81,7 +81,7 @@ function install_check_directories(&$doContinue) {
 			<p><code>chmod ugo+w ";
 
 		reset($_opendb_install_required_writedirs);
-		while (list(, $directory) = each($_opendb_install_required_writedirs)) {
+		foreach ( $_opendb_install_required_writedirs as $directory ) {
 			$buffer .= "$directory ";
 		}
 
@@ -161,13 +161,13 @@ function install_check_mysql_collation_mismatch() {
 		$buffer .= "<table>";
 		$buffer .= "<tr class=\"navbar\"><th>Table</th><th>Column</th><th>Collation</th></tr>";
 		$table_r = fetch_opendb_table_list_r();
-		while (list(, $table) = each($table_r)) {
+		foreach ( $table_r as $table ) {
 			if (isset($table_colation_mismatch[$table])) {
 				$buffer .= "<tr><td class=\"prompt\">$table</td><td class=\"prompt\">&nbsp;</td><td class=\"data\">" . $table_colation_mismatch[$table] . "</td></tr>";
 			}
 
 			if (isset($table_column_colation_mismatch[$table])) {
-				while (list($column, $collation) = each($table_column_colation_mismatch[$table])) {
+				foreach ( $table_column_colation_mismatch[$table] as $column => $collation ) {
 					$buffer .= "<tr><td class=\"prompt\">$table</td><td class=\"prompt\">$column</td><td class=\"data\">" . $collation . "</td></tr>";
 				}
 			}
@@ -219,7 +219,7 @@ function install_check_user_permissions() {
 				</tr>";
 
 		reset($privileges_rs);
-		while (list(, $privileges_r) = each($privileges_rs)) {
+		foreach ( $privileges_rs as $privileges_r ) {
 			$buffer .= "<tr class=\"prompt\"><th>" . $privileges_r['privilege'] . "</th>";
 			if ($privileges_r['granted']) {
 				$buffer .= "<td class=\"data\">$TICK_IMAGE</td>";
@@ -472,7 +472,7 @@ function install_opendb_upgrade($HTTP_VARS, &$errors) {
 			} else if (count($upgraders_rs) > 1) {
 				$errors[] = "More than one upgrader is available for this version, this is an error, please contact the author.";
 				reset($upgraders_rs);
-				while (list(, $upgraders_r) = each($upgraders_rs)) {
+				foreach ( $upgraders_rs as $upgraders_r ) {
 					$errors[] = 'Upgrader: ' . $upgraders_r['description'];
 				}
 
@@ -734,7 +734,7 @@ function perform_upgrade_step($HTTP_VARS, $opendb_release_r, $latest_to_version
 
 				if (is_array($errors)) {
 					echo ("<ul class=\"error\">");
-					while (list(, $error) = each($errors)) {
+					foreach ( $errors as $error ) {
 						echo ("<li>$error</li>");
 					}
 					echo ("</ul>");
@@ -893,4 +893,4 @@ function perform_upgrade_step($HTTP_VARS, $opendb_release_r, $latest_to_version
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/item_borrow.php b/item_borrow.php
index 6816f32f..7045cf0e 100644
--- a/item_borrow.php
+++ b/item_borrow.php
@@ -94,7 +94,7 @@ function more_information_form($op, $borrowed_item_rs, $HTTP_VARS, $email_notifi
 		$default_borrow_duration = NULL;
 
 		reset($borrowed_item_rs);
-		while (list(, $borrowed_item_r) = each($borrowed_item_rs)) {
+		foreach ($borrowed_item_rs as $borrowed_item_r) {
 			$listingObject->startRow();
 
 			// If only a sequence_number, we need to fetch the borrow record.
@@ -169,7 +169,7 @@ function more_information_form($op, $borrowed_item_rs, $HTTP_VARS, $email_notifi
 			}//if(get_opendb_config_var('borrow', 'duration_support') && $duration_attr_type!==FALSE)
 
 			$listingObject->endRow();
-		}//while(list(,$borrowed_item_r) = each($borrowed_item_rs))
+		}
 
 		$listingObject->endListing();
 
@@ -265,12 +265,12 @@ function display_html_success_borrow_results($section_intro, $results_rs) {
 	echo ("<dl class=\"userItemList\">");
 
 	reset($results_rs);
-	while (list(, $results_r) = each($results_rs)) {
+	foreach ($results_rs as $results_r) {
 		echo ("<dt>" . $results_r['user_name'] . "</dt>");
 		echo ("<dd>");
 
 		echo ("<ul>");
-		while (list(, $display_title) = each($results_r['display_titles'])) {
+		foreach ($results_r['display_titles'] as $display_title) {
 			echo ("<li>");
 			echo ($display_title);
 			echo ("</li>");
@@ -297,8 +297,7 @@ function display_html_failure_borrow_results($section_intro, $results_rs) {
 	echo ("<p class=\"error\">$section_intro</p>");
 	echo ("<ul class=\"failureItems\">");
 	reset($results_rs);
-
-	while (list(, $results_r) = each($results_rs)) {
+	foreach ($results_rs as $results_r) {
 		echo ("<li>");
 		echo ($results_r['display_title']);
 		if (is_not_empty_array($results_r['errors'])) {
@@ -313,10 +312,10 @@ function display_job_success_borrow_results($section_intro, $results_rs) {
 	echo ("\n$section_intro\n");
 
 	reset($results_rs);
-	while (list(, $results_r) = each($results_rs)) {
+	foreach ($results_rs as $results_r) {
 		echo ("\n\t" . $results_r['user_name']);
 
-		while (list(, $display_title) = each($results_r['display_titles'])) {
+		foreach ($results_r['display_titles'] as $display_title) {
 			echo ("\n\t\t * $display_title");
 		}
 
@@ -325,7 +324,7 @@ function display_job_success_borrow_results($section_intro, $results_rs) {
 			if ($results_r['email_result'] !== TRUE) {
 				echo (get_opendb_lang_var('notication_email_not_sent'));
 				if (is_not_empty_array($results_r['email_errors'])) {
-					while (list(, $error) = each($results_r['email_errors'])) {
+					foreach ($results_r['email_errors'] as $error) {
 						echo ("\n\t\t$error");
 					}
 				}
@@ -341,11 +340,11 @@ function display_job_failure_borrow_results($section_intro, $results_rs) {
 	echo ("\n$section_intro\n");
 
 	reset($results_rs);
-	while (list(, $results_r) = each($results_rs)) {
+	foreach ($results_rs as $results_r) {
 		echo ("\n\t* ");
 		echo ($results_r['display_title']);
 		if (is_not_empty_array($results_r['errors'])) {
-			while (list(, $error) = each($results_r['errors'])) {
+			foreach ($results_r['errors'] as $error) {
 				echo ("\n\t$error");
 			}
 		}
@@ -363,7 +362,7 @@ function process_borrow_results($op, $mode, $heading, $success_intro, $failure_i
 		// Sort the items by user, so we can send emails for multiple 
 		// items, instead of individually.
 		$borrowed_item_user_r = array();
-		while (list(, $borrowed_item_r) = each($success_item_rs)) {
+		foreach ($success_item_rs as $borrowed_item_r) {
 			$item_r = fetch_item_instance_r($borrowed_item_r['item_id'], $borrowed_item_r['instance_no']);
 			$item_r['title'] = $titleMaskCfg->expand_item_title($item_r);
 
@@ -387,7 +386,7 @@ function process_borrow_results($op, $mode, $heading, $success_intro, $failure_i
 		}
 
 		$success_results = array();
-		while (list($to_user, $item_entry_rs) = each($borrowed_item_user_r)) {
+		foreach ($borrowed_item_user_r as $to_user => $item_entry_rs) {
 			$errors = NULL;
 
 			if (is_valid_opendb_mailer() && $email_notification !== FALSE) {
@@ -397,7 +396,7 @@ function process_borrow_results($op, $mode, $heading, $success_intro, $failure_i
 
 			$display_title_r = NULL;
 			reset($item_entry_rs);
-			while (list(, $item_entry_r) = each($item_entry_rs)) {
+			foreach ($item_entry_rs as $item_entry_r) {
 				$display_title_r[] = $item_entry_r['display_title'];
 			}
 
@@ -416,7 +415,7 @@ function process_borrow_results($op, $mode, $heading, $success_intro, $failure_i
 
 	if (is_not_empty_array($failure_item_rs)) {
 		$failure_results = array();
-		while (list(, $borrowed_item_r) = each($failure_item_rs)) {
+		foreach ($failure_item_rs as $borrowed_item_r) {
 			$item_r = fetch_item_instance_r($borrowed_item_r['item_id'], $borrowed_item_r['instance_no']);
 
 			// Expand title mask.
@@ -475,11 +474,11 @@ function send_notification_email($to_user, $from_user, $heading, $introduction,
 	// Format the entire message.
 	$message = get_opendb_lang_var('to_user_email_intro', 'fullname', fetch_user_name($to_user)) . "\n\n" . $introduction;
 
-	while (list(, $item_entry_r) = each($item_entry_rs)) {
+	foreach ($item_entry_rs as $item_entry_r) {
 		$message .= "\n*    " . $item_entry_r['display_title'];
 
 		// Add any item Borrow (overdue,due,reminder,etc) details here.
-		while (list(, $detail) = @each($item_entry_r['detail'])) {
+		foreach ($item_entry_r['detail'] as $detail) {
 			$message .= "\n     - " . $detail;
 		}
 	}
@@ -556,12 +555,12 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 						$HTTP_VARS['op'] = 'reserve';
 					} else if (is_not_empty_array($HTTP_VARS['sequence_number'])) { // from reserve basket
  						reset($HTTP_VARS['sequence_number']);
-						while (list(, $sequence_number) = each($HTTP_VARS['sequence_number'])) {
+						foreach ($HTTP_VARS['sequence_number'] as $sequence_number) {
 							$reserve_item_rs[] = fetch_borrowed_item_pk_r($sequence_number);
 						}
 					} else if (is_not_empty_array($HTTP_VARS['item_id_instance_no'])) { // direct from listings
  						// Format of $item_id_instance_no {item_id}_{instance_no}
-						while (list(, $item_id_instance_no) = each($HTTP_VARS['item_id_instance_no'])) {
+						foreach ($HTTP_VARS['item_id_instance_no'] as $item_id_instance_no) {
 							$item_id_instance_no_r = get_item_id_and_instance_no($item_id_instance_no);
 							if (is_not_empty_array($item_id_instance_no_r))
 								$reserve_item_rs[] = $item_id_instance_no_r;
@@ -578,7 +577,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 						if (get_opendb_config_var('borrow', 'reserve_more_information') && $HTTP_VARS['more_info_requested'] != 'true') {
 							more_information_form('reserve', $reserve_item_rs, $HTTP_VARS, get_opendb_config_var('borrow', 'reserve_email_notification'));
 						} else {
-							while (list(, $reserve_item_r) = @each($reserve_item_rs)) {
+							foreach ($reserve_item_rs as $reserve_item_r) {
 								// In case someone is trying to pass invalid item_id/instance_no combo's
 								if (is_exists_item_instance($reserve_item_r['item_id'], $reserve_item_r['instance_no'])) {
 									if (($new_borrowed_item_id = handle_reserve($reserve_item_r['item_id'], $reserve_item_r['instance_no'], get_opendb_session_var('user_id'), $HTTP_VARS['more_information'], $errors)) !== FALSE)// This allows reserve to support calls from borrow.php, item_display.php or listings.php
@@ -616,7 +615,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 						if (get_opendb_config_var('borrow', 'cancel_more_information') && $HTTP_VARS['more_info_requested'] != 'true') {
 							more_information_form('cancel_reserve', $sequence_number_r, $HTTP_VARS, get_opendb_config_var('borrow', 'cancel_email_notification'));
 						} else {
-							while (list(, $sequence_number) = @each($sequence_number_r)) {
+							foreach ($sequence_number_r as $sequence_number) {
 								// This allows cancel-reserve to support calls from borrow.php, item_display.php or listings.php
 								if (handle_cancelreserve($sequence_number, $HTTP_VARS['more_information'], $errors))
 									$success_items_rs[] = fetch_borrowed_item_r($sequence_number);
@@ -647,7 +646,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 						if (get_opendb_config_var('borrow', 'checkout_more_information') && $HTTP_VARS['more_info_requested'] != 'true') {
 							more_information_form('check_out', $sequence_number_r, $HTTP_VARS, get_opendb_config_var('borrow', 'checkout_email_notification'));
 						} else {
-							while (list(, $sequence_number) = each($sequence_number_r)) {
+							foreach ($sequence_number_r as $sequence_number) {
 								$borrow_duration = NULL;
 
 								// The More Information form was not presented
@@ -701,7 +700,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 					}
 
 					if (is_not_empty_array($HTTP_VARS['checkout_item_instance_rs'])) {
-						while (list(, $item_id_and_instance_no) = each($HTTP_VARS['checkout_item_instance_rs'])) {
+						foreach ($HTTP_VARS['checkout_item_instance_rs'] as $item_id_and_instance_no) {
 							if (strlen($item_id_and_instance_no) > 0) {
 								$item_id_and_instance_no_r = get_item_id_and_instance_no($item_id_and_instance_no);
 								if (is_not_empty_array($item_id_and_instance_no_r)) {
@@ -725,7 +724,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 						if ($HTTP_VARS['more_info_requested'] != 'true') {
 							more_information_form('quick_check_out', $checkout_item_rs, $HTTP_VARS, get_opendb_config_var('borrow', 'quick_checkout_email_notification'));
 						} else {
-							while (list(, $checkout_item_r) = @each($checkout_item_rs)) {
+							foreach ($checkout_item_rs as $checkout_item_r) {
 								// In case someone is trying to pass invalid item_id/instance_no combo's
 								if (is_exists_item_instance($checkout_item_r['item_id'], $checkout_item_r['instance_no'])) {
 									$borrow_duration = NULL;
@@ -774,7 +773,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 						if (get_opendb_config_var('borrow', 'checkin_more_information') && $HTTP_VARS['more_info_requested'] != 'true') {
 							more_information_form('check_in', $sequence_number_r, $HTTP_VARS, get_opendb_config_var('borrow', 'checkin_email_notification'));
 						} else {
-							while (list(, $sequence_number) = @each($sequence_number_r)) {
+							foreach ($sequence_number_r as $sequence_number) {
 								if (handle_checkin($sequence_number, $HTTP_VARS['more_information'], $errors))
 									$success_items_rs[] = fetch_borrowed_item_r($sequence_number);
 								else
@@ -804,7 +803,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 							if (get_opendb_config_var('borrow', 'reminder_more_information') && $HTTP_VARS['more_info_requested'] != 'true') {
 								more_information_form('reminder', $sequence_number_r, $HTTP_VARS, TRUE);
 							} else {
-								while (list(, $sequence_number) = @each($sequence_number_r)) {
+								foreach ($sequence_number_r as $sequence_number) {
 									if (handle_reminder($sequence_number, $errors))
 										$success_items_rs[] = fetch_borrowed_item_r($sequence_number, TRUE);
 									else
@@ -842,7 +841,7 @@ function add_errors_to_borrowed_item_r($borrowed_item_r, $errors) {
 								}
 								more_information_form('extension', $sequence_number_r, $HTTP_VARS, TRUE);
 							} else {
-								while (list(, $sequence_number) = @each($sequence_number_r)) {
+								foreach ($sequence_number_r as $sequence_number) {
 									if (handle_extension($sequence_number, $HTTP_VARS['default_borrow_duration'], $HTTP_VARS['more_information'], $errors))
 										$success_items_rs[] = fetch_borrowed_item_r($sequence_number, TRUE);
 									else
diff --git a/item_display.php b/item_display.php
index 2e6a0532..0ab1fade 100644
--- a/item_display.php
+++ b/item_display.php
@@ -52,7 +52,7 @@
 				$titleMaskCfg = new TitleMask('item_display');
 
 				$page_title = $titleMaskCfg->expand_item_title($item_r);
-				echo _theme_header($page_title, $HTTP_VARS['inc_menu']);
+				echo _theme_header($page_title, $HTTP_VARS['inc_menu'] ?? TRUE);
 
 				echo ("<h2>" . $page_title . " " . get_item_image($item_r['s_item_type'], $item_r['item_id']) . "</h2>");
 
@@ -63,10 +63,12 @@
 						$coverimages_rs = NULL;
 
 						while ($image_attribute_type_r = db_fetch_assoc($results)) {
-							$imageurl_r = fetch_attribute_val_r($item_r['item_id'], $item_r['instance_no'], $image_attribute_type_r['s_attribute_type'], $image_attribute_type_r['order_no']);
+							$imageurl_r = fetch_attribute_val_r($item_r['item_id'], $item_r['instance_no'],
+                                                                $image_attribute_type_r['s_attribute_type'], $image_attribute_type_r['order_no']);
 							if ($imageurl_r !== FALSE) {
-								while (list(, $imageurl) = each($imageurl_r)) {
-									$coverimages_rs[] = array('file' => file_cache_get_image_r($imageurl, 'display'), 'prompt' => $image_attribute_type_r['prompt']);
+								foreach ( $imageurl_r as $imageurl ) {
+									$coverimages_rs[] = array('file' => file_cache_get_image_r($imageurl, 'display'),
+															  'prompt' => $image_attribute_type_r['prompt']);
 								}
 							}
 						}
@@ -78,7 +80,7 @@
 						}
 
 						echo ("<ul class=\"coverimages\">");
-						while (list(, $coverimage_r) = each($coverimages_rs)) {
+						foreach ( $coverimages_rs as $coverimage_r ) {
 							echo ("<li>");
 							$file_r = $coverimage_r['file'];
 
@@ -99,9 +101,9 @@
 							}
 							echo ("<img src=\"" . $file_r['thumbnail']['url'] . "\" title=\"" . htmlspecialchars($coverimage_r['prompt']) . "\" ");
 
-							if (is_numeric($file_r['thumbnail']['width']))
+							if (is_numeric($file_r['thumbnail']['width'] ?? ""))
 								echo (' width="' . $file_r['thumbnail']['width'] . '"');
-							if (is_numeric($file_r['thumbnail']['height']))
+							if (is_numeric($file_r['thumbnail']['height'] ?? ""))
 								echo (' height="' . $file_r['thumbnail']['height'] . '"');
 
 							echo (">");
@@ -147,7 +149,8 @@
                         if (has_role_permission($item_attribute_type_r['view_perm'])) {
                             $display_type = trim($item_attribute_type_r['display_type']);
 
-                            if (($HTTP_VARS['mode'] == 'printable' && $item_attribute_type_r['printable_ind'] != 'Y') || (strlen($display_type) == 0 && $item_attribute_type_r['input_type'] == 'hidden')) {
+                            if ( ( $HTTP_VARS['mode'] == 'printable' && $item_attribute_type_r['printable_ind'] != 'Y') ||
+                                 ( strlen($display_type) == 0 && $item_attribute_type_r['input_type'] == 'hidden')) {
                                 // We allow the get_display_field to handle hidden variable, in case at some stage
                                 // we might want to change the functionality of 'hidden' to something other than ignore.
                                 $display_type = 'hidden';
@@ -169,7 +172,7 @@
                                 $field = get_item_display_field($item_r, $item_attribute_type_r, $value, FALSE);
 
                                 if (strlen($field) > 0) {
-                                    echo format_item_data_field($item_attribute_type_r, $field, $prompt_mask, NULL); // field mask
+                                    echo format_item_data_field($item_attribute_type_r, $field); // field mask
                                 }
                             }
                         }
@@ -203,6 +206,7 @@
 				echo ("<p class=\"error\">" . get_opendb_lang_var('item_not_found') . "</p>");
 			}
 
+			$footer_links_r = array();
 			if (is_export_plugin(get_opendb_config_var('item_display', 'export_link')) && is_user_granted_permission(PERM_USER_EXPORT)) {
 				$footer_links_r[] = array('url' => "export.php?op=export&plugin=" . get_opendb_config_var('item_display', 'export_link') . "&item_id=" . $item_r['item_id'] . "&instance_no=" . $item_r['instance_no'], 'text' => get_opendb_lang_var('export_item_record'));
 			}
diff --git a/item_input.php b/item_input.php
index a1916a4c..7b27f267 100644
--- a/item_input.php
+++ b/item_input.php
@@ -170,6 +170,7 @@ function get_site_type_input_fields($HTTP_VARS, $site_plugin_r, $item_r) {
 	$sifresults = fetch_site_plugin_input_field_rs($site_plugin_r['site_type']);
 	if ($sifresults) {
 		$display_field_r = NULL;
+		$inrow = FALSE;
 		while ($input_field_r = db_fetch_assoc($sifresults)) {
 			// Only if we are are refreshing an item.
 			if (is_not_empty_array($item_r)) {
@@ -225,7 +226,7 @@ function get_site_plugin_rs($HTTP_VARS, $item_r = NULL) {
 	$site_plugin_rs = NULL;
 
 	// if $HTTP_VARS['s_item_type'] is null, all site plugins will be returned.
-	$results = fetch_site_plugin_rs($HTTP_VARS['s_item_type']);
+	$results = fetch_site_plugin_rs($HTTP_VARS['s_item_type'] ?? NULL);
 	if ($results) {
 		$ischecked = FALSE;
 
@@ -235,7 +236,7 @@ function get_site_plugin_rs($HTTP_VARS, $item_r = NULL) {
 				if (is_array($input_field_rs)) {
 					$site_plugin_r['input_fields'] = $input_field_rs;
 
-					if (strlen($HTTP_VARS['s_item_type']) == 0) {
+					if (strlen($HTTP_VARS['s_item_type'] ?? "") == 0) {
 						$site_plugin_r['s_item_type'] = fetch_site_item_type_r($site_plugin_r['site_type']);
 					} else {
 						$site_plugin_r['s_item_type'][] = $HTTP_VARS['s_item_type'];
@@ -244,6 +245,8 @@ function get_site_plugin_rs($HTTP_VARS, $item_r = NULL) {
 						if (!$ischecked) {
 							$site_plugin_r['checked_ind'] = 'Y';
 							$ischecked = TRUE;
+						} else {
+							$site_plugin_r['checked_ind'] = 'N';
 						}
 						$site_plugin_rs[] = $site_plugin_r;
 					}
@@ -266,7 +269,7 @@ function display_site_plugin_blocks($HTTP_VARS, $item_r = NULL) {
 		echo ("<ul id=\"site-add-menu\">");
 		reset($site_plugin_rs);
 		$first = TRUE;
-		while (list(, $site_plugin_r) = each($site_plugin_rs)) {
+		foreach ($site_plugin_rs as $site_plugin_r) {
 			echo ("<li" . ($first ? ' class="first activeTab"' : ' class=""') . " id=\"menu-" . $site_plugin_r['site_type'] . "\" onClick=\"return activateTab('" . $site_plugin_r['site_type'] . "', 'site-add-menu', 'site-add-content', 'activeTab', 'sitePlugin'); return false;\">"
 					. $site_plugin_r['title'] . "</li>");
 			if ($first)
@@ -276,7 +279,7 @@ function display_site_plugin_blocks($HTTP_VARS, $item_r = NULL) {
 
 		echo ("\n<div id=\"site-add-content\">");
 		reset($site_plugin_rs);
-		while (list(, $site_plugin_r) = each($site_plugin_rs)) {
+		foreach ($site_plugin_rs as $site_plugin_r) {
 			echo ("\n<div class=\"sitePlugin" . ($site_plugin_r['checked_ind'] != 'Y' ? "Hidden" : "") . "\" id=\"" . $site_plugin_r['site_type'] . "\">");
 
 			$title = "<img src=\"./images/site/" . $site_plugin_r['image'] . "\" title=\"" . strip_tags($site_plugin_r['description']) . "\" alt=\"" . strip_tags($site_plugin_r['description']) . "\">";
@@ -287,36 +290,29 @@ function display_site_plugin_blocks($HTTP_VARS, $item_r = NULL) {
 
 			echo ("<h4>" . $site_plugin_r['description'] . "</h4>");
 
-			echo ("\n<form action=\"item_input.php\" method=\"GET\">");
-			if (is_exists_item_type($HTTP_VARS['s_item_type'])) {
+			start_item_input_form($HTTP_VARS, "site-search");
+			echo ("<input type=hidden name=\"site_type\" value=\"" . $site_plugin_r['site_type'] . "\">\n");
+
+			if (isset($HTTP_VARS['s_item_type']) && is_exists_item_type($HTTP_VARS['s_item_type'])) {
 				echo ("\n<input type=\"hidden\" name=\"s_item_type\" value=\"" . $HTTP_VARS['s_item_type'] . "\">");
 			} else {
 				echo ("\n<label for=\"" . $site_plugin_r['site_type'] . "-s_item_type\">" . get_opendb_lang_var('item_type') . "</label>");
 				echo (single_select("s_item_type", fetch_item_type_for_item_types_rs($site_plugin_r['s_item_type'], TRUE), "%value% - %display%", NULL, NULL, NULL, FALSE, $site_plugin_r['site_type'] . "-s_item_type"));
 			}
 
-			echo ("<input type=hidden name=\"site_type\" value=\"" . $site_plugin_r['site_type'] . "\">");
-			echo ("<input type=hidden name=\"owner_id\" value=\"" . $HTTP_VARS['owner_id'] . "\">");
-			echo ("<input type=hidden name=\"s_status_type\" value=\"" . $HTTP_VARS['s_status_type'] . "\">");
-			echo ("<input type=hidden name=\"item_id\" value=\"" . $HTTP_VARS['item_id'] . "\">");
-			echo ("<input type=hidden name=\"instance_no\" value=\"" . $HTTP_VARS['instance_no'] . "\">");
-			echo ("<input type=hidden name=\"parent_item_id\" value=\"" . $HTTP_VARS['parent_item_id'] . "\">");
-			echo ("<input type=hidden name=\"parent_instance_no\" value=\"" . $HTTP_VARS['parent_instance_no'] . "\">");
-
 			if (is_array($site_plugin_r['input_fields'])) {
-				while (list(, $input_field_r) = each($site_plugin_r['input_fields'])) {
+				foreach ($site_plugin_r['input_fields'] as $input_field_r) {
 					if ($input_field_r['type'] == 'hidden') {
 						echo ("<input type=hidden name=\"" . $input_field_r['name'] . "\" value=\"" . htmlspecialchars($input_field_r['value']) . "\">");
 					} else {
-						echo ("\n<label for=\"" . $site_plugin_r['site_type'] . "-" . $field_r['name'] . "\">" . $input_field_r['prompt'] . "</label>");
-						while (list(, $field_r) = each($input_field_r['fieldset'])) {
-							echo ("<input id=\"" . $site_plugin_r['site_type'] . "-" . $field_r['name'] . "\" class=\"text\" type=\"text\" name=\"" . $field_r['name'] . "\" value=\"" . htmlspecialchars($field_r['value']) . "\">");
+						foreach ($input_field_r['fieldset'] as $field_r) {
+							echo ("<label for=\"" . $site_plugin_r['site_type'] . "-" . $field_r['name'] . "\">" . $input_field_r['prompt'] . "</label>");
+							echo ("<input id=\"" . $site_plugin_r['site_type'] . "-" . $field_r['name'] . "\" class=\"text\" type=\"text\" name=\"" . $field_r['name'] . "\" value=\"" . htmlspecialchars($field_r['value']) . "\">\n");
 						}
 					}
 				}
 			}
 
-			echo ("<input type=hidden name=\"op\" value=\"site-search\">");
 			echo ("<input class=\"submit\" type=submit value=\"" . get_opendb_lang_var('site_search', 'site', $site_plugin_r['title']) . "\">");
 
 			echo ("</form>");
@@ -332,22 +328,15 @@ function display_site_plugin_blocks($HTTP_VARS, $item_r = NULL) {
 
 		echo ("<h3>" . get_opendb_lang_var('manual_entry') . "</h3>");
 
-		echo ("\n<form action=\"item_input.php\" method=\"GET\">");
-		echo ("<input type=\"hidden\" name=\"owner_id\" value=\"" . $HTTP_VARS['owner_id'] . "\">");
-		echo ("<input type=\"hidden\" name=\"s_status_type\" value=\"" . $HTTP_VARS['s_status_type'] . "\">");
-		echo ("<input type=\"hidden\" name=\"item_id\" value=\"" . $HTTP_VARS['item_id'] . "\">");
-		echo ("<input type=\"hidden\" name=\"instance_no\" value=\"" . $HTTP_VARS['instance_no'] . "\">");
-		echo ("<input type=\"hidden\" name=\"parent_item_id\" value=\"" . $HTTP_VARS['parent_item_id'] . "\">");
-		echo ("<input type=\"hidden\" name=\"parent_instance_no\" value=\"" . $HTTP_VARS['parent_instance_no'] . "\">");
+		start_item_input_form($HTTP_VARS, "new");
 
-		if (is_exists_item_type($HTTP_VARS['s_item_type'])) {
+		if (isset($HTTP_VARS['s_item_type']) && is_exists_item_type($HTTP_VARS['s_item_type'])) {
 			echo ("\n<input type=\"hidden\" name=\"s_item_type\" value=\"" . $HTTP_VARS['s_item_type'] . "\">");
 		} else {
 			echo ("\n<label for=\"manual-s_item_type\">" . get_opendb_lang_var('item_type') . "</label>");
 			echo (single_select("s_item_type", fetch_item_type_rs(TRUE), "%value% - %display%", NULL, NULL, NULL, FALSE, 'manual-s_item_type'));
 		}
 
-		echo "\n<input type=\"hidden\" name=\"op\" value=\"new\">";
 		echo ("<input type=\"submit\" class=\"submit\" value=\"" . get_opendb_lang_var('submit') . "\">");
 
 		echo ("</form>");
@@ -363,11 +352,11 @@ function handle_site_add_or_refresh($item_r, $status_type_r, &$HTTP_VARS, &$foot
 	global $titleMaskCfg;
 
 	if (!is_array($item_r)) {
-		if ($HTTP_VARS['confirmed'] === 'false' || strlen($HTTP_VARS['owner_id']) == 0) {
+		if (($HTTP_VARS['confirmed'] ?? "") == 'false' || strlen($HTTP_VARS['owner_id']) == 0) {
 			$page_title = get_opendb_lang_var('add_new_item');
 			echo _theme_header($page_title);
 
-			if (is_exists_item_type($HTTP_VARS['s_item_type']))
+			if (isset($HTTP_VARS['s_item_type']) && is_exists_item_type($HTTP_VARS['s_item_type']))
 				echo ("<h2>" . $page_title . " " . get_item_image($HTTP_VARS['s_item_type']) . "</h2>");
 			else
 				echo ("<h2>" . $page_title . "</h2>");
@@ -390,7 +379,7 @@ function handle_site_add_or_refresh($item_r, $status_type_r, &$HTTP_VARS, &$foot
 
 			echo _theme_header($page_title);
 
-			if (is_exists_item_type($HTTP_VARS['s_item_type']))
+			if (isset($HTTP_VARS['s_item_type']) && is_exists_item_type($HTTP_VARS['s_item_type']))
 				echo ("<h2>" . $page_title . " " . get_item_image($HTTP_VARS['s_item_type']) . "</h2>");
 			else
 				echo ("<h2>" . $page_title . "</h2>");
@@ -416,6 +405,24 @@ function handle_site_add_or_refresh($item_r, $status_type_r, &$HTTP_VARS, &$foot
 	}
 }
 
+function start_item_input_form($HTTP_VARS, $op) {
+	echo ("\n<form action=\"item_input.php\" method=\"GET\">");
+
+	if (isset($HTTP_VARS['owner_id']))
+		echo ("<input type=hidden name=\"owner_id\" value=\"" . $HTTP_VARS['owner_id'] . "\">\n");
+	if (isset($HTTP_VARS['s_status_type']))
+		echo ("<input type=hidden name=\"s_status_type\" value=\"" . $HTTP_VARS['s_status_type'] . "\">\n");
+	if (isset($HTTP_VARS['item_id']))
+		echo ("<input type=hidden name=\"item_id\" value=\"" . $HTTP_VARS['item_id'] . "\">\n");
+	if (isset($HTTP_VARS['instance_no']))
+		echo ("<input type=hidden name=\"instance_no\" value=\"" . $HTTP_VARS['instance_no'] . "\">\n");
+	if (isset($HTTP_VARS['parent_item_id']))
+		echo ("<input type=hidden name=\"parent_item_id\" value=\"" . $HTTP_VARS['parent_item_id'] . "\">\n");
+	if (isset($HTTP_VARS['parent_instance_no']))
+		echo ("<input type=hidden name=\"parent_instance_no\" value=\"" . $HTTP_VARS['parent_instance_no'] . "\">\n");
+	echo ("<input type=hidden name=\"" . $op . "\" value=\"site-search\">\n");
+}
+
 /**
     Bypass get_edit_form, by choosing defaults for all data provided by site plugin, supports site / refresh operations
  */
@@ -1495,36 +1502,38 @@ function perform_site_process(&$item_r, &$status_type_r, &$HTTP_VARS, &$footer_l
 			if (empty($HTTP_VARS['ajax_op'])) {
 				// For a $op == ('site' OR 'site-search' OR 'site-add') where an item is actually defined,
 				// it is really a 'refresh' site operation.
-				if ($HTTP_VARS['op'] == 'new' || $HTTP_VARS['op'] == 'insert'
-						|| (($HTTP_VARS['op'] == 'site-search' 
-						|| $HTTP_VARS['op'] == 'site-add' 
-						|| $HTTP_VARS['op'] == 'site-refresh' 
-						|| $HTTP_VARS['op'] == 'site') 
-						&& !is_exists_item($HTTP_VARS['item_id']))) {
-					
-					if (strlen($HTTP_VARS['s_status_type']) == 0) {
-						$status_attr_type_r = fetch_sfieldtype_item_attribute_type_r($HTTP_VARS['s_item_type'], 'STATUSTYPE');
-						$HTTP_VARS['s_status_type'] = $HTTP_VARS[get_field_name($status_attr_type_r['s_attribute_type'], $status_attr_type_r['order_no'])];
+				if ( $HTTP_VARS['op'] == 'new' ||
+					 $HTTP_VARS['op'] == 'insert' ||
+					 ( ( $HTTP_VARS['op'] == 'site-search' ||
+						 $HTTP_VARS['op'] == 'site-add' ||
+						 $HTTP_VARS['op'] == 'site-refresh' ||
+						 $HTTP_VARS['op'] == 'site') &&
+					   !is_exists_item($HTTP_VARS['item_id'] ?? NULL))) {
+
+					if (strlen($HTTP_VARS['s_status_type'] ?? "") == 0) {
+						$status_attr_type_r = fetch_sfieldtype_item_attribute_type_r($HTTP_VARS['s_item_type'] ?? "", 'STATUSTYPE');
+						$HTTP_VARS['s_status_type'] = $HTTP_VARS[get_field_name($status_attr_type_r['s_attribute_type'], $status_attr_type_r['order_no'])] ?? "";
 					}
 	
 					if (strlen($HTTP_VARS['s_status_type']) > 0) {
 						$status_type_r = fetch_status_type_r($HTTP_VARS['s_status_type']);
 					} else {
 						// Dummy array entry, as the s_status_type will be chosen in the edit form.
-						$status_type_r = array('borrow_ind' => 'Y');
+						$status_type_r = array('borrow_ind' => 'Y', 's_status_type' => '');
 					}
 	
 					// where we are making a copy of an existing item
-					if (is_exists_item($HTTP_VARS['item_id'])) {
+					if (is_exists_item($HTTP_VARS['item_id'] ?? NULL)) {
 						$item_r = fetch_item_r($HTTP_VARS['item_id']);
 					} else {
-						$item_r = array('item_id' => NULL, 'title' => NULL, 's_item_type' => trim($HTTP_VARS['s_item_type']));
+						$item_r = array('item_id' => NULL, 'title' => NULL, 's_item_type' => trim($HTTP_VARS['s_item_type'] ?? ""));
 					}
 	
 					$item_r['instance_no'] = NULL; // if a new copy / clone let insert process work out next instance no
 					$item_r['owner_id'] = ifempty($HTTP_VARS['owner_id'], get_opendb_session_var('user_id'));
 					$item_r['s_status_type'] = $status_type_r['s_status_type'];
 					$item_r['status_comment'] = NULL;
+
 				} else { //otherwise either a site refresh operation or an edit/update/delete
 	 				$item_r = fetch_item_instance_r($HTTP_VARS['item_id'], $HTTP_VARS['instance_no']);
 	
diff --git a/javascript/date.js b/javascript/date.js
index 53bb8525..e2966540 100644
--- a/javascript/date.js
+++ b/javascript/date.js
@@ -302,4 +302,4 @@ function is_datetime(datetime, format_mask)
 		//mismatch
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/AdminAjaxJobs.class.php b/lib/AdminAjaxJobs.class.php
index 0e81decb..38b87e05 100644
--- a/lib/AdminAjaxJobs.class.php
+++ b/lib/AdminAjaxJobs.class.php
@@ -13,7 +13,7 @@ class AdminAjaxJobs {
 	var $_id;
 	var $_debug;
 
-	function AdminAjaxJobs($id, $job, $batchlimit) {
+	function __construct($id, $job, $batchlimit) {
 		$this->_id = $id;
 		$this->_job = $job;
 		$this->_batchlimit = $batchlimit;
@@ -139,4 +139,4 @@ function printJobProgressBar($arg1 = NULL) {
 	function __executeJob() {
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/BooleanParser.class.php b/lib/BooleanParser.class.php
index 6ce90422..c2349ead 100644
--- a/lib/BooleanParser.class.php
+++ b/lib/BooleanParser.class.php
@@ -29,10 +29,6 @@ class BooleanLexer {
 	var $string;
 	var $stringLen;
 	
-	// Do nothing.
-	function BooleanLexer() {
-	}
-
 	function parse($string, $lookahead = NULL) {
 		$this->string = $string;
 		$this->stringLen = strlen ( $string );
@@ -61,12 +57,12 @@ function get($idx = NULL) {
 			// If idx is negative, this should work as well.
 			$index = $this->tokPtr + $idx;
 			if ($index >= 0 && $index < $this->stringLen)
-				return $this->string {$index};
+				return $this->string[$index];
 			else
 				return NULL;
 		} else {
 			if ($this->tokPtr < $this->stringLen)
-				return $this->string {$this->tokPtr ++};
+				return $this->string[$this->tokPtr ++];
 			else
 				return NULL; // reached end of string
 		}
@@ -253,17 +249,13 @@ function _nextToken() {
 
 class BooleanParser {
 	var $lexer = NULL;
-	
-	// Do nothing.
-	function BooleanParser() {
-	}
 
 	function parseBooleanStatement($statement) {
 		if ($this->lexer == NULL)
 			$this->lexer = new BooleanLexer ();
-		
+
 		$this->lexer->parse ( $statement, 1 );
-		
+
 		while ( true ) {
 			$statement = $this->parseStatement ();
 			if ($statement === FALSE)
@@ -273,7 +265,7 @@ function parseBooleanStatement($statement) {
 			else
 				break; // finished
 		}
-		
+
 		return $statements;
 	}
 
@@ -289,14 +281,14 @@ function parseStatement() {
 			$token = $this->lexer->nextToken ();
 		}
 		$this->lexer->pushBack ();
-		
+
 		if (is_array ( $conditions ) && count ( $conditions ) > 1) {
 			return array ('or' => $conditions );
 		} else {
 			return $conditions [0];
 		}
 	}
-	
+
 	/*
 	* Will parse several basic 'left <op> right' condition statements, as
 	* long as they are separated by AND tokens.
@@ -414,8 +406,8 @@ function get_compare_clause($column_name, $column_value, $match_mode, $case_sens
 */
 function build_boolean_clause($statement_rs, $column_name, $match_mode, $mode = 'AND', $case_sensitive = NULL) {
 	$query = "";
-	
-	while ( list ( $key, $statement ) = each ( $statement_rs ) ) {
+
+	foreach ( $statement_rs as $key => $statement ) {
 		if (strlen ( $query ) > 0)
 			$query .= " $mode ";
 		
diff --git a/lib/DocTypeNameSpaceXMLParser.class.php b/lib/DocTypeNameSpaceXMLParser.class.php
index d99e23b6..b136cf03 100644
--- a/lib/DocTypeNameSpaceXMLParser.class.php
+++ b/lib/DocTypeNameSpaceXMLParser.class.php
@@ -28,9 +28,6 @@ class DocTypeNameSpaceXMLParser {
 	var $_nameSpace;
 	var $_errors;
 
-	function DocTypeNameSpaceXMLParser() {
-	}
-
 	function parseFile($fileLocation) {
 		// reset it.
 		$this->_docType = NULL;
@@ -90,8 +87,7 @@ function _startElement($parser, $name, $attributes) {
 			
 			if (is_array ( $attributes )) {
 				reset ( $attributes );
-				while ( list ( $name, $value ) = each ( $attributes ) ) {
-					
+				foreach ($attributes as $name => $value) {
 					if (ends_with ( $name, ":schemaLocation" )) {
 						$this->_nameSpace = $value;
 						break;
diff --git a/lib/HTML_Listing.class.php b/lib/HTML_Listing.class.php
index 55df3592..77893e6b 100644
--- a/lib/HTML_Listing.class.php
+++ b/lib/HTML_Listing.class.php
@@ -42,8 +42,8 @@ class HTML_Listing extends Listing {
 	* @param $PHP_SELF
 	* @param $HTTP_VARS
 	*/
-	function HTML_Listing($PHP_SELF, $HTTP_VARS) {
-		parent::Listing ( $PHP_SELF, $HTTP_VARS );
+	function __construct($PHP_SELF, $HTTP_VARS) {
+		parent::__construct( $PHP_SELF, $HTTP_VARS );
 	}
 
 	function setIncludeFooter($boolean) {
diff --git a/lib/Install_Table.class.php b/lib/Install_Table.class.php
index 20d0cc58..6a68beb7 100644
--- a/lib/Install_Table.class.php
+++ b/lib/Install_Table.class.php
@@ -47,7 +47,7 @@ class Install_Table {
 
 	/**
 	*/
-	function Install_Table($table) {
+	function __construct($table) {
 		$this->_table_name = $table;
 		
 		if (! check_opendb_table ( $this->_table_name )) {
@@ -234,4 +234,4 @@ function getHeaderRow() {
 		return $this->_header_row;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/ItemImportHandler.class.php b/lib/ItemImportHandler.class.php
index 433200ca..783e427a 100644
--- a/lib/ItemImportHandler.class.php
+++ b/lib/ItemImportHandler.class.php
@@ -30,9 +30,6 @@ class Item {
 	var $_title = NULL;
 	var $_attribute_rs = NULL;
 
-	function Item() {
-	}
-
 	function setItemType($s_item_type) {
 		$this->_item_type = $s_item_type;
 	}
@@ -98,8 +95,8 @@ class ItemInstance extends Item {
 	var $_borrow_duration;
 	var $_instance_no;
 
-	function ItemInstance(&$parentItemObj, $ownerId) {
-		parent::Item ();
+	function __construct(&$parentItemObj, $ownerId) {
+		parent::__construct();
 		
 		$this->setOwnerID ( $ownerId );
 		
@@ -182,7 +179,7 @@ class ItemImportHandler {
 	* @param $owner_id - Will be used for item_instance insert, as well as validation
 	* 					of any owner insert restrictions.
 	*/
-	function ItemImportHandler($owner_id, $cfg_is_trial_run, $cfg_ignore_duplicate_title, $cfg_override_status_type, $cfg_default_status_type_r, &$listingsObject) {
+	function __construct($owner_id, $cfg_is_trial_run, $cfg_ignore_duplicate_title, $cfg_override_status_type, $cfg_default_status_type_r, &$listingsObject) {
 		$this->_owner_id = $owner_id;
 		$this->_cfg_ignore_duplicate_title = $cfg_ignore_duplicate_title;
 		$this->_cfg_is_trial_run = $cfg_is_trial_run;
@@ -492,13 +489,13 @@ function __listing_item_import_result_row($item_r, $status_type_r, $attribute_rs
 			if (is_array ( $attribute_rs )) {
 				$column .= '<dl class="importAttribs">';
 				reset ( $attribute_rs );
-				while ( list ( $key, $attribute_val ) = each ( $attribute_rs ) ) {
+				foreach ($attribute_rs as $key => $attribute_val) {
 					$attribute_type_r = NULL;
 					
 					$attribute_type_rs = $this->__getItemTypeAttribs ( $item_r ['s_item_type'] );
 					if (is_array ( $attribute_type_rs )) {
 						reset ( $attribute_type_rs );
-						while ( list ( , $attribute_type_r ) = each ( $attribute_type_rs ) ) {
+						foreach ($attribute_type_rs as $attribute_type_r) {
 							if ($key == get_field_name ( $attribute_type_r ['s_attribute_type'], $attribute_type_r ['order_no'] )) {
 								if ($attribute_type_r ['display_type'] == 'hidden' || ($attribute_type_r ['display_type'] == 0 && $attribute_type_r ['input_type'] == 'hidden')) {
 									$attribute_type_r ['display_type'] = 'display';
@@ -534,7 +531,7 @@ function __getItemHTTPVars(&$itemObj) {
 			$new_attributes_rs = $itemObj->getAttributes ();
 			
 			reset ( $attribute_type_rs );
-			while ( list ( , $attribute_type_r ) = each ( $attribute_type_rs ) ) {
+			foreach ($attribute_type_rs as $attribute_type_r) {
 				if ($attribute_type_r ['s_field_type'] != 'DURATION' && $attribute_type_r ['s_field_type'] != 'TITLE' && $attribute_type_r ['s_field_type'] != 'STATUSTYPE' && $attribute_type_r ['s_field_type'] != 'STATUSCMNT' && $attribute_type_r ['s_field_type'] != 'ITEM_ID') {
 					$fieldname = get_field_name ( $attribute_type_r ['s_attribute_type'], $attribute_type_r ['order_no'] );
 					
@@ -630,4 +627,4 @@ function __getItemTypeAttribs($s_item_type) {
 		return $this->_item_type_structure_rs [$s_item_type];
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/Listing.class.php b/lib/Listing.class.php
index 94d4ce4b..7c98ba8c 100644
--- a/lib/Listing.class.php
+++ b/lib/Listing.class.php
@@ -49,11 +49,10 @@ class Listing {
 	// TitleMask class reference
 	var $_titleMaskCfg;
 
-	function Listing($PHP_SELF, $HTTP_VARS) {
+	function __construct($PHP_SELF, $HTTP_VARS) {
 		$this->_php_self = $PHP_SELF;
 		$this->_http_vars = $HTTP_VARS;
 		
-		$this->_mode = $mode;
 		if (isset ( $HTTP_VARS ['items_per_page'] )) {
 			$this->_items_per_page = $HTTP_VARS ['items_per_page'];
 		} else {
@@ -66,8 +65,8 @@ function Listing($PHP_SELF, $HTTP_VARS) {
 			$this->_start_index = NULL;
 		}
 		
-		$this->_current_orderby = $this->_http_vars ['order_by'];
-		$this->_current_sortorder = $this->_http_vars ['sortorder'];
+		$this->_current_orderby = $this->_http_vars ['order_by'] ?? '';
+		$this->_current_sortorder = $this->_http_vars ['sortorder'] ?? '';
 		
 		// initialise to default.
 		$this->_no_rows_message = get_opendb_lang_var ( 'no_matches_found' );
@@ -191,7 +190,7 @@ function getHelpEntries() {
 	function addHelpEntry($help_text, $img = NULL, $id = NULL) {
 		if (is_array ( $help_text )) {
 			reset ( $help_text );
-			while ( list ( , $help ) = @each ( $help_text ) ) {
+			foreach ( $help_text as $help ) {
 				$this->_addHelpEntry ( $help, $img, $id );
 			}
 		} else {
@@ -209,14 +208,14 @@ function _addHelpEntry($help_text, $img = NULL, $id = NULL) {
 		}
 	}
 
-	/**
-	 * @$fieldname should always be provided as it provides the header element id, which can be used to style the 
-	 * width of the column, etc.  The $sortColumn parameter should be used to control whether the column is sortable
-	 * or not.
-	 *
-	 * @param unknown_type $title
-	 * @param unknown_type $fieldname
-	 * @param unknown_type $sortColumn
+	/**
+	 * @$fieldname should always be provided as it provides the header element id, which can be used to style the
+	 * width of the column, etc.  The $sortColumn parameter should be used to control whether the column is sortable
+	 * or not.
+	 *
+	 * @param unknown_type $title
+	 * @param unknown_type $fieldname
+	 * @param unknown_type $sortColumn
 	 */
 	function addHeaderColumn($title, $fieldname = NULL, $sortColumn = TRUE, $type = NULL) {
 		if ($fieldname == NULL) {
@@ -230,7 +229,14 @@ function addHeaderColumn($title, $fieldname = NULL, $sortColumn = TRUE, $type =
 				'type' => $type );
 		
 		if ($fieldname == 'title') {
-			if (is_user_granted_permission ( PERM_VIEW_ITEM_COVERS ) && ($this->_show_item_images === TRUE || ((get_opendb_config_var ( 'listings', 'allow_override_show_item_image' ) === FALSE && get_opendb_config_var ( 'listings', 'show_item_image' ) !== FALSE) || get_opendb_config_var ( 'listings', 'allow_override_show_item_image' ) !== FALSE && ((get_opendb_config_var ( 'listings', 'show_item_image' ) !== FALSE && strlen ( $this->_http_vars ['show_item_image'] ) == 0) || $this->_http_vars ['show_item_image'] == 'Y')))) {
+			if ( is_user_granted_permission ( PERM_VIEW_ITEM_COVERS ) &&
+                 ( $this->_show_item_images === TRUE ||
+                   ( ( get_opendb_config_var( 'listings', 'allow_override_show_item_image' ) === FALSE &&
+                       get_opendb_config_var( 'listings', 'show_item_image' ) !== FALSE) ||
+                     get_opendb_config_var( 'listings', 'allow_override_show_item_image' ) !== FALSE &&
+                     ( ( get_opendb_config_var( 'listings', 'show_item_image' ) !== FALSE &&
+                         strlen( $this->_http_vars['show_item_image'] ?? '') == 0) ||
+                       $this->_http_vars['show_item_image'] === 'Y')))) {
 				$header_column_r ['cover_image_support'] = TRUE;
 				
 				$this->_header_column_rs [] = array (
@@ -507,7 +513,7 @@ function endListing() {
 			
 			$title_mask_elements = $this->_titleMaskCfg->title_mask_macro_element_r ( 'theme_img' );
 			if (is_array ( $title_mask_elements )) {
-				while ( list ( $img, $prompt ) = each ( $title_mask_elements ) ) {
+				foreach ($title_mask_elements as $img => $prompt ) {
 					$this->addHelpEntry ( $prompt, $img, 'title_mask' );
 				}
 			}
@@ -522,4 +528,4 @@ function endListing() {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/GDImage.class.php b/lib/ODImage.class.php
similarity index 96%
rename from lib/GDImage.class.php
rename to lib/ODImage.class.php
index 3e0592a3..ca3a0d72 100644
--- a/lib/GDImage.class.php
+++ b/lib/ODImage.class.php
@@ -29,14 +29,14 @@ function is_function_valid($function) {
 	}
 }
 
-class GDImage {
+class ODImage {
 	var $_imgType;
 	var $_image;
 	var $_imageSrc;
 	var $_image_type_r;
 	var $_errors;
 
-	function GDImage($imgType = 'auto') {
+	function __construct($imgType = 'auto') {
 		global $GD_IMAGE_TYPES;
 		
 		if ($imgType != NULL && $imgType != 'auto') {
@@ -50,7 +50,7 @@ function GDImage($imgType = 'auto') {
 		} else {
 			// else choose automatically based on support of functions
 			reset ( $GD_IMAGE_TYPES );
-			while ( list ( $imgType, $image_type_r ) = each ( $GD_IMAGE_TYPES ) ) {
+			foreach ( $GD_IMAGE_TYPES as $imgType => $image_type_r ) {
 				if ($this->isImageTypeValid ( $imgType ) !== FALSE) {
 					$this->_imgType = $imgType;
 					$this->_image_type_r = $image_type_r;
@@ -171,4 +171,4 @@ function _getImageSrc($name) {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/OpenDbBrowserSniffer.class.php b/lib/OpenDbBrowserSniffer.class.php
index f0888ed5..aa52cc82 100644
--- a/lib/OpenDbBrowserSniffer.class.php
+++ b/lib/OpenDbBrowserSniffer.class.php
@@ -34,8 +34,8 @@ class OpenDbBrowserSniffer {
 			'kq',
 			'sf' );
 
-	function OpenDbBrowserSniffer() {
-		$this->phpSniffer = new phpSniff ( get_http_env ( 'HTTP_USER_AGENT' ) );
+	function __construct() {
+		$this->phpSniffer = new phpSniff( get_http_env( 'HTTP_USER_AGENT' ) );
 		$this->__initIsSupported ();
 	}
 
@@ -83,4 +83,4 @@ function __initIsSupported() {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/OpenDbSnoopy.class.php b/lib/OpenDbSnoopy.class.php
index 561a6538..f8a4eb24 100644
--- a/lib/OpenDbSnoopy.class.php
+++ b/lib/OpenDbSnoopy.class.php
@@ -34,7 +34,7 @@ class OpenDbSnoopy extends Snoopy {
 	var $_file_cache_r;
 	var $_file_cache_enabled;
 
-	function OpenDbSnoopy($debug = FALSE) {
+	function __construct($debug = FALSE) {
 		// if file cache table is not installed, we cannot use file cache.
 		$this->_file_cache_enabled = get_opendb_config_var ( 'http.cache', 'enable' );
 		
diff --git a/lib/OpenDbUpgrader.class.php b/lib/OpenDbUpgrader.class.php
index 8310c9e3..5ab2bc4f 100644
--- a/lib/OpenDbUpgrader.class.php
+++ b/lib/OpenDbUpgrader.class.php
@@ -33,7 +33,7 @@ class OpenDbUpgrader {
 	    		description=>'step description',
 	    		skippable=>[TRUE|FALSE]),
 	*/
-	function OpenDbUpgrader($from_version, $to_version = NULL, $steps_r = NULL) {
+	function __construct($from_version, $to_version = NULL, $steps_r = NULL) {
 		// derive a upgrade sql directory from the classname
 		$this->_upgraderdir = './install/upgrade/' . $from_version;
 		if ($to_version != NULL) {
@@ -204,7 +204,7 @@ function addError($message, $detail = NULL) {
 	*/
 	function addErrors($errors) {
 		if (is_array ( $errors )) {
-			while ( list ( , $error ) = each ( $errors ) ) {
+			foreach ($errors as $error) {
 				if (is_array ( $error ))
 					$this->addError ( $error ['error'], $error ['detail'] );
 				else
diff --git a/lib/RowImportPluginHandler.class.php b/lib/RowImportPluginHandler.class.php
index 45d6c48c..3142a94b 100644
--- a/lib/RowImportPluginHandler.class.php
+++ b/lib/RowImportPluginHandler.class.php
@@ -28,7 +28,7 @@ class RowImportPluginHandler {
 	// stores the first error encountered.
 	var $_error;
 
-	function RowImportPluginHandler(&$itemImportHandler, &$importPlugin, &$fileHandler, $field_column_r, $field_default_r, $field_initcap_r) {
+	function __construct(&$itemImportHandler, &$importPlugin, &$fileHandler, $field_column_r, $field_default_r, $field_initcap_r) {
 		$this->itemImportHandler = & $itemImportHandler;
 		$this->importPlugin = & $importPlugin;
 		$this->fileHandler = & $fileHandler;
@@ -135,4 +135,4 @@ function getError() {
 		return $this->_error;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/SitePlugin.class.php b/lib/SitePlugin.class.php
index 89d391fb..630b7924 100644
--- a/lib/SitePlugin.class.php
+++ b/lib/SitePlugin.class.php
@@ -50,7 +50,7 @@ class SitePlugin {
 	var $_httpClient;
 	var $_titleMaskCfg;
 
-	function SitePlugin($site_type) {
+	function __construct($site_type) {
 		global $SITE_PLUGIN_SNOOPY;
 		
 		$this->_type = $site_type;
@@ -219,7 +219,7 @@ function addListingRow($title, $cover_image_url, $comments, $attributes_r) {
 					if (is_array ( $this->_item_list_rs ['attributes'] )) {
 						$found = TRUE;
 						reset ( $attributes_r );
-						while ( list ( $key, $value ) = each ( $attributes_r ) ) {
+						foreach ($attributes_r as $key => $value) {
 							// if not set, this is considered no match and do next for loop cycle
 							if (! isset ( $this->_item_list_rs ['attributes'] [$key] ) || $this->_item_list_rs ['attributes'] [$key] != $key) {
 								$found = FALSE;
@@ -408,7 +408,7 @@ function _queryItem($HTTP_VARS, $s_item_type = NULL) {
 				unset ( $search_attributes_r ['search_title'] );
 				
 				reset ( $search_attributes_r );
-				while ( list ( $key, $value ) = each ( $search_attributes_r ) ) {
+				foreach ( $search_attributes_r as $key => $value ) {
 					if ($this->getItemAttribute ( $key ) === FALSE) {
 						$this->addItemAttribute ( $key, $value );
 					}
@@ -447,7 +447,7 @@ function getDebugItemDataAsHtml($s_item_type = NULL) {
 	function __getDebugItemData($itemData) {
 		@reset ( $itemData );
 		$buffer = "<ul>";
-		while ( list ( $key, $value ) = each ( $itemData ) ) {
+		foreach ( $itemData as $key => $value ) {
 			$buffer .= "\n<li>";
 			if (! is_numeric ( $key )) {
 				$buffer .= "<strong>$key:</strong> ";
diff --git a/lib/Snoopy.class.php b/lib/Snoopy.class.php
index fb54a082..4e2bae54 100644
--- a/lib/Snoopy.class.php
+++ b/lib/Snoopy.class.php
@@ -1,12 +1,11 @@
 <?php
 
 /*************************************************
-
-Snoopy - the PHP net client
-Author: Monte Ohrt <monte@ispi.net>
-Copyright (c): 1999-2008 New Digital Group, all rights reserved
-Version: 1.2.4
-
+ *
+ * Snoopy - the PHP net client
+ * Author: Monte Ohrt <monte@ohrt.com>
+ * Copyright (c): 1999-2014, all rights reserved
+ * Version: 2.0.0
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,802 +19,982 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * You may contact the author of Snoopy by e-mail at:
+ * monte@ohrt.com
+ *
+ * The latest version of Snoopy can be obtained from:
+ * http://snoopy.sourceforge.net/
+ *************************************************/
+class Snoopy
+{
+    /**** Public variables ****/
+
+    /* user definable vars */
+
+    var $scheme = 'http'; // http or https
+    var $host = "www.php.net"; // host name we are connecting to
+    var $port = 80; // port we are connecting to
+    var $proxy_host = ""; // proxy host to use
+    var $proxy_port = ""; // proxy port to use
+    var $proxy_user = ""; // proxy user to use
+    var $proxy_pass = ""; // proxy password to use
+
+    var $agent = "Snoopy v2.0.0"; // agent we masquerade as
+    var $referer = ""; // referer info to pass
+    var $cookies = array(); // array of cookies to pass
+    // $cookies["username"]="joe";
+    var $rawheaders = array(); // array of raw headers to send
+    // $rawheaders["Content-type"]="text/html";
+
+    var $maxredirs = 5; // http redirection depth maximum. 0 = disallow
+    var $lastredirectaddr = ""; // contains address of last redirected address
+    var $offsiteok = true; // allows redirection off-site
+    var $maxframes = 0; // frame content depth maximum. 0 = disallow
+    var $expandlinks = true; // expand links to fully qualified URLs.
+    // this only applies to fetchlinks()
+    // submitlinks(), and submittext()
+    var $passcookies = true; // pass set cookies back through redirects
+    // NOTE: this currently does not respect
+    // dates, domains or paths.
+
+    var $user = ""; // user for http authentication
+    var $pass = ""; // password for http authentication
+
+    // http accept types
+    var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+
+    var $results = ""; // where the content is put
+
+    var $error = ""; // error messages sent here
+    var $response_code = ""; // response code returned from server
+    var $headers = array(); // headers returned from server sent here
+    var $maxlength = 500000; // max return data length (body)
+    var $read_timeout = 0; // timeout on read operations, in seconds
+    // supported only since PHP 4 Beta 4
+    // set to 0 to disallow timeouts
+    var $timed_out = false; // if a read operation timed out
+    var $status = 0; // http request status
+
+    var $temp_dir = "/tmp"; // temporary directory that the webserver
+    // has permission to write to.
+    // under Windows, this should be C:\temp
+
+    var $curl_path = false;
+    // deprecated, snoopy no longer uses curl for https requests,
+    // but instead requires the openssl extension.
+
+    // send Accept-encoding: gzip?
+    var $use_gzip = true;
+
+    // file or directory with CA certificates to verify remote host with
+    var $cafile;
+    var $capath;
+
+    /**** Private variables ****/
+
+    var $_maxlinelen = 4096; // max line length (headers)
+
+    var $_httpmethod = "GET"; // default http request method
+    var $_httpversion = "HTTP/1.0"; // default http request version
+    var $_submit_method = "POST"; // default submit method
+    var $_submit_type = "application/x-www-form-urlencoded"; // default submit type
+    var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type
+    var $_redirectaddr = false; // will be set if page fetched is a redirect
+    var $_redirectdepth = 0; // increments on an http redirect
+    var $_frameurls = array(); // frame src urls
+    var $_framedepth = 0; // increments on frame depth
+
+    var $_isproxy = false; // set if using a proxy server
+    var $_fp_timeout = 30; // timeout for socket connection
+
+    /*======================================================================*\
+        Function:	fetch
+        Purpose:	fetch the contents of a web page
+                    (and possibly other protocols in the
+                    future like ftp, nntp, gopher, etc.)
+        Input:		$URI	the location of the page to fetch
+        Output:		$this->results	the output text from the fetch
+    \*======================================================================*/
+
+    function fetch($URI)
+    {
+
+        $URI_PARTS = parse_url($URI);
+        if (!empty($URI_PARTS["user"]))
+            $this->user = $URI_PARTS["user"];
+        if (!empty($URI_PARTS["pass"]))
+            $this->pass = $URI_PARTS["pass"];
+        if (empty($URI_PARTS["query"]))
+            $URI_PARTS["query"] = '';
+        if (empty($URI_PARTS["path"]))
+            $URI_PARTS["path"] = '';
+
+        $fp = null;
+
+        switch (strtolower($URI_PARTS["scheme"])) {
+            case "https":
+                if (!extension_loaded('openssl')) {
+                    trigger_error("openssl extension required for HTTPS", E_USER_ERROR);
+                    exit;
+                }
+                $this->port = 443;
+            case "http":
+                $this->scheme = strtolower($URI_PARTS["scheme"]);
+                $this->host = $URI_PARTS["host"];
+                if (!empty($URI_PARTS["port"]))
+                    $this->port = $URI_PARTS["port"];
+                if ($this->_connect($fp)) {
+                    if ($this->_isproxy) {
+                        // using proxy, send entire URI
+                        $this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
+                    } else {
+                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        // no proxy, send only the path
+                        $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
+                    }
+
+                    $this->_disconnect($fp);
+
+                    if ($this->_redirectaddr) {
+                        /* url was redirected, check if we've hit the max depth */
+                        if ($this->maxredirs > $this->_redirectdepth) {
+                            // only follow redirect if it's on this site, or offsiteok is true
+                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                                /* follow the redirect */
+                                $this->_redirectdepth++;
+                                $this->lastredirectaddr = $this->_redirectaddr;
+                                $this->fetch($this->_redirectaddr);
+                            }
+                        }
+                    }
+
+                    if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) {
+                        $frameurls = $this->_frameurls;
+                        $this->_frameurls = array();
+
+                        foreach ($frameurls as $frameurl) {
+                            if ($this->_framedepth < $this->maxframes) {
+                                $this->fetch($frameurl);
+                                $this->_framedepth++;
+                            } else
+                                break;
+                        }
+                    }
+                } else {
+                    return false;
+                }
+                return $this;
+                break;
+            default:
+                // not a valid protocol
+                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                return false;
+                break;
+        }
+        return $this;
+    }
+
+    /*======================================================================*\
+        Function:	submit
+        Purpose:	submit an http(s) form
+        Input:		$URI	the location to post the data
+                    $formvars	the formvars to use.
+                        format: $formvars["var"] = "val";
+                    $formfiles  an array of files to submit
+                        format: $formfiles["var"] = "/dir/filename.ext";
+        Output:		$this->results	the text output from the post
+    \*======================================================================*/
+
+    function submit($URI, $formvars = "", $formfiles = "")
+    {
+        unset($postdata);
+
+        $postdata = $this->_prepare_post_body($formvars, $formfiles);
+
+        $URI_PARTS = parse_url($URI);
+        if (!empty($URI_PARTS["user"]))
+            $this->user = $URI_PARTS["user"];
+        if (!empty($URI_PARTS["pass"]))
+            $this->pass = $URI_PARTS["pass"];
+        if (empty($URI_PARTS["query"]))
+            $URI_PARTS["query"] = '';
+        if (empty($URI_PARTS["path"]))
+            $URI_PARTS["path"] = '';
+
+        switch (strtolower($URI_PARTS["scheme"])) {
+            case "https":
+                if (!extension_loaded('openssl')) {
+                    trigger_error("openssl extension required for HTTPS", E_USER_ERROR);
+                    exit;
+                }
+                $this->port = 443;
+            case "http":
+                $this->scheme = strtolower($URI_PARTS["scheme"]);
+                $this->host = $URI_PARTS["host"];
+                if (!empty($URI_PARTS["port"]))
+                    $this->port = $URI_PARTS["port"];
+                if ($this->_connect($fp)) {
+                    if ($this->_isproxy) {
+                        // using proxy, send entire URI
+                        $this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
+                    } else {
+                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        // no proxy, send only the path
+                        $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
+                    }
+
+                    $this->_disconnect($fp);
 
-You may contact the author of Snoopy by e-mail at:
-monte@ohrt.com
-
-The latest version of Snoopy can be obtained from:
-http://snoopy.sourceforge.net/
-
-*************************************************/
-class Snoopy {
-	/**** Public variables ****/
-	
-	/* user definable vars */
-	var $host = "www.php.net"; // host name we are connecting to
-	var $port = 80; // port we are connecting to
-	var $proxy_host = ""; // proxy host to use
-	var $proxy_port = ""; // proxy port to use
-	var $proxy_user = ""; // proxy user to use
-	var $proxy_pass = ""; // proxy password to use
-	var $agent = "Snoopy v1.2.4"; // agent we masquerade as
-	var $referer = ""; // referer info to pass
-	var $cookies = array (); // array of cookies to pass
-	// $cookies["username"]="joe";
-	var $rawheaders = array (); // array of raw headers to send
-	// $rawheaders["Content-type"]="text/html";
-	var $maxredirs = 5; // http redirection depth maximum. 0 = disallow
-	var $lastredirectaddr = ""; // contains address of last redirected address
-	var $offsiteok = true; // allows redirection off-site
-	var $maxframes = 0; // frame content depth maximum. 0 = disallow
-	var $expandlinks = true; // expand links to fully qualified URLs.
-	// this only applies to fetchlinks()
-	// submitlinks(), and submittext()
-	var $passcookies = true; // pass set cookies back through redirects
-	// NOTE: this currently does not respect
-	// dates, domains or paths.
-	var $user = ""; // user for http authentication
-	var $pass = ""; // password for http authentication
-	
-
-	// http accept types
-	var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-	var $results = ""; // where the content is put
-	var $error = ""; // error messages sent here
-	var $response_code = ""; // response code returned from server
-	var $headers = array (); // headers returned from server sent here
-	var $maxlength = 500000; // max return data length (body)
-	var $read_timeout = 0; // timeout on read operations, in seconds
-	// supported only since PHP 4 Beta 4
-	// set to 0 to disallow timeouts
-	var $timed_out = false; // if a read operation timed out
-	var $status = 0; // http request status
-	var $temp_dir = "/tmp"; // temporary directory that the webserver
-	// has permission to write to.
-	// under Windows, this should be C:\temp
-	var $curl_path = "/usr/local/bin/curl";
-	// Snoopy will use cURL for fetching
-	// SSL content if a full system path to
-	// the cURL binary is supplied here.
-	// set to false if you do not have
-	// cURL installed. See http://curl.haxx.se
-	// for details on installing cURL.
-	// Snoopy does *not* use the cURL
-	// library functions built into php,
-	// as these functions are not stable
-	// as of this Snoopy release.
-	
-
-	/**** Private variables ****/
-	var $_maxlinelen = 4096; // max line length (headers)
-	var $_httpmethod = "GET"; // default http request method
-	var $_httpversion = "HTTP/1.0"; // default http request version
-	var $_submit_method = "POST"; // default submit method
-	var $_submit_type = "application/x-www-form-urlencoded"; // default submit type
-	var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type
-	var $_redirectaddr = false; // will be set if page fetched is a redirect
-	var $_redirectdepth = 0; // increments on an http redirect
-	var $_frameurls = array (); // frame src urls
-	var $_framedepth = 0; // increments on frame depth
-	var $_isproxy = false; // set if using a proxy server
-	var $_fp_timeout = 30; // timeout for socket connection
-
-	
-	/*======================================================================*\
-	Function:	fetch
-	Purpose:	fetch the contents of a web page
-				(and possibly other protocols in the
-				future like ftp, nntp, gopher, etc.)
-	Input:		$URI	the location of the page to fetch
-	Output:		$this->results	the output text from the fetch
-\*======================================================================*/
-	function fetch($URI) {
-		
-		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
-		$URI_PARTS = parse_url ( $URI );
-		if (! empty ( $URI_PARTS ["user"] ))
-			$this->user = $URI_PARTS ["user"];
-		if (! empty ( $URI_PARTS ["pass"] ))
-			$this->pass = $URI_PARTS ["pass"];
-		if (empty ( $URI_PARTS ["query"] ))
-			$URI_PARTS ["query"] = '';
-		if (empty ( $URI_PARTS ["path"] ))
-			$URI_PARTS ["path"] = '';
-		
-		switch (strtolower ( $URI_PARTS ["scheme"] )) {
-			case "http" :
-			case "https" :
-				$this->host = $URI_PARTS ["host"];
-				if (! empty ( $URI_PARTS ["port"] ))
-					$this->port = $URI_PARTS ["port"];
-				if ($this->_isproxy) {
-					// using proxy, send entire URI
-					$this->_httprequest ( $URI, $URI, $this->_httpmethod );
-				} else {
-					$path = $URI_PARTS ["path"] . ($URI_PARTS ["query"] ? "?" . $URI_PARTS ["query"] : "");
-					// no proxy, send only the path
-					$this->_httprequest ( $path, $URI, $this->_httpmethod );
-				}
-
-				if ($this->_redirectaddr) {
-					/* url was redirected, check if we've hit the max depth */
-					if ($this->maxredirs > $this->_redirectdepth) {
-						// only follow redirect if it's on this site, or offsiteok is true
-						if (preg_match ( "|^http://" . preg_quote ( $this->host ) . "|i", $this->_redirectaddr ) || $this->offsiteok) {
-							/* follow the redirect */
-							$this->_redirectdepth ++;
-							$this->lastredirectaddr = $this->_redirectaddr;
-							$this->fetch ( $this->_redirectaddr );
-						}
-					}
-				}
-
-				if ($this->_framedepth < $this->maxframes && count ( $this->_frameurls ) > 0) {
-					$frameurls = $this->_frameurls;
-					$this->_frameurls = array ();
-					
-					while ( list ( , $frameurl ) = each ( $frameurls ) ) {
-						if ($this->_framedepth < $this->maxframes) {
-							$this->fetch ( $frameurl );
-							$this->_framedepth ++;
-						} else
-							break;
-					}
-				}
-				return true;
-				break;
-			default :
-				// not a valid protocol
-				$this->error = 'Invalid protocol "' . $URI_PARTS ["scheme"] . '"\n';
-				return false;
-				break;
-		}
-		return true;
-	}
-	
-	/*======================================================================*\
-	Function:	submit
-	Purpose:	submit an http form
-	Input:		$URI	the location to post the data
-				$formvars	the formvars to use.
-					format: $formvars["var"] = "val";
-				$formfiles  an array of files to submit
-					format: $formfiles["var"] = "/dir/filename.ext";
-	Output:		$this->results	the text output from the post
-\*======================================================================*/
-	function submit($URI, $formvars = "", $formfiles = "") {
-		unset ( $postdata );
-		
-		$postdata = $this->_prepare_post_body ( $formvars, $formfiles );
-		
-		$URI_PARTS = parse_url ( $URI );
-		if (! empty ( $URI_PARTS ["user"] ))
-			$this->user = $URI_PARTS ["user"];
-		if (! empty ( $URI_PARTS ["pass"] ))
-			$this->pass = $URI_PARTS ["pass"];
-		if (empty ( $URI_PARTS ["query"] ))
-			$URI_PARTS ["query"] = '';
-		if (empty ( $URI_PARTS ["path"] ))
-			$URI_PARTS ["path"] = '';
-		
-		switch (strtolower ( $URI_PARTS ["scheme"] )) {
-			case "http" :
-			case "https" :
-				$this->host = $URI_PARTS ["host"];
-				if (! empty ( $URI_PARTS ["port"] ))
-					$this->port = $URI_PARTS ["port"];
-				if ($this->_isproxy) {
-					// using proxy, send entire URI
-					$this->_httprequest ( $URI, $URI, $this->_submit_method, $this->_submit_type, $postdata );
-				} else {
-					$path = $URI_PARTS ["path"] . ($URI_PARTS ["query"] ? "?" . $URI_PARTS ["query"] : "");
-					// no proxy, send only the path
-					$this->_httprequest ( $path, $URI, $this->_submit_method, $this->_submit_type, $postdata );
-				}
-
-				if ($this->_redirectaddr) {
-					/* url was redirected, check if we've hit the max depth */
-					if ($this->maxredirs > $this->_redirectdepth) {
-						if (! preg_match ( "|^" . $URI_PARTS ["scheme"] . "://|", $this->_redirectaddr ))
-							$this->_redirectaddr = $this->_expandlinks ( $this->_redirectaddr, $URI_PARTS ["scheme"] . "://" . $URI_PARTS ["host"] );
-							
-							// only follow redirect if it's on this site, or offsiteok is true
-						if (preg_match ( "|^http://" . preg_quote ( $this->host ) . "|i", $this->_redirectaddr ) || $this->offsiteok) {
-							/* follow the redirect */
-							$this->_redirectdepth ++;
-							$this->lastredirectaddr = $this->_redirectaddr;
-							if (strpos ( $this->_redirectaddr, "?" ) > 0)
-								$this->fetch ( $this->_redirectaddr ); // the redirect has changed the request method from post to get
-							else
-								$this->submit ( $this->_redirectaddr, $formvars, $formfiles );
-						}
-					}
-				}
-				
-				if ($this->_framedepth < $this->maxframes && count ( $this->_frameurls ) > 0) {
-					$frameurls = $this->_frameurls;
-					$this->_frameurls = array ();
-					
-					while ( list ( , $frameurl ) = each ( $frameurls ) ) {
-						if ($this->_framedepth < $this->maxframes) {
-							$this->fetch ( $frameurl );
-							$this->_framedepth ++;
-						} else
-							break;
-					}
-				}
-				return true;
-				break;
-			default :
-				// not a valid protocol
-				$this->error = 'Invalid protocol "' . $URI_PARTS ["scheme"] . '"\n';
-				return false;
-				break;
-		}
-		return true;
-	}
-	
-	/*======================================================================*\
-	Function:	fetchlinks
-	Purpose:	fetch the links from a web page
-	Input:		$URI	where you are fetching from
-	Output:		$this->results	an array of the URLs
-\*======================================================================*/
-	function fetchlinks($URI) {
-		if ($this->fetch ( $URI )) {
-			if ($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
-			if (is_array ( $this->results )) {
-				for($x = 0; $x < count ( $this->results ); $x ++)
-					$this->results [$x] = $this->_striplinks ( $this->results [$x] );
-			} else
-				$this->results = $this->_striplinks ( $this->results );
-			
-			if ($this->expandlinks)
-				$this->results = $this->_expandlinks ( $this->results, $URI );
-			return true;
-		} else
-			return false;
-	}
-	
-	/*======================================================================*\
-	Function:	fetchform
-	Purpose:	fetch the form elements from a web page
-	Input:		$URI	where you are fetching from
-	Output:		$this->results	the resulting html form
-\*======================================================================*/
-	function fetchform($URI) {
-		if ($this->fetch ( $URI )) {
-			
-			if (is_array ( $this->results )) {
-				for($x = 0; $x < count ( $this->results ); $x ++)
-					$this->results [$x] = $this->_stripform ( $this->results [$x] );
-			} else
-				$this->results = $this->_stripform ( $this->results );
-			
-			return true;
-		} else
-			return false;
-	}
-	
-	/*======================================================================*\
-	Function:	fetchtext
-	Purpose:	fetch the text from a web page, stripping the links
-	Input:		$URI	where you are fetching from
-	Output:		$this->results	the text from the web page
-\*======================================================================*/
-	function fetchtext($URI) {
-		if ($this->fetch ( $URI )) {
-			if (is_array ( $this->results )) {
-				for($x = 0; $x < count ( $this->results ); $x ++)
-					$this->results [$x] = $this->_striptext ( $this->results [$x] );
-			} else
-				$this->results = $this->_striptext ( $this->results );
-			return true;
-		} else
-			return false;
-	}
-	
-	/*======================================================================*\
-	Function:	submitlinks
-	Purpose:	grab links from a form submission
-	Input:		$URI	where you are submitting from
-	Output:		$this->results	an array of the links from the post
-\*======================================================================*/
-	function submitlinks($URI, $formvars = "", $formfiles = "") {
-		if ($this->submit ( $URI, $formvars, $formfiles )) {
-			if ($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
-			if (is_array ( $this->results )) {
-				for($x = 0; $x < count ( $this->results ); $x ++) {
-					$this->results [$x] = $this->_striplinks ( $this->results [$x] );
-					if ($this->expandlinks)
-						$this->results [$x] = $this->_expandlinks ( $this->results [$x], $URI );
-				}
-			} else {
-				$this->results = $this->_striplinks ( $this->results );
-				if ($this->expandlinks)
-					$this->results = $this->_expandlinks ( $this->results, $URI );
-			}
-			return true;
-		} else
-			return false;
-	}
-	
-	/*======================================================================*\
-	Function:	submittext
-	Purpose:	grab text from a form submission
-	Input:		$URI	where you are submitting from
-	Output:		$this->results	the text from the web page
-\*======================================================================*/
-	function submittext($URI, $formvars = "", $formfiles = "") {
-		if ($this->submit ( $URI, $formvars, $formfiles )) {
-			if ($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
-			if (is_array ( $this->results )) {
-				for($x = 0; $x < count ( $this->results ); $x ++) {
-					$this->results [$x] = $this->_striptext ( $this->results [$x] );
-					if ($this->expandlinks)
-						$this->results [$x] = $this->_expandlinks ( $this->results [$x], $URI );
-				}
-			} else {
-				$this->results = $this->_striptext ( $this->results );
-				if ($this->expandlinks)
-					$this->results = $this->_expandlinks ( $this->results, $URI );
-			}
-			return true;
-		} else
-			return false;
-	}
-	
-	/*======================================================================*\
-	Function:	set_submit_multipart
-	Purpose:	Set the form submission content type to
-				multipart/form-data
-\*======================================================================*/
-	function set_submit_multipart() {
-		$this->_submit_type = "multipart/form-data";
-	}
-	
-	/*======================================================================*\
-	Function:	set_submit_normal
-	Purpose:	Set the form submission content type to
-				application/x-www-form-urlencoded
-\*======================================================================*/
-	function set_submit_normal() {
-		$this->_submit_type = "application/x-www-form-urlencoded";
-	}
-	
-	/*======================================================================*\
-	Private functions
-\*======================================================================*/
-	
-	
-/*======================================================================*\
-	Function:	_striplinks
-	Purpose:	strip the hyperlinks from an html document
-	Input:		$document	document to strip.
-	Output:		$match		an array of the links
-\*======================================================================*/
-
-	function _striplinks($document) {
-		preg_match_all ( "'<\s*a\s.*?href\s*=\s*			# find <a href=
+                    if ($this->_redirectaddr) {
+                        /* url was redirected, check if we've hit the max depth */
+                        if ($this->maxredirs > $this->_redirectdepth) {
+                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
+                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+
+                            // only follow redirect if it's on this site, or offsiteok is true
+                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                                /* follow the redirect */
+                                $this->_redirectdepth++;
+                                $this->lastredirectaddr = $this->_redirectaddr;
+                                if (strpos($this->_redirectaddr, "?") > 0)
+                                    $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
+                                else
+                                    $this->submit($this->_redirectaddr, $formvars, $formfiles);
+                            }
+                        }
+                    }
+
+                    if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) {
+                        $frameurls = $this->_frameurls;
+                        $this->_frameurls = array();
+
+                        foreach ($frameurls as $frameurl) {
+                            if ($this->_framedepth < $this->maxframes) {
+                                $this->fetch($frameurl);
+                                $this->_framedepth++;
+                            } else
+                                break;
+                        }
+                    }
+
+                } else {
+                    return false;
+                }
+                return $this;
+                break;
+            default:
+                // not a valid protocol
+                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                return false;
+                break;
+        }
+        return $this;
+    }
+
+    /*======================================================================*\
+        Function:	fetchlinks
+        Purpose:	fetch the links from a web page
+        Input:		$URI	where you are fetching from
+        Output:		$this->results	an array of the URLs
+    \*======================================================================*/
+
+    function fetchlinks($URI)
+    {
+        if ($this->fetch($URI) !== false) {
+            if ($this->lastredirectaddr)
+                $URI = $this->lastredirectaddr;
+            if (is_array($this->results)) {
+                for ($x = 0; $x < count($this->results); $x++)
+                    $this->results[$x] = $this->_striplinks($this->results[$x]);
+            } else
+                $this->results = $this->_striplinks($this->results);
+
+            if ($this->expandlinks)
+                $this->results = $this->_expandlinks($this->results, $URI);
+            return $this;
+        } else
+            return false;
+    }
+
+    /*======================================================================*\
+        Function:	fetchform
+        Purpose:	fetch the form elements from a web page
+        Input:		$URI	where you are fetching from
+        Output:		$this->results	the resulting html form
+    \*======================================================================*/
+
+    function fetchform($URI)
+    {
+
+        if ($this->fetch($URI) !== false) {
+
+            if (is_array($this->results)) {
+                for ($x = 0; $x < count($this->results); $x++)
+                    $this->results[$x] = $this->_stripform($this->results[$x]);
+            } else
+                $this->results = $this->_stripform($this->results);
+
+            return $this;
+        } else
+            return false;
+    }
+
+
+    /*======================================================================*\
+        Function:	fetchtext
+        Purpose:	fetch the text from a web page, stripping the links
+        Input:		$URI	where you are fetching from
+        Output:		$this->results	the text from the web page
+    \*======================================================================*/
+
+    function fetchtext($URI)
+    {
+        if ($this->fetch($URI) !== false) {
+            if (is_array($this->results)) {
+                for ($x = 0; $x < count($this->results); $x++)
+                    $this->results[$x] = $this->_striptext($this->results[$x]);
+            } else
+                $this->results = $this->_striptext($this->results);
+            return $this;
+        } else
+            return false;
+    }
+
+    /*======================================================================*\
+        Function:	submitlinks
+        Purpose:	grab links from a form submission
+        Input:		$URI	where you are submitting from
+        Output:		$this->results	an array of the links from the post
+    \*======================================================================*/
+
+    function submitlinks($URI, $formvars = "", $formfiles = "")
+    {
+        if ($this->submit($URI, $formvars, $formfiles) !== false) {
+            if ($this->lastredirectaddr)
+                $URI = $this->lastredirectaddr;
+            if (is_array($this->results)) {
+                for ($x = 0; $x < count($this->results); $x++) {
+                    $this->results[$x] = $this->_striplinks($this->results[$x]);
+                    if ($this->expandlinks)
+                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                }
+            } else {
+                $this->results = $this->_striplinks($this->results);
+                if ($this->expandlinks)
+                    $this->results = $this->_expandlinks($this->results, $URI);
+            }
+            return $this;
+        } else
+            return false;
+    }
+
+    /*======================================================================*\
+        Function:	submittext
+        Purpose:	grab text from a form submission
+        Input:		$URI	where you are submitting from
+        Output:		$this->results	the text from the web page
+    \*======================================================================*/
+
+    function submittext($URI, $formvars = "", $formfiles = "")
+    {
+        if ($this->submit($URI, $formvars, $formfiles) !== false) {
+            if ($this->lastredirectaddr)
+                $URI = $this->lastredirectaddr;
+            if (is_array($this->results)) {
+                for ($x = 0; $x < count($this->results); $x++) {
+                    $this->results[$x] = $this->_striptext($this->results[$x]);
+                    if ($this->expandlinks)
+                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                }
+            } else {
+                $this->results = $this->_striptext($this->results);
+                if ($this->expandlinks)
+                    $this->results = $this->_expandlinks($this->results, $URI);
+            }
+            return $this;
+        } else
+            return false;
+    }
+
+
+    /*======================================================================*\
+        Function:	set_submit_multipart
+        Purpose:	Set the form submission content type to
+                    multipart/form-data
+    \*======================================================================*/
+    function set_submit_multipart()
+    {
+        $this->_submit_type = "multipart/form-data";
+        return $this;
+    }
+
+
+    /*======================================================================*\
+        Function:	set_submit_normal
+        Purpose:	Set the form submission content type to
+                    application/x-www-form-urlencoded
+    \*======================================================================*/
+    function set_submit_normal()
+    {
+        $this->_submit_type = "application/x-www-form-urlencoded";
+        return $this;
+    }
+
+
+
+
+    /*======================================================================*\
+        Private functions
+    \*======================================================================*/
+
+
+    /*======================================================================*\
+        Function:	_striplinks
+        Purpose:	strip the hyperlinks from an html document
+        Input:		$document	document to strip.
+        Output:		$match		an array of the links
+    \*======================================================================*/
+
+    function _striplinks($document)
+    {
+        preg_match_all("'<\s*a\s.*?href\s*=\s*			# find <a href=
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
-						'isx", $document, $links );
-		
-		// catenate the non-empty matches from the conditional subpattern
-		
-
-		while ( list ( $key, $val ) = each ( $links [2] ) ) {
-			if (! empty ( $val ))
-				$match [] = $val;
-		}
-		
-		while ( list ( $key, $val ) = each ( $links [3] ) ) {
-			if (! empty ( $val ))
-				$match [] = $val;
-		}
-		
-		// return the links
-		return $match;
-	}
-	
-	/*======================================================================*\
-	Function:	_stripform
-	Purpose:	strip the form elements from an html document
-	Input:		$document	document to strip.
-	Output:		$match		an array of the links
-\*======================================================================*/
-	function _stripform($document) {
-		preg_match_all ( "'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements );
-		
-		// catenate the matches
-		$match = implode ( "\r\n", $elements [0] );
-		
-		// return the links
-		return $match;
-	}
-	
-	/*======================================================================*\
-	Function:	_striptext
-	Purpose:	strip the text from an html document
-	Input:		$document	document to strip.
-	Output:		$text		the resulting text
-\*======================================================================*/
-	function _striptext($document) {
-		
-		// I didn't use preg eval (//e) since that is only available in PHP 4.0.
-		// so, list your entities one by one here. I included some of the
-		// more common ones.
-		$search = array (
-				"'<script[^>]*?>.*?</script>'si", // strip out javascript
-				"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
-				"'([\r\n])[\s]+'", // strip out white space
-				"'&(quot|#34|#034|#x22);'i", // replace html entities
-				"'&(amp|#38|#038|#x26);'i", // added hexadecimal values
-				"'&(lt|#60|#060|#x3c);'i",
-				"'&(gt|#62|#062|#x3e);'i",
-				"'&(nbsp|#160|#xa0);'i",
-				"'&(iexcl|#161);'i",
-				"'&(cent|#162);'i",
-				"'&(pound|#163);'i",
-				"'&(copy|#169);'i",
-				"'&(reg|#174);'i",
-				"'&(deg|#176);'i",
-				"'&(#39|#039|#x27);'",
-				"'&(euro|#8364);'i", // europe
-				"'&a(uml|UML);'", // german
-				"'&o(uml|UML);'",
-				"'&u(uml|UML);'",
-				"'&A(uml|UML);'",
-				"'&O(uml|UML);'",
-				"'&U(uml|UML);'",
-				"'&szlig;'i" );
-		$replace = array (
-				"",
-				"",
-				"\\1",
-				"\"",
-				"&",
-				"<",
-				">",
-				" ",
-				chr ( 161 ),
-				chr ( 162 ),
-				chr ( 163 ),
-				chr ( 169 ),
-				chr ( 174 ),
-				chr ( 176 ),
-				chr ( 39 ),
-				chr ( 128 ),
-				"�",
-				"�",
-				"�",
-				"�",
-				"�",
-				"�",
-				"�" );
-		
-		$text = preg_replace ( $search, $replace, $document );
-		
-		return $text;
-	}
-	
-	/*======================================================================*\
-	Function:	_expandlinks
-	Purpose:	expand each link into a fully qualified URL
-	Input:		$links			the links to qualify
-				$URI			the full URI to get the base from
-	Output:		$expandedLinks	the expanded links
-\*======================================================================*/
-	function _expandlinks($links, $URI) {
-		preg_match ( "/^[^\?]+/", $URI, $match );
-		
-		$match = preg_replace ( "|/[^\/\.]+\.[^\/\.]+$|", "", $match [0] );
-		$match = preg_replace ( "|/$|", "", $match );
-		$match_part = parse_url ( $match );
-		$match_root = $match_part ["scheme"] . "://" . $match_part ["host"];
-		
-		$search = array (
-				"|^http://" . preg_quote ( $this->host ) . "|i",
-				"|^(\/)|i",
-				"|^(?!http://)(?!mailto:)|i",
-				"|/\./|",
-				"|/[^\/]+/\.\./|" );
-		
-		$replace = array (
-				"",
-				$match_root . "/",
-				$match . "/",
-				"/",
-				"/" );
-		
-		$expandedLinks = preg_replace ( $search, $replace, $links );
-		
-		return $expandedLinks;
-	}
-	
-	/*======================================================================*\
-	Function:	_httprequest
-	Purpose:	go get the https data from the server using curl
-	Input:		$url		the url to fetch
-				$URI		the full URI
-				$body		body contents to send if any (POST)
-	Output:		
-\*======================================================================*/
-	function _httprequest($url, $URI, $http_method, $content_type = "", $body = "") {
-		if ($this->passcookies && $this->_redirectaddr)
-			$this->setcookies ();
-		
-		$headers = array ();
-		
-		$curl = curl_init($URI);
-
-		$URI_PARTS = parse_url ( $URI );
-		if (empty ( $url ))
-			$url = "/";
-			// GET ... header not needed for curl
-			//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if (! empty ( $this->agent ))
-			curl_setopt($curl, CURLOPT_USERAGENT, $this->agent);
-
-		if (! empty ($this->port) ) {
-			switch ($URI_PARTS['scheme']) {
-				case 'https':
-					if ($this->port == 80 || $this->port == 443) {
-						$URI = str_replace( ':'.$this->port, '', $URI);
-						$this->port = 443;
-					}
-					break;
-				case 'http':
-					if ($this->port == 80 || $this->port == 443) {
-						$URI = str_replace( ':'.$this->port, '', $URI);
-						$this->port = 80;
-					}
-					break;
-				default:
-					error_log("Snoopy:_httprequest: Bad Scheme: ".$URI);
-					break;
-			}
-		}
-
-		if (! empty ( $this->host ))
-			if (! empty ( $this->port ) )
-				$headers [] = "Host: " . $this->host . ":" . $this->port;
-			else
-				$headers [] = "Host: " . $this->host;
-		if (! empty ( $this->accept ))
-			$headers [] = "Accept: " . $this->accept;
-		if (! empty ( $this->referer ))
-			 curl_setopt($curl, CURLOPT_REFERER, $this->referer);
-		if (! empty ( $this->cookies )) {
-			if (! is_array ( $this->cookies ))
-				$this->cookies = ( array ) $this->cookies;
-			
-			reset ( $this->cookies );
-			if (count ( $this->cookies ) > 0) {
-				$cookie_str = '';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-					$cookie_str .= $cookieKey . "=" . urlencode ( $cookieVal ) . "; ";
-				}
-				curl_setopt($curl, CURLOPT_COOKIE, substr ( $cookie_str, 0, - 2 ));
-			}
-		}
-		if (! empty ( $this->rawheaders )) {
-			if (! is_array ( $this->rawheaders ))
-				$this->rawheaders = ( array ) $this->rawheaders;
-			while ( list ( $headerKey, $headerVal ) = each ( $this->rawheaders ) )
-				$headers [] = $headerKey . ": " . $headerVal;
-		}
-		if (! empty ( $content_type )) {
-			if ($content_type == "multipart/form-data")
-				$headers [] = "Content-type: $content_type; boundary=" . $this->_mime_boundary;
-			else
-				$headers [] = "Content-type: $content_type";
-		}
-		if (! empty ( $body ))
-			$headers [] = "Content-length: " . strlen ( $body );
-
-		if (! empty ( $this->user ) || ! empty ( $this->pass ))
-			$headers [] = "Authorization: BASIC " . base64_encode ( $this->user . ":" . $this->pass );
-
-		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-
-		if (! empty ( $body )) {
-			curl_setopt($curl, CURLOPT_POST, true);
-			curl_setopt($curl, CURLOPT_POSTFIELDS, $body);
-		}
-
-		if ($this->read_timeout > 0)
-			curl_setopt($curl, CURLOPT_TIMEOUT, $this->read_timeout);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);	// return is data
-		curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
-		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);	// follow redirects
-		curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 0);
-		curl_setopt($curl, CURLOPT_AUTOREFERER, 1);
-		curl_setopt($curl, CURLOPT_HEADER, 0);		// don't include headers in output
-
-		$results = curl_exec($curl);
-		$status = curl_getinfo($curl);
-		$this->status = $status['http_code'];
-		curl_close($curl);
-
-		if ($status['http_code'] > 300 && $status['http_code'] < 400) {
-			$arr = get_headers($URI, 1);
-			if (is_array( $arr['Location'] ))
-				$this->_redirectaddr = implode($arr['Location']);
-			else
-				$this->_redirectaddr = $arr['Location'];
-			return true;
-		}
-		if ($this->status != 200) {
-			$this->error = "Error: cURL had HTTP failures (".$URI."), error: ".$this->status;
-			return false;
-		}
-		if ($results === FALSE) {
-			$this->error = "Error: cURL could not retrieve the document (".$URI."), error: ".$this->status;
-			return false;
-		}
-
-		$this->_redirectaddr = false;
-		
-		// check if there is a a redirect meta tag
-
-		if (preg_match ( "'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match )) {
-			$this->_redirectaddr = $this->_expandlinks ( $match [1], $URI );
-		}
-		
-		$this->results = $results;
-		
-		return true;
-	}
-	
-	/*======================================================================*\
-	Function:	setcookies()
-	Purpose:	set cookies for a redirection
-\*======================================================================*/
-	function setcookies() {
-		for($x = 0; $x < count ( $this->headers ); $x ++) {
-			if (preg_match ( '/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers [$x], $match ))
-				$this->cookies [$match [1]] = urldecode ( $match [2] );
-		}
-	}
-	
-	/*======================================================================*\
-	Function:	_check_timeout
-	Purpose:	checks whether timeout has occurred
-	Input:		$fp	file pointer
-\*======================================================================*/
-	function _check_timeout($fp) {
-		if ($this->read_timeout > 0) {
-			$fp_status = socket_get_status ( $fp );
-			if ($fp_status ["timed_out"]) {
-				$this->timed_out = true;
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/*======================================================================*\
-	Function:	_connect
-	Purpose:	make a socket connection
-	Input:		$fp	file pointer
-\*======================================================================*/
-	function _connect(&$fp) {
-		if (! empty ( $this->proxy_host ) && ! empty ( $this->proxy_port )) {
-			$this->_isproxy = true;
-			
-			$host = $this->proxy_host;
-			$port = $this->proxy_port;
-		} else {
-			$host = $this->host;
-			$port = $this->port;
-		}
-		
-		$this->status = 0;
-		
-		if ($fp = fsockopen ( $host, $port, $errno, $errstr, $this->_fp_timeout )) {
-			// socket connection succeeded
-			
-
-			return true;
-		} else {
-			// socket connection failed
-			$this->status = $errno;
-			switch ($errno) {
-				case - 3 :
-					$this->error = "socket creation failed (-3)";
-				case - 4 :
-					$this->error = "dns lookup failure (-4)";
-				case - 5 :
-					$this->error = "connection refused or timed out (-5)";
-				default :
-					$this->error = "connection failed (" . $errno . ")";
-			}
-			return false;
-		}
-	}
-	/*======================================================================*\
-	Function:	_disconnect
-	Purpose:	disconnect a socket connection
-	Input:		$fp	file pointer
-\*======================================================================*/
-	function _disconnect($fp) {
-		return (fclose ( $fp ));
-	}
-	
-	/*======================================================================*\
-	Function:	_prepare_post_body
-	Purpose:	Prepare post body according to encoding type
-	Input:		$formvars  - form variables
-				$formfiles - form upload files
-	Output:		post body
-\*======================================================================*/
-	function _prepare_post_body($formvars, $formfiles) {
-		settype ( $formvars, "array" );
-		settype ( $formfiles, "array" );
-		$postdata = '';
-		
-		if (count ( $formvars ) == 0 && count ( $formfiles ) == 0)
-			return;
-		
-		switch ($this->_submit_type) {
-			case "application/x-www-form-urlencoded" :
-				reset ( $formvars );
-				while ( list ( $key, $val ) = each ( $formvars ) ) {
-					if (is_array ( $val ) || is_object ( $val )) {
-						while ( list ( $cur_key, $cur_val ) = each ( $val ) ) {
-							$postdata .= urlencode ( $key ) . "[]=" . urlencode ( $cur_val ) . "&";
-						}
-					} else
-						$postdata .= urlencode ( $key ) . "=" . urlencode ( $val ) . "&";
-				}
-				break;
-			
-			case "multipart/form-data" :
-				$this->_mime_boundary = "Snoopy" . md5 ( uniqid ( microtime () ) );
-				
-				reset ( $formvars );
-				while ( list ( $key, $val ) = each ( $formvars ) ) {
-					if (is_array ( $val ) || is_object ( $val )) {
-						while ( list ( $cur_key, $cur_val ) = each ( $val ) ) {
-							$postdata .= "--" . $this->_mime_boundary . "\r\n";
-							$postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
-							$postdata .= "$cur_val\r\n";
-						}
-					} else {
-						$postdata .= "--" . $this->_mime_boundary . "\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
-						$postdata .= "$val\r\n";
-					}
-				}
-				
-				reset ( $formfiles );
-				while ( list ( $field_name, $file_names ) = each ( $formfiles ) ) {
-					settype ( $file_names, "array" );
-					while ( list ( , $file_name ) = each ( $file_names ) ) {
-						if (! is_readable ( $file_name ))
-							continue;
-						
-						$fp = fopen ( $file_name, "r" );
-						$file_content = fread ( $fp, filesize ( $file_name ) );
-						fclose ( $fp );
-						$base_name = basename ( $file_name );
-						
-						$postdata .= "--" . $this->_mime_boundary . "\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
-						$postdata .= "$file_content\r\n";
-					}
-				}
-				$postdata .= "--" . $this->_mime_boundary . "--\r\n";
-				break;
-		}
-		
-		return $postdata;
-	}
+						'isx", $document, $links);
+
+
+        // catenate the non-empty matches from the conditional subpattern
+        foreach ($links[2] as $key => $val) {
+            if (!empty($val))
+                $match[] = $val;
+        }
+
+        foreach ($links[3] as $key => $val) {
+            if (!empty($val))
+                $match[] = $val;
+        }
+
+        // return the links
+        return $match;
+    }
+
+    /*======================================================================*\
+        Function:	_stripform
+        Purpose:	strip the form elements from an html document
+        Input:		$document	document to strip.
+        Output:		$match		an array of the links
+    \*======================================================================*/
+
+    function _stripform($document)
+    {
+        preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements);
+
+        // catenate the matches
+        $match = implode("\r\n", $elements[0]);
+
+        // return the links
+        return $match;
+    }
+
+
+    /*======================================================================*\
+        Function:	_striptext
+        Purpose:	strip the text from an html document
+        Input:		$document	document to strip.
+        Output:		$text		the resulting text
+    \*======================================================================*/
+
+    function _striptext($document)
+    {
+
+        // I didn't use preg eval (//e) since that is only available in PHP 4.0.
+        // so, list your entities one by one here. I included some of the
+        // more common ones.
+
+        $search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+            "'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+            "'([\r\n])[\s]+'", // strip out white space
+            "'&(quot|#34|#034|#x22);'i", // replace html entities
+            "'&(amp|#38|#038|#x26);'i", // added hexadecimal values
+            "'&(lt|#60|#060|#x3c);'i",
+            "'&(gt|#62|#062|#x3e);'i",
+            "'&(nbsp|#160|#xa0);'i",
+            "'&(iexcl|#161);'i",
+            "'&(cent|#162);'i",
+            "'&(pound|#163);'i",
+            "'&(copy|#169);'i",
+            "'&(reg|#174);'i",
+            "'&(deg|#176);'i",
+            "'&(#39|#039|#x27);'",
+            "'&(euro|#8364);'i", // europe
+            "'&a(uml|UML);'", // german
+            "'&o(uml|UML);'",
+            "'&u(uml|UML);'",
+            "'&A(uml|UML);'",
+            "'&O(uml|UML);'",
+            "'&U(uml|UML);'",
+            "'&szlig;'i",
+        );
+        $replace = array("",
+            "",
+            "\\1",
+            "\"",
+            "&",
+            "<",
+            ">",
+            " ",
+            chr(161),
+            chr(162),
+            chr(163),
+            chr(169),
+            chr(174),
+            chr(176),
+            chr(39),
+            chr(128),
+            "ä",
+            "ö",
+            "ü",
+            "Ä",
+            "Ö",
+            "Ü",
+            "ß",
+        );
+
+        $text = preg_replace($search, $replace, $document);
+
+        return $text;
+    }
+
+    /*======================================================================*\
+        Function:	_expandlinks
+        Purpose:	expand each link into a fully qualified URL
+        Input:		$links			the links to qualify
+                    $URI			the full URI to get the base from
+        Output:		$expandedLinks	the expanded links
+    \*======================================================================*/
+
+    function _expandlinks($links, $URI)
+    {
+
+        preg_match("/^[^\?]+/", $URI, $match);
+
+        $match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|", "", $match[0]);
+        $match = preg_replace("|/$|", "", $match);
+        $match_part = parse_url($match);
+        $match_root =
+            $match_part["scheme"] . "://" . $match_part["host"];
+
+        $search = array("|^http://" . preg_quote($this->host) . "|i",
+            "|^(\/)|i",
+            "|^(?!http://)(?!mailto:)|i",
+            "|/\./|",
+            "|/[^\/]+/\.\./|"
+        );
+
+        $replace = array("",
+            $match_root . "/",
+            $match . "/",
+            "/",
+            "/"
+        );
+
+        $expandedLinks = preg_replace($search, $replace, $links);
+
+        return $expandedLinks;
+    }
+
+    /*======================================================================*\
+        Function:	_httprequest
+        Purpose:	go get the http(s) data from the server
+        Input:		$url		the url to fetch
+                    $fp			the current open file pointer
+                    $URI		the full URI
+                    $body		body contents to send if any (POST)
+        Output:
+    \*======================================================================*/
+
+    function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
+    {
+        $cookie_headers = '';
+        if ($this->passcookies && $this->_redirectaddr)
+            $this->setcookies();
+
+        $URI_PARTS = parse_url($URI);
+        if (empty($url))
+            $url = "/";
+        $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
+        if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
+            $headers .= "Host: " . $this->host;
+            if (!empty($this->port) && $this->port != '80')
+                $headers .= ":" . $this->port;
+            $headers .= "\r\n";
+        }
+        if (!empty($this->agent))
+            $headers .= "User-Agent: " . $this->agent . "\r\n";
+        if (!empty($this->accept))
+            $headers .= "Accept: " . $this->accept . "\r\n";
+        if ($this->use_gzip) {
+            // make sure PHP was built with --with-zlib
+            // and we can handle gzipp'ed data
+            if (function_exists('gzinflate')) {
+                $headers .= "Accept-encoding: gzip\r\n";
+            } else {
+                trigger_error(
+                    "use_gzip is on, but PHP was built without zlib support." .
+                    "  Requesting file(s) without gzip encoding.",
+                    E_USER_NOTICE);
+            }
+        }
+        if (!empty($this->referer))
+            $headers .= "Referer: " . $this->referer . "\r\n";
+        if (!empty($this->cookies)) {
+            if (!is_array($this->cookies))
+                $this->cookies = (array)$this->cookies;
+
+            reset($this->cookies);
+            if (count($this->cookies) > 0) {
+                $cookie_headers .= 'Cookie: ';
+                foreach ($this->cookies as $cookieKey => $cookieVal) {
+                    $cookie_headers .= $cookieKey . "=" . urlencode($cookieVal) . "; ";
+                }
+                $headers .= substr($cookie_headers, 0, -2) . "\r\n";
+            }
+        }
+        if (!empty($this->rawheaders)) {
+            if (!is_array($this->rawheaders))
+                $this->rawheaders = (array)$this->rawheaders;
+            foreach ($this->rawheaders as $headerKey => $headerVal)
+                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+        }
+        if (!empty($content_type)) {
+            $headers .= "Content-type: $content_type";
+            if ($content_type == "multipart/form-data")
+                $headers .= "; boundary=" . $this->_mime_boundary;
+            $headers .= "\r\n";
+        }
+        if (!empty($body))
+            $headers .= "Content-length: " . strlen($body) . "\r\n";
+        if (!empty($this->user) || !empty($this->pass))
+            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+
+        //add proxy auth headers
+        if (!empty($this->proxy_user))
+            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+
+
+        $headers .= "\r\n";
+
+        // set the read timeout if needed
+        if ($this->read_timeout > 0)
+            socket_set_timeout($fp, $this->read_timeout);
+        $this->timed_out = false;
+
+        fwrite($fp, $headers . $body, strlen($headers . $body));
+
+        $this->_redirectaddr = false;
+        unset($this->headers);
+
+        // content was returned gzip encoded?
+        $is_gzipped = false;
+
+        while ($currentHeader = fgets($fp, $this->_maxlinelen)) {
+            if ($this->read_timeout > 0 && $this->_check_timeout($fp)) {
+                $this->status = -100;
+                return false;
+            }
+
+            if ($currentHeader == "\r\n")
+                break;
+
+            // if a header begins with Location: or URI:, set the redirect
+            if (preg_match("/^(Location:|URI:)/i", $currentHeader)) {
+                // get URL portion of the redirect
+                preg_match("/^(Location:|URI:)[ ]+(.*)/i", chop($currentHeader), $matches);
+                // look for :// in the Location header to see if hostname is included
+                if (!preg_match("|\:\/\/|", $matches[2])) {
+                    // no host in the path, so prepend
+                    $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
+                    // eliminate double slash
+                    if (!preg_match("|^/|", $matches[2]))
+                        $this->_redirectaddr .= "/" . $matches[2];
+                    else
+                        $this->_redirectaddr .= $matches[2];
+                } else
+                    $this->_redirectaddr = $matches[2];
+            }
+
+            if (preg_match("|^HTTP/|", $currentHeader)) {
+                if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $currentHeader, $status)) {
+                    $this->status = $status[1];
+                }
+                $this->response_code = $currentHeader;
+            }
+
+            if (preg_match("/Content-Encoding: gzip/", $currentHeader)) {
+                $is_gzipped = true;
+            }
+
+            $this->headers[] = $currentHeader;
+        }
+
+        $results = '';
+        do {
+            $_data = fread($fp, $this->maxlength);
+            if (strlen($_data) == 0) {
+                break;
+            }
+            $results .= $_data;
+        } while (true);
+
+        // gunzip
+        if ($is_gzipped) {
+            // per http://www.php.net/manual/en/function.gzencode.php
+            $results = substr($results, 10);
+            $results = gzinflate($results);
+        }
+
+        if ($this->read_timeout > 0 && $this->_check_timeout($fp)) {
+            $this->status = -100;
+            return false;
+        }
+
+        // check if there is a a redirect meta tag
+
+        if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match)) {
+            $this->_redirectaddr = $this->_expandlinks($match[1], $URI);
+        }
+
+        // have we hit our frame depth and is there frame src to fetch?
+        if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
+            $this->results[] = $results;
+            for ($x = 0; $x < count($match[1]); $x++)
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+        } // have we already fetched framed content?
+        elseif (is_array($this->results))
+            $this->results[] = $results;
+        // no framed content
+        else
+            $this->results = $results;
+
+        return $this;
+    }
+
+    /*======================================================================*\
+        Function:	setcookies()
+        Purpose:	set cookies for a redirection
+    \*======================================================================*/
+
+    function setcookies()
+    {
+        for ($x = 0; $x < count($this->headers); $x++) {
+            if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match))
+                $this->cookies[$match[1]] = urldecode($match[2]);
+        }
+        return $this;
+    }
+
+
+    /*======================================================================*\
+        Function:	_check_timeout
+        Purpose:	checks whether timeout has occurred
+        Input:		$fp	file pointer
+    \*======================================================================*/
+
+    function _check_timeout($fp)
+    {
+        if ($this->read_timeout > 0) {
+            $fp_status = socket_get_status($fp);
+            if ($fp_status["timed_out"]) {
+                $this->timed_out = true;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /*======================================================================*\
+        Function:	_connect
+        Purpose:	make a socket connection
+        Input:		$fp	file pointer
+    \*======================================================================*/
+
+    function _connect(&$fp)
+    {
+        if (!empty($this->proxy_host) && !empty($this->proxy_port)) {
+            $this->_isproxy = true;
+
+            $host = $this->proxy_host;
+            $port = $this->proxy_port;
+
+            if ($this->scheme == 'https') {
+                trigger_error("HTTPS connections over proxy are currently not supported", E_USER_ERROR);
+                exit;
+            }
+        } else {
+            $host = $this->host;
+            $port = $this->port;
+        }
+
+        $this->status = 0;
+
+        $context_opts = array();
+
+        if ($this->scheme == 'https') {
+            // if cafile or capath is specified, enable certificate
+            // verification (including name checks)
+            if (isset($this->cafile) || isset($this->capath)) {
+                $context_opts['ssl'] = array(
+                    'verify_peer' => true,
+                    'CN_match' => $this->host,
+                    'disable_compression' => true,
+                );
+
+                if (isset($this->cafile))
+                    $context_opts['ssl']['cafile'] = $this->cafile;
+                if (isset($this->capath))
+                    $context_opts['ssl']['capath'] = $this->capath;
+            }
+                    
+            $host = 'ssl://' . $host;
+        }
+
+        $context = stream_context_create($context_opts);
+
+        if (version_compare(PHP_VERSION, '5.0.0', '>')) {
+            if($this->scheme == 'http')
+                $host = "tcp://" . $host;
+            $fp = stream_socket_client(
+                "$host:$port",
+                $errno,
+                $errmsg,
+                $this->_fp_timeout,
+                STREAM_CLIENT_CONNECT,
+                $context);
+        } else {
+            $fp = fsockopen(
+                $host,
+                $port,
+                $errno,
+                $errstr,
+                $this->_fp_timeout,
+                $context);
+        }
+
+        if ($fp) {
+            // socket connection succeeded
+            return true;
+        } else {
+            // socket connection failed
+            $this->status = $errno;
+            switch ($errno) {
+                case -3:
+                    $this->error = "socket creation failed (-3)";
+                case -4:
+                    $this->error = "dns lookup failure (-4)";
+                case -5:
+                    $this->error = "connection refused or timed out (-5)";
+                default:
+                    $this->error = "connection failed (" . $errno . ")";
+            }
+            return false;
+        }
+    }
+
+    /*======================================================================*\
+        Function:	_disconnect
+        Purpose:	disconnect a socket connection
+        Input:		$fp	file pointer
+    \*======================================================================*/
+
+    function _disconnect($fp)
+    {
+        return (fclose($fp));
+    }
+
+
+    /*======================================================================*\
+        Function:	_prepare_post_body
+        Purpose:	Prepare post body according to encoding type
+        Input:		$formvars  - form variables
+                    $formfiles - form upload files
+        Output:		post body
+    \*======================================================================*/
+
+    function _prepare_post_body($formvars, $formfiles)
+    {
+        settype($formvars, "array");
+        settype($formfiles, "array");
+        $postdata = '';
+
+        if (count($formvars) == 0 && count($formfiles) == 0)
+            return;
+
+        switch ($this->_submit_type) {
+            case "application/x-www-form-urlencoded":
+                reset($formvars);
+                foreach ($formvars as $key => $val) {
+                    if (is_array($val) || is_object($val)) {
+                        foreach ($val as $cur_key => $cur_val) {
+                            $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
+                        }
+                    } else
+                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                }
+                break;
+
+            case "multipart/form-data":
+                $this->_mime_boundary = "Snoopy" . md5(uniqid(microtime()));
+
+                reset($formvars);
+                foreach ($formvars as $key => $val) {
+                    if (is_array($val) || is_object($val)) {
+                        foreach ($val as $cur_key => $cur_val) {
+                            $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                            $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
+                            $postdata .= "$cur_val\r\n";
+                        }
+                    } else {
+                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
+                        $postdata .= "$val\r\n";
+                    }
+                }
+
+                reset($formfiles);
+                foreach ($formfiles as $field_name => $file_names) {
+                    settype($file_names, "array");
+                    foreach ($file_names as $file_name) {
+                        if (!is_readable($file_name)) continue;
+
+                        $fp = fopen($file_name, "r");
+                        $file_content = fread($fp, filesize($file_name));
+                        fclose($fp);
+                        $base_name = basename($file_name);
+
+                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
+                        $postdata .= "$file_content\r\n";
+                    }
+                }
+                $postdata .= "--" . $this->_mime_boundary . "--\r\n";
+                break;
+        }
+
+        return $postdata;
+    }
+
+    /*======================================================================*\
+    Function:	getResults
+    Purpose:	return the results of a request
+    Output:		string results
+    \*======================================================================*/
+
+    function getResults()
+    {
+        return $this->results;
+    }
 }
 
 ?>
diff --git a/lib/StringFileHandler.class.php b/lib/StringFileHandler.class.php
index c6210424..e6128936 100644
--- a/lib/StringFileHandler.class.php
+++ b/lib/StringFileHandler.class.php
@@ -24,7 +24,7 @@ class StringFileHandler {
 	var $_line_ending;
 	var $_line_ending_length;
 
-	function StringFileHandler($content) {
+	function __construct($content) {
 		$this->_content = $content;
 		$this->_content_length = strlen ( $content );
 		$this->_offset = 0;
@@ -90,4 +90,4 @@ function readLine() {
 		return FALSE;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/TitleMask.class.php b/lib/TitleMask.class.php
index 6a98f4de..6f414145 100755
--- a/lib/TitleMask.class.php
+++ b/lib/TitleMask.class.php
@@ -39,10 +39,10 @@ class TitleMask {
 	/**
 	    @param mask_group - if an array, then will use first group that has values defined.
 	*/
-	function TitleMask($mask_group = NULL) {
+	function __construct($mask_group = NULL) {
 		if ($mask_group !== NULL) {
 			if (is_array ( $mask_group )) {
-				while ( list ( , $group ) = each ( $mask_group ) ) {
+				foreach ( $mask_group as $group ) {
 					$results = fetch_title_display_mask_rs ( $group );
 					if ($results) {
 						$this->_mask_group = $group;
@@ -161,12 +161,12 @@ function title_mask_macro_element_r($macro_type) {
 	*/
 	function _parse_field_mask(&$display_mask) {
 		$i = 0;
-		$array_of_vars = NULL;
+		$array_of_vars = [];
 		$inside_variable = 0;
 		$variable = '';
 		$new_display_mask = '';
 		
-		for($i = 0; $i < strlen ( $display_mask ); $i ++) {
+		for ($i = 0; $i < strlen ( $display_mask ); $i ++) {
 			if ($inside_variable > 0) {
 				// if closing bracket
 				if ($display_mask [$i] == '}') {
@@ -318,9 +318,10 @@ function _parse_field_mask(&$display_mask) {
 										
 										break;
 								}
-							} 							//if(is_array($function_r))
-else if ($variable == 'title' || $variable == 's_item_type' || $variable == 's_status_type' || $variable == 'item_id' || $variable == 'instance_no') {
+
+							} elseif ($variable == 'title' || $variable == 's_item_type' || $variable == 's_status_type' || $variable == 'item_id' || $variable == 'instance_no') {
 								$array_of_vars [] = $variable;
+
 							} else {
 								$index_of_sep = strrpos ( $variable, '.' );
 								if ($index_of_sep !== false) {
@@ -329,8 +330,9 @@ function _parse_field_mask(&$display_mask) {
 									
 									if ($option == 'display_type') {
 										$attribute_r = fetch_attribute_type_r ( $s_attribute_type );
-										
-										$array_of_vars [] = array (
+
+										if ($attribute_r)
+											$array_of_vars [] = array (
 												's_attribute_type' => $s_attribute_type,
 												'option' => $option,
 												'display_type' => $attribute_r ['display_type'],
@@ -398,35 +400,35 @@ function _expand_title_mask($item_instance_r, $mask, &$mask_element_rs, $config_
 		
 		for($i = 0; $i < count ( $mask_element_rs ); $i ++) {
 			// no array set, or simple attribute variable 's_attribute_type.option' not set.
-			if (is_not_empty_array ( $mask_element_rs [$i] ) && ! isset ( $mask_element_rs [$i] ['s_attribute_type'] ) && ! isset ( $mask_element_rs [$i] ['option'] )) {
+			if (is_not_empty_array ( $mask_element_rs[$i] ) && ! isset ( $mask_element_rs [$i] ['s_attribute_type'] ) && ! isset ( $mask_element_rs [$i] ['option'] )) {
 				// replace the array index.
-				switch ($mask_element_rs [$i] ['type']) {
+				switch ($mask_element_rs[$i]['type']) {
 					case 'ifdef' : // ifdef(s_attribute_type, "if_mask"[, "else_mask"])
-						if (is_item_attribute_set ( $item_instance_r ['item_id'], $item_instance_r ['instance_no'], strtoupper ( $mask_element_rs [$i] ['varname'] ) ))
-							$value = $this->_expand_title_mask ( $item_instance_r, $mask_element_rs [$i] ['if_mask'], $mask_element_rs [$i] ['if_mask_elements'] );
-						else if (strlen ( $mask_element_rs [$i] ['else_mask'] ) > 0)
-							$value = $this->_expand_title_mask ( $item_instance_r, $mask_element_rs [$i] ['else_mask'], $mask_element_rs [$i] ['else_mask_elements'] );
+						if (isset($item_instance_r['item_id']) && is_item_attribute_set( $item_instance_r['item_id'], $item_instance_r['instance_no'], strtoupper( $mask_element_rs[$i]['varname'] ) ))
+							$value = $this->_expand_title_mask( $item_instance_r, $mask_element_rs[$i]['if_mask'], $mask_element_rs[$i]['if_mask_elements'] );
+						else if (strlen( $mask_element_rs[$i]['else_mask'] ?? "" ) > 0)
+							$value = $this->_expand_title_mask( $item_instance_r, $mask_element_rs[$i]['else_mask'], $mask_element_rs[$i]['else_mask_elements'] );
 						else
 							$value = NULL;
 						break;
 					
 					case 'if' : // if(varname[<|<=|>=|>|==|!=]value, "if_mask"[, "else_mask"])
-						if ($mask_element_rs [$i] ['varname'] == 'instance_no')
-							$value = $item_instance_r ['instance_no'];
-						else if ($mask_element_rs [$i] ['varname'] == 's_status_type')
-							$value = $item_instance_r ['s_status_type'];
-						else if ($mask_element_rs [$i] ['varname'] == 's_item_type')
-							$value = $item_instance_r ['s_item_type'];
+						if ($mask_element_rs[$i]['varname'] == 'instance_no')
+							$value = $item_instance_r['instance_no'];
+						else if ($mask_element_rs[$i]['varname'] == 's_status_type')
+							$value = $item_instance_r['s_status_type'];
+						else if ($mask_element_rs[$i]['varname'] == 's_item_type')
+							$value = $item_instance_r['s_item_type'] ?? "";
 						else {
-							$value = fetch_attribute_val ( $item_instance_r ['item_id'], $item_instance_r ['instance_no'], strtoupper ( $mask_element_rs [$i] ['varname'] ) );
+							$value = fetch_attribute_val( $item_instance_r['item_id'], $item_instance_r['instance_no'], strtoupper( $mask_element_rs[$i]['varname'] ) );
 						}
 						
 						// the attribute is defined, so now lets do the comparison.
 						if ($value !== false) {
-							if ($this->_test_if_condition ( $value, $mask_element_rs [$i] ['op'], $mask_element_rs [$i] ['value'] ))
-								$value = $this->_expand_title_mask ( $item_instance_r, $mask_element_rs [$i] ['if_mask'], $mask_element_rs [$i] ['if_mask_elements'] );
-							else if (strlen ( $mask_element_rs [$i] ['else_mask'] ) > 0)
-								$value = $this->_expand_title_mask ( $item_instance_r, $mask_element_rs [$i] ['else_mask'], $mask_element_rs [$i] ['else_mask_elements'] );
+							if ($this->_test_if_condition( $value, $mask_element_rs[$i]['op'], $mask_element_rs[$i]['value'] ))
+								$value = $this->_expand_title_mask( $item_instance_r, $mask_element_rs[$i]['if_mask'], $mask_element_rs[$i]['if_mask_elements'] );
+							else if (strlen( $mask_element_rs[$i]['else_mask'] ?? "" ) > 0)
+								$value = $this->_expand_title_mask( $item_instance_r, $mask_element_rs[$i]['else_mask'], $mask_element_rs[$i]['else_mask_elements'] );
 							else {
 								$value = NULL;
 							}
@@ -533,9 +535,9 @@ function _expand_title_mask($item_instance_r, $mask, &$mask_element_rs, $config_
 					default : // no valid function specified, so set to empty.
 						$value = '';
 				}
-			} 			//if(is_not_empty_array($mask_element_rs[$i]))
-else 			// standard variable (title, instance_no, item_attribute or plain text)
-{
+
+			} else {
+				// standard variable (title, instance_no, item_attribute or plain text)
 				$value = $this->_get_mask_variable_value ( $mask_element_rs [$i], $item_instance_r );
 			}
 			
@@ -568,23 +570,23 @@ function _expand_field_mask(&$values_rs, $mask, &$mask_element_rs, $config_var_r
 				// Replace the array index.
 				switch ($mask_element_rs [$i] ['type']) {
 					case 'ifdef' : // ifdef(s_attribute_type, "if_mask"[, "else_mask"])
-						if (isset ( $values_rs [$mask_element_rs [$i] ['varname']] ))
-							$value = $this->_expand_field_mask ( $values_rs, $mask_element_rs [$i] ['if_mask'], $mask_element_rs [$i] ['if_mask_elements'], $config_var_rs );
-						else if (strlen ( $mask_element_rs [$i] ['else_mask'] ) > 0)
-							$value = $this->_expand_field_mask ( $values_rs, $mask_element_rs [$i] ['else_mask'], $mask_element_rs [$i] ['else_mask_elements'], $config_var_rs );
+						if (isset( $values_rs[$mask_element_rs[$i]['varname']] ))
+							$value = $this->_expand_field_mask ( $values_rs, $mask_element_rs[$i]['if_mask'], $mask_element_rs[$i]['if_mask_elements'], $config_var_rs );
+						else if (strlen( $mask_element_rs[$i]['else_mask'] ?? '' ) > 0)
+							$value = $this->_expand_field_mask( $values_rs, $mask_element_rs[$i]['else_mask'], $mask_element_rs[$i]['else_mask_elements'], $config_var_rs );
 						else
 							$value = NULL;
 						break;
 					
 					case 'if' : // if(varname[<|<=|>=|>|==|!=]value, "if_mask"[, "else_mask"])
-						$value = $values_rs [$mask_element_rs [$i] ['varname']];
+						$value = $values_rs[$mask_element_rs[$i]['varname']];
 						
 						// The attribute is defined, so now lets do the comparison.
 						if (! empty ( $value )) {
-							if ($this->_test_if_condition ( $value, $mask_element_rs [$i] ['op'], $mask_element_rs [$i] ['value'] ))
-								$value = $this->_expand_field_mask ( $values_rs, $mask_element_rs [$i] ['if_mask'], $mask_element_rs [$i] ['if_mask_elements'], $config_var_rs );
-							else if (strlen ( $mask_element_rs [$i] ['else_mask'] ) > 0)
-								$value = $this->_expand_field_mask ( $values_rs, $mask_element_rs [$i] ['else_mask'], $mask_element_rs [$i] ['else_mask_elements'], $config_var_rs );
+							if ($this->_test_if_condition( $value, $mask_element_rs[$i]['op'], $mask_element_rs[$i]['value'] ))
+								$value = $this->_expand_field_mask( $values_rs, $mask_element_rs[$i]['if_mask'], $mask_element_rs[$i]['if_mask_elements'], $config_var_rs );
+							else if (strlen ( $mask_element_rs[$i]['else_mask'] ?? '' ) > 0)
+								$value = $this->_expand_field_mask ( $values_rs, $mask_element_rs[$i]['else_mask'], $mask_element_rs[$i]['else_mask_elements'], $config_var_rs );
 							else {
 								$value = NULL;
 							}
@@ -594,7 +596,7 @@ function _expand_field_mask(&$values_rs, $mask, &$mask_element_rs, $config_var_r
 						break;
 					
 					case 'switch' :
-						$value = $values_rs [$mask_element_rs [$i] ['varname']];
+						$value = $values_rs[$mask_element_rs[$i]['varname']];
 						
 						// The attribute is defined, so now lets do the comparison.
 						if (! empty ( $value )) {
@@ -759,7 +761,7 @@ function _get_mask_variable_value($mask_variable, $item_instance_r) {
 			$value = NULL;
 			
 			// the options that require a item_id context
-			if (is_numeric ( $item_instance_r ['item_id'] )) {
+			if (is_numeric ( $item_instance_r ['item_id'] ?? "")) {
 				if ($mask_variable ['option'] == 'img') {
 					$lookup_attr_r = fetch_attribute_type_lookup_r ( $mask_variable ['s_attribute_type'], fetch_attribute_val ( $item_instance_r ['item_id'], $item_instance_r ['instance_no'], $mask_variable ['s_attribute_type'] ) );
 					if ($lookup_attr_r !== false) {
@@ -779,7 +781,7 @@ function _get_mask_variable_value($mask_variable, $item_instance_r) {
 				if (strlen ( $value ) == 0) {
 					$value = fetch_attribute_val ( $item_instance_r ['item_id'], $item_instance_r ['instance_no'], $mask_variable ['s_attribute_type'] );
 				}
-			} else if (strlen ( $item_instance_r ['s_item_type'] ) > 0) 			// s_item_type context items.
+			} else if (strlen ( $item_instance_r ['s_item_type'] ?? "" ) > 0) 			// s_item_type context items.
 {
 				if ($mask_variable ['option'] == 'prompt') 				// the s_attribute_type prompt
 {
@@ -789,15 +791,15 @@ function _get_mask_variable_value($mask_variable, $item_instance_r) {
 			return $value;
 		} 		// special variable references.
 		else if (! is_array ( $mask_variable ) && $mask_variable == 'title')
-			return $item_instance_r ['title'];
+			return $item_instance_r['title'] ?? "";
 		else if (! is_array ( $mask_variable ) && $mask_variable == 's_item_type')
-			return $item_instance_r ['s_item_type'];
+			return $item_instance_r['s_item_type'] ?? "";
 		else if (! is_array ( $mask_variable ) && $mask_variable == 'item_id')
-			return $item_instance_r ['item_id'];
+			return $item_instance_r['item_id'] ?? "";
 		else if (! is_array ( $mask_variable ) && $mask_variable == 'instance_no')
-			return $item_instance_r ['instance_no'];
+			return $item_instance_r['instance_no'] ?? "";
 		else if (! is_array ( $mask_variable ) && $mask_variable == 's_status_type')
-			return $item_instance_r ['s_status_type'];
+			return $item_instance_r['s_status_type'] ?? "";
 		else 		// plain text
 {
 			return $mask_variable;
@@ -840,7 +842,7 @@ function _get_title_mask_idx($s_item_type_group, $s_item_type) {
 			$item_type_group_r = fetch_item_type_groups_for_item_type_r ( $s_item_type, 'Y' );
 			if (is_array ( $item_type_group_r )) {
 				reset ( $item_type_group_r );
-				while ( list ( , $group ) = each ( $item_type_group_r ) ) {
+				foreach ( $item_type_group_r as $key => $group ) {
 					$index = $this->_find_title_mask_idx ( $group, NULL );
 					if ($index != - 1) {
 						// cache mapping
@@ -881,4 +883,4 @@ function _find_title_mask_idx($s_item_type_group, $s_item_type) {
 		return - 1;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/WelcomeBlock.class.php b/lib/WelcomeBlock.class.php
index 6159fb38..971ceae2 100644
--- a/lib/WelcomeBlock.class.php
+++ b/lib/WelcomeBlock.class.php
@@ -29,7 +29,7 @@ class WelcomeBlock {
 	/**
 	 * Assumes the configuration ID = welcome.$id, or $cfgId needs to be non NULL to override
 	 */
-	function WelcomeBlock($id, $titlelangvar = NULL, $cfgId = NULL, $permId = NULL) {
+	function __construct($id, $titlelangvar = NULL, $cfgId = NULL, $permId = NULL) {
 		$this->_id = $id;
 		$this->_title = $titlelangvar;
 		$this->_cfgId = $cfgId;
@@ -91,4 +91,4 @@ function renderBlock($userid, $lastvisit) {
 		return "Override Me!";
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/WrapperFileHandler.class.php b/lib/WrapperFileHandler.class.php
index 070e4886..d6a052ed 100644
--- a/lib/WrapperFileHandler.class.php
+++ b/lib/WrapperFileHandler.class.php
@@ -20,7 +20,7 @@
 class WrapperFileHandler {
 	var $_fileHandle;
 
-	function WrapperFileHandler($fileHandle) {
+	function __construct($fileHandle) {
 		$this->_fileHandle = $fileHandle;
 	}
 
@@ -36,4 +36,4 @@ function readLine() {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/XMLImportPlugin.class.php b/lib/XMLImportPlugin.class.php
index 06366417..e3ac59a3 100644
--- a/lib/XMLImportPlugin.class.php
+++ b/lib/XMLImportPlugin.class.php
@@ -20,9 +20,6 @@
 class XMLImportPlugin {
 	var $_itemImportHandler;
 
-	function XMLImportPlugin() {
-	}
-
 	/**
 	 * Import script will inject the ItemImportHandler before using this
 	 * class.
@@ -73,4 +70,4 @@ function addAttribute($attributeType, $orderNo, $attributeVal) {
 		$this->_itemImportHandler->addAttribute ( $attributeType, $orderNo, $attributeVal );
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/XMLImportPluginHandler.class.php b/lib/XMLImportPluginHandler.class.php
index 8be83e09..872cfc2c 100644
--- a/lib/XMLImportPluginHandler.class.php
+++ b/lib/XMLImportPluginHandler.class.php
@@ -30,7 +30,7 @@ class XMLImportPluginHandler {
 	// stores the first error encountered.
 	var $_error;
 
-	function XMLImportPluginHandler(&$importPlugin, &$fileHandler) {
+	function __construct(&$importPlugin, &$fileHandler) {
 		$this->importPlugin = & $importPlugin;
 		$this->fileHandler = & $fileHandler;
 	}
diff --git a/lib/admin.php b/lib/admin.php
index 11594faf..eec70d40 100644
--- a/lib/admin.php
+++ b/lib/admin.php
@@ -59,7 +59,7 @@ function get_user_browser_crlf() {
 		return "\n";
 }
 
-/**
+/**
 */
 function get_overflow_tooltip_column($columntext, $size = NULL) {
 	if (is_numeric ( $size ) && strlen ( $columntext ) > $size) {
@@ -137,7 +137,7 @@ function get_system_admin_tools_menu($admin_type = NULL) {
 			return NULL;
 	} else {
 		$menu_options_rs = array ();
-		while ( list ( $id, $menu_r ) = each ( $admin_menu_rs ) ) {
+		foreach ($admin_menu_rs as $id => $menu_r ) {
 			$menu_r ['url'] = 'admin.php?type=' . $id;
 			$menu_options_rs ['admin'] [] = $menu_r;
 		}
@@ -162,12 +162,12 @@ function execute_sql_install($ADMIN_TYPE, $sqlfile, &$errors) {
 	}
 }
 
-/**
- * @param unknown_type $ADMIN_TYPE
- * @param unknown_type $typeName
- * @param unknown_type $sqlRegexp - if provided, assumes that the first group is the type
- * and the second is a description.  Will display both hypen separated.
- * @param unknown_type $is_not_exists_function
+/**
+ * @param unknown_type $ADMIN_TYPE
+ * @param unknown_type $typeName
+ * @param unknown_type $sqlRegexp - if provided, assumes that the first group is the type
+ * and the second is a description.  Will display both hypen separated.
+ * @param unknown_type $is_not_exists_function
  */
 function generate_sql_list($ADMIN_TYPE, $typeName, $sqlRegexp, $is_not_exists_function) {
 	$filelist = get_file_list ( './admin/' . $ADMIN_TYPE . '/sql/', 'sql' );
diff --git a/lib/announcement.php b/lib/announcement.php
index b26ad148..0c7442ce 100644
--- a/lib/announcement.php
+++ b/lib/announcement.php
@@ -40,7 +40,7 @@ function get_announcements_whereclause($limit_days, $limit_closed) {
 		$query = 'WHERE ';
 		
 		$whereclause = '';
-		while ( list ( , $q ) = each ( $where ) ) {
+		foreach ( $where as $q ) {
 			if (strlen ( $whereclause ) > 0)
 				$whereclause .= ' AND';
 			
@@ -146,4 +146,4 @@ function fetch_announcement_title($announcement_id) {
 	//else
 	return FALSE;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/auth.php b/lib/auth.php
index a5deb601..597f6190 100644
--- a/lib/auth.php
+++ b/lib/auth.php
@@ -104,33 +104,32 @@ function get_user_granted_permissions_r($user_id) {
 }
 
 function is_user_granted_permission($permission, $user_id = NULL, $ignoreRememberMe = FALSE) {
+	$is_remember_me = FALSE;
 	if (strlen ( $user_id ) == 0 && is_site_public_access()) {
 		$perms_r = get_public_access_permission_r();
-	} else {
-		if (strlen ( $user_id ) == 0) {
-			$user_id = $_SESSION['user_id'];
-			
-			if (!$ignoreRememberMe) {
-				$is_remember_me = ($_SESSION['login_method'] == 'remember_me');
-			} else {
-				$is_remember_me = FALSE;
-			}
-			
-			global $PERM_MATRIX;
-			if (!is_array($PERM_MATRIX)) {
-				$perms_r = get_user_granted_permissions_r($user_id);
-				$PERM_MATRIX = $perms_r;
-			} else {
-				$perms_r = $PERM_MATRIX;
-			}
-		} else { // won't cache explicit request for perms
+
+	} elseif (strlen ( $user_id ) == 0) {
+		$user_id = $_SESSION['user_id'];
+
+		if (!$ignoreRememberMe) {
+			$is_remember_me = ($_SESSION['login_method'] == 'remember_me');
+		}
+
+		global $PERM_MATRIX;
+		if (!is_array($PERM_MATRIX)) {
 			$perms_r = get_user_granted_permissions_r($user_id);
+			$PERM_MATRIX = $perms_r;
+		} else {
+			$perms_r = $PERM_MATRIX;
 		}
+
+	} else { // won't cache explicit request for perms
+		$perms_r = get_user_granted_permissions_r($user_id);
 	}
 	
 	if (is_array($permission)) {
 		reset($permission);
-		while(list(,$perm) = each($permission)) {
+		foreach ( $permission as $perm ) {
 			if (isset($perms_r[$perm])) {
 				$rememberMe = $perms_r[$perm];
 				if (!$is_remember_me || $rememberMe == 'Y') {
@@ -138,12 +137,10 @@ function is_user_granted_permission($permission, $user_id = NULL, $ignoreRemembe
 				}
 			}
 		}
-	} else {
-		if (isset($perms_r[$permission])) {
-			$rememberMe = $perms_r[$permission];
-			if (!$is_remember_me || $rememberMe == 'Y') {
-				return TRUE;
-			}
+	} elseif (isset($perms_r[$permission])) {
+		$rememberMe = $perms_r[$permission];
+		if (!$is_remember_me || $rememberMe == 'Y') {
+			return TRUE;
 		}
 	}
 	return FALSE;
@@ -158,11 +155,9 @@ function is_permission_disabled_for_remember_me($permission) {
 	if (is_array($PERM_MATRIX)) {
 		if (is_array($permission)) {
 			reset($permission);
-			while(list(,$perm) = each($permission)) {
-				if(isset($PERM_MATRIX[$perm])) {
-					if ($PERM_MATRIX[$perm] == 'N') {
-						return TRUE;
-					}
+			foreach ( $permission as $perm ) {
+				if (isset($PERM_MATRIX[$perm]) && $PERM_MATRIX[$perm] == 'N') {
+					return TRUE;
 				}
 			}
 		}
@@ -219,8 +214,8 @@ function is_opendb_valid_session() {
 				// how long a session can remain active overall.
 				$current_time = time ();
 				
-				if (! is_numeric ( $site_r ['login_timeout'] ) || (($current_time - get_opendb_session_var ( 'login_time' )) < $site_r ['login_timeout'])) {
-					if (! is_numeric ( $site_r ['idle_timeout'] ) || (($current_time - get_opendb_session_var ( 'last_access_time' )) < $site_r ['idle_timeout'])) {
+				if (!is_numeric( $site_r['login_timeout'] ?? "" ) || ( ($current_time - get_opendb_session_var( 'login_time' )) < $site_r['login_timeout'])) {
+					if (! is_numeric ( $site_r ['idle_timeout'] ?? "" ) || (($current_time - get_opendb_session_var ( 'last_access_time' )) < $site_r ['idle_timeout'])) {
 						if (is_user_active ( get_opendb_session_var ( 'user_id' ) )) {
 							// reset the time, as we are only interested in idle session tests.
 							$_SESSION ['last_access_time'] = $current_time;
@@ -285,7 +280,7 @@ function remove_opendb_remember_me() {
 	
 	$remember_me_r = get_remember_me_r($oldCookie);
 	if ($remember_me_r !== FALSE) {
-		delete_remember_me($remember_me_r['id']);
+		delete_remember_me($remember_me_r['id'], $oldCookie);
 	}
 }
 
@@ -302,25 +297,25 @@ function handle_opendb_remember_me() {
 			$doRememberMe = FALSE;
 		}
 		
-		$oldCookie = $_COOKIE[get_opendb_remember_me_cookie_name()];
+		$oldCookie = $_COOKIE[get_opendb_remember_me_cookie_name()] ?? "";
 		if (!empty($oldCookie)) {
 			$remember_me_r = get_remember_me_r($oldCookie);
 			if ($remember_me_r !== FALSE) {
-				
+
 				// no need to register if already logged in
 				if ($remember_me_r['valid'] === TRUE && !$doRememberMe) { 
 					// the second TRUE, flags the current user login as being enabled by a remember me cookie
 					register_user_login($remember_me_r['user_id'], TRUE, TRUE);
 					$doRememberMe = TRUE;
 				}
-				delete_remember_me($remember_me_r['id']);
+				delete_remember_me($remember_me_r['id'], $oldCookie);
 			}
 		}
 	
 		if ($doRememberMe) {
 			$cookie = generate_opendb_cookie();
 			$site_r = get_opendb_config_var('site');
-			$login_timeout = (int) ifempty(ifempty($site_r['login_timeout'], $site_r['idle_timeout']), 3600);
+			$login_timeout = (int) ($site_r['login_timeout'] ?? $site_r['idle_timeout'] ?? 3600);
 		
 			if (insert_remember_me($_SESSION['user_id'], $cookie)) {
 				setcookie(get_opendb_remember_me_cookie_name(), $cookie, time() + $login_timeout);
@@ -347,7 +342,7 @@ function get_remember_me_r($cookie) {
 	$cookie = addslashes($cookie);
 	
 	$site_r = get_opendb_config_var ('site');
-	$login_timeout = (int) ifempty(ifempty($site_r['login_timeout'], $site_r['idle_timeout']), 3600);
+	$login_timeout = (int) ($site_r['login_timeout'] ?? ($site_r['idle_timeout'] ?? 3600));
 	
 	$query = "SELECT id, user_id, UNIX_TIMESTAMP() AS 'current_time', UNIX_TIMESTAMP(DATE_ADD(created_on, INTERVAL $login_timeout SECOND)) AS expiry_time FROM remember_me WHERE cookie = '$cookie' ";
 	$result = db_query ( $query );
@@ -363,7 +358,7 @@ function get_remember_me_r($cookie) {
 	return FALSE;
 }
 
-function delete_remember_me($id) {
+function delete_remember_me($id, $cookie) {
 	$id = addslashes($id);
 	$query = "DELETE FROM remember_me WHERE id = '$id'";
 	
@@ -391,4 +386,4 @@ function insert_remember_me($user_id, $cookie) {
 		return FALSE;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/chart.php b/lib/chart.php
index f8c701e9..fdc7f95c 100644
--- a/lib/chart.php
+++ b/lib/chart.php
@@ -17,21 +17,8 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-require_once ("./lib/GDImage.class.php");
-
-$chartLib = get_opendb_config_var ( 'stats', 'chart_lib' );
-
-if ($chartLib == 'legacy') {
-	include_once("./lib/chart/LegacyStatsChart.class.php");
-} else if ($chartLib == 'phplot' && is_dir ( "./lib/phplot" )) {
-	include_once("./lib/chart/PhplotStatsChart.class.php");
-} else if ($chartLib == 'jpgraph' && is_php51 () && is_dir ( "./lib/jpgraph" )) {
-	include_once("./lib/chart/JPGraphStatsChart.class.php");
-} else if (is_php5 ()) {
-	include_once("./lib/chart/StatsLibChart12.class.php");
-} else {
-	include_once("./lib/chart/StatsLibChart11.class.php");
-}
+require_once ("./lib/ODImage.class.php");
+include_once("./lib/chart/StatsLibChart.class.php");
 
 function sort_data_element($a_r, $b_r) {
 	$a = $a_r ['value'];
@@ -44,8 +31,8 @@ function sort_data_element($a_r, $b_r) {
 }
 
 function build_and_send_graph($data_rs, $chartType, $title) {
-	$gdImage = new GDImage ( get_opendb_image_type () );
-	$imgType = $gdImage->getImageType ();
+	$gdImage = new ODImage ( get_opendb_image_type() );
+	$imgType = $gdImage->getImageType();
 	unset ( $gdImage );
 	
 	$graphCfg = _theme_graph_config ();
@@ -63,7 +50,7 @@ function build_and_send_graph($data_rs, $chartType, $title) {
 			$data_rs = array_slice ( $data_rs, 0, 11 );
 		
 		reset ( $data_rs );
-		while ( list ( , $data_r ) = each ( $data_rs ) ) {
+		foreach ($data_rs as $data_r) {
 			if ($chartType == 'piechart')
 				$chart->addData ( $data_r ['display'] . " (${data_r['value']})", $data_r ['value'] );
 			else
@@ -73,4 +60,4 @@ function build_and_send_graph($data_rs, $chartType, $title) {
 	
 	$chart->render ( $imgType );
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/chart/JPGraphStatsChart.class.php b/lib/chart/JPGraphStatsChart.class.php
deleted file mode 100644
index 2789b3b4..00000000
--- a/lib/chart/JPGraphStatsChart.class.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/* 	
-    Open Media Collectors Database
-    Copyright (C) 2001,2013 by Jason Pell
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-include_once("./lib/chart/StatsChart.class.php");
-
-include_once("./lib/jpgraph/jpgraph.php");
-include_once("./lib/jpgraph/jpgraph_pie.php");
-include_once("./lib/jpgraph/jpgraph_pie3d.php");
-include_once("./lib/jpgraph/jpgraph_bar.php");
-
-class StatsChartImpl extends StatsChart {
-	var $graph;
-	var $value_r = array();
-	var $display_r = array();
-
-	function StatsChartImpl($chartType, $graphCfg) {
-		parent::StatsChart($chartType, $graphCfg);
-
-		if ($this->chartType == 'piechart') {
-			$this->graph = new PieGraph($this->width, $this->height, "");
-		} else {
-			$this->graph = new Graph($this->width, $this->height, "");
-			$this->graph->SetScale("textlin");
-			$this->graph->yaxis->scale->SetGrace(20);
-			$this->graph->SetMargin(25, 25, 50, 125);
-			$this->graph->yaxis->HideZeroLabel();
-			$this->graph->yscale->SetAutoMin(0);
-			$this->graph->yaxis->SetLabelFormatString("%2d");
-			$this->graph->xaxis->SetLabelAngle(90);
-		}
-
-		if ($this->transparent) {
-			$this->graph->img->setTransparent("white");
-		}
-
-		$this->graph->SetFrame(false);
-	}
-
-	function addData($display, $value) {
-		$this->value_r[] = $value;
-		$this->display_r[] = $display;
-	}
-
-	function setTitle($title) {
-		$this->graph->title->Set($title);
-	}
-
-	function render($imgType) {
-		$this->graph->SetImgFormat($imgType);
-
-		if ($this->chartType == 'piechart') {
-			$plot = new PiePlot3d($this->value_r);
-			$plot->SetTheme("sand");
-			$plot->SetCenter(0.35);
-			$plot->SetAngle(50);
-			$plot->SetLegends($this->display_r);
-			$plot->SetLabelType(PIE_VALUE_ADJPER);
-		} else {
-			$this->graph->xaxis->SetTickLabels($this->display_r);
-
-			$plot = new BarPlot($this->value_r);
-			$plot->SetWidth(0.5);
-			$plot->SetFillColor("orange@0.75");
-		}
-
-		$this->graph->Add($plot);
-		$this->graph->Stroke();
-	}
-}
-?>
\ No newline at end of file
diff --git a/lib/chart/LegacyStatsChart.class.php b/lib/chart/LegacyStatsChart.class.php
deleted file mode 100644
index a968ba3c..00000000
--- a/lib/chart/LegacyStatsChart.class.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/* 	
-    Open Media Collectors Database
-    Copyright (C) 2001,2013 by Jason Pell
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-include_once("./lib/chart/StatsChart.class.php");
-
-class StatsChartImpl extends StatsChart {
-	var $data;
-
-	function StatsChartImpl($chartType, $graphCfg) {
-		parent::StatsChart($chartType, $graphCfg);
-	}
-
-	function addData($display, $value) {
-		$this->data[$display] = $value;
-	}
-
-	function render($imgType) {
-		$data = $this->data;
-		$chartType = $this->chartType;
-		$graphCfg = $this->graphCfg;
-
-		// standard threshold.
-		$chartOptions['threshold'] = 3;
-
-		if ($chartType == 'barchart') {
-			$chartOptions['striped'] = FALSE;
-			$chartOptions['12oclock'] = FALSE;
-		} else {
-			$chartOptions['12oclock'] = FALSE;
-			$chartOptions['striped'] = TRUE;
-		}
-
-		$itemCount = fetch_item_instance_cnt();
-
-		// size of pie-chart (not counting text borders)
-		$imgsize = ifempty($graphCfg['size'], $this->width / 3);
-
-		$fontsize = $graphCfg['font-size'];
-		$fontheight = imagefontheight($fontsize);
-
-		// Create a new image
-		$side_margin = round($imgsize * 2 / 3);
-
-		$top_margin = $fontheight + 1;
-		$xsize = $imgsize + 2 * $side_margin;
-		$ysize = $imgsize + 2 * $top_margin;
-
-		$im = ImageCreate($xsize, $ysize);
-
-		$bgcolor = ImageHexColorAllocate($im, $graphCfg['background-color']);
-		$text_color = ImageHexColorAllocate($im, $graphCfg['text-color']);
-		$captions_color = ImageHexColorAllocate($im, $graphCfg['caption-color']);
-		$lt_color = ImageHexColorAllocate($im, $graphCfg['light-color']);
-		$dk_color = ImageHexColorAllocate($im, $graphCfg['dark-color']);
-		$lt_border = ImageHexColorAllocate($im, $graphCfg['light-border-color']);
-		$dk_border = ImageHexColorAllocate($im, $graphCfg['dark-border-color']);
-
-		// Do this if you want your background image to show through:
-		if ($graphCfg['background'] == 'transparent') {
-			imagecolortransparent($im, $bgcolor);
-		}
-
-		// color background
-		ImageFilledRectangle($im, 0, 0, $xsize, $ysize, $bgcolor);
-
-		if (is_array($data)) {
-			// process data
-			$dataCount = @count($data);
-
-			if ($dataCount > 0 && !empty($sortorder)) {
-				if ($sortorder == 'asc')
-					asort($data);
-				else
-					arsort($data);
-			}
-
-			$TotalArrayValues = @array_sum($data);
-			if ($TotalArrayValues > 0 && $itemCount > 0) {
-				$maxdata = 0;
-
-				foreach ($data as $key => $value) {
-					$value = number_format(@($value / $itemCount) * 100, 1);
-					$data[$key] = $value;
-
-					if ($maxdata < $value) {
-						$maxdata = $value + 1;
-					}
-				}
-			}
-
-			if ($chartType == 'barchart') {
-				if ($TotalArrayValues > 0) {
-					$sidegap = 10; // pixels.
-					$topgap = $sidegap;
-
-					// An iterative process to determine the best box width.
-					// It will perform only one loop, unless you have so many items that
-					// the box width is smaller than the font height.  Then it will
-					// recompute with fewer items.
-					$dataCount++; // We undo this on the next line.
-					do {
-						$dataCount--;
-						$boxwidth = round(($xsize - ($sidegap * 2)) / ($dataCount + 1));
-						$gapwidth = round($boxwidth / 10);
-						if ($gapwidth < 1)
-							$gapwidth = 1;
-						$boxwidth = floor(($xsize - ($sidegap * 2) - ($gapwidth * ($dataCount - 1))) / $dataCount);
-						$totalwidth = $boxwidth * $dataCount + $gapwidth * ($dataCount - 1);
-					} while ($dataCount > 0 && $boxwidth < $fontheight + 2);
-
-					// centre it:
-					$sidegap = ($xsize - $totalwidth) / 2;
-
-					$ix = 0;
-					foreach ($data as $key => $value) {
-						//$height = $data[$ix][1] * ($ysize - $topgap*2) / 100;
-						$height = $value * ($ysize - $topgap * 2) / $maxdata;
-
-						$x1 = $sidegap + ($ix * $boxwidth) + ($ix * $gapwidth);
-
-						// ImageLine($im, $x1, $ysize - $top_margin, $x1, $ysize - $top_margin - $height, $dk_border );
-						ImageFilledRectangle($im, $x1, $ysize - $topgap - $height, $x1 + $boxwidth, $ysize - $topgap, $lt_color);
-
-						// Highlight it from the top left, shadow on bottom and right.
-						ImageLine($im, $x1, $ysize - $topgap - $height, $x1, $ysize - $topgap, $lt_border);
-						ImageLine($im, $x1, $ysize - $topgap - $height, $x1 + $boxwidth, $ysize - $topgap - $height, $lt_border);
-						ImageLine($im, $x1 + $boxwidth, $ysize - $topgap - $height, $x1 + $boxwidth, $ysize - $topgap, $dk_border);
-						ImageLine($im, $x1, $ysize - $topgap, $x1 + $boxwidth, $ysize - $topgap, $dk_border);
-
-						$text = $key . " " . round($value) . "%"; // show percent
-						ImageStringUp($im, $fontsize, $x1 + $boxwidth / 2 - $fontheight / 2, $ysize - $topgap - 3, $text, $text_color);
-
-						$ix++;
-					}
-				}
-			} else { //if($chartType == 'piechart')
-				// A pie chart.
-				if (is_numeric($chartOptions['threshold']))// minimum wedge percent to omit from caption
-					$threshold = $chartOptions['threshold'];
-				else
-					$threshold = 3;
-
-				$radius = round($imgsize / 2);
-
-				$originx = $radius + $side_margin;
-				$originy = $radius + $top_margin;
-
-				// draw a circle
-				ImageArc($im, $originx, $originy, $radius * 2, $radius * 2, 0, 360, $dk_border);
-
-				// fill circle with color
-				ImageFill($im, $originx, $originy, $lt_color);
-
-				// GD-2 version of the above two calls.	 Damn PHP.
-				// ImageFilledArc($im, $originx, $originy, $radius*2, $radius*2, 0, 360, $dk_border, IMG_ARC_PIE);
-
-				if ($chartOptions['12oclock'] !== FALSE) {
-					// draw a wedge
-					$last_angle = deg2rad(-90);
-					// Draw line at 0 degrees if we have more than one item.
-					if ($TotalArrayValues > 1) {
-						ImageLine($im, $originx, $originy, $originx, $originy - $radius + 1, $dk_border);
-					}
-				} else {
-					$last_angle = deg2rad(0);
-					if ($TotalArrayValues > 1) {
-						ImageLine($im, $originx, $originy, $originx + $radius - 1, $originy, $dk_border);
-					}
-				}
-
-				if ($chartOptions['striped'] !== FALSE) {
-					// Draw every other pie wedge a different colour.
-					$striped = TRUE;
-				}
-
-				$ix = 0;
-				foreach ($data as $key => $value) {
-					$angle = deg2rad(($value * 3.6)) + $last_angle;
-
-					$x2 = ($radius - 1) * cos($angle) + $originx;
-					$y2 = ($radius - 1) * sin($angle) + $originy;
-
-					if ($ix != $TotalArrayValues - 1) { // don't draw wedge-line for 100%
-						ImageLine($im, $originx, $originy, $x2, $y2, $dk_border);
-					}
-
-					$mid_angle = ($angle - $last_angle) / 2;
-
-					if ($value > $threshold) { // caption if over $threshold
-						// Fill every other wedge with a different colour:
-						if (($ix % 2) && $striped) {
-							ImageFillToBorder($im, $radius * 0.9 * cos($mid_angle + $last_angle) + $originx, $radius * 0.9 * sin($mid_angle + $last_angle) + $originy, $dk_border, $dk_color);
-						}
-
-						$x1 = ($radius / 2) * cos($mid_angle + $last_angle) + $originx;
-						$y1 = ($radius / 2) * sin($mid_angle + $last_angle) + $originy;
-
-						$x2 = $radius * cos($mid_angle + $last_angle) + $originx;
-						$y2 = $radius * sin($mid_angle + $last_angle) + $originy;
-
-						ImageArc($im, $x1, $y1, $imgsize / 25, $imgsize / 25, 0, 360, $captions_color); // display caption
-						ImageLine($im, $x1, $y1, $x2, $y2, $captions_color);
-
-						$text = $key . " " . round($value) . "%"; // show percent
-						if ($x1 > $originx) {
-							ImageLine($im, $x2, $y2, $x2 + $side_margin, $y2, $captions_color); // caption on right side
-							if ($y2 > $originy) // Bottom half
-								ImageString($im, $fontsize, $x2, $y2, $text, $text_color);
-							else
-								// Should use font height here:
-								ImageString($im, $fontsize, $x2, $y2 - 15, $text, $text_color);
-						} else {
-							ImageLine($im, $x2, $y2, $x2 - $side_margin, $y2, $captions_color); // caption on left side
-							if ($y2 > $originy) // Bottom half
-								ImageString($im, $fontsize, $x2 - $side_margin, $y2, $text, $text_color);
-							else {
-								// Should use font height here:
-								ImageString($im, $fontsize, $x2 - $side_margin, $y2 - 15, $text, $text_color);
-							}
-						}
-					}
-					$last_angle = $angle;
-
-					$ix++;
-				}
-			}
-		}
-
-		header("Pragma: no-cache");
-		header("Expires: 0");
-
-		switch ($imgType) {
-		case 'jpeg':
-		case 'jpg':
-			Header("Content-Type: image/jpeg");
-			ImageJPEG($im);
-			break;
-
-		case 'gif'://not all sites support GIF!
-			Header("Content-Type: image/gif");
-			ImageGIF($im);
-			break;
-
-		case 'png':
-		default:
-			Header("Content-Type: image/png");
-			ImagePNG($im);// send image as PNG to browser
-		}
-
-		// destroy image when done
-		ImageDestroy($im);
-	}
-}
-
-function ImageHexColorAllocate(&$img, $HexColorString) {
-	$start = 0;
-	if ($HexColorString{0} == '#')
-		$start = 1;
-
-	$R = hexdec(substr($HexColorString, $start, 2));
-	$G = hexdec(substr($HexColorString, $start + 2, 2));
-	$B = hexdec(substr($HexColorString, $start + 4, 2));
-	return ImageColorAllocate($img, $R, $G, $B);
-}
-?>
diff --git a/lib/chart/PhplotStatsChart.class.php b/lib/chart/PhplotStatsChart.class.php
deleted file mode 100644
index ca964ba5..00000000
--- a/lib/chart/PhplotStatsChart.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/* 	
-    Open Media Collectors Database
-    Copyright (C) 2001,2013 by Jason Pell
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// TODO - not currently working very well.
-include_once("./lib/chart/StatsChart.class.php");
-
-include_once("./lib/phplot/phplot.php");
-
-class StatsChartImpl extends StatsChart {
-	var $phplot;
-	var $data_values;
-
-	function StatsChartImpl($chartType, $graphCfg) {
-		parent::StatsChart($chartType, $graphCfg);
-
-		$this->phplot = new PHPlot($this->width, $this->height);
-
-		$this->phplot->SetImageBorderType('plain');
-
-		if ($chartType == 'piechart') {
-			$this->phplot->SetDataType('text-data-single');
-			$this->phplot->SetPlotType('pie');
-			$this->phplot->SetLabelScalePosition(0.35);
-			//$this->phplot->SetDataColors(array('#BDC7F7', '#DCE6FB', 'yellow', 'red', 'blue', 'orange', 'purple'));
-		} else {
-			$this->phplot->SetPlotType('bar');
-			$this->phplot->SetDataType('text-data');
-			# Turn off X tick labels and ticks because they don't apply here:
-			$this->phplot->SetXTickLabelPos('none');
-			$this->phplot->SetXTickPos('none');
-
-			$this->phplot->SetXLabelAngle(90);
-
-			# Make sure Y=0 is displayed:
-			$this->phplot->SetPlotAreaWorld(NULL, 0);
-
-			# Y Tick marks are off, but Y Tick Increment also controls the Y grid lines:
-			//$this->phplot->SetYTickIncrement(100);
-
-			# Turn on Y data labels:
-			$this->phplot->SetYDataLabelPos('plotin');
-
-			# With Y data labels, we don't need Y ticks or their labels, so turn them off.
-			$this->phplot->SetYTickLabelPos('none');
-			$this->phplot->SetYTickPos('none');
-		}
-	}
-
-	function addData($display, $value) {
-		$this->data_values[] = array($display, $value);
-	}
-
-	function setTitle($title) {
-		$this->phplot->setTitle($title);
-	}
-
-	function render($imgType) {
-		$this->phplot->SetDataValues($this->data_values);
-
-		if ($this->chartType == 'piechart') {
-			reset($this->data_values);
-			while (list(, $name) = each($this->data_values)) {
-				$this->phplot->SetLegend($name[0]);
-			}
-		}
-
-		$this->phplot->SetFileFormat($imgType);
-		$this->phplot->DrawGraph();
-	}
-}
-?>
diff --git a/lib/chart/StatsChart.class.php b/lib/chart/StatsChart.class.php
index 306195af..99aac0bf 100644
--- a/lib/chart/StatsChart.class.php
+++ b/lib/chart/StatsChart.class.php
@@ -26,10 +26,8 @@ class StatsChart {
 	var $height;
 	var $transparent;
 
-	function StatsChart($chartType, $graphCfg) {
+	function __construct($chartType, $graphCfg) {
 		$this->chartType = $chartType;
-		$this->imgType = $imgType;
-
 		$this->height = $graphCfg['height'];
 		$this->width = $graphCfg['width'];
 		if (!is_numeric($this->height) && !is_numeric($this->width)) {
@@ -54,4 +52,4 @@ function setTitle($title) {
 	function render($imgType) {
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/chart/StatsLibChart12.class.php b/lib/chart/StatsLibChart.class.php
similarity index 84%
rename from lib/chart/StatsLibChart12.class.php
rename to lib/chart/StatsLibChart.class.php
index 6f3ed211..d22faa6e 100644
--- a/lib/chart/StatsLibChart12.class.php
+++ b/lib/chart/StatsLibChart.class.php
@@ -2,7 +2,7 @@
 /* 	
     Open Media Collectors Database
     Copyright (C) 2001,2013 by Jason Pell
-
+    
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-include_once("./lib/libchart12/classes/libchart.php");
+include_once("./lib/libchart/classes/libchart.php");
 
 include_once("./lib/chart/StatsChart.class.php");
 
@@ -26,8 +26,8 @@ class StatsChartImpl extends StatsChart {
 	var $libchart;
 	var $dataSet;
 
-	function StatsChartImpl($chartType, $graphCfg) {
-		parent::StatsChart($chartType, $graphCfg);
+	function __construct($chartType, $graphCfg) {
+		parent::__construct($chartType, $graphCfg);
 
 		if ($chartType == 'piechart')
 			$this->libchart = new PieChart($this->width, $this->height);
@@ -37,10 +37,6 @@ function StatsChartImpl($chartType, $graphCfg) {
 		$this->libchart->getPlot()->setLogoFileName(NULL);
 
 		$this->dataSet = new XYDataSet();
-
-		if ($this->transparent) {
-			$this->libchart->getPlot()->setTransparent(TRUE);
-		}
 	}
 
 	function addData($display, $value) {
@@ -53,7 +49,7 @@ function setTitle($title) {
 
 	function render($imgType) {
 		$this->libchart->setDataSet($this->dataSet);
-		$this->libchart->render($imgType);
+		$this->libchart->render();
 	}
 }
 ?>
diff --git a/lib/chart/StatsLibChart11.class.php b/lib/chart/StatsLibChart11.class.php
deleted file mode 100644
index 82e2bbef..00000000
--- a/lib/chart/StatsLibChart11.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* 	
-    Open Media Collectors Database
-    Copyright (C) 2001,2013 by Jason Pell
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-include_once("./lib/libchart/libchart.php");
-
-include_once("./lib/chart/StatsChart.class.php");
-
-class StatsChartImpl extends StatsChart {
-	var $libchart;
-
-	function StatsChartImpl($chartType, $graphCfg) {
-		parent::StatsChart($chartType, $graphCfg);
-
-		if ($chartType == 'piechart')
-			$this->libchart = new PieChart($this->width, $this->height);
-		else
-			$this->libchart = new VerticalChart($this->width, $this->height);
-
-		$this->libchart->setLogo(NULL);
-
-		if ($this->transparent) {
-			$this->libchart->setTransparent(TRUE);
-		}
-	}
-
-	function addData($display, $value) {
-		$this->libchart->addPoint(new Point($display, $value));
-	}
-
-	function setTitle($title) {
-		$this->libchart->setTitle($title);
-	}
-
-	function render($imgType) {
-		$this->libchart->render($imgType);
-	}
-}
-?>
diff --git a/lib/config.php b/lib/config.php
index 05c1222b..ae7ac72b 100755
--- a/lib/config.php
+++ b/lib/config.php
@@ -31,10 +31,10 @@
 function is_gzip_compression_enabled($php_self) {
 	$page = basename ( $php_self, '.php' );
 	
-	if (get_opendb_config_var ( 'site.gzip_compression', 'enable' ) === TRUE) {
+	if (get_opendb_config_var( 'site.gzip_compression', 'enable' ) === TRUE) {
 		// hard code disable for installer and url as most images already compressed
 		// so is superfluous.
-		if ($page != 'install' && $page != 'url' && ! in_array ( $page, get_opendb_config_var ( 'site.gzip_compression', 'disabled' ) )) {
+		if ($page != 'install' && $page != 'url' && ! in_array ( $page, get_opendb_config_var( 'site.gzip_compression', 'disabled' ) )) {
 			return TRUE;
 		}
 	}
@@ -44,14 +44,14 @@ function is_gzip_compression_enabled($php_self) {
 }
 
 function get_opendb_image_type() {
-	return strlen ( get_opendb_config_var ( 'site', 'image_type' ) ) > 0 ? get_opendb_config_var ( 'site', 'image_type' ) : "auto";
+	return strlen( get_opendb_config_var( 'site', 'image_type' ) ) > 0 ? get_opendb_config_var ( 'site', 'image_type' ) : "auto";
 }
 
 /**
  * @return unknown
  */
 function is_show_login_menu_enabled() {
-	return get_opendb_config_var ( 'login', 'show_menu' ) !== FALSE;
+	return get_opendb_config_var( 'login', 'show_menu' ) !== FALSE;
 }
 
 /**
@@ -116,25 +116,26 @@ function get_opendb_config_var($group, $id = NULL, $keyid = NULL) {
 		
 		if ($group != NULL) {
 			// override config value.
-			if ($group == 'db_server' || $group == 'session_handler' || is_array ( $CONFIG_VARS [$group] )) { // cached vars
+			if ( $group == 'db_server' ||
+				 $group == 'session_handler' ||
+				 ( array_key_exists($group, $CONFIG_VARS) && is_array( $CONFIG_VARS[$group] ))) { // cached vars
 				if ($id !== NULL && $keyid !== NULL)
-					return $CONFIG_VARS [$group] [$id] [$keyid];
+					return $CONFIG_VARS[$group][$id][$keyid];
 				else if ($id !== NULL)
-					return $CONFIG_VARS [$group] [$id];
+					return $CONFIG_VARS[$group][$id];
 				else
-					return $CONFIG_VARS [$group]; // will return an array of all config items in group
+					return $CONFIG_VARS[$group]; // will return an array of all config items in group
 			} else {
-				$group_r = get_opendb_db_config_var ( $group );
-				if (is_array ( $group_r )) {
-					$CONFIG_VARS [$group] = $group_r;
+				$group_r = get_opendb_db_config_var( $group );
+				if (is_array( $group_r )) {
+					$CONFIG_VARS[$group] = $group_r;
 				}
-				
 				if ($id !== NULL && $keyid !== NULL)
-					return $CONFIG_VARS [$group] [$id] [$keyid];
+					return $CONFIG_VARS[$group][$id][$keyid];
 				else if ($id !== NULL)
-					return $CONFIG_VARS [$group] [$id];
+					return $CONFIG_VARS[$group][$id];
 				else
-					return $CONFIG_VARS [$group];
+					return $CONFIG_VARS[$group];
 			}
 		} else {		//if($group!=NULL)
 			return NULL;
@@ -148,49 +149,68 @@ function get_opendb_db_config_var($group, $id = NULL, $keyid = NULL) {
 	if (is_db_connected ()) {
 		if ($group != NULL) {
 			if ($id != NULL && $keyid != NULL) {
-				$query = "SELECT cgiv.group_id, cgiv.id, scgi.type, cgiv.keyid, cgiv.value " . "FROM s_config_group_item_var cgiv, s_config_group_item scgi " . "WHERE cgiv.group_id = scgi.group_id AND " . "cgiv.id = scgi.id AND " . "cgiv.keyid = scgi.keyid AND " . "cgiv.group_id = '$group' AND " . "cgiv.id = '$id' AND " . "cgiv.keyid = '$keyid' " . "LIMIT 0,1"; // enforce only one record returned.
+				$query = "SELECT cgiv.group_id, cgiv.id, scgi.type, cgiv.keyid, cgiv.value " .
+					   "FROM s_config_group_item_var cgiv, s_config_group_item scgi " .
+					   "WHERE cgiv.group_id = scgi.group_id AND cgiv.id = scgi.id AND " .
+					   " cgiv.keyid = scgi.keyid AND " . "cgiv.group_id = '$group' AND " .
+					   " cgiv.id = '$id' AND " . "cgiv.keyid = '$keyid' " .
+					   "LIMIT 0,1";
 			} else if ($id != NULL) {
-				$query = "SELECT cgiv.group_id, cgiv.id, scgi.type, cgiv.keyid, cgiv.value " . "FROM s_config_group_item_var cgiv, s_config_group_item scgi " . "WHERE cgiv.group_id = scgi.group_id AND " . "cgiv.id = scgi.id AND " . "(scgi.type = 'array' OR cgiv.keyid = scgi.keyid) AND " . "cgiv.group_id = '$group' AND cgiv.id = '$id' " . "ORDER BY cgiv.keyid";
+				$query = "SELECT cgiv.group_id, cgiv.id, scgi.type, cgiv.keyid, cgiv.value " .
+					   "FROM s_config_group_item_var cgiv, s_config_group_item scgi " .
+					   "WHERE cgiv.group_id = scgi.group_id AND " . "cgiv.id = scgi.id AND " .
+					   " (scgi.type = 'array' OR cgiv.keyid = scgi.keyid) AND " .
+					   " cgiv.group_id = '$group' AND cgiv.id = '$id' " .
+					   "ORDER BY cgiv.keyid";
 			} else {
 				// will need to update these lines if we ever add any more array types.
-				$query = "SELECT cgiv.group_id, cgiv.id, scgi.type, cgiv.keyid, cgiv.value " . "FROM s_config_group_item_var cgiv, s_config_group_item scgi " . "WHERE cgiv.group_id = scgi.group_id AND " . "cgiv.id = scgi.id AND " . "(scgi.type = 'array' OR cgiv.keyid = scgi.keyid) AND " . "cgiv.group_id = '$group' " . "ORDER BY cgiv.id, cgiv.keyid";
+				$query = "SELECT cgiv.group_id, cgiv.id, scgi.type, cgiv.keyid, cgiv.value " .
+					   "FROM s_config_group_item_var cgiv, s_config_group_item scgi " .
+					   "WHERE cgiv.group_id = scgi.group_id AND cgiv.id = scgi.id AND " .
+					   " (scgi.type = 'array' OR cgiv.keyid = scgi.keyid) AND " . "cgiv.group_id = '$group' " .
+					   "ORDER BY cgiv.id, cgiv.keyid";
 			}
 		} else {
 			// invalid parameters provided
 			return NULL;
 		}
 		
-		$results = db_query ( $query );
+		$results = db_query( $query );
 		if ($results) {
-			if (db_num_rows ( $results ) > 0) {
+			if (db_num_rows( $results ) > 0) {
 				$results_r = NULL;
 				$tmp_vars_r = NULL;
 				$current_id = NULL;
 				$current_type = NULL;
-				
-				while ( $config_var_r = db_fetch_assoc ( $results ) ) {
+
+				while ( $config_var_r = db_fetch_assoc( $results ) ) {
 					// first time through loop
 					if ($current_id == NULL) {
-						$current_id = $config_var_r ['id'];
-						$current_type = $config_var_r ['type'];
-					} else if ($current_id !== $config_var_r ['id']) {	// end of id, so process
-						$results_r [$current_id] = get_db_config_var ( $current_type, $tmp_vars_r, $group, $id, $keyid );
-						
-						$current_id = $config_var_r ['id'];
-						$current_type = $config_var_r ['type'];
-						
+						$current_id = $config_var_r['id'];
+						$current_type = $config_var_r['type'];
+					} else if ($current_id !== $config_var_r['id']) {
+						// end of id, so process
+						$results_r[$current_id] = get_db_config_var(
+							$current_type, $tmp_vars_r, $group, $id, $keyid
+						);
+
+						$current_id = $config_var_r['id'];
+						$current_type = $config_var_r['type'];
+
 						// reset
 						$tmp_vars_r = NULL;
 					}
-					
-					$tmp_vars_r [$config_var_r ['keyid']] = $config_var_r ['value'];
+
+					$tmp_vars_r[$config_var_r['keyid']] = $config_var_r['value'];
 				}
-				db_free_result ( $results );
-				
-				$results_r [$current_id] = get_db_config_var ( $current_type, $tmp_vars_r, $group, $id, $keyid );
-				
+				db_free_result( $results );
+
+				$results_r[$current_id] = get_db_config_var(
+					$current_type, $tmp_vars_r, $group, $id, $keyid
+				);
+
 				if ($id != NULL)
-					return $results_r [$current_id];
+					return $results_r[$current_id];
 					// 				else
 					return $results_r;
 			} else {			//if(db_num_rows($results)>0)
@@ -225,48 +245,45 @@ function get_db_config_var($type, $vars_r, $group, $id, $keyid) {
 		if ($type == 'boolean') {
 			$boolean_vars_r = NULL;
 			reset ( $vars_r );
-			while ( list ( $key, $value ) = each ( $vars_r ) ) {
+			foreach ($vars_r as $key=>$value) {
 				if ($value == 'TRUE')
-					$boolean_vars_r [$key] = TRUE;
+					$boolean_vars_r[$key] = TRUE;
 				else //if($value == 'FALSE')
-					$boolean_vars_r [$key] = FALSE;
+					$boolean_vars_r[$key] = FALSE;
 			}
-			
 			return $boolean_vars_r;
-		} else {
-			return $vars_r;
 		}
-	} else {
-		if ($type == 'array') {
-			return $vars_r;
-		} else {
-			reset ( $vars_r );
-			if (list ( $key, $value ) = each ( $vars_r )) {
-				if ($type == 'boolean') {
-					if ($value == 'TRUE') {
-						return TRUE;
-					} else {//if($value == 'FALSE')
-						return FALSE;
-					}
-				} else {
-					// if keyid specified, or key is numeric, then return simple
-					// value, otherwise be helpful and return single element array.
-					if ($keyid != NULL || is_numeric ( $key ))
-						return $value;
-					else {
-						return $vars_r;
-					}
-				}
-			}
-			
-			//else
-			if ($type == 'boolean') {
+		return $vars_r;
+
+	} elseif ($type == 'array') {
+		return $vars_r;
+
+	} elseif (count( $vars_r ) == 1) {
+		$key = key( $vars_r );
+		$value = current( $vars_r );
+
+		if ($type == 'boolean') {
+			if ($value == 'TRUE') {
+				return TRUE;
+			} else {//if($value == 'FALSE')
 				return FALSE;
-			} else {
-				return NULL;
+			}
+		} else {
+			// if keyid specified, or key is numeric, then return simple
+			// value, otherwise be helpful and return single element array.
+			if ($keyid != NULL || is_numeric ( $key ))
+				return $value;
+			else {
+				return $vars_r;
 			}
 		}
 	}
+
+	if ($type == 'boolean') {
+		return FALSE;
+	} else {
+		return NULL;
+	}
 }
 
 /**
@@ -280,4 +297,4 @@ function fetch_title_display_mask_rs($stdm_id) {
 	else
 		return FALSE;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/cssparser/cssparser.php b/lib/cssparser/cssparser.php
index a7eec9b3..b17d22dd 100644
--- a/lib/cssparser/cssparser.php
+++ b/lib/cssparser/cssparser.php
@@ -3,14 +3,12 @@ class cssparser {
 	var $css;
 	var $html;
 
-	function cssparser($html = true) {
-		// Register "destructor"
-		register_shutdown_function(array(&$this, "finalize"));
+	function __construct($html = true) {
 		$this->html = ($html != false);
 		$this->Clear();
 	}
 
-	function finalize() {
+	function __destruct() {
 		unset($this->css);
 	}
 
@@ -103,7 +101,13 @@ function Add($key, $codestr) {
 		if (count($codes) > 0) {
 			foreach ($codes as $code) {
 				$code = trim($code);
-				list($codekey, $codevalue) = explode(":", $code);
+				$v = explode(":", $code);
+				if (count($v) == 2)
+					list($codekey, $codevalue) = $v;
+				else {
+					$codekey = $v[0];
+					$codevalue = "";
+				}
 				if (strlen($codekey) > 0) {
 					$this->css[$key][trim($codekey)] = trim($codevalue);
 				}
diff --git a/lib/database.php b/lib/database.php
index 980dbf11..d65bdc5d 100644
--- a/lib/database.php
+++ b/lib/database.php
@@ -20,22 +20,21 @@
 $_OPENDB_DB_CONNECTED = NULL;
 
 function init_db_connection() {
-	$dbserver_conf_r = get_opendb_config_var ( 'db_server' );
-	if (is_array ( $dbserver_conf_r )) {
-		return db_connect ( $dbserver_conf_r ['host'], $dbserver_conf_r ['username'], $dbserver_conf_r ['passwd'], $dbserver_conf_r ['dbname'],  $dbserver_conf_r ['charset']);
+	$dbserver_conf_r = get_opendb_config_var( 'db_server' );
+	if (is_array( $dbserver_conf_r )) {
+		return db_connect( $dbserver_conf_r['host'], $dbserver_conf_r['username'], $dbserver_conf_r['passwd'], $dbserver_conf_r['dbname'], $dbserver_conf_r['charset']);
 	}
-	
-	//else
+
 	return FALSE;
 }
 
 function is_db_connected() {
 	global $_OPENDB_DB_CONNECTED;
-	
+
 	if (! is_bool ( $_OPENDB_DB_CONNECTED )) {
 		$_OPENDB_DB_CONNECTED = (init_db_connection () !== FALSE);
 	}
-	
+
 	return $_OPENDB_DB_CONNECTED;
 }
 
@@ -179,7 +178,7 @@ function parse_sql_statement($sql, $prefix) {
 			
 			// Reset from clause.
 			$from_clause = '';
-			while ( list ( , $table ) = each ( $array_of_tables ) ) {
+			foreach ($array_of_tables as $table) {
 				if (strlen ( $from_clause ) > 0)
 					$from_clause .= ', ';
 				$from_clause .= $prefix . trim ( $table );
@@ -213,7 +212,7 @@ function parse_sql_statement($sql, $prefix) {
 		$tables_r = explode ( ',', substr ( $sql, 12 ) ); //LOCK TABLES	
 		if (is_array ( $tables_r )) {
 			$query = '';
-			while ( list ( $key, $table ) = each ( $tables_r ) ) {
+			foreach ( $tables_r as  $key => $table ) {
 				if (strlen ( $query ) > 0)
 					$query .= ', ';
 				
@@ -336,4 +335,4 @@ function fetch_opendb_table_list_r() {
 	
 	return $tables;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/database/mysqli.inc.php b/lib/database/mysqli.inc.php
index 1adb77f0..f2e4aec2 100644
--- a/lib/database/mysqli.inc.php
+++ b/lib/database/mysqli.inc.php
@@ -50,10 +50,10 @@ function db_connect($host, $user, $passwd, $dbname, $charset = NULL, $cache_link
 		}
 	}
 
-	if (strlen($socket) > 0) {
+	if (isset($socket)) {
 		$link = @mysqli_connect($host, $user, $passwd, $dbname, NULL, $socket);
 	} else {
-		if (strlen($port) > 0)
+		if (isset($port))
 			$link = @mysqli_connect($host, $user, $passwd, $dbname, $port);
 		else
 			$link = @mysqli_connect($host, $user, $passwd, $dbname);
@@ -163,4 +163,4 @@ function db_num_rows($result) {
 function db_num_fields($result) {
 	return @mysqli_num_fields($result);
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/datetime.php b/lib/datetime.php
index efa47d1e..760b58a1 100644
--- a/lib/datetime.php
+++ b/lib/datetime.php
@@ -109,7 +109,7 @@ function get_localised_timestamp($format_mask, $timestamp = NULL) {
 	
 	// Now expand the mask with the test of the elements.
 	reset ( $php_mask_conversion );
-	while ( list ( $key, $match ) = each ( $php_mask_conversion ) ) {
+	foreach ( $php_mask_conversion as $key => $match ) {
 		$format_mask = str_replace ( $key, adodb_date ( $match, $timestamp ), $format_mask );
 	}
 	
@@ -163,8 +163,8 @@ function tokenize_datetime_or_mask_string($value, $format_tokens = NULL) {
 	
 	$token = '';
 	$tokens = array ();
-	for($i = 0; $i < strlen ( $value ); $i ++) {
-		switch ($value {$i}) {
+	for($i = 0; $i < strlen( $value ); $i ++) {
+		switch ($value[$i]) {
 			case ' ' :
 			case "\t" :
 			case ',' :
@@ -173,29 +173,29 @@ function tokenize_datetime_or_mask_string($value, $format_tokens = NULL) {
 			case '-' :
 			case ':' :
 			case '.' :
-				if (strlen ( $token ) > 0) {
-					$tokens [] = $token;
+				if (strlen( $token ) > 0) {
+					$tokens[] = $token;
 					$token = '';
 				}
-				$tokens [] = $value {$i};
+				$tokens[] = $value[$i];
 				break;
 			
 			default :
 				// based on the format token, we may need to cut the token off,
 				// at a certain point.
-				if (is_array ( $format_tokens )) {
-					if (! is_numeric ( $value {$i} )) {	// all date tokens are numeric
-						if (strlen ( $token ) > 0) {
+				if (is_array( $format_tokens )) {
+					if (! is_numeric( $value[$i] )) {	// all date tokens are numeric
+						if (strlen( $token ) > 0) {
 							$tokens [] = $token;
 							$token = '';
 						}
-						$tokens [] = $value {$i};
+						$tokens [] = $value[$i];
 					} else {
-						$format_token = $format_tokens [count ( $tokens )];
+						$format_token = $format_tokens[count( $tokens )];
 						
-						if (array_search ( $format_token, $datetime_masks_r ) !== FALSE) {
+						if (array_search( $format_token, $datetime_masks_r ) !== FALSE) {
 							if ($format_token == 'YYYY') {
-								if (strlen ( $token ) >= 4) {
+								if (strlen( $token ) >= 4) {
 									$tokens [] = $token;
 									$token = '';
 								}
@@ -204,16 +204,16 @@ function tokenize_datetime_or_mask_string($value, $format_tokens = NULL) {
 								$token = '';
 							}
 							
-							$token .= $value {$i};
+							$token .= $value[$i];
 						}
 					}
 				} else {
-					$token .= $value {$i};
+					$token .= $value[$i];
 					
-					if (array_search ( $token, $datetime_masks_r ) !== FALSE) {
+					if (array_search( $token, $datetime_masks_r ) !== FALSE) {
 						if ($token == 'HH') {
 							// if there is actually a HH24 token, we should ignore this HH one.
-							if (strlen ( $value ) > ($i + 2) && substr ( $value, $i + 1, 2 ) == '24') {
+							if (strlen( $value ) > ($i + 2) && substr ( $value, $i + 1, 2 ) == '24') {
 								break; // break to start of switch again.
 							}
 						}
diff --git a/lib/displayfields.php b/lib/displayfields.php
index ccc9719f..99754859 100644
--- a/lib/displayfields.php
+++ b/lib/displayfields.php
@@ -65,7 +65,7 @@ function get_item_display_field($item_r, $item_attribute_type_r, $value = NULL,
 		
 		if (count ( $values ) > 0) {
 			$display_value_r = array ();
-			while ( list ( , $value ) = each ( $values ) ) {
+			foreach ( $values as $value ) {
 				$value = trim ( $value );
 				$value_format_mask = $format_mask;
 				
@@ -106,7 +106,7 @@ function get_item_display_field($item_r, $item_attribute_type_r, $value = NULL,
 		
 		if (count ( $values ) > 0) {
 			$display_value_r = array ();
-			while ( list ( , $value ) = each ( $values ) ) {
+			foreach ( $values as $value ) {
 				$value = trim ( $value );
 				
 				$timestamp = get_timestamp_for_datetime ( $value, 'YYYYMMDDHH24MISS' );
@@ -141,7 +141,7 @@ function get_item_display_field($item_r, $item_attribute_type_r, $value = NULL,
 		
 		if (count ( $values ) > 0) {
 			$display_value_r = array ();
-			while ( list ( , $value ) = each ( $values ) ) {
+			foreach ( $values as $value ) {
 				$value = trim ( $value );
 				if (is_numeric ( $value )) {
 					// Ensure we have a mask to work with.
@@ -213,7 +213,7 @@ function get_item_display_field($item_r, $item_attribute_type_r, $value = NULL,
 		
 		if (count ( $values ) > 0) {
 			$display_value_r = array ();
-			while ( list ( , $value ) = each ( $values ) ) {
+			foreach ( $values as $value ) {
 				$value = trim ( $value );
 				
 				// no point unless numeric
@@ -326,11 +326,12 @@ function get_item_display_field($item_r, $item_attribute_type_r, $value = NULL,
 		// where extra items that do not have a matching lookup value.
 		if (is_not_empty_array ( $value_array )) {
 			reset ( $value_array );
-			while ( list ( , $value ) = each ( $value_array ) ) {
+			foreach ( $value_array as $value ) {
 				if (strlen ( trim ( $value ) ) > 0) {				// In case there are extra spaces
 					$attribute_value_rs [] = array (
 							'value' => $value,
-							'display' => $value );
+							'display' => $value,
+							'img' => '' );
 				}
 			}
 		}
@@ -389,7 +390,7 @@ function format_multivalue_block($display_value_r, $type) {
 		
 		$first = TRUE;
 		reset ( $display_value_r );
-		while ( list ( , $value ) = each ( $display_value_r ) ) {
+		foreach ( $display_value_r as $value ) {
 			$field .= '<li' . ($first ? ' class="first"' : '') . '>' . $value . '</li>';
 			
 			if ($first)
@@ -406,7 +407,7 @@ function format_lookup_display_block($item_attribute_type_r, $attribute_value_rs
 	$block = '';
 	
 	$first = TRUE;
-	while ( list ( , $attribute_value_r ) = each ( $attribute_value_rs ) ) {
+	foreach ( $attribute_value_rs as $attribute_value_r ) {
 		$display_value = format_lookup_display_field ( $item_attribute_type_r, $attribute_value_r );
 		
 		$block .= '<li' . ($first ? ' class="first"' : '') . '>' . $display_value . '</li>';
@@ -451,7 +452,7 @@ function format_listing_links($value, $item_attribute_type_r, $attr_match) {
 	else
 		$tokens [] = $value;
 	
-	while ( list ( , $token ) = @each ( $tokens ) ) {
+	foreach ( $tokens as $token ) {
 		$token = trim ( $token );
 		$lines [] = format_listing_link ( $token, $token, $item_attribute_type_r, $attr_match );
 	}
@@ -500,7 +501,7 @@ function format_list_from_array($tokens, $item_attribute_type_r, $attr_match = F
 	if (is_not_empty_array ( $tokens )) {
 		$first = TRUE;
 		$value = '';
-		while ( list ( , $token ) = each ( $tokens ) ) {
+		foreach ( $tokens as $token ) {
 			if ($attr_match !== FALSE)
 				$token = format_listing_link ( $token, $token, $item_attribute_type_r, $attr_match );
 			
@@ -536,7 +537,7 @@ function format_display_value($mask, $img, $value, $display, $theme_image_type =
 	if (strlen ( $mask ) == 0)
 		$mask = "%display%";
 		
-		// Note: We are only modifying local copy of $mask for return.
+	// Note: We are only modifying local copy of $mask for return.
 	if (strlen ( trim ( $img ) ) > 0 && $img !== "none") {
 		$image = theme_image ( $img, $display, $theme_image_type );
 		if (strlen ( $image ) > 0)
@@ -563,4 +564,4 @@ function format_display_value($mask, $img, $value, $display, $theme_image_type =
 	
 	return $mask;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/export.php b/lib/export.php
index fc221f81..b6c86ab8 100644
--- a/lib/export.php
+++ b/lib/export.php
@@ -125,7 +125,7 @@ function get_export_plugin_list_r() {
 	
 	$export_type_r = get_export_r ();
 	if (is_array ( $export_type_r )) {
-		while ( list ( , $pluginRef ) = @each ( $export_type_r ) ) {
+		foreach ($export_type_r as $pluginRef) {
 			include_once("./lib/export/" . $pluginRef . ".class.php");
 			$exportPlugin = new $pluginRef ();
 			if ($exportPlugin !== NULL) {
@@ -143,4 +143,4 @@ function get_export_plugin_list_r() {
 	
 	return $pluginList;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/export/CSVExportPlugin.class.php b/lib/export/CSVExportPlugin.class.php
index c3670304..088d944c 100644
--- a/lib/export/CSVExportPlugin.class.php
+++ b/lib/export/CSVExportPlugin.class.php
@@ -19,9 +19,6 @@
  */
 
 class CSVExportPlugin {
-	function CSVExportPlugin() {
-	}
-
 	/*
 	 * The content type, when saved as file.
 	 */
@@ -47,7 +44,7 @@ function get_plugin_type() {
 	function prompt_header($columns) {
 		$buffer = "";
 
-		while (list(, $column) = each($columns)) {
+		foreach ($columns as $column) {
 			if (strlen($buffer) > 0)
 				$buffer .= ",$column";
 			else
@@ -60,7 +57,7 @@ function item_row($columns) {
 		$buffer = "";
 
 		$isFirst = TRUE;
-		while (list(, $column) = each($columns)) {
+		foreach ($columns as $column) {
 			if (is_array($column)) {
 				$colval = '';
 				for ($i = 0; $i < count($column); $i++) {
diff --git a/lib/export/MARCExportPlugin.class.php b/lib/export/MARCExportPlugin.class.php
index 6b83bf16..ddbcbc56 100644
--- a/lib/export/MARCExportPlugin.class.php
+++ b/lib/export/MARCExportPlugin.class.php
@@ -36,9 +36,6 @@ class MARCExportPlugin {
     var $_data;
     var $_file_title;
 
-    function MARCExportPlugin() {
-    }
-
     /*
      * The content type, when saved as file.
      */
diff --git a/lib/export/OpenDbExportPlugin.class.php b/lib/export/OpenDbExportPlugin.class.php
index cff2c792..f0d406ad 100644
--- a/lib/export/OpenDbExportPlugin.class.php
+++ b/lib/export/OpenDbExportPlugin.class.php
@@ -21,9 +21,6 @@
 class OpenDbExportPlugin {
 	var $_level = 1;
 
-	function OpenDbExportPlugin() {
-	}
-
 	/*
 	 * The content type, when saved as file.
 	 */
diff --git a/lib/export/XMMMovieDatabasePlugin.class.php b/lib/export/XMMMovieDatabasePlugin.class.php
index 0482cba8..c1784ab3 100644
--- a/lib/export/XMMMovieDatabasePlugin.class.php
+++ b/lib/export/XMMMovieDatabasePlugin.class.php
@@ -48,7 +48,7 @@ class XMMMovieDatabasePlugin {
 	 * @param $isZip Allows disabling of ZIP function mostly just for testing.
 	 * @param $includeParent Include parent items that have related items.
 	 */
-	function XMMMovieDatabasePlugin($isZip = TRUE, $includeParent = FALSE) {
+	function __construct($isZip = TRUE, $includeParent = FALSE) {
 		$this->isZip = $isZip;
 		$this->includeParent = $includeParent;
 
@@ -147,7 +147,7 @@ function end_item() {
 		//$actorsFound = FALSE;
 
 		reset($this->attribute_rs);
-		while (list($type, $value) = each($this->attribute_rs)) {
+		foreach ($this->attribute_rs as $type => $value) {
 			if ($type == 'Cover') {
 				$file = $this->get_cached_image($value);
 
@@ -197,7 +197,7 @@ function get_cached_image($url) {
 
 	function print_multi_attribute($plural, $singular, $values) {
 		$this->itemBuffer .= "\n\t\t<$plural>";
-		while (list(, $value) = each($values)) {
+		foreach ($values as $value) {
 			$this->itemBuffer .= "\n\t\t\t<$singular>" . $this->encode($value) . "</$singular>";
 		}
 		$this->itemBuffer .= "\n\t\t</$plural>";
@@ -296,4 +296,4 @@ function encode($str) {
                           @"War", @"Western"
  */
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/filecache.php b/lib/filecache.php
index edd6cedc..c56a9b4c 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -249,9 +249,11 @@ function file_cache_get_image_r($url, $type) {
 			}
 		}
 		
-		if (! is_numeric ( $file_r ['thumbnail'] ['width'] ) && ! is_numeric ( $file_r ['thumbnail'] ['height'] )) {
-			$file_r ['thumbnail'] ['width'] = $thumbnail_size_r ['width'];
-			$file_r ['thumbnail'] ['height'] = $thumbnail_size_r ['height'];
+		if (! is_numeric ( $file_r['thumbnail']['width'] ?? '' ) && ! is_numeric ( $file_r['thumbnail']['height'] ?? '' )) {
+			if (isset($thumbnail_size_r ['width']))
+				$file_r ['thumbnail'] ['width'] = $thumbnail_size_r ['width'];
+			if (isset($thumbnail_size_r ['height']))
+				$file_r ['thumbnail'] ['height'] = $thumbnail_size_r ['height'];
 		}
 		
 		return $file_r;
@@ -888,7 +890,7 @@ function delete_file_cache($file_cache_r) {
 function delete_file_cache_rs($file_cache_rs) {
 	$count = 0;
 	reset ( $file_cache_rs );
-	while ( list ( , $file_cache_r ) = each ( $file_cache_rs ) ) {
+	foreach ( $file_cache_rs as $file_cache_r ) {
 		if (delete_file_cache ( $file_cache_r ) !== FALSE) {
 			$count ++;
 		}
@@ -968,4 +970,4 @@ function file_cache_delete_orphan_item_cache() {
 		db_free_result ( $results );
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/http.php b/lib/http.php
index 8950de5f..24639002 100644
--- a/lib/http.php
+++ b/lib/http.php
@@ -73,12 +73,12 @@ function opendb_redirect($link) {
 				$link,
 				$url ) );
 		
-		header ( 'Location: ' . $url );
+		header( 'Location: ' . $url );
 	} else {
 		opendb_logger ( OPENDB_LOG_INFO, __FILE__, __FUNCTION__, NULL, array (
 				$link ) );
 		
-		header ( "Location: $link" );
+		header( 'Location: ' . $link );
 	}
 }
 
@@ -110,10 +110,7 @@ function is_register_globals_enabled() {
 	version independant manner.
 */
 function get_http_env($envname) {
-	// supposedly not required
-	global $_SERVER;
-	
-	return $_SERVER [$envname];
+	return $_SERVER[$envname];
 }
 
 /**
@@ -210,7 +207,7 @@ function get_url_string($http_vars, $extra_vars_r = NULL, $exclude_keys_r = NULL
 		$http_vars = $extra_vars_r;
 	
 	@reset ( $http_vars );
-	while ( list ( $key, $value ) = @each ( $http_vars ) ) {
+	foreach ( $http_vars as $key => $value ) {
 		if (! is_array ( $exclude_keys_r ) || ! in_array ( $key, $exclude_keys_r )) {
 			$url = _get_url_string ( $url, $key, $value );
 		}
@@ -221,7 +218,7 @@ function get_url_string($http_vars, $extra_vars_r = NULL, $exclude_keys_r = NULL
 
 function _get_url_string($url, $key, $value) {
 	if (is_array ( $value )) {
-		while ( list ( $akey, $avalue ) = each ( $value ) ) {
+		foreach ( $value as $akey => $avalue ) {
 			if (is_numeric ( $akey ))
 				$url = _get_url_string ( $url, $key . '[]', $avalue );
 			else
@@ -252,7 +249,7 @@ function get_url_fields($http_vars, $extra_vars_r = NULL, $exclude_keys_r = NULL
 		$http_vars = $extra_vars_r;
 	
 	@reset ( $http_vars );
-	while ( list ( $key, $value ) = @each ( $http_vars ) ) {
+	foreach ( $http_vars as $key => $value ) {
 		if (! is_array ( $exclude_keys_r ) || ! in_array ( $key, $exclude_keys_r )) {
 			$fields .= _get_url_field ( $key, $value );
 		}
@@ -263,7 +260,7 @@ function get_url_fields($http_vars, $extra_vars_r = NULL, $exclude_keys_r = NULL
 function _get_url_field($key, $value) {
 	$fields = '';
 	if (is_array ( $value )) {
-		while ( list ( $akey, $avalue ) = each ( $value ) ) {
+		foreach ( $value as $akey => $avalue ) {
 			if (is_numeric ( $akey ))
 				$fields .= _get_url_field ( $key . '[]', $avalue );
 			else
diff --git a/lib/inputfields.php b/lib/inputfields.php
index 2dfd8b27..cd0182ae 100644
--- a/lib/inputfields.php
+++ b/lib/inputfields.php
@@ -43,11 +43,11 @@ function get_input_field($fieldname, $s_attribute_type, $prompt, $input_type, $c
 			'order_no' => NULL,
 			'prompt' => $prompt,
 			'input_type' => $input_type_def ['type'],
-			'input_type_arg1' => $input_type_def ['args'] [0],
-			'input_type_arg2' => $input_type_def ['args'] [1],
-			'input_type_arg3' => $input_type_def ['args'] [2],
-			'input_type_arg4' => $input_type_def ['args'] [3],
-			'input_type_arg5' => $input_type_def ['args'] [4],
+			'input_type_arg1' => $input_type_def ['args'] [0] ?? "",
+			'input_type_arg2' => $input_type_def ['args'] [1] ?? "",
+			'input_type_arg3' => $input_type_def ['args'] [2] ?? "",
+			'input_type_arg4' => $input_type_def ['args'] [3] ?? "",
+			'input_type_arg5' => $input_type_def ['args'] [4] ?? "",
 			'compulsory_ind' => $compulsory_ind ), NULL, 	// $item_r
 $value, $dowrap, $prompt_mask, $onchange_event, $disabled );
 }
@@ -68,7 +68,7 @@ function get_item_input_field($fieldname, $item_attribute_type_r, $item_r, $valu
 		$widget ['args'] [4] = $item_attribute_type_r ['input_type_arg5'];
 	}
 	
-	if ($item_attribute_type_r ['multi_attribute_ind'] == 'Y') {
+	if (isset($item_attribute_type_r ['multi_attribute_ind']) && $item_attribute_type_r ['multi_attribute_ind'] == 'Y') {
 		$multi_value = TRUE;
 		
 		if (! is_array ( $value )) {
@@ -715,7 +715,7 @@ function url($name, $item_r, $item_attribute_type_r, $prompt, $length, $maxlengt
 		$onchange = "onchange=\"$onchange_event\"";
 	}
 	
-	if ($item_attribute_type_r ['file_attribute_ind'] == 'Y') {
+	if (isset($item_attribute_type_r ['file_attribute_ind']) && $item_attribute_type_r ['file_attribute_ind'] == 'Y') {
 		$field .= "\n<ul class=\"urlOptionsMenu\" id=\"${name}-tab-menu\" class=\"file-upload-menu\">";
 		$field .= "<li id=\"menu-${name}_saveurl\" class=\"activeTab\" onclick=\"return activateTab('${name}_saveurl', '${name}-tab-menu', '${name}-tab-content', 'activeTab', 'fieldContent');\">URL</li>";
 		if (is_file_upload_enabled ()) {
@@ -751,7 +751,7 @@ function value_radio_grid($name, $lookup_rs, $value, $disabled = FALSE) {
 	$field = "<ul class=\"radioGridOptionsVertical\">";
 	
 	$is_checked = FALSE;
-	while ( list ( , $val ) = each ( $lookup_rs ) ) {
+	foreach ( $lookup_rs as $val ) {
 		if ((strlen ( $value ) > 0 && strcasecmp ( trim ( $value ), $val ) === 0) || (strlen ( $value ) == 0 && ! $is_checked)) {
 			$field .= "\n<li><input type=\"radio\" class=\"radio\" name=\"$name\" value=\"$val\" CHECKED" . ($disabled ? ' DISABLED' : '') . ">$val</li>";
 			$is_checked = TRUE;
@@ -831,7 +831,7 @@ function radio_grid($name, $lookup_results, $mask, $orientation, $value, $disabl
 	$buffer = "<ul class=\"$class\">";
 	
 	reset ( $lookup_val_rs );
-	while ( list ( , $lookup_val_r ) = each ( $lookup_val_rs ) ) {
+	foreach ( $lookup_val_rs as $lookup_val_r ) {
 		$buffer .= "\n<li><input type=\"radio\" class=\"radio\" name=\"$name\" value=\"" . $lookup_val_r ['value'] . "\"" . ($lookup_val_r ['checked_ind'] == 'Y' ? ' CHECKED' : '') . ($disabled ? ' DISABLED' : '') . ">" . format_display_value ( $mask, $lookup_val_r ['img'], $lookup_val_r ['value'], $lookup_val_r ['display'] ) . "</li>";
 	}
 	
@@ -851,7 +851,7 @@ function checkbox_grid($name, $lookup_results, $mask, $orientation, $value, $dis
 	$buffer = "<ul class=\"$class\">";
 	
 	reset ( $lookup_val_rs );
-	while ( list ( , $lookup_val_r ) = each ( $lookup_val_rs ) ) {
+	foreach ( $lookup_val_rs as $lookup_val_r ) {
 		$buffer .= "<li><input type=\"checkbox\" class=\"checkbox\" name=\"" . $name . "[]\" value=\"" . $lookup_val_r ['value'] . "\"" . ($lookup_val_r ['checked_ind'] == 'Y' ? ' CHECKED' : '') . ($disabled ? ' DISABLED' : '') . ">" . format_display_value ( $mask, $lookup_val_r ['img'], $lookup_val_r ['value'], $lookup_val_r ['display'] ) . "</li>";
 	}
 	
@@ -871,7 +871,7 @@ function single_select($name, $lookup_results, $mask, $length, $value, $onchange
 	$var = "\n<select " . ($id != NULL ? "id=\"$id\"" : "") . " name=\"$name\" $onchange" . ($disabled ? ' DISABLED' : '') . ">";
 	
 	reset ( $lookup_val_rs );
-	while ( list ( , $lookup_val_r ) = each ( $lookup_val_rs ) ) {
+	foreach ( $lookup_val_rs as $lookup_val_r ) {
 		// Now get the display value.
 		$display = format_display_value ( $mask, NULL, $lookup_val_r ['value'], $lookup_val_r ['display'] );
 		
@@ -880,7 +880,7 @@ function single_select($name, $lookup_results, $mask, $length, $value, $onchange
 			$display = substr ( $display, 0, $length );
 		}
 		
-		$var .= "\n<option value=\"" . $lookup_val_r ['value'] . "\"" . ($lookup_val_r ['checked_ind'] == 'Y' ? ' SELECTED' : '') . ">$display";
+		$var .= "\n<option value=\"" . $lookup_val_r['value'] . "\"" . (($lookup_val_r['checked_ind'] ?? '') == 'Y' ? ' SELECTED' : '') . ">$display";
 	}
 	
 	$var .= "\n</select>";
@@ -901,7 +901,7 @@ function multi_select($name, $lookup_results, $mask, $length, $size, $value, $on
 	$lookup_val_rs = process_lookup_results ( $lookup_results, $value );
 	
 	reset ( $lookup_val_rs );
-	while ( list ( , $lookup_val_r ) = each ( $lookup_val_rs ) ) {
+	foreach ( $lookup_val_rs as $lookup_val_r ) {
 		// Now get the display value.
 		$display = format_display_value ( $mask, NULL, $lookup_val_r ['value'], $lookup_val_r ['display'] );
 		
@@ -927,8 +927,8 @@ function value_select($name, $values_r, $size, $value, $onchange_event = NULL, $
 		$var = "\n<select multiple name=\"" . $name . "[]\" size=\"$size\" $onchange" . ($disabled ? ' DISABLED' : '') . ">";
 	else
 		$var = "\n<select name=\"$name\" $onchange" . ($disabled ? ' DISABLED' : '') . ">";
-	
-	while ( list ( , $val ) = @each ( $values_r ) ) {
+
+	foreach ( $values_r as $val ) {
 		if ($value !== NULL && strcasecmp ( trim ( $value ), $val ) === 0)
 			$var .= "\n<option value=\"$val\" SELECTED>$val";
 		else
@@ -951,7 +951,7 @@ function process_lookup_results($lookup_results, $value) {
 	$lookup_rs = fetch_results_array ( $lookup_results );
 	
 	$value_found = FALSE;
-	while ( list ( , $lookup_r ) = each ( $lookup_rs ) ) {
+	foreach ( $lookup_rs as $lookup_r ) {
 		if (is_array ( $values_r ) && ($lookup_key = array_search2 ( $lookup_r ['value'], $values_r, TRUE )) !== FALSE) {
 			$value_found = TRUE;
 			break;
@@ -961,7 +961,7 @@ function process_lookup_results($lookup_results, $value) {
 	$lookup_val_rs = array ();
 	
 	reset ( $lookup_rs );
-	while ( list ( , $lookup_r ) = each ( $lookup_rs ) ) {
+	foreach ( $lookup_rs as $lookup_r ) {
 		if ($value_found) {
 			$lookup_r ['checked_ind'] = 'N';
 		}
@@ -979,7 +979,7 @@ function process_lookup_results($lookup_results, $value) {
 	if (is_array ( $values_r )) {
 		// Add the value to the list of options and select it.
 		reset ( $values_r );
-		while ( list ( , $value ) = each ( $values_r ) ) {
+		foreach ( $values_r as $value ) {
 			if (strlen ( $value ) > 0) {
 				$lookup_val_rs [] = array (
 						'value' => $value,
@@ -990,4 +990,4 @@ function process_lookup_results($lookup_results, $value) {
 	
 	return $lookup_val_rs;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/install.php b/lib/install.php
index bdcb04ff..f11f9c35 100755
--- a/lib/install.php
+++ b/lib/install.php
@@ -58,14 +58,14 @@ function get_opendb_table_column_collation_mismatches(&$table_colation_mismatch,
 	
 	if (strlen ( $default_collation ) > 0) {
 		reset ( $table_collations_r );
-		while ( list ( $table, $collation ) = each ( $table_collations_r ) ) {
+		foreach ( $table_collations_r as $table => $collation ) {
 			if (strlen ( $collation ) > 0 && $collation != $default_collation) {
 				$table_colation_mismatch [$table] = $collation;
 			}
 		}
 		
-		while ( list ( $table, $columns_r ) = each ( $table_column_collations_r ) ) {
-			while ( list ( $column, $collation ) = each ( $columns_r ) ) {
+		foreach ( $table_column_collations_r as $table => $columns_r ) {
+			foreach ( $columns_r as $column => $collation ) {
 				if (strlen ( $collation ) > 0 && $collation != $default_collation) {
 					$table_column_colation_mismatch [$table] [$column] = $collation;
 				}
@@ -117,7 +117,7 @@ function fetch_opendb_table_column_collations(&$table_collations_r, &$table_colu
 	$collation_spread = array ();
 	
 	reset ( $table_r );
-	while ( list ( , $table ) = each ( $table_r ) ) {
+	foreach ( $table_r as $table ) {
 		$query = "SHOW TABLE STATUS LIKE '$table'";
 		
 		$result = db_query ( $query );
@@ -146,8 +146,8 @@ function fetch_opendb_table_column_collations(&$table_collations_r, &$table_colu
 	
 	$prevalent_colation = NULL;
 	$colation_highest_count = NULL;
-	
-	while ( list ( $collation, $count ) = each ( $collation_spread ) ) {
+
+	foreach ( $collation_spread as $collation => $count ) {
 		if (! is_numeric ( $colation_highest_count ) || $count > $colation_highest_count) {
 			$prevalent_colation = $collation;
 			$colation_highest_count = $count;
@@ -347,7 +347,7 @@ function exec_install_sql($sqltext, &$errors) {
 	split_sql_file ( $sqltext, $queries );
 	
 	$return_val = TRUE;
-	while ( list ( , $sql ) = each ( $queries ) ) {
+	foreach ( $queries as $sql ) {
 		if (! exec_install_sql_statement ( $sql, $error )) {
 			$return_val = FALSE;
 			$errors [] = $error;
@@ -552,7 +552,7 @@ function install_filter_opendb_tables($tables_r, $table_prefix = NULL) {
 			$table_prefix = '';
 		
 		$opendb_table_list_r = fetch_opendb_table_list_r ();
-		while ( list ( , $table ) = each ( $opendb_table_list_r ) ) {
+		foreach ( $opendb_table_list_r as $table ) {
 			if ($table != 's_opendb_release') {
 				if (array_search ( $table_prefix . $table, $tables_r ) !== FALSE) {
 					$opendb_table_r [] = $table;
@@ -625,10 +625,10 @@ function install_determine_db_prefixes($db_tables_r) {
 	$prefixes = array ();
 	
 	$opendb_table_list_r = fetch_opendb_table_list_r ();
-	while ( list ( , $odb_table ) = each ( $opendb_table_list_r ) ) {
+	foreach ( $opendb_table_list_r as $odb_table ) {
 		reset ( $db_tables_r );
-		
-		while ( list ( , $table ) = each ( $db_tables_r ) ) {
+
+		foreach ( $db_tables_r as $table ) {
 			if (preg_match ( "/^(.+)" . preg_quote ( $odb_table ) . "$/", $table, $matches )) {
 				// exclude prefix match for tables that end in _item
 				if ($odb_table == 'item' && ends_with ( $table, '_item' )) {
@@ -655,7 +655,7 @@ function is_opendb_partially_installed() {
 	$table_list_r = fetch_opendb_table_list_r ();
 	
 	reset ( $table_list_r );
-	while ( list ( , $table ) = each ( $table_list_r ) ) {
+	foreach ( $table_list_r as $table ) {
 		// ignore release table
 		if ($table != 's_opendb_release') {
 			if (check_opendb_table ( $table )) {
@@ -908,4 +908,4 @@ function update_opendb_release_step($release_version, $step, $step_part = NULL)
 		return FALSE;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/item.php b/lib/item.php
index 6f22e5ed..f7ba8b82 100644
--- a/lib/item.php
+++ b/lib/item.php
@@ -206,12 +206,12 @@ function fetch_owner_item_cnt($owner_id, $s_item_type = NULL) {
 */
 function fetch_owner_s_status_type_item_cnt($owner_id, $s_status_type) {
 	$query = "SELECT count(ii.item_id) as count " . "FROM item_instance ii, s_status_type sst, item i " . "WHERE i.id = ii.item_id AND sst.s_status_type = ii.s_status_type AND ii.owner_id='" . $owner_id . "' AND ii.s_status_type = '$s_status_type' ";
-	
+
 	// no need for such a restriction if current user is item admin
 	if (! is_user_granted_permission ( PERM_ITEM_ADMIN )) {
 		$query .= " AND ( sst.hidden_ind = 'N' OR ii.owner_id = '" . get_opendb_session_var ( 'user_id' ) . "') ";
 	}
-	
+
 	$result = db_query ( $query );
 	if ($result && db_num_rows ( $result ) > 0) {
 		$found = db_fetch_assoc ( $result );
@@ -600,6 +600,8 @@ function is_exists_item_instance_with_owner_and_status($item_id, $s_status_type,
 	Checks if the underlying item record actually exists or not.
 */
 function is_exists_item($item_id) {
+	if (!isset($item_id))
+		return FALSE;
 	$query = "SELECT 'x' FROM item WHERE id = '$item_id'";
 	
 	$result = db_query ( $query );
@@ -695,7 +697,7 @@ function fetch_item_listing_cnt($HTTP_VARS, $column_display_config_rs = NULL) {
 	@param	$index is the LIMIT value to apply.
 */
 function fetch_item_listing_rs($HTTP_VARS, $column_display_config_rs, $order_by, $sortorder, $start_index = NULL, $items_per_page = NULL) {
-	$query .= 'SELECT DISTINCT i.id AS item_id, ii.instance_no, ii.s_status_type, ii.status_comment, ii.owner_id, ii.borrow_duration, i.s_item_type, i.title, UNIX_TIMESTAMP(ii.update_on) AS update_on';
+	$query = 'SELECT DISTINCT i.id AS item_id, ii.instance_no, ii.s_status_type, ii.status_comment, ii.owner_id, ii.borrow_duration, i.s_item_type, i.title, UNIX_TIMESTAMP(ii.update_on) AS update_on';
 	
 	$column_order_by_rs = array ();
 	
@@ -757,8 +759,8 @@ function fetch_item_listing_rs($HTTP_VARS, $column_display_config_rs, $order_by,
 	
 	if (count ( $column_order_by_rs ) > 0) {
 		$orderbyquery = '';
-		
-		while ( list ( , $column_order_by_r ) = each ( $column_order_by_rs ) ) {
+
+		foreach ( $column_order_by_rs as $column_order_by_r ) {
 			if (strlen ( $orderbyquery ) > 0) {
 				$orderbyquery .= ', ';
 			}
@@ -822,84 +824,94 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	$from_r [] = 'item_instance ii';
 	
 	$where_r [] = 'ii.item_id = i.id'; // only parent items should ever be listed.
+	$query = "";
 	
 
 	//
 	// Owner restriction
 	//
-	if (strlen ( $HTTP_VARS ['owner_id'] ) > 0)
+	if (isset( $HTTP_VARS ['owner_id'] ))
 		$where_r [] = 'ii.owner_id = \'' . $HTTP_VARS ['owner_id'] . '\'';
-	else if (strlen ( $HTTP_VARS ['not_owner_id'] ) > 0) //For not showing current user items.
+	else if (isset( $HTTP_VARS ['not_owner_id'] )) //For not showing current user items.
 		$where_r [] = 'ii.owner_id <> \'' . $HTTP_VARS ['not_owner_id'] . '\'';
-		
-		//
-		// Item Type / Item Type group restriction
-		//
-	if (! is_array ( $HTTP_VARS ['s_item_type'] ) && strlen ( $HTTP_VARS ['s_item_type'] ) > 0) {
+
+	//
+	// Item Type / Item Type group restriction
+	//
+	if (isset($HTTP_VARS['s_item_type']) &&
+		!is_array( $HTTP_VARS['s_item_type'] ) &&
+		strlen( $HTTP_VARS['s_item_type'] ) > 0)
+	{
 		$where_r [] = 'i.s_item_type = \'' . $HTTP_VARS ['s_item_type'] . '\'';
-	} else if (strlen ( $HTTP_VARS ['s_item_type_group'] ) > 0) {
+	} else if (isset( $HTTP_VARS ['s_item_type_group'] )) {
 		$from_r [] = 's_item_type_group_rltshp sitgr';
 		$where_r [] = 'sitgr.s_item_type = i.s_item_type';
 		$where_r [] = 'sitgr.s_item_type_group = \'' . $HTTP_VARS ['s_item_type_group'] . '\'';
-	} else if (is_not_empty_array ( $HTTP_VARS ['s_item_type'] )) {
+	} else if (isset( $HTTP_VARS['s_item_type'] ) &&
+			   is_not_empty_array( $HTTP_VARS['s_item_type'] )) {
 		$where_r [] = 'i.s_item_type IN(' . format_sql_in_clause ( $HTTP_VARS ['s_item_type'] ) . ')';
 	}
-	
+
 	$from_r [] = 's_status_type sst';
 	$where_r [] = 'sst.s_status_type = ii.s_status_type';
-	
+
 	//
 	// Status Type restriction
 	//
-	if (is_not_empty_array ( $HTTP_VARS ['s_status_type'] )) {
+	if (isset( $HTTP_VARS['s_status_type'] ) &&
+		is_not_empty_array ( $HTTP_VARS['s_status_type'] )) {
 		$where_r [] = 'sst.s_status_type IN(' . format_sql_in_clause ( $HTTP_VARS ['s_status_type'] ) . ')';
-	} else if ($HTTP_VARS ['s_status_type'] != 'ALL' && strlen ( $HTTP_VARS ['s_status_type'] ) > 0) {
+	} else if (isset( $HTTP_VARS ['s_status_type'] ) &&
+			   $HTTP_VARS ['s_status_type'] != 'ALL' ) {
 		$where_r [] = 'sst.s_status_type = \'' . $HTTP_VARS ['s_status_type'] . '\'';
 	}
-	
+
 	// no need for such a restriction if current user is item admin
-	if (! is_user_granted_permission ( PERM_ITEM_ADMIN )) {
+	if (! is_user_granted_permission( PERM_ITEM_ADMIN )) {
 		$where_r [] = "( sst.hidden_ind = 'N' OR ii.owner_id = '" . get_opendb_session_var ( 'user_id' ) . "') ";
 	}
-	
+
 	//
 	// User and Status type restriction
 	//
-	if (strcmp ( $HTTP_VARS ['owner_id'], get_opendb_session_var ( 'user_id' ) ) !== 0) {	// not current user
+	if (isset($HTTP_VARS['owner_id']) &&
+		strcmp( $HTTP_VARS['owner_id'], get_opendb_session_var( 'user_id' ) ) !== 0) {	// not current user
 		$from_r [] = 'user u';
 		$where_r [] = 'u.user_id = ii.owner_id';
 		$where_r [] = 'u.active_ind = \'Y\'';
 	}
-	
+
 	//
 	// Status Comment restriction
 	//
-	if (strlen ( $HTTP_VARS ['status_comment'] ) > 0) {
+	if (isset( $HTTP_VARS['status_comment'] )) {
 		// Escape only the single quote!
-		$HTTP_VARS ['status_comment'] = str_replace ( "'", "\\'", $HTTP_VARS ['status_comment'] );
-		
-		if ($HTTP_VARS ['status_comment_match'] != 'exact') {
+		$HTTP_VARS['status_comment'] = str_replace( "'", "\\'", $HTTP_VARS['status_comment'] );
+
+		if ($HTTP_VARS['status_comment_match'] != 'exact') {
 			$parser = new BooleanParser ();
 			$statements = $parser->parseBooleanStatement ( $HTTP_VARS ['status_comment'] );
 			if (is_array ( $statements )) {
-				$where_r [] = build_boolean_clause ( $statements, 'ii.status_comment', $HTTP_VARS ['status_comment_match'], 'AND', $HTTP_VARS ['status_comment_case'] );
+				$where_r [] = build_boolean_clause ( $statements, 'ii.status_comment',
+													 $HTTP_VARS['status_comment_match'], 'AND',
+													 $HTTP_VARS['status_comment_case'] );
 			}
 		} else {
-			if (is_null ( $HTTP_VARS ['status_comment_case'] )) {
-				$where_r [] = 'ii.status_comment = \'' . $HTTP_VARS ['status_comment'] . '\'';
+			if (is_null( $HTTP_VARS['status_comment_case'] )) {
+				$where_r[] = 'ii.status_comment = \'' . $HTTP_VARS['status_comment'] . '\'';
 			} else {
-				$where_r [] = 'BINARY ii.status_comment = \'' . $HTTP_VARS ['status_comment'] . '\'';
+				$where_r[] = 'BINARY ii.status_comment = \'' . $HTTP_VARS['status_comment'] . '\'';
 			}
 		}
 	}
-	
+
 	//
 	// Title restriction
 	//
-	if (strlen ( $HTTP_VARS ['title'] ) > 0) {
+	if (isset( $HTTP_VARS ['title'] )) {
 		// Escape only the single quote!
 		$HTTP_VARS ['title'] = str_replace ( "'", "\\'", $HTTP_VARS ['title'] );
-		
+
 		if ($HTTP_VARS ['title_match'] != 'exact') {
 			$parser = new BooleanParser ();
 			$statements = $parser->parseBooleanStatement ( $HTTP_VARS ['title'] );
@@ -913,19 +925,20 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 				$where_r [] = 'BINARY i.title = \'' . $HTTP_VARS ['title'] . '\'';
 			}
 		}
-	} else if (strlen ( $HTTP_VARS ['letter'] ) > 0) {
+	}
+	if (strlen ( $HTTP_VARS ['letter'] ?? '' ) > 0) {
 		// Numeric match.
 		if ($HTTP_VARS ['letter'] == '#')
 			$where_r [] = 'ASCII(LEFT(title,1)) BETWEEN ASCII(\'0\') AND ASCII(\'9\')';
 		else
 			$where_r [] = 'UPPER(LEFT(i.title,1)) = \'' . strtoupper ( $HTTP_VARS ['letter'] ) . '\'';
 	}
-	
+
 	//
 	// Last Updated support
 	//
-	if (strlen ( $HTTP_VARS ['update_on'] ) > 0) {
-		if (strlen ( $HTTP_VARS ['datetimemask'] ) > 0) {
+	if (strlen( $HTTP_VARS ['update_on'] ?? "" ) > 0) {
+		if (strlen( $HTTP_VARS ['datetimemask'] ?? "" ) > 0) {
 			$timestamp = get_timestamp_for_datetime ( $HTTP_VARS ['update_on'], $HTTP_VARS ['datetimemask'] );
 			if ($timestamp !== FALSE) {
 				$where_r [] = 'ii.update_on >= FROM_UNIXTIME(' . $timestamp . ')';
@@ -936,7 +949,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 		} else {
 			$where_r [] = 'ii.update_on >= \'' . $HTTP_VARS ['update_on'] . '\'';
 		}
-	} else if (is_numeric ( $HTTP_VARS ['update_on_days'] )) {	// GIve us all records updated in the last however many days.
+	} else if (is_numeric ( $HTTP_VARS ['update_on_days'] ?? "" )) {	// Give us all records updated in the last however many days.
 		$where_r [] = 'TO_DAYS(ii.update_on) >= (TO_DAYS(now())-' . $HTTP_VARS ['update_on_days'] . ')';
 	}
 	
@@ -1041,16 +1054,19 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	
 	// If attribute_val specified without a attribute_type, then do a loose join to item_attribute table,
 	// only on attribute_val column.
-	if (strlen ( $HTTP_VARS ['attribute_type'] ) == 0 && (strlen ( $HTTP_VARS ['attribute_val'] ) > 0 || strlen ( $HTTP_VARS ['attr_update_on'] ) > 0 || strlen ( $HTTP_VARS ['attr_update_on_days'] ) > 0)) {
+	if ( strlen ( $HTTP_VARS ['attribute_type'] ?? "" ) == 0 &&
+		 ( strlen ( $HTTP_VARS ['attribute_val'] ?? 0 ) > 0 ||
+		   strlen ( $HTTP_VARS ['attr_update_on'] ?? 0 ) > 0 ||
+		   strlen ( $HTTP_VARS ['attr_update_on_days'] ?? 0 ) > 0)) {
 		$from_r [] = 'item_attribute ia';
 		
 		// now do the where clause.
 		$where_r [] = 'ia.item_id = i.id '; //AND ia.attribute_no = 1';
 		
 
-		if ($HTTP_VARS ['attr_match'] != 'exact') {
+		if ($HTTP_VARS['attr_match'] ?? '' != 'exact') {
 			$parser = new BooleanParser ();
-			$statements = $parser->parseBooleanStatement ( strtoupper ( str_replace ( "'", "\\'", $HTTP_VARS ['attribute_val'] ) ) );
+			$statements = $parser->parseBooleanStatement ( strtoupper ( str_replace ( "'", "\\'", $HTTP_VARS ['attribute_val'] ?? '' ) ) );
 			if (is_array ( $statements )) {
 				if (is_lookup_attribute_type ( $HTTP_VARS ['attribute_type'] )) {
 					$where_r [] = build_boolean_clause ( $statements, 'ia.lookup_attribute_val', 'plain', 'AND', $HTTP_VARS ['attr_case'] );
@@ -1074,7 +1090,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 			}
 		}
 		
-		if (strlen ( $HTTP_VARS ['attr_update_on'] ) > 0) {
+		if (strlen ( $HTTP_VARS ['attr_update_on'] ?? '' ) > 0) {
 			if (strlen ( $HTTP_VARS ['datetimemask'] ) > 0) {
 				$timestamp = get_timestamp_for_datetime ( $HTTP_VARS ['attr_update_on'], $HTTP_VARS ['datetimemask'] );
 				if ($timestamp !== FALSE) {
@@ -1086,7 +1102,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 			} else {
 				$where_r [] = 'ia.update_on >= \'' . $HTTP_VARS ['attr_update_on'] . '\'';
 			}
-		} else if (is_numeric ( $HTTP_VARS ['attr_update_on_days'] )) {		// GIve us all records updated in the last however many days.
+		} else if (is_numeric ( $HTTP_VARS ['attr_update_on_days'] ?? '' )) {		// Give us all records updated in the last however many days.
 			$where_r [] = 'TO_DAYS(ia.update_on) >= (TO_DAYS(now())-' . $HTTP_VARS ['attr_update_on_days'] . ')';
 		}
 	}
@@ -1094,7 +1110,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	// Review restrictions
 	//
-	if (strlen ( $HTTP_VARS ['rating'] ) > 0) {
+	if (strlen ( $HTTP_VARS ['rating'] ?? "" ) > 0) {
 		$where_r [] = 'r.item_id = i.id AND r.rating >= ' . $HTTP_VARS ['rating'];
 		$from_r [] = 'review r';
 	}
@@ -1102,7 +1118,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	// Item ID range restriction (Used by Import script)
 	//
-	if (strlen ( $HTTP_VARS ['item_id_range'] ) > 0) {
+	if (strlen ( $HTTP_VARS ['item_id_range'] ?? "" ) > 0) {
 		$where_r [] = 'i.id IN (' . expand_number_range ( $HTTP_VARS ['item_id_range'] ) . ')';
 	}
 	
@@ -1119,7 +1135,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 		$query .= 'FROM (' . $from_clause . ') ';
 	}
 	
-	if (is_array ( $left_join_from_r )) {
+	if (isset ($left_join_from_r) && is_array ( $left_join_from_r )) {
 		$left_join_from_clause = '';
 		for($i = 0; $i < count ( $left_join_from_r ); $i ++) {
 			if (strlen ( $left_join_from_clause ) > 0)
@@ -1477,7 +1493,7 @@ function insert_item_instance_relationships($item_id, $related_item_id, $related
 	
 	// todo - should this be locked?!
 	if (is_array ( $instance_no_r )) {
-		while ( list ( , $instance_no ) = each ( $instance_no_r ) ) {
+		foreach ($instance_no_r as $instance_no) {
 			insert_item_instance_relationship ( $item_id, $instance_no, $related_item_id, $related_instance_no );
 		}
 	}
@@ -1550,7 +1566,7 @@ function copy_related_item_instance_relationships($item_id, $instance_no) {
 	}
 	
 	if (is_array ( $item_instance_rs )) {
-		while ( list ( , $item_instance_r ) = each ( $item_instance_rs ) ) {
+		foreach ($item_instance_rs as $item_instance_r) {
 			insert_item_instance_relationship ( $item_id, $instance_no, $item_instance_r ['item_id'], $item_instance_r ['instance_no'] );
 		}
 	}
diff --git a/lib/item_attribute.php b/lib/item_attribute.php
index 70422c44..c7ed2e14 100644
--- a/lib/item_attribute.php
+++ b/lib/item_attribute.php
@@ -782,7 +782,7 @@ function _insert_or_update_item_attributes($item_id, $instance_no, $s_item_type,
 			db_query ( "UNLOCK TABLES" );
 			
 			if (is_array ( $file_attributes_rs )) {
-				while ( list ( , $file_attribute_r ) = each ( $file_attributes_rs ) ) {
+				foreach ($file_attributes_rs as $file_attribute_r) {
 					file_cache_insert_file ( $file_attribute_r ['attribute_val'], NULL, NULL, NULL, 'ITEM', $file_attribute_r ['file_attribute_ind'] == 'Y' );
 				}
 			}
diff --git a/lib/item_display.php b/lib/item_display.php
index fa11dd92..7a681044 100644
--- a/lib/item_display.php
+++ b/lib/item_display.php
@@ -79,7 +79,7 @@ function get_site_plugin_links($page_title, $item_r) {
 }
 
 function get_item_review_block($item_r) {
-	$buffer .= "<h3>" . get_opendb_lang_var ( 'review(s)' ) . "</h3>";
+	$buffer = "<h3>" . get_opendb_lang_var ( 'review(s)' ) . "</h3>";
 	
 	$result = fetch_review_rs ( $item_r ['item_id'] );
 	if ($result) {
@@ -521,4 +521,4 @@ function get_related_items_listing($item_r, $HTTP_VARS, $related_mode) {
 		return NULL;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/language.php b/lib/language.php
index a96d17e2..20772bf0 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -150,10 +150,10 @@ function get_opendb_lang_var($varname, $find = NULL, $replace = NULL) {
 	global $LANG_VARS;
 	global $_OPENDB_LANGUAGE;
 	
-	if (strlen ( $LANG_VARS [$varname] ) == 0) {
-		$value = fetch_opendb_db_lang_var ( $_OPENDB_LANGUAGE, $varname );
+	if (!isset($LANG_VARS[$varname]) || strlen( $LANG_VARS[$varname] ) == 0) {
+		$value = fetch_opendb_db_lang_var( $_OPENDB_LANGUAGE, $varname );
 		if ($value !== FALSE) {
-			$LANG_VARS [$varname] = $value;
+			$LANG_VARS[$varname] = $value;
 		} else if (! is_default_language ( $_OPENDB_LANGUAGE )) 		// otherwise get default
 {
 			$value = fetch_opendb_db_lang_var ( fetch_default_language (), $varname );
@@ -168,7 +168,7 @@ function get_opendb_lang_var($varname, $find = NULL, $replace = NULL) {
 		
 		if (is_array ( $find )) {
 			reset ( $find );
-			while ( list ( $key, $value ) = @each ( $find ) ) {
+			foreach ( $find as $key => $value ) {
 				$langval = str_replace ( '{' . $key . '}', $value, $langval );
 			}
 		} else if (strlen ( $find ) > 0 && $replace !== NULL) 		// can replace with empty string.
@@ -277,7 +277,7 @@ function get_system_table_r() {
 	$tables_r = NULL;
 	
 	reset ( $_OPENDB_LANG_SYSTEM_TABLES );
-	while ( list ( $table, ) = each ( $_OPENDB_LANG_SYSTEM_TABLES ) ) {
+	foreach ( $_OPENDB_LANG_SYSTEM_TABLES as $key => $table ) {
 		$tables_r [] = $table;
 	}
 	
diff --git a/lib/libchart/COPYING b/lib/libchart/COPYING
index 2d2d780e..0b52bd88 100644
--- a/lib/libchart/COPYING
+++ b/lib/libchart/COPYING
@@ -1,510 +1,15 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
+Open Source License
+---------------------------------------------------------------------------
+Libchart is distributed under the terms of the GNU GPL v3.
+This includes everything in the source code distribution
+except where otherwise stated.
+A copy of the GNU GPL v3 can be found in doc/GNU_GPL_V3.
+
+Third Party Content
+---------------------------------------------------------------------------
+The following third party software is distributed with Libchart and
+is provided under other licenses and/or has source available from
+other locations. 
+
+Files in the fonts directory are distributed under Dejavu font license.
+A copy of the Dejavu font license can be found in doc/DEJAVU_LICENSE.
diff --git a/lib/libchart/ChangeLog b/lib/libchart/ChangeLog
index fe6e492a..ac608bf2 100644
--- a/lib/libchart/ChangeLog
+++ b/lib/libchart/ChangeLog
@@ -1,6 +1,51 @@
 Libchart ChangeLog
 ==================
-(C) 2005-2006 Jean-Marc Trémeaux
+(C) 2005-2011 Jean-Marc Trémeaux
+
+
+VERSION 1.3: (2011-07-27)
+==========
+  FEATURES:
+    * Customized palette on Horizontal and Vertical Bar charts.
+    * Add an option to turn off text caption on individual data points.
+    * Add an option to disable sorting (preserve data points order).
+    
+  BUGFIXES:
+    * Issue #2: DejaVu Fonts don't include license
+
+VERSION 1.2.2: (2010-10-12)
+==========
+  FEATURES:
+    * Ability to change colors.
+
+  BUGFIXES:
+    * Fix #1 : Pie chart filled with solid color when percentage < 1.
+
+VERSION 1.2.1: (2008-04-10)
+==========
+  BUGFIXES:
+    * Ability to set the upper/lower bounds (regression).
+    * HorizontalBarChart: a small box is shown when x = 0 (regression).
+    * Multiple series charts: when we go over the maximum series count, loop over color.
+    * Multiple series bar chart: brown color is shown twice.
+    * Pie chart : if some relative percentage is null, the whole diagram is filled in by one color.
+    * Ability to use negative values in bar chart.
+
+VERSION 1.2: (2007-08-13)
+==========
+  LICENSE:
+    * Change of license to GPL v3
+
+  FEATURES:
+    * Multiple line charts
+    * Multiple vertical and horizontal bar charts
+    * Customizable layout (plot)
+    
+  REFACTORING:
+    * Support for PHP4 is deprecated, as PHP 4 has reached its end of life.
+    * Use of PHP5 OO constructs
+    * Use of <?php tags for better server compatibility
+    * Better separation of data and presentation objects, introduction of dataset objects
 
 
 VERSION 1.1: (2006-04-02)
diff --git a/lib/libchart/README b/lib/libchart/README
index 0d9500ea..4f0e0107 100644
--- a/lib/libchart/README
+++ b/lib/libchart/README
@@ -12,7 +12,8 @@ Libchart is a free chart creation PHP library, that is easy to use.
 
     * Bar charts (horizontal or vertical).
     * Pie charts.
-    * Compatibility with PHP 4 / PHP 5.
+    * Line charts.
+    * Compatibility with PHP 5.
 
 --------------------------------------------------------------------------------
 
@@ -20,7 +21,7 @@ Libchart is a free chart creation PHP library, that is easy to use.
  Dependencies
 ==============
 
-    * PHP 4 or PHP 5, compiled with:
+    * PHP 5, compiled with:
     * GD 2+
     * FreeType 2+
 
@@ -32,6 +33,7 @@ Libchart is a free chart creation PHP library, that is easy to use.
 
 In order to use Libchart, unpack the archive in you project directory and
 include libchart.php. Please have a look at the demo files for more information.
+You need to chmod 777 the "generated" directory in order to generate the demos.
 There is also a tutorial available at the project homepage.
 
 
diff --git a/lib/libchart/classes/Axis.php b/lib/libchart/classes/Axis.php
deleted file mode 100644
index b1c21601..00000000
--- a/lib/libchart/classes/Axis.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Automatic axis boundaries and ticks calibration
-	*
-	* @author   Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	*/
-
-	class Axis
-	{
-		/**
-		* Creates a new axis formatter
-		*
-		* @access	public
-    		* @param	integer		minimum value on the axis
-    		* @param	integer		maximum value on the axis
-		*/
-		
-		function Axis($min, $max)
-		{
-			$this->min = $min;
-			$this->max = $max;
-
-			$this->guide = 10;
-		}
-
-		/**
-		* Computes value between two ticks
-		*
-		* @access	private
-		*/
-
-		function quantizeTics()
-		{
-			// Approximate number of decades, in [1..10[
-
-			$norm = $this->delta / $this->magnitude;
-
-			// Approximate number of tics per decade
-
-			$posns = $this->guide / $norm;
-
-		    	if ($posns > 20)
-				$tics = 0.05;		// e.g. 0, .05, .10, ...
-			else
-			if ($posns > 10)
-				$tics = 0.2;		// e.g.  0, .1, .2, ...
-			else
-			if ($posns > 5)
-				$tics = 0.4;		// e.g.  0, 0.2, 0.4, ...
-			else
-			if ($posns > 3)
-				$tics = 0.5;		// e.g. 0, 0.5, 1, ...
-			else
-			if ($posns > 2)
-				$tics = 1;		// e.g. 0, 1, 2, ...
-			else
-			if ($posns > 0.25)
-				$tics = 2;		// e.g. 0, 2, 4, 6 
-			else
-				$tics = ceil($norm);
-			
-			$this->tics = $tics * $this->magnitude;
-		}
-
-		/**
-		* Computes automatic boundaries on the axis
-		*
-		* @access	public
-		*/
-
-		function computeBoundaries()
-		{
-			// Range
-
-			$this->delta = abs($this->max - $this->min);
-
-			// Check for null distribution
-			
-			if($this->delta == 0)
-				$this->delta = 1;
-			
-			// Order of magnitude of range
-
-			$this->magnitude = pow(10, floor(log10($this->delta)));
-			
-			$this->quantizeTics();
-
-			$this->displayMin = floor($this->min / $this->tics) * $this->tics;
-			$this->displayMax = ceil($this->max / $this->tics) * $this->tics;
-			$this->displayDelta = $this->displayMax - $this->displayMin;
-		
-			// Check for null distribution
-			
-			if($this->displayDelta == 0)
-				$this->displayDelta = 1;
-		}
-
-		/**
-		* Set boundaries on the axis. Theses values override the automatic values.
-		*
-		* @access	public
-		*/
-		
-		function setBoundaries($sampleCount, $yMinValue, $yMaxValue)
-		{
-			$this->sampleCount = $sampleCount;
-			$this->yMinValue = $yMinValue;
-			$this->yMaxValue = $yMaxValue;
-		}
-
-		/**
-		* Get the lower boundary on the axis
-		*
-		* @access	public
-		* @return	integer		lower boundary on the axis
-		*/
-
-		function getLowerBoundary()
-		{
-			return $this->displayMin;
-		}
-
-		/**
-		* Get the upper boundary on the axis
-		*
-		* @access	public
-		* @return	integer		upper boundary on the axis
-		*/
-
-		function getUpperBoundary()
-		{
-			return $this->displayMax;
-		}
-
-		/**
-		* Get the value between two ticks
-		*
-		* @access	public
-		* @return	integer		value between two ticks
-		*/
-
-		function getTics()
-		{
-			return $this->tics;
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/BarChart.php b/lib/libchart/classes/BarChart.php
deleted file mode 100644
index 727f0418..00000000
--- a/lib/libchart/classes/BarChart.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Base bar chart class (horizontal or vertical)
-	*
-	* @author   Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	* @abstract
-	*/
-
-	class BarChart extends Chart
-	{
-		/**
-		* Creates a new bar chart
-		*
-		* @access	protected
-    		* @param	integer		width of the image
-    		* @param	integer		height of the image
-		*/
-		
-		function BarChart($width, $height)
-		{
-			parent::Chart($width, $height);
-
-			$this->setMargin(5);
-			$this->setLowerBound(0);
-		}
-
-		/**
-		* Compute the boundaries on the axis
-		*
-		* @access	protected
-		*/
-		
-		function computeBound()
-		{
-			// Compute lower and upper bound on the value axis
-
-			$point = current($this->point);
-			
-			// Check if some points were defined
-			
-			if(!$point)
-			{
-				$yMin = 0;
-				$yMax = 1;
-			}
-			else
-			{
-				$yMax = $yMin = $point->getY();
-	
-				foreach($this->point as $point)
-				{
-					$y = $point->getY();
-	
-					if($y < $yMin)
-						$yMin = $y;
-	
-					if($y > $yMax)
-						$yMax = $y;
-				}
-			}
-
-			$this->yMinValue = isset($this->lowerBound) ? $this->lowerBound : $yMin;
-			$this->yMaxValue = isset($this->upperBound) ? $this->upperBound : $yMax;
-			
-			// Compute boundaries on the sample axis
-
-			$this->sampleCount = count($this->point);
-		}
-
-		/**
-		* Set manually the lower boundary value (overrides the automatic formatting)
-		* Typical usage is to set the bars starting from zero
-		*
-		* @access	public
-		* @param	double		lower boundary value
-		*/
-		
-		function setLowerBound($lowerBound)
-		{
-			$this->lowerBound = $lowerBound;
-		}
-
-		/**
-		* Set manually the upper boundary value (overrides the automatic formatting)
-		*
-		* @access	public
-		* @param	double		upper boundary value
-		*/
-		
-		function setUpperBound($upperBound)
-		{
-			$this->upperBound = $upperBound;
-		}
-
-		/**
-		* Compute the image layout
-		*
-		* @access	protected
-		*/
-		
-		function computeLabelMargin()
-		{
-			$this->axis = new Axis($this->yMinValue, $this->yMaxValue);
-			$this->axis->computeBoundaries();
-
-			$this->graphTLX = $this->margin + $this->labelMarginLeft;
-			$this->graphTLY = $this->margin + $this->labelMarginTop;
-			$this->graphBRX = $this->width - $this->margin - $this->labelMarginRight;
-			$this->graphBRY = $this->height - $this->margin - $this->labelMarginBottom;
-		}
-
-		/**
-		* Create the image
-		*
-		* @access	protected
-		*/
-		
-		function createImage()
-		{
-			parent::createImage();
-
-			$this->axisColor1 = new Color(201, 201, 201);
-			$this->axisColor2 = new Color(158, 158, 158);
-
-			$this->aquaColor1 = new Color(242, 242, 242);
-			$this->aquaColor2 = new Color(231, 231, 231);
-			$this->aquaColor3 = new Color(239, 239, 239);
-			$this->aquaColor4 = new Color(253, 253, 253);
-
-			$this->barColor1 = new Color(42, 71, 181);
-			$this->barColor2 = new Color(33, 56, 143);
-
-			$this->barColor3 = new Color(172, 172, 210);
-			$this->barColor4 = new Color(117, 117, 143);
-			
-			// Aqua-like background
-
-			$aquaColor = Array($this->aquaColor1, $this->aquaColor2, $this->aquaColor3, $this->aquaColor4);
-
-			for($i = $this->graphTLY; $i < $this->graphBRY; $i++)
-			{
-				$color = $aquaColor[($i + 3) % 4];
-				$this->primitive->line($this->graphTLX, $i, $this->graphBRX, $i, $color);
-			}
-
-			// Axis
-
-			imagerectangle($this->img, $this->graphTLX - 1, $this->graphTLY, $this->graphTLX, $this->graphBRY, $this->axisColor1->getColor($this->img));
-			imagerectangle($this->img, $this->graphTLX - 1, $this->graphBRY, $this->graphBRX, $this->graphBRY + 1, $this->axisColor1->getColor($this->img));
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/Chart.php b/lib/libchart/classes/Chart.php
deleted file mode 100644
index 6af8094f..00000000
--- a/lib/libchart/classes/Chart.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/*! \mainpage Libchart
-	*
-	* This is the reference API, automatically compiled by <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a>.
-        * You can find here information that is not covered by the <a href="../samplecode/">tutorial</a>.
-	*
-	*/
-
-	/**
-	* Base chart class
-	*
-	* @author   Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	* @abstract
-	*/
-
-	class Chart
-	{
-		var $isTransparent;
-		
-		/**
-		* Creates a new chart
-		*
-		* @access	protected
-    		* @param	integer		width of the image
-    		* @param	integer		height of the image
-		*/
-		
-		function Chart($width, $height)
-		{
-			$this->width = $width;
-			$this->height = $height;
-
-			$this->reset();
-		}
-	
-		function setTransparent($b) {
-			$this->isTransparent = $b;
-		}
-		
-		/**
-		* Initialize the chart
-		*
-		* @access	private
-		*/
-		
-		function reset()
-		{
-			$this->text = new Text();		
-			$this->point = array();
-
-			unset($this->lowerBound);
-			unset($this->upperBound);
-
-			$this->setTitle("Untitled chart");
-			$this->setLogo(dirname(__FILE__) . "/../images/PoweredBy.png");
-		}
-
-		/**
-		* Add a new sampling point to the chart
-		*
-		* @access	public
-		* @param	Point		sampling point to add
-		*/
-		
-		function addPoint($point)
-		{
-			array_push($this->point, $point);
-		}
-
-		/**
-		* Sets the title
-		*
-		* @access	public
-		* @param	string		new title
-		*/
-		
-		function setTitle($title)
-		{
-			$this->title = $title;
-		}
-
-		/**
-		* Sets the logo image file name
-		*
-		* @access	public
-		* @param	string		new logo image file name
-		*/
-		
-		function setLogo($logoFileName)
-		{
-			$this->logoFileName = $logoFileName;
-		}
-
-		/**
-		* Print the title to the image
-		*
-		* @access	private
-		*/
-		
-		function printTitle()
-		{
-			$this->text->printCentered($this->img, ($this->labelMarginTop + $this->margin) / 2, $this->textColor, $this->title, $this->text->fontCondensedBold);
-		}
-
-		/**
-		* Print the logo image to the image
-		*
-		* @access	private
-		*/
-		
-		function printLogo()
-		{
-			@$logoImage = imageCreateFromPNG($this->logoFileName);
-
-			if($logoImage)
-				imagecopymerge($this->img, $logoImage, 2*$this->margin, $this->margin, 0, 0, imagesx($logoImage), imagesy($logoImage), 100);
-		}
-
-		/**
-		* Set the outer margin
-		*
-		* @access	public
-		* @param	integer		outer margin value in pixels
-		*/
-		
-		function setMargin($margin)
-		{
-			$this->margin = $margin;
-		}
-
-		/**
-		* Set the label left margin
-		*
-		* @access	public
-		* @param	integer		label left margin value in pixels
-		*/
-		
-		function setLabelMarginLeft($labelMarginLeft)
-		{
-			$this->labelMarginLeft = $labelMarginLeft;
-		}
-
-		/**
-		* Set the label right margin
-		*
-		* @access	public
-		* @param	integer		label right margin value in pixels
-		*/
-		
-		function setLabelMarginRight($labelMarginRight)
-		{
-			$this->labelMarginRight = $labelMarginRight;
-		}
-
-		/**
-		* Set the label top margin
-		*
-		* @access	public
-		* @param	integer		label top margin value in pixels
-		*/
-		
-		function setLabelMarginTop($labelMarginTop)
-		{
-			$this->labelMarginTop = $labelMarginTop;
-		}
-
-		/**
-		* Set the label bottom margin
-		*
-		* @access	public
-		* @param	integer		label bottom margin value in pixels
-		*/
-		
-		function setLabelMarginBottom($labelMarginBottom)
-		{
-			$this->labelMarginBottom = $labelMarginBottom;
-		}
-
-		/**
-		* Creates and initialize the image
-		*
-		* @access	protected
-		*/
-		
-		function createImage()
-		{
-			$this->img = imagecreatetruecolor($this->width, $this->height);
-			
-			$this->primitive = new Primitive($this->img);
-
-			$this->backGroundColor = new Color(255, 255, 255);
-			$this->textColor = new Color(0, 0, 0);
-
-			// White background
-
-			if($this->isTransparent) {
-				imagecolortransparent($this->img, $this->backGroundColor->getColor($this->img));
-			}
-			
-			imagefilledrectangle($this->img, 0, 0, $this->width - 1, $this->height - 1, $this->backGroundColor->getColor($this->img));
-		}
-		
-		function render($imgType, $filename = NULL)
-		{
-			header("Pragma: no-cache");
-			header("Expires: 0");
-			
-			switch(imgType)
-			{
-				case 'jpeg':
-				case 'jpg':
-					Header("Content-Type: image/jpeg");
-					if(isset($fileName))
-						ImageJPEG($this->img, $filename);
-					else
-						ImageJPEG($this->img);
-					break;
-		
-				case 'gif':
-					Header("Content-Type: image/gif");
-					if(isset($fileName))
-						ImageGIF($this->img, $filename);
-					else
-						ImageGIF($this->img);
-					break;
-		
-				case 'png':
-				default:
-					Header("Content-Type: image/png");
-					if(isset($fileName))
-						ImagePNG($this->img, $filename);
-					else
-						ImagePNG($this->img);
-			}
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/Color.php b/lib/libchart/classes/Color.php
deleted file mode 100644
index f68dcfa6..00000000
--- a/lib/libchart/classes/Color.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Color
-	*
-	* @author   Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	*/
-
-	class Color
-	{
-		/**
-		* Creates a new color
-		*
-		* @access	public
-		* @param	integer		red [0,255]
-		* @param	integer		green [0,255]
-		* @param	integer		blue [0,255]
-		* @param	integer		alpha [0,255]
-		*/
-		
-		function Color($red, $green, $blue, $alpha = 0)
-		{
-			$this->red = (int)$red;
-			$this->green = (int)$green;
-			$this->blue = (int)$blue;
-			$this->alpha = (int)round($alpha * 127.0 / 255);
-			
-			$this->gdColor = null;
-		}
-		
-		/**
-		* Get GD color
-		*
-		* @access	public
-		* @param	$img		GD image resource
-		*/
-		
-		function getColor($img)
-		{
-			// Checks if color has already been allocated
-			
-			if(!$this->gdColor)
-			{
-				if($this->alpha == 0 || !function_exists('imagecolorallocatealpha'))
-					$this->gdColor = imagecolorallocate($img, $this->red, $this->green, $this->blue);
-				else
-					$this->gdColor = imagecolorallocatealpha($img, $this->red, $this->green, $this->blue, $this->alpha);
-			}
-			
-			// Returns GD color
-			
-			return $this->gdColor;
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/HorizontalChart.php b/lib/libchart/classes/HorizontalChart.php
deleted file mode 100644
index dd3cff38..00000000
--- a/lib/libchart/classes/HorizontalChart.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Horizontal bar chart
-	*
-	* @author   Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	*/
-
-	class HorizontalChart extends BarChart
-	{
-		/**
-		* Creates a new horizontal bar chart
-		*
-		* @access	public
-    		* @param	integer		width of the image
-    		* @param	integer		height of the image
-		*/
-		
-		function HorizontalChart($width = 600, $height = 250)
-		{
-			parent::BarChart($width, $height);
-
-			$this->setLabelMarginLeft(150);
-			$this->setLabelMarginRight(30);
-			$this->setLabelMarginTop(40);
-			$this->setLabelMarginBottom(30);
-		}
-
-		/**
-		* Print the axis
-		*
-		* @access	private
-		*/
-		
-		function printAxis()
-		{
-			// Check if some points were defined
-			
-			if(!$this->sampleCount)
-				return;
-		
-			$minValue = $this->axis->getLowerBoundary();
-			$maxValue = $this->axis->getUpperBoundary();
-			$stepValue = $this->axis->getTics();
-
-			// Horizontal axis
-
-			for($value = $minValue; $value <= $maxValue; $value += $stepValue)
-			{
-				$x = $this->graphTLX + ($value - $minValue) * ($this->graphBRX - $this->graphTLX) / ($this->axis->displayDelta);
-
-				imagerectangle($this->img, $x - 1, $this->graphBRY + 2, $x, $this->graphBRY + 3, $this->axisColor1->getColor($this->img));
-				imagerectangle($this->img, $x - 1, $this->graphBRY, $x, $this->graphBRY + 1, $this->axisColor2->getColor($this->img));
-
-				$this->text->printText($this->img, $x, $this->graphBRY + 5, $this->textColor, $value, $this->text->fontCondensed, $this->text->HORIZONTAL_CENTER_ALIGN);
-			}
-
-			// Vertical Axis
-
-			$rowHeight = ($this->graphBRY - $this->graphTLY) / $this->sampleCount;
-
-			reset($this->point);
-
-			for($i = 0; $i <= $this->sampleCount; $i++)
-			{
-				$y = $this->graphBRY - $i * $rowHeight;
-
-				imagerectangle($this->img, $this->graphTLX - 3, $y, $this->graphTLX - 2, $y + 1, $this->axisColor1->getColor($this->img));
-				imagerectangle($this->img, $this->graphTLX - 1, $y, $this->graphTLX, $y + 1, $this->axisColor2->getColor($this->img));
-
-				if($i < $this->sampleCount)
-				{
-					$point = current($this->point);
-					next($this->point);
-	
-					$text = $point->getX();
-
-					$this->text->printText($this->img, $this->graphTLX - 5, $y - $rowHeight / 2, $this->textColor, $text, $this->text->fontCondensed, $this->text->HORIZONTAL_RIGHT_ALIGN | $this->text->VERTICAL_CENTER_ALIGN);
-				}
-			}
-		}
-
-		/**
-		* Print the bars
-		*
-		* @access	private
-		*/
-		
-		function printBar()
-		{
-			// Check if some points were defined
-			
-			if(!$this->sampleCount)
-				return;
-			
-			reset($this->point);
-
-			$minValue = $this->axis->getLowerBoundary();
-			$maxValue = $this->axis->getUpperBoundary();
-			$stepValue = $this->axis->getTics();
-
-			$rowHeight = ($this->graphBRY - $this->graphTLY) / $this->sampleCount;
-
-			for($i = 0; $i < $this->sampleCount; $i++)
-			{
-				$y = $this->graphBRY - $i * $rowHeight;
-
-				$point = current($this->point);
-				next($this->point);
-
-				$value = $point->getY();
-				
-				$xmax = $this->graphTLX + ($value - $minValue) * ($this->graphBRX - $this->graphTLX) / ($this->axis->displayDelta);
-
-				$this->text->printText($this->img, $xmax + 5, $y - $rowHeight / 2, $this->textColor, $value, $this->text->fontCondensed, $this->text->VERTICAL_CENTER_ALIGN);
-
-				// Horizontal bar
-
-				$y1 = $y - $rowHeight * 4 / 5;
-				$y2 = $y - $rowHeight * 1 / 5;
-
-				imagefilledrectangle($this->img, $this->graphTLX + 1, $y1, $xmax, $y2, $this->barColor2->getColor($this->img));
-				imagefilledrectangle($this->img, $this->graphTLX + 2, $y1+1, $xmax - 4, $y2, $this->barColor1->getColor($this->img));
-			}
-		}
-		
-		/**
-		* Render the chart image
-		*
-		* @access	public
-		* @param	string		name of the file to render the image to (optional)
-		*/
-		
-		function render($imgType, $fileName = null)
-		{
-			$this->computeBound();
-			$this->computeLabelMargin();
-			$this->createImage();
-			$this->printLogo();
-			$this->printTitle();
-			$this->printAxis();
-			$this->printBar();
-
-			parent::render($imgType, $filename);
-		}
-	}
-?>
diff --git a/lib/libchart/classes/LineChart.php b/lib/libchart/classes/LineChart.php
deleted file mode 100644
index 07528547..00000000
--- a/lib/libchart/classes/LineChart.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Line chart
-	*
-	* @author   Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	*/
-
-	class LineChart extends BarChart
-	{
-		/**
-		* Creates a new line chart
-		*
-		* @access	public
-    		* @param	integer		width of the image
-    		* @param	integer		height of the image
-		*/
-		
-		function LineChart($width = 600, $height = 250)
-		{
-			parent::BarChart($width, $height);
-
-			$this->setLabelMarginLeft(50);
-			$this->setLabelMarginRight(50);
-			$this->setLabelMarginTop(40);
-			$this->setLabelMarginBottom(50);
-		}
-
-		/**
-		* Print the axis
-		*
-		* @access	private
-		*/
-		
-		function printAxis()
-		{
-			// Check if some points were defined
-			
-			if($this->sampleCount < 2)
-				return;
-			
-			$minValue = $this->axis->getLowerBoundary();
-			$maxValue = $this->axis->getUpperBoundary();
-			$stepValue = $this->axis->getTics();
-
-			// Line axis
-
-			for($value = $minValue; $value <= $maxValue; $value += $stepValue)
-			{
-				$y = $this->graphBRY - ($value - $minValue) * ($this->graphBRY - $this->graphTLY) / ($this->axis->displayDelta);
-
-				imagerectangle($this->img, $this->graphTLX - 3, $y, $this->graphTLX - 2, $y + 1, $this->axisColor1->getColor($this->img));
-				imagerectangle($this->img, $this->graphTLX - 1, $y, $this->graphTLX, $y + 1, $this->axisColor2->getColor($this->img));
-
-				$this->text->printText($this->img, $this->graphTLX - 5, $y, $this->textColor, $value, $this->text->fontCondensed, $this->text->HORIZONTAL_RIGHT_ALIGN | $this->text->VERTICAL_CENTER_ALIGN);
-			}
-
-			// Horizontal Axis
-
-			$columnWidth = ($this->graphBRX - $this->graphTLX) / ($this->sampleCount - 1);
-
-			reset($this->point);
-
-			for($i = 0; $i < $this->sampleCount; $i++)
-			{
-				$x = $this->graphTLX + $i * $columnWidth;
-
-				imagerectangle($this->img, $x - 1, $this->graphBRY + 2, $x, $this->graphBRY + 3, $this->axisColor1->getColor($this->img));
-				imagerectangle($this->img, $x - 1, $this->graphBRY, $x, $this->graphBRY + 1, $this->axisColor2->getColor($this->img));
-
-				$point = current($this->point);
-				next($this->point);
-
-				$text = $point->getX();
-
-				$this->text->printDiagonal($this->img, $x - 5, $this->graphBRY + 10, $this->textColor, $text);
-			}
-		}
-
-		/**
-		* Print the lines
-		*
-		* @access	private
-		*/
-
-		function printLine()
-		{
-			// Check if some points were defined
-			
-			if($this->sampleCount < 2)
-				return;
-			
-			reset($this->point);
-
-			$minValue = $this->axis->getLowerBoundary();
-			$maxValue = $this->axis->getUpperBoundary();
-			
-			$columnWidth = ($this->graphBRX - $this->graphTLX) / ($this->sampleCount - 1);
-
-			$x1 = null;
-			$y1 = null;
-
-			for($i = 0; $i < $this->sampleCount; $i++)
-			{
-				$x2 = $this->graphTLX + $i * $columnWidth;
-
-				$point = current($this->point);
-				next($this->point);
-
-				$value = $point->getY();
-				
-				$y2 = $this->graphBRY - ($value - $minValue) * ($this->graphBRY - $this->graphTLY) / ($this->axis->displayDelta);
-
-//				$this->text->printText($this->img, $x2, $y2 - 5, $this->textColor, $value, $this->text->fontCondensed, $this->text->HORIZONTAL_CENTER_ALIGN | $this->text->VERTICAL_BOTTOM_ALIGN);
-
-				// Draw line 
-
-				if($x1)
-				{
-					$this->primitive->line($x1, $y1, $x2, $y2, $this->barColor4, 4);
-					$this->primitive->line($x1, $y1 - 1, $x2, $y2 - 1, $this->barColor3, 2);
-				}
-				
-				$x1 = $x2;
-				$y1 = $y2;
-			}
-		}
-		
-		/**
-		* Render the chart image
-		*
-		* @access	public
-		* @param	string		name of the file to render the image to (optional)
-		*/
-		
-		function render($imgType, $fileName = null)
-		{
-			$this->computeBound();
-			$this->computeLabelMargin();
-			$this->createImage();
-			$this->printLogo();
-			$this->printTitle();
-			$this->printAxis();
-			$this->printLine();
-
-			parent::render($imgType, $filename);
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/PieChart.php b/lib/libchart/classes/PieChart.php
deleted file mode 100644
index 8940a9ee..00000000
--- a/lib/libchart/classes/PieChart.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Pie chart
-	*
-	* @author   Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	*/
-
-	class PieChart extends Chart
-	{
-		/**
-		* Creates a new pie chart
-		*
-		* @access	public
-    		* @param	integer		width of the image
-    		* @param	integer		height of the image
-		*/
-		
-		function PieChart($width = 600, $height = 250)
-		{
-			parent::Chart($width, $height);
-
-			$this->setMargin(5);
-			$this->setLabelMarginLeft(30);
-			$this->setLabelMarginRight(30);
-			$this->setLabelMarginTop(50);
-			$this->setLabelMarginBottom(30);
-			$this->setLabelMarginCenter(20);
-
-			$this->setPieRatio(0.55);
-
-			$this->labelBoxWidth = 15;
-			$this->labelBoxHeight = 15;
-		}
-
-		/**
-		* Set the ratio of the pie image over the legend
-		*
-		* @access	public
-		* @param	double		ratio (value between 0 and 1)
-		*/
-		
-		function setPieRatio($pieRatio)
-		{
-			$this->pieRatio = $pieRatio;
-		}
-
-		/**
-		* Compare two sampling point values, order from biggest to lowest value
-		*
-		* @access	private
-		* @param	double		first value
-		* @param	double		second value
-		* @return	integer		result of the comparison
-		*/
-		
-		function sortPie($v1, $v2)
-		{
-			return $v1[0] == $v2[0] ? 0 :
-				$v1[0] > $v2[0] ? -1 :
-				1;
-		}
-		
-		/**
-		* Compute pie values in percentage and sort them
-		*
-		* @access	private
-		*/
-		
-		function computePercent()
-		{
-			$this->total = 0;
-			$this->percent = array();
-
-			foreach($this->point as $point)
-				$this->total += $point->getY();
-
-			foreach($this->point as $point)
-			{
-				$percent = $this->total == 0 ? 0 : 100 * $point->getY() / $this->total;
-
-				array_push($this->percent, array($percent, $point));
-			}
-
-			usort($this->percent, array("PieChart", "sortPie"));
-		}
-
-		/**
-		* Set the margin between the pie image and the legend
-		*
-		* @access	public
-		* @param	integer		margin value in pixels
-		*/
-		
-		function setLabelMarginCenter($labelMarginCenter)
-		{
-			$this->labelMarginCenter = $labelMarginCenter;
-		}
-
-		/**
-		* Draw a gray box with nice borders
-		*
-		* @access	private
-		* @param	integer		top left coordinate (x)
-		* @param	integer		top left coordinate (y)
-		* @param	integer		bottom right coordinate (x)
-		* @param	integer		bottom right coordinate (y)
-		*/
-		
-		function outlinedBox($x1, $y1, $x2, $y2)
-		{
-			imagefilledrectangle($this->img, $x1, $y1, $x2, $y2, $this->axisColor1->getColor($this->img));
-			imagerectangle($this->img, $x1, $y1, $x1 + 1, $y1 + 1, $this->axisColor2->getColor($this->img));
-			imagerectangle($this->img, $x2 - 1, $y1, $x2, $y1 + 1, $this->axisColor2->getColor($this->img));
-			imagerectangle($this->img, $x1, $y2 - 1, $x1 + 1, $y2, $this->axisColor2->getColor($this->img));
-			imagerectangle($this->img, $x2 - 1, $y2 - 1, $x2, $y2, $this->axisColor2->getColor($this->img));
-		}
-
-		/**
-		* Compute image layout
-		*
-		* @access	private
-		*/
-		
-		function computeLabelMargin()
-		{
-			$graphWidth = $this->width - $this->margin * 2 - $this->labelMarginLeft - $this->labelMarginCenter - $this->labelMarginRight;
-			
-			$this->pieTLX = $this->margin + $this->labelMarginLeft;
-			$this->pieTLY = $this->margin + $this->labelMarginTop;
-			$this->pieBRX = $this->pieTLX + $graphWidth * $this->pieRatio;
-			$this->pieBRY = $this->height - $this->margin - $this->labelMarginBottom;
-			
-			$this->pieCenterX = $this->pieTLX + ($this->pieBRX - $this->pieTLX) / 2;
-			$this->pieCenterY = $this->pieTLY + ($this->pieBRY - $this->pieTLY) / 2;
-			
-			$this->pieWidth = round(($this->pieBRX - $this->pieTLX) * 4 / 5);
-			$this->pieHeight = round(($this->pieBRY - $this->pieTLY) * 3.7 / 5);
-			$this->pieDepth = round($this->pieWidth * 0.05);
-
-			$this->labelTLX = $this->pieBRX + $this->labelMarginCenter;
-			$this->labelTLY = $this->pieTLY;
-			$this->labelBRX = $this->pieTLX + $this->labelMarginCenter + $graphWidth;
-			$this->labelBRY = $this->pieBRY;
-
-		}
-
-		/**
-		* Creates the pie chart image
-		*
-		* @access	private
-		*/
-		
-		function createImage()
-		{
-			parent::createImage();
-
-			$pieColors = array(
-				array(2, 78, 0),
-				array(148, 170, 36),
-				array(233, 191, 49),
-				array(240, 127, 41),
-				array(243, 63, 34),
-				array(190, 71, 47),
-				array(135, 81, 60),
-				array(128, 78, 162),
-				array(121, 75, 255),
-				array(142, 165, 250),
-				array(162, 254, 239),
-				array(137, 240, 166),
-				array(104, 221, 71),
-				array(98, 174, 35),
-				array(93, 129, 1)
-			);
-
-			$this->pieColor = array();
-			$this->pieShadowColor = array();
-			$shadowFactor = 0.5;
-
-			foreach($pieColors as $colorRGB)
-			{
-				list($red, $green, $blue) = $colorRGB;
-
-				$color = new Color($red, $green, $blue);
-				$shadowColor = new Color($red * $shadowFactor, $green * $shadowFactor, $blue * $shadowFactor);
-
-				array_push($this->pieColor, $color);
-				array_push($this->pieShadowColor, $shadowColor);
-			}
-
-			$this->axisColor1 = new Color(201, 201, 201);
-			$this->axisColor2 = new Color(158, 158, 158);
-
-			$this->aquaColor1 = new Color(242, 242, 242);
-			$this->aquaColor2 = new Color(231, 231, 231);
-			$this->aquaColor3 = new Color(239, 239, 239);
-			$this->aquaColor4 = new Color(253, 253, 253);
-
-			// Legend box
-
-			$this->outlinedBox($this->pieTLX, $this->pieTLY, $this->pieBRX, $this->pieBRY);
-
-			// Aqua-like background
-
-			$aquaColor = Array($this->aquaColor1, $this->aquaColor2, $this->aquaColor3, $this->aquaColor4);
-
-			for($i = $this->pieTLY + 2; $i < $this->pieBRY - 1; $i++)
-			{
-				$color = $aquaColor[($i + 3) % 4];
-				$this->primitive->line($this->pieTLX + 2, $i, $this->pieBRX - 2, $i, $color);
-			}
-		}
-
-		/**
-		* Print legend
-		*
-		* @access	private
-		*/
-		
-		function printLabel()
-		{
-			$i = 0;
-
-			$boxX1 = $this->labelTLX + $this->margin;
-			$boxX2 = $boxX1 + $this->labelBoxWidth;
-
-			foreach($this->percent as $a)
-			{
-				list($percent, $point) = $a;
-				$legend = $point->getX();
-				
-				$color = $this->pieColor[$i % count($this->pieColor)];
-
-				$boxY1 = $this->labelTLY + $this->margin + $i * ($this->labelBoxHeight + $this->margin);
-				$boxY2 = $boxY1 + $this->labelBoxHeight;
-
-				$this->outlinedBox($boxX1, $boxY1, $boxX2, $boxY2);
-				imagefilledrectangle($this->img, $boxX1 + 2, $boxY1 + 2, $boxX2 - 2, $boxY2 - 2, $color->getColor($this->img));
-
-				$this->text->printText($this->img, $boxX2 + $this->margin, $boxY1 + $this->labelBoxHeight / 2, $this->textColor, $legend, $this->text->fontCondensed, $this->text->VERTICAL_CENTER_ALIGN);
-
-				$i++;
-			}
-		}
-
-		/**
-		* Draw a 2D disc
-		*
-		* @access	private
-		* @param	integer		center coordinate (y)
-		* @param	array		colors for each portion
-		* @param	bitfield	drawing mode
-		*/
-		
-		function drawDisc($cy, $colorArray, $mode)
-		{
-			$i = 0;
-			$angle1 = 0;
-			$percentTotal = 0;
-
-			foreach($this->percent as $a)
-			{
-				list($percent, $point) = $a;
-
-				$color = $colorArray[$i % count($colorArray)];
-
-				$percentTotal += $percent;
-				$angle2 = $percentTotal * 360 / 100;
-
-				imagefilledarc($this->img, $this->pieCenterX, $cy, $this->pieWidth, $this->pieHeight, $angle1, $angle2, $color->getColor($this->img), $mode);
-
-				$angle1 = $angle2;
-
-				$i++;
-			}
-		}
-
-		/**
-		* Print the percentage text
-		*
-		* @access	private
-		*/
-		
-		function drawPercent()
-		{
-			$angle1 = 0;
-			$percentTotal = 0;
-
-			foreach($this->percent as $a)
-			{
-				list($percent, $point) = $a;
-
-				// If value is null, don't print percentage
-				
-				if($percent <= 0)
-					continue;
-
-				$percentTotal += $percent;
-				$angle2 = $percentTotal * 2 * M_PI / 100;
-
-				$angle = $angle1 + ($angle2 - $angle1) / 2;
-				$text = number_format($percent) . "%";
-
-				$x = cos($angle) * ($this->pieWidth + 35) / 2 + $this->pieCenterX;
-				$y = sin($angle) * ($this->pieHeight + 35) / 2 + $this->pieCenterY;
-
-				$this->text->printText($this->img, $x, $y, $this->textColor, $text, $this->text->fontCondensed, $this->text->HORIZONTAL_CENTER_ALIGN | $this->text->VERTICAL_CENTER_ALIGN);
-
-				$angle1 = $angle2;
-			}
-		}
-
-		/**
-		* Print the pie chart
-		*
-		* @access	private
-		*/
-		
-		function printPie()
-		{
-			// Silhouette
-
-			for ($cy = $this->pieCenterY + $this->pieDepth / 2; $cy >= $this->pieCenterY - $this->pieDepth / 2; $cy--)
-				$this->drawDisc($cy, $this->pieShadowColor, IMG_ARC_EDGED);
-
-
-			// Top
-
-			$this->drawDisc($this->pieCenterY - $this->pieDepth / 2, $this->pieColor, IMG_ARC_PIE);
-
-			// Top Outline
-
-			$this->drawPercent();
-		}
-
-		/**
-		* Render the chart image
-		*
-		* @access	public
-		* @param	string		name of the file to render the image to (optional)
-		*/
-		
-		function render($imgType, $fileName = null)
-		{
-			$this->computeLabelMargin();
-			$this->computePercent();
-			$this->createImage();
-			$this->printLogo();
-			$this->printTitle();
-			$this->printPie();
-			$this->printLabel();
-
-			parent::render($imgType, $filename);
-		}
-	}
-?>
diff --git a/lib/libchart/classes/Point.php b/lib/libchart/classes/Point.php
deleted file mode 100644
index 02529b89..00000000
--- a/lib/libchart/classes/Point.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Sampling point
-	*
-	* @author   Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	*/
-
-	class Point
-	{
-		/**
-		* Creates a new sampling point of coordinates (x, y)
-		*
-		* @access	public
-    		* @param	integer		x coordinate (label)
-    		* @param	integer		y coordinate (value)
-		*/
-		
-		function Point($x, $y)
-		{
-			$this->x = $x;
-			$this->y = $y;
-		}
-
-		/**
-		* Gets the x coordinate (label)
-		*
-		* @access	public
-    		* @return	integer		x coordinate (label)
-		*/
-		
-		function getX()
-		{
-			return $this->x;
-		}
-
-		/**
-		* Gets the y coordinate (value)
-		*
-		* @access	public
-    		* @return	integer		y coordinate (value)
-		*/
-		
-		function getY()
-		{
-			return $this->y;
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/Primitive.php b/lib/libchart/classes/Primitive.php
deleted file mode 100644
index 9580b40c..00000000
--- a/lib/libchart/classes/Primitive.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Graphic primitives, extends GD with chart related primitives
-	*
-	* @author   Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	*/
-
-	class Primitive
-	{
-		/**
-		* Creates a new primitive object
-		*
-		* @access	public
-		* @param	resource	GD image resource
-		*/
-		
-		function Primitive($img)
-		{
-			$this->img = $img;
-		}
-		
-		/**
-		* Draws a straight line
-		*
-		* @access	public
-		* @param	integer		line start (X)
-		* @param	integer		line start (Y)
-		* @param	integer		line end (X)
-		* @param	integer		line end (Y)
-		* @param	Color		line color
-		*/
-		
-		function line($x1, $y1, $x2, $y2, $color, $width = 1)
-		{
-			imagefilledpolygon($this->img, array($x1, $y1 - $width / 2, $x1, $y1 + $width / 2, $x2, $y2 + $width / 2, $x2, $y2 - $width / 2), 4, $color->getColor($this->img));
-//			imageline($this->img, $x1, $y1, $x2, $y2, $color->getColor($this->img));
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/Text.php b/lib/libchart/classes/Text.php
deleted file mode 100644
index 58a75eb9..00000000
--- a/lib/libchart/classes/Text.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Text drawing helper
-	*
-	* @author   Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
-	*/
-
-	class Text
-	{
-		var $HORIZONTAL_LEFT_ALIGN = 1;		// PHP4 doesn't support class constants
-		var $HORIZONTAL_CENTER_ALIGN = 2;
-		var $HORIZONTAL_RIGHT_ALIGN = 4;
-		var $VERTICAL_TOP_ALIGN = 8;
-		var $VERTICAL_CENTER_ALIGN = 16;
-		var $VERTICAL_BOTTOM_ALIGN = 32;
-
-		/**
-		* Creates a new text drawing helper
-		*
-		* @access	public
-		*/
-		
-		function Text()
-		{
-			// Free low-res fonts based on Bitstream Vera <http://dejavu.sourceforge.net/wiki/>
-
-			$this->fontCondensed = dirname(__FILE__) . "/../fonts/DejaVuSansCondensed.ttf";
-			$this->fontCondensedBold = dirname(__FILE__) . "/../fonts/DejaVuSansCondensed-Bold.ttf";
-		}
-
-		/**
-		* Print text
-		*
-		* @access	public
-		* @param	Image		GD image
-		* @param	integer		text coordinate (x)
-		* @param	integer		text coordinate (y)
-		* @param	Color		text color
-		* @param	string		text value
-		* @param	string		font file name
-		* @param	bitfield	text alignment
-		*/
-		
-		function printText($img, $px, $py, $color, $text, $fontFileName, $align = 0)
-		{
-			if(!($align & $this->HORIZONTAL_CENTER_ALIGN) && !($align & $this->HORIZONTAL_RIGHT_ALIGN))
-				$align |= $this->HORIZONTAL_LEFT_ALIGN;
-
-			if(!($align & $this->VERTICAL_CENTER_ALIGN) && !($align & $this->VERTICAL_BOTTOM_ALIGN))
-				$align |= $this->VERTICAL_TOP_ALIGN;
-
-			$fontSize = 8;
-			$lineSpacing = 1;
-
- 			list($llx, $lly, $lrx, $lry, $urx, $ury, $ulx, $uly) = imageftbbox($fontSize, 0, $fontFileName, $text, array("linespacing" => $lineSpacing));
-
-			$textWidth = $lrx - $llx;
-			$textHeight = $lry - $ury;
-
-			$angle = 0;
-
-			if($align & $this->HORIZONTAL_CENTER_ALIGN)
-				$px -= $textWidth / 2;
-
-			if($align & $this->HORIZONTAL_RIGHT_ALIGN)
-				$px -= $textWidth;
-
-			if($align & $this->VERTICAL_CENTER_ALIGN)
-				$py += $textHeight / 2;
-
-			if($align & $this->VERTICAL_TOP_ALIGN)
-				$py += $textHeight;
-
-			imagettftext($img, $fontSize, $angle, $px, $py, $color->getColor($img), $fontFileName, $text);
-		}
-		
-		/**
-		* Print text centered horizontally on the image
-		*
-		* @access	public
-		* @param	Image		GD image
-		* @param	integer		text coordinate (y)
-		* @param	Color		text color
-		* @param	string		text value
-		* @param	string		font file name
-		*/
-		
-		function printCentered($img, $py, $color, $text, $fontFileName)
-		{
-			$this->printText($img, imagesx($img) / 2, $py, $color, $text, $fontFileName, $this->HORIZONTAL_CENTER_ALIGN | $this->VERTICAL_CENTER_ALIGN);
-		}
-
-		/**
-		* Print text in diagonal
-		*
-		* @access	public
-		* @param	Image		GD image
-		* @param	integer		text coordinate (x)
-		* @param	integer		text coordinate (y)
-		* @param	Color		text color
-		* @param	string		text value
-		*/
-		
-		function printDiagonal($img, $px, $py, $color, $text)
-		{
-			$fontSize = 8;
-			$fontFileName = $this->fontCondensed;
-
-			$lineSpacing = 1;
-
- 			list($lx, $ly, $rx, $ry) = imageftbbox($fontSize, 0, $fontFileName, $text, array("linespacing" => $lineSpacing));
-			$textWidth = $rx - $lx;
-
-			$angle = -45;
-
-			imagettftext($img, $fontSize, $angle, $px, $py, $color->getColor($img), $fontFileName, $text);
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/VerticalChart.php b/lib/libchart/classes/VerticalChart.php
deleted file mode 100644
index 5ee30518..00000000
--- a/lib/libchart/classes/VerticalChart.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-	
-	/**
-	* Vertical bar chart
-	*
-	* @author   Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
-	*/
-
-	class VerticalChart extends BarChart
-	{
-		/**
-		* Creates a new vertical bar chart
-		*
-		* @access	public
-    		* @param	integer		width of the image
-    		* @param	integer		height of the image
-		*/
-		
-		function VerticalChart($width = 600, $height = 250)
-		{
-			parent::BarChart($width, $height);
-
-			$this->setLabelMarginLeft(50);
-			$this->setLabelMarginRight(30);
-			$this->setLabelMarginTop(40);
-			$this->setLabelMarginBottom(50);
-		}
-
-		/**
-		* Print the axis
-		*
-		* @access	private
-		*/
-		
-		function printAxis()
-		{
-			// Check if some points were defined
-			
-			if(!$this->sampleCount)
-				return;
-			
-			$minValue = $this->axis->getLowerBoundary();
-			$maxValue = $this->axis->getUpperBoundary();
-			$stepValue = $this->axis->getTics();
-
-			// Vertical axis
-
-			for($value = $minValue; $value <= $maxValue; $value += $stepValue)
-			{
-				$y = $this->graphBRY - ($value - $minValue) * ($this->graphBRY - $this->graphTLY) / ($this->axis->displayDelta);
-
-				imagerectangle($this->img, $this->graphTLX - 3, $y, $this->graphTLX - 2, $y + 1, $this->axisColor1->getColor($this->img));
-				imagerectangle($this->img, $this->graphTLX - 1, $y, $this->graphTLX, $y + 1, $this->axisColor2->getColor($this->img));
-
-				$this->text->printText($this->img, $this->graphTLX - 5, $y, $this->textColor, $value, $this->text->fontCondensed, $this->text->HORIZONTAL_RIGHT_ALIGN | $this->text->VERTICAL_CENTER_ALIGN);
-			}
-
-			// Horizontal Axis
-
-			$columnWidth = ($this->graphBRX - $this->graphTLX) / $this->sampleCount;
-
-			reset($this->point);
-
-			for($i = 0; $i <= $this->sampleCount; $i++)
-			{
-				$x = $this->graphTLX + $i * $columnWidth;
-
-				imagerectangle($this->img, $x - 1, $this->graphBRY + 2, $x, $this->graphBRY + 3, $this->axisColor1->getColor($this->img));
-				imagerectangle($this->img, $x - 1, $this->graphBRY, $x, $this->graphBRY + 1, $this->axisColor2->getColor($this->img));
-
-				if($i < $this->sampleCount)
-				{
-					$point = current($this->point);
-					next($this->point);
-	
-					$text = $point->getX();
-
-					$this->text->printDiagonal($this->img, $x + $columnWidth * 1 / 3, $this->graphBRY + 10, $this->textColor, $text);
-				}
-			}
-		}
-
-		/**
-		* Print the bars
-		*
-		* @access	private
-		*/
-
-		function printBar()
-		{
-			// Check if some points were defined
-			
-			if(!$this->sampleCount)
-				return;
-			
-			reset($this->point);
-
-			$minValue = $this->axis->getLowerBoundary();
-			$maxValue = $this->axis->getUpperBoundary();
-			$stepValue = $this->axis->getTics();
-
-			$columnWidth = ($this->graphBRX - $this->graphTLX) / $this->sampleCount;
-
-			for($i = 0; $i < $this->sampleCount; $i++)
-			{
-				$x = $this->graphTLX + $i * ($this->graphBRX - $this->graphTLX) / $this->sampleCount;
-
-				$point = current($this->point);
-				next($this->point);
-
-				$value = $point->getY();
-				
-				$ymin = $this->graphBRY - ($value - $minValue) * ($this->graphBRY - $this->graphTLY) / ($this->axis->displayDelta);
-
-				$this->text->printText($this->img, $x + $columnWidth / 2, $ymin - 5, $this->textColor, $value, $this->text->fontCondensed, $this->text->HORIZONTAL_CENTER_ALIGN | $this->text->VERTICAL_BOTTOM_ALIGN);
-
-				// Vertical bar
-
-				$x1 = $x + $columnWidth * 1 / 5;
-				$x2 = $x + $columnWidth * 4 / 5;
-
-				imagefilledrectangle($this->img, $x1, $ymin, $x2, $this->graphBRY - 1, $this->barColor2->getColor($this->img));
-				imagefilledrectangle($this->img, $x1 + 1, $ymin + 1, $x2 - 4, $this->graphBRY - 1, $this->barColor1->getColor($this->img));
-			}
-		}
-		
-		/**
-		* Render the chart image
-		*
-		* @access	public
-		* @param	string		name of the file to render the image to (optional)
-		*/
-		
-		function render($imgType, $fileName = null)
-		{
-			$this->computeBound();
-			$this->computeLabelMargin();
-			$this->createImage();
-			$this->printLogo();
-			$this->printTitle();
-			$this->printAxis();
-			$this->printBar();
-
-			parent::render($imgType, $filename);
-		}
-	}
-?>
\ No newline at end of file
diff --git a/lib/libchart/classes/libchart.php b/lib/libchart/classes/libchart.php
new file mode 100644
index 00000000..481d920b
--- /dev/null
+++ b/lib/libchart/classes/libchart.php
@@ -0,0 +1,43 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+
+    require_once 'model/ChartConfig.php';
+    require_once 'model/Point.php';
+    require_once 'model/DataSet.php';
+    require_once 'model/XYDataSet.php';
+    require_once 'model/XYSeriesDataSet.php';
+    
+    require_once 'view/primitive/Padding.php';
+    require_once 'view/primitive/Rectangle.php';
+    require_once 'view/primitive/Primitive.php';
+    require_once 'view/text/Text.php';
+    require_once 'view/color/Color.php';
+    require_once 'view/color/ColorSet.php';
+    require_once 'view/color/Palette.php';
+    require_once 'view/axis/Bound.php';
+    require_once 'view/axis/Axis.php';
+    require_once 'view/plot/Plot.php';
+    require_once 'view/caption/Caption.php';
+    require_once 'view/chart/Chart.php';
+    require_once 'view/chart/BarChart.php';
+    require_once 'view/chart/VerticalBarChart.php';
+    require_once 'view/chart/HorizontalBarChart.php';
+    require_once 'view/chart/LineChart.php';
+    require_once 'view/chart/PieChart.php';
+?>
\ No newline at end of file
diff --git a/lib/libchart/classes/model/ChartConfig.php b/lib/libchart/classes/model/ChartConfig.php
new file mode 100644
index 00000000..3813286a
--- /dev/null
+++ b/lib/libchart/classes/model/ChartConfig.php
@@ -0,0 +1,112 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Configuration attributes of the chart.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class ChartConfig {
+        /**
+         * Use several colors for a single data set chart (as if it was a multiple data set).
+         * 
+         * @var Boolean
+         */
+        private $useMultipleColor;
+        
+        /**
+         * Show caption on individual data points.
+         * 
+         * @var Boolean
+         */
+        private $showPointCaption;
+        
+        /**
+         * Sort data points (only pie charts).
+         * 
+         * @var Boolean
+         */
+        private $sortDataPoint;
+        
+        /**
+         * Creates a new ChartConfig with default options.
+         */
+        public function __construct() {
+            $this->useMultipleColor = false;
+            $this->showPointCaption = true;
+            $this->sortDataPoint = true;
+        }
+        
+        /**
+         * If true the chart will use several colors for a single data set chart
+         * (as if it was a multiple data set).
+         * 
+         * @param $useMultipleColor Use several colors : boolean
+         */
+        public function setUseMultipleColor($useMultipleColor) {
+            $this->useMultipleColor = $useMultipleColor;
+        }
+        
+        /**
+         * If true the chart will use several colors for a single data set chart
+         * (as if it was a multiple data set).
+         * 
+         * @return $useMultipleColor Use several colors : boolean
+         */
+        public function getUseMultipleColor() {
+            return $this->useMultipleColor;
+        }
+        
+        /**
+         * Set the option to show caption on individual data points.
+         * 
+         * @param $showPointCaption Show caption on individual data points : boolean
+         */
+        public function setShowPointCaption($showPointCaption) {
+            $this->showPointCaption = $showPointCaption;
+        }
+        
+        /**
+         * Get the option to show caption on individual data points.
+         * 
+         * @return Show caption on individual data points : boolean
+         */
+        public function getShowPointCaption() {
+            return $this->showPointCaption;
+        }
+        
+        /**
+         * Set the option to sort data points (only pie charts).
+         * 
+         * @param $sortDataPoint Sort data points : boolean
+         */
+        public function setSortDataPoint($sortDataPoint) {
+            $this->sortDataPoint = $sortDataPoint;
+        }
+        
+        /**
+         * Get the option to sort data points (only pie charts).
+         * 
+         * @return Sort data points : boolean
+         */
+        public function getSortDataPoint() {
+            return $this->sortDataPoint;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/model/DataSet.php b/lib/libchart/classes/model/DataSet.php
new file mode 100644
index 00000000..d4b332fa
--- /dev/null
+++ b/lib/libchart/classes/model/DataSet.php
@@ -0,0 +1,28 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Superclass of all data sets.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 10 may 2007
+     */
+    abstract class DataSet {
+    }
+?>
\ No newline at end of file
diff --git a/lib/libchart/classes/model/Point.php b/lib/libchart/classes/model/Point.php
new file mode 100644
index 00000000..a441e636
--- /dev/null
+++ b/lib/libchart/classes/model/Point.php
@@ -0,0 +1,59 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Point of coordinates (X,Y).
+     * The value of X isn't really of interest, but X is used as a label to display on the horizontal axis.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class Point {
+        private $x;
+        private $y;
+    
+        /**
+         * Creates a new sampling point of coordinates (x, y)
+         *
+         * @param integer x coordinate (label)
+         * @param integer y coordinate (value)
+         */
+        public function __construct($x, $y) {
+            $this->x = $x;
+            $this->y = $y;
+        }
+
+        /**
+         * Gets the x coordinate (label).
+         *
+         * @return integer x coordinate (label)
+         */
+        public function getX() {
+            return $this->x;
+        }
+
+        /**
+         * Gets the y coordinate (value).
+         *
+         * @return integer y coordinate (value)
+         */
+        public function getY() {
+            return $this->y;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/model/XYDataSet.php b/lib/libchart/classes/model/XYDataSet.php
new file mode 100644
index 00000000..67553a15
--- /dev/null
+++ b/lib/libchart/classes/model/XYDataSet.php
@@ -0,0 +1,56 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Set of data in the form of (x, y) items.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 10 may 2007
+     */
+    class XYDataSet extends DataSet {
+        private $pointList;
+    
+        /**
+         * Constructor of XYDataSet.
+         *
+         */
+        public function __construct() {
+            $this->pointList = array();
+        }
+    
+        /**
+         * Add a new point to the dataset.
+         *
+         * @param Point Point to add to the dataset
+         */
+        
+        public function addPoint($point) {
+            array_push($this->pointList, $point);
+        }
+
+        /**
+         * Getter of pointList.
+         *
+         * @return List of points.
+         */
+        public function getPointList() {
+            return $this->pointList;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/model/XYSeriesDataSet.php b/lib/libchart/classes/model/XYSeriesDataSet.php
new file mode 100644
index 00000000..dc04e02c
--- /dev/null
+++ b/lib/libchart/classes/model/XYSeriesDataSet.php
@@ -0,0 +1,76 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * This dataset comprises several series of points and is used to plot multiple lines charts.
+     * Each serie is a XYDataSet.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 20 july 2007
+     */
+    class XYSeriesDataSet extends DataSet {
+        /**
+         * List of titles
+         */
+        private $titleList;
+    
+        /**
+         * List of XYDataSet.
+         */
+        private $serieList;
+        
+        /**
+         * Constructor of XYSeriesDataSet.
+         *
+         */
+        public function __construct() {
+            $this->titleList = array();
+            $this->serieList = array();
+        }
+    
+        /**
+         * Add a new serie to the dataset.
+         *
+         * @param string Title (label) of the serie.
+         * @param XYDataSet Serie of points to add
+         */
+        public function addSerie($title, $serie) {
+            array_push($this->titleList, $title);
+            array_push($this->serieList, $serie);
+        }
+        
+        /**
+         * Getter of titleList.
+         *
+         * @return List of titles.
+         */
+        public function getTitleList() {
+            return $this->titleList;
+        }
+
+        /**
+         * Getter of serieList.
+         *
+         * @return List of series.
+         */
+        public function getSerieList() {
+            return $this->serieList;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/axis/Axis.php b/lib/libchart/classes/view/axis/Axis.php
new file mode 100644
index 00000000..eef2a90b
--- /dev/null
+++ b/lib/libchart/classes/view/axis/Axis.php
@@ -0,0 +1,130 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Automatic axis boundaries and ticks calibration
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class Axis {
+        private $min;
+        private $max;
+        private $guide;
+        private $delta;
+        private $magnitude;
+        private $displayMin;
+        private $displayMax;
+        private $tics;
+    
+        /**
+         * Creates a new axis formatter.
+         *
+         * @param integer minimum value on the axis
+         * @param integer maximum value on the axis
+         */
+        public function __construct($min, $max) {
+            $this->min = $min;
+            $this->max = $max;
+
+            $this->guide = 10;
+        }
+
+        /**
+         * Computes value between two ticks.
+         */
+        public function quantizeTics() {
+            // Approximate number of decades, in [1..10[
+            $norm = $this->delta / $this->magnitude;
+
+            // Approximate number of tics per decade
+            $posns = $this->guide / $norm;
+
+            if ($posns > 20) {
+                $tics = 0.05;        // e.g. 0, .05, .10, ...
+            } else if ($posns > 10) {
+                $tics = 0.2;        // e.g.  0, .1, .2, ...
+            } else if ($posns > 5) {
+                $tics = 0.4;        // e.g.  0, 0.2, 0.4, ...
+            } else if ($posns > 3) {
+                $tics = 0.5;        // e.g. 0, 0.5, 1, ...
+            } else if ($posns > 2) {
+                $tics = 1;        // e.g. 0, 1, 2, ...
+            } else if ($posns > 0.25) {
+                $tics = 2;        // e.g. 0, 2, 4, 6 
+            } else {
+                $tics = ceil($norm);
+            }
+            
+            $this->tics = $tics * $this->magnitude;
+        }
+
+        /**
+         * Computes automatic boundaries on the axis
+         */
+        public function computeBoundaries() {
+            // Range
+            $this->delta = abs($this->max - $this->min);
+
+            // Check for null distribution
+            if ($this->delta == 0)
+                $this->delta = 1;
+            
+            // Order of magnitude of range
+            $this->magnitude = pow(10, floor(log10($this->delta)));
+            
+            $this->quantizeTics();
+
+            $this->displayMin = floor($this->min / $this->tics) * $this->tics;
+            $this->displayMax = ceil($this->max / $this->tics) * $this->tics;
+            $this->displayDelta = $this->displayMax - $this->displayMin;
+        
+            // Check for null distribution
+            if ($this->displayDelta == 0) {
+                $this->displayDelta = 1;
+            }
+        }
+
+        /**
+         * Get the lower boundary on the axis3
+         *
+         * @return integer lower boundary on the axis
+         */
+        public function getLowerBoundary() {
+            return $this->displayMin;
+        }
+
+        /**
+         * Get the upper boundary on the axis3
+         *
+         * @return integer upper boundary on the axis
+         */
+        public function getUpperBoundary() {
+            return $this->displayMax;
+        }
+
+        /**
+         * Get the value between two ticks3
+         *
+         * @return integer value between two ticks
+         */
+        public function getTics() {
+            return $this->tics;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/axis/Bound.php b/lib/libchart/classes/view/axis/Bound.php
new file mode 100644
index 00000000..3ecdb12e
--- /dev/null
+++ b/lib/libchart/classes/view/axis/Bound.php
@@ -0,0 +1,156 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Object representing the bounds of a dataset (its minimal and maximal values) on its vertical axis.
+     * The bounds are automatically calculated from a XYDataSet or XYSeriesDataSet.
+     * Default (calculated) bounds can be overriden using the setLowerBound() and setUpperBound() methods.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 25 july 2007
+     */
+     class Bound {
+        /**
+         * Manually set lower bound, overrides the value calculated by computeBound().
+         */
+        private $lowerBound = null;
+
+        /**
+         * Manually set upper bound, overrides the value calculated by computeBound().
+         */
+        private $upperBound = null;
+        
+        /**
+         * Computed min bound.
+         */
+        private $yMinValue = null;
+        
+        /**
+         * Computed max bound.
+         */
+        private $yMaxValue = null;
+        
+        /**
+         * Compute the boundaries on the axis.
+         *
+         * @param dataSet The data set
+         */
+        public function computeBound($dataSet) {
+            // Check if the data set is empty
+            $dataSetEmpty = true;
+            $serieList = null;
+            if ($dataSet instanceof XYDataSet) {
+                $pointList = $dataSet->getPointList();
+                $dataSetEmpty = count($pointList) == 0;
+                
+                if (!$dataSetEmpty) {
+                    // Process it as a serie
+                    $serieList = array();
+                    array_push($serieList, $dataSet);
+                }
+            } else if ($dataSet instanceof XYSeriesDataSet) {
+                $serieList = $dataSet->getSerieList();
+                if (count($serieList) > 0) {
+                    $serie = current($serieList);
+                    $dataSetEmpty = count($serie) == 0;
+                }
+            } else {
+                die("Error: unknown dataset type");
+            }
+            
+            // If the dataset is empty, default some bounds
+            $yMin = 0;
+            $yMax = 1;
+            if (!$dataSetEmpty) {
+                // Compute lower and upper bound on the value axis
+                unset($yMin);
+                unset($yMax);
+
+                foreach ($serieList as $serie) {
+                    foreach ($serie->getPointList() as $point) {
+                        $y = $point->getY();
+                        
+                        if (!isset($yMin)) {
+                            $yMin = $y;
+                            $yMax = $y;
+                        } else {
+                            if ($y < $yMin) {
+                                $yMin = $y;
+                            }
+            
+                            if ($y > $yMax) {
+                                $yMax = $y;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // If user specified bounds and they are actually greater than computer bounds, override computed bounds
+            if (isset($this->lowerBound) && $this->lowerBound < $yMin) {
+                $this->yMinValue = $this->lowerBound;
+            } else {
+                $this->yMinValue = $yMin;
+            }
+
+            if (isset($this->upperBound) && $this->upperBound > $yMax) {
+                $this->yMaxValue = $this->upperBound;
+            } else {
+                $this->yMaxValue = $yMax;
+            }
+        }
+
+        /**
+         * Getter of yMinValue.
+         *
+         * @return min bound
+         */
+        public function getYMinValue() {
+            return $this->yMinValue;
+        }
+
+        /**
+         * Getter of yMaxValue.
+         *
+         * @return max bound
+         */
+        public function getYMaxValue() {
+            return $this->yMaxValue;
+        }
+
+        /**
+         * Set manually the lower boundary value (overrides the automatic formatting).
+         * Typical usage is to set the bars starting from zero.
+         *
+         * @param double lower boundary value
+         */
+        public function setLowerBound($lowerBound) {
+            $this->lowerBound = $lowerBound;
+        }
+
+        /**
+         * Set manually the upper boundary value (overrides the automatic formatting).
+         *
+         * @param double upper boundary value
+         */
+        public function setUpperBound($upperBound) {
+            $this->upperBound = $upperBound;
+        }
+     }
+?>
\ No newline at end of file
diff --git a/lib/libchart/classes/view/caption/Caption.php b/lib/libchart/classes/view/caption/Caption.php
new file mode 100644
index 00000000..69d23cb1
--- /dev/null
+++ b/lib/libchart/classes/view/caption/Caption.php
@@ -0,0 +1,112 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Caption.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 30 july 2007
+     */
+    class Caption {
+        protected $labelBoxWidth;
+        protected $labelBoxHeight;
+    
+        // Plot
+        protected $plot;
+        
+        // Label list
+        protected $labelList;
+        
+        // Color set
+        protected $colorSet;
+        
+        /**
+         * Constructor of Caption
+         */
+        public function __construct() {
+            $this->labelBoxWidth = 15;
+            $this->labelBoxHeight = 15;
+        }
+        
+        /**
+         * Render the caption.
+         */
+        public function render() {
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            $primitive = $this->plot->getPrimitive();
+            
+            // Get the caption area
+            $captionArea = $this->plot->getCaptionArea();
+
+            // Get the pie color set
+            $colorSet = $this->colorSet;
+            $colorSet->reset();
+            
+            $i = 0;
+            foreach ($this->labelList as $label) {
+                // Get the next color
+                $color = $colorSet->currentColor();
+                $colorSet->next();
+
+                $boxX1 = $captionArea->x1;
+                $boxX2 = $boxX1 + $this->labelBoxWidth;
+                $boxY1 = $captionArea->y1 + 5 + $i * ($this->labelBoxHeight + 5);
+                $boxY2 = $boxY1 + $this->labelBoxHeight;
+
+                $primitive->outlinedBox($boxX1, $boxY1, $boxX2, $boxY2, $palette->axisColor[0], $palette->axisColor[1]);
+                imagefilledrectangle($img, $boxX1 + 2, $boxY1 + 2, $boxX2 - 2, $boxY2 - 2, $color->getColor($img));
+
+                $text->printText($img, $boxX2 + 5, $boxY1 + $this->labelBoxHeight / 2, $this->plot->getTextColor(), $label, $text->fontCondensed, $text->VERTICAL_CENTER_ALIGN);
+
+                $i++;
+            }
+        }
+
+        /**
+         * Sets the plot.
+         *
+         * @param Plot The plot
+         */
+        public function setPlot($plot) {
+            $this->plot = $plot;
+        }
+        
+        /**
+         * Sets the label list.
+         *
+         * @param Array label list
+         */
+        public function setLabelList($labelList) {
+            $this->labelList = $labelList;
+        }
+        
+        
+        /**
+         * Sets the color set.
+         *
+         * @param Array Color set
+         */
+        public function setColorSet($colorSet) {
+            $this->colorSet = $colorSet;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/chart/BarChart.php b/lib/libchart/classes/view/chart/BarChart.php
new file mode 100644
index 00000000..64d794d1
--- /dev/null
+++ b/lib/libchart/classes/view/chart/BarChart.php
@@ -0,0 +1,183 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Base abstract class for rendering both horizontal and vertical bar charts.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    abstract class BarChart extends Chart {
+        protected $bound;
+        protected $axis;
+        protected $hasSeveralSerie;
+        
+        /**
+         * Creates a new bar chart.
+         *
+         * @param integer width of the image
+         * @param integer height of the image
+         */
+        protected function __construct($width, $height) {
+            parent::__construct($width, $height);
+
+            // Initialize the bounds
+            $this->bound = new Bound();
+            $this->bound->setLowerBound(0);
+        }
+
+        /**
+         * Compute the axis.
+         */
+        protected function computeAxis() {
+            $this->axis = new Axis($this->bound->getYMinValue(), $this->bound->getYMaxValue());
+            $this->axis->computeBoundaries();
+        }
+
+        /**
+         * Create the image.
+         */
+        protected function createImage() {
+            parent::createImage();
+
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            $primitive = $this->plot->getPrimitive();
+            
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+
+            // Aqua-like background
+            for ($i = $graphArea->y1; $i < $graphArea->y2; $i++) {
+                $color = $palette->backgroundColor[($i + 3) % 4];
+                $primitive->line($graphArea->x1, $i, $graphArea->x2, $i, $color);
+            }
+
+            // Axis
+            imagerectangle($img, $graphArea->x1 - 1, $graphArea->y1, $graphArea->x1, $graphArea->y2, $palette->axisColor[0]->getColor($img));
+            imagerectangle($img, $graphArea->x1 - 1, $graphArea->y2, $graphArea->x2, $graphArea->y2 + 1, $palette->axisColor[0]->getColor($img));
+        }
+
+        /**
+         * Returns true if the data set has some data.
+         * @param minNumberOfPoint Minimum number of points (1 for bars, 2 for lines).
+         *
+         * @return true if data set empty
+         */
+        protected function isEmptyDataSet($minNumberOfPoint) {
+            if ($this->dataSet instanceof XYDataSet) {
+                $pointList = $this->dataSet->getPointList();
+                $pointCount = count($pointList);
+                return $pointCount < $minNumberOfPoint;
+            } else if ($this->dataSet instanceof XYSeriesDataSet) {
+                $serieList = $this->dataSet->getSerieList();
+                reset($serieList);
+                if (count($serieList) > 0) {
+                    $serie = current($serieList);
+                    $pointList = $serie->getPointList();
+                    $pointCount = count($pointList);
+                    return $pointCount < $minNumberOfPoint;
+                }
+            } else {
+                die("Error: unknown dataset type");
+            }
+        }
+
+        /**
+         * Checks the data model before rendering the graph.
+         */
+        protected function checkDataModel() {
+            // Check if a dataset was defined
+            if (!$this->dataSet) {
+                die("Error: No dataset defined.");
+            }
+            
+            // Bar charts accept both XYDataSet and XYSeriesDataSet
+            if ($this->dataSet instanceof XYDataSet) {
+                // The dataset contains only one serie
+                $this->hasSeveralSerie = false;
+            } else if ($this->dataSet instanceof XYSeriesDataSet) {
+                // Check if each series has the same number of points
+                unset($lastPointCount);
+                $serieList = $this->dataSet->getSerieList();
+                for ($i = 0; $i < count($serieList); $i++) {
+                    $serie = $serieList[$i];
+                    $pointCount = count($serie->getPointList());
+                    if (isset($lastPointCount) && $pointCount != $lastPointCount) {
+                        die("Error: serie <" . $i . "> doesn't have the same number of points as last serie (last one: <" . $lastPointCount. ">, this one: <" . $pointCount. ">).");
+                    }
+                    $lastPointCount = $pointCount;
+                }
+                
+                // The dataset contains several series
+                $this->hasSeveralSerie = true;
+            } else {
+                die("Error: Bar chart accept only XYDataSet and XYSeriesDataSet");
+            }
+        }
+
+        /**
+         * Return the data as a series list (for consistency).
+         *
+         * @return List of series
+         */
+        protected function getDataAsSerieList() {
+            // Get the data as a series list
+            $serieList = null;
+            if ($this->dataSet instanceof XYSeriesDataSet) {
+                $serieList = $this->dataSet->getSerieList();
+            } else if ($this->dataSet instanceof XYDataSet) {
+                $serieList = array();
+                array_push($serieList, $this->dataSet);
+            }
+            
+            return $serieList;
+        }
+        
+        /**
+         * Return the first serie of the list, or the dataSet itself if there is no serie.
+         *
+         * @return XYDataSet
+         */
+        protected function getFirstSerieOfList() {
+            $pointList = null;
+            if ($this->dataSet instanceof XYSeriesDataSet) {
+                // For a series dataset, print the legend from the first serie
+                $serieList = $this->dataSet->getSerieList();
+                reset($serieList);
+                $serie = current($serieList);
+                $pointList = $serie->getPointList();
+            } else if ($this->dataSet instanceof XYDataSet) {
+                $pointList = $this->dataSet->getPointList();
+            }
+            
+            return $pointList;
+        }
+        
+        /**
+         * Retourns the bound.
+         *
+         * @return bound Bound
+         */
+        public function getBound() {
+            return $this->bound;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/chart/Chart.php b/lib/libchart/classes/view/chart/Chart.php
new file mode 100644
index 00000000..605a1e5f
--- /dev/null
+++ b/lib/libchart/classes/view/chart/Chart.php
@@ -0,0 +1,119 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /*! \mainpage Libchart
+     *
+     * This is the reference API, automatically compiled by <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a>.
+     * You can find here information that is not covered by the <a href="../samplecode/">tutorial</a>.
+     *
+     */
+
+    /**
+     * Base chart class.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    abstract class Chart {
+        /**
+         * The chart configuration.
+         */
+        protected $config;
+    
+        /**
+         * The data set.
+         */
+        protected $dataSet;
+    
+        /**
+         * Plot (holds graphical attributes).
+         */
+        protected $plot;
+
+        /**
+         * Abstract constructor of Chart.
+         *
+         * @param integer width of the image
+         * @param integer height of the image
+         */
+        protected function __construct($width, $height) {
+            // Initialize the configuration
+            $this->config = new ChartConfig();
+            
+            // Creates the plot
+            $this->plot = new Plot($width, $height);
+            $this->plot->setTitle("Untitled chart");
+            $this->plot->setLogoFileName(dirname(__FILE__) . "/../../../images/PoweredBy.png");
+        }
+
+        /**
+         * Checks the data model before rendering the graph.
+         */
+        protected function checkDataModel() {
+            // Check if a dataset was defined
+            if (!$this->dataSet) {
+                die("Error: No dataset defined.");
+            }
+            
+            // Maybe no points are defined, but that's ok. This will yield and empty graph with default boundaries.
+        }
+        
+        /**
+         * Create the image.
+         */
+        protected function createImage() {
+            $this->plot->createImage();
+        }
+
+        /**
+         * Sets the data set.
+         *
+         * @param dataSet The data set
+         */
+        public function setDataSet($dataSet) {
+            $this->dataSet = $dataSet;
+        }
+        
+        /**
+         * Return the chart configuration.
+         *
+         * @return configuration : ChartConfig
+         */
+        public function getConfig() {
+            return $this->config;
+        }
+        
+        /**
+         * Return the plot.
+         *
+         * @return plot
+         */
+        public function getPlot() {
+            return $this->plot;
+        }
+        
+        /**
+         * Sets the title.
+         *
+         * @param string New title
+         */
+        public function setTitle($title) {
+            $this->plot->setTitle($title);
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/chart/HorizontalBarChart.php b/lib/libchart/classes/view/chart/HorizontalBarChart.php
new file mode 100644
index 00000000..2ee1e93a
--- /dev/null
+++ b/lib/libchart/classes/view/chart/HorizontalBarChart.php
@@ -0,0 +1,230 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Horizontal bar chart
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class HorizontalBarChart extends BarChart {
+        /**
+         * Ratio of empty space beside the bars.
+         */
+        private $emptyToFullRatio;
+    
+        /**
+         * Creates a new horizontal bar chart.
+         *
+         * @param integer width of the image
+         * @param integer height of the image
+         */
+        public function __construct($width = 600, $height = 250) {
+            parent::__construct($width, $height);
+
+            $this->emptyToFullRatio = 1 / 5;
+            $this->plot->setGraphPadding(new Padding(5, 30, 30, 50));
+        }
+
+        /**
+         * Computes the layout.
+         */
+        protected function computeLayout() {
+            if ($this->hasSeveralSerie) {
+                $this->plot->setHasCaption(true);
+            }
+            $this->plot->computeLayout();
+        }
+        
+        /**
+         * Print the axis.
+         */
+        protected function printAxis() {
+            $minValue = $this->axis->getLowerBoundary();
+            $maxValue = $this->axis->getUpperBoundary();
+            $stepValue = $this->axis->getTics();
+
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+
+            // Horizontal axis
+            for ($value = $minValue; $value <= $maxValue; $value += $stepValue) {
+                $x = $graphArea->x1 + ($value - $minValue) * ($graphArea->x2 - $graphArea->x1) / ($this->axis->displayDelta);
+
+                imagerectangle($img, $x - 1, $graphArea->y2 + 2, $x, $graphArea->y2 + 3, $palette->axisColor[0]->getColor($img));
+                imagerectangle($img, $x - 1, $graphArea->y2, $x, $graphArea->y2 + 1, $palette->axisColor[1]->getColor($img));
+
+                $text->printText($img, $x, $graphArea->y2 + 5, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN);
+            }
+
+            // Get first serie of a list
+            $pointList = $this->getFirstSerieOfList();
+
+            // Vertical Axis
+            $pointCount = count($pointList);
+            reset($pointList);
+            $rowHeight = ($graphArea->y2 - $graphArea->y1) / $pointCount;
+            reset($pointList);
+            for ($i = 0; $i <= $pointCount; $i++) {
+                $y = $graphArea->y2 - $i * $rowHeight;
+
+                imagerectangle($img, $graphArea->x1 - 3, $y, $graphArea->x1 - 2, $y + 1, $palette->axisColor[0]->getColor($img));
+                imagerectangle($img, $graphArea->x1 - 1, $y, $graphArea->x1, $y + 1, $palette->axisColor[1]->getColor($img));
+
+                if ($i < $pointCount) {
+                    $point = current($pointList);
+                    next($pointList);
+    
+                    $label = $point->getX();
+
+                    $text->printText($img, $graphArea->x1 - 5, $y - $rowHeight / 2, $this->plot->getTextColor(), $label, $text->fontCondensed, $text->HORIZONTAL_RIGHT_ALIGN | $text->VERTICAL_CENTER_ALIGN);
+                }
+            }
+        }
+
+        /**
+         * Print the bars.
+         */
+        protected function printBar() {
+            // Get the data as a list of series for consistency
+            $serieList = $this->getDataAsSerieList();
+            
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+
+            $minValue = $this->axis->getLowerBoundary();
+            $maxValue = $this->axis->getUpperBoundary();
+            $stepValue = $this->axis->getTics();
+            
+            // Start from the first color for the first serie
+            $barColorSet = $palette->barColorSet;
+            $barColorSet->reset();
+
+            $serieCount = count($serieList);
+            for ($j = 0; $j < $serieCount; $j++) {
+                $serie = $serieList[$j];
+                $pointList = $serie->getPointList();
+                $pointCount = count($pointList);
+                reset($pointList);
+                
+                // Select the next color for the next serie
+                if (!$this->config->getUseMultipleColor()) {
+                    $color = $barColorSet->currentColor();
+                    $shadowColor = $barColorSet->currentShadowColor();
+                    $barColorSet->next();
+                }
+
+                $rowHeight = ($graphArea->y2 - $graphArea->y1) / $pointCount;
+                for ($i = 0; $i < $pointCount; $i++) {
+                    $y = $graphArea->y2 - $i * $rowHeight;
+
+                    $point = current($pointList);
+                    next($pointList);
+
+                    $value = $point->getY();
+                    
+                    $xmax = $graphArea->x1 + ($value - $minValue) * ($graphArea->x2 - $graphArea->x1) / ($this->axis->displayDelta);
+
+                    // Bar dimensions
+                    $yWithMargin = $y - $rowHeight * $this->emptyToFullRatio;
+                    $rowWidthWithMargin = $rowHeight * (1 - $this->emptyToFullRatio * 2);
+                    $barWidth = $rowWidthWithMargin / $serieCount;
+                    $barOffset = $barWidth * $j;
+                    $y1 = $yWithMargin - $barWidth - $barOffset;
+                    $y2 = $yWithMargin - $barOffset - 1;
+
+                    // Select the next color for the next item in the serie
+                    if ($this->config->getUseMultipleColor()) {
+                        $color = $barColorSet->currentColor();
+                        $shadowColor = $barColorSet->currentShadowColor();
+                        $barColorSet->next();
+                    }
+                        
+                    // Draw caption text on bar
+                    if ($this->config->getShowPointCaption()) {
+                        $text->printText($img, $xmax + 5, $y2 - $barWidth / 2, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->VERTICAL_CENTER_ALIGN);
+                    }
+                    
+                    // Draw the horizontal bar
+	                imagefilledrectangle($img, $graphArea->x1 + 1, $y1, $xmax, $y2, $shadowColor->getColor($img));
+                    
+	                // Prevents drawing a small box when x = 0
+                    if ($graphArea->x1 != $xmax) {
+                        imagefilledrectangle($img, $graphArea->x1 + 2, $y1 + 1, $xmax - 4, $y2, $color->getColor($img));
+                    }
+                }
+            }
+        }
+        
+        /**
+         * Renders the caption.
+         */
+        protected function printCaption() {
+            // Get the list of labels
+            $labelList = $this->dataSet->getTitleList();
+            
+            // Create the caption
+            $caption = new Caption();
+            $caption->setPlot($this->plot);
+            $caption->setLabelList($labelList);
+            
+            $palette = $this->plot->getPalette();
+            $barColorSet = $palette->barColorSet;
+            $caption->setColorSet($barColorSet);
+            
+            // Render the caption
+            $caption->render();
+        }
+
+        /**
+         * Render the chart image.
+         *
+         * @param string name of the file to render the image to (optional)
+         */
+        public function render($fileName = null) {
+            // Check the data model
+            $this->checkDataModel();
+            
+            $this->bound->computeBound($this->dataSet);
+            $this->computeAxis();
+            $this->computeLayout();
+            $this->createImage();
+            $this->plot->printLogo();
+            $this->plot->printTitle();
+            if (!$this->isEmptyDataSet(1)) {
+                $this->printAxis();
+                $this->printBar();
+                if ($this->hasSeveralSerie) {
+                    $this->printCaption();
+                }
+            }
+
+            $this->plot->render($fileName);
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/chart/LineChart.php b/lib/libchart/classes/view/chart/LineChart.php
new file mode 100644
index 00000000..f72c49aa
--- /dev/null
+++ b/lib/libchart/classes/view/chart/LineChart.php
@@ -0,0 +1,200 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Line chart.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class LineChart extends BarChart {
+        /**
+         * Creates a new line chart.
+         * Line charts allow for XYDataSet and XYSeriesDataSet in order to plot several lines.
+         *
+         * @param integer width of the image
+         * @param integer height of the image
+         */
+        public function __construct($width = 600, $height = 250) {
+            parent::__construct($width, $height);
+
+            $this->plot->setGraphPadding(new Padding(5, 30, 50, 50));
+        }
+
+        /**
+         * Computes the layout.
+         */
+        protected function computeLayout() {
+            if ($this->hasSeveralSerie) {
+                $this->plot->setHasCaption(true);
+            }
+            $this->plot->computeLayout();
+        }
+        
+        /**
+         * Print the axis.
+         */
+        protected function printAxis() {
+            $minValue = $this->axis->getLowerBoundary();
+            $maxValue = $this->axis->getUpperBoundary();
+            $stepValue = $this->axis->getTics();
+
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+            
+            // Vertical axis
+            for ($value = $minValue; $value <= $maxValue; $value += $stepValue) {
+                $y = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+                imagerectangle($img, $graphArea->x1 - 3, $y, $graphArea->x1 - 2, $y + 1, $palette->axisColor[0]->getColor($img));
+                imagerectangle($img, $graphArea->x1 - 1, $y, $graphArea->x1, $y + 1, $palette->axisColor[1]->getColor($img));
+
+                $text->printText($img, $graphArea->x1 - 5, $y, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_RIGHT_ALIGN | $text->VERTICAL_CENTER_ALIGN);
+            }
+
+            // Get first serie of a list
+            $pointList = $this->getFirstSerieOfList();
+            
+            // Horizontal Axis
+            $pointCount = count($pointList);
+            reset($pointList);
+            $columnWidth = ($graphArea->x2 - $graphArea->x1) / ($pointCount - 1);
+
+            for ($i = 0; $i < $pointCount; $i++) {
+                $x = $graphArea->x1 + $i * $columnWidth;
+
+                imagerectangle($img, $x - 1, $graphArea->y2 + 2, $x, $graphArea->y2 + 3, $palette->axisColor[0]->getColor($img));
+                imagerectangle($img, $x - 1, $graphArea->y2, $x, $graphArea->y2 + 1, $palette->axisColor[1]->getColor($img));
+
+                $point = current($pointList);
+                next($pointList);
+
+                $label = $point->getX();
+
+                $text->printDiagonal($img, $x - 5, $graphArea->y2 + 10, $this->plot->getTextColor(), $label);
+            }
+        }
+
+        /**
+         * Print the lines.
+         */
+        protected function printLine() {
+            $minValue = $this->axis->getLowerBoundary();
+            $maxValue = $this->axis->getUpperBoundary();
+            
+            // Get the data as a list of series for consistency
+            $serieList = $this->getDataAsSerieList();
+            
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            $primitive = $this->plot->getPrimitive();
+            
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+            
+            $lineColorSet = $palette->lineColorSet;
+            $lineColorSet->reset();
+            for ($j = 0; $j < count($serieList); $j++) {
+                $serie = $serieList[$j];
+                $pointList = $serie->getPointList();
+                $pointCount = count($pointList);
+                reset($pointList);
+
+                $columnWidth = ($graphArea->x2 - $graphArea->x1) / ($pointCount - 1);
+
+                $lineColor = $lineColorSet->currentColor();
+                $lineColorShadow = $lineColorSet->currentShadowColor();
+                $lineColorSet->next();
+                $x1 = null;
+                $y1 = null;
+                for ($i = 0; $i < $pointCount; $i++) {
+                    $x2 = $graphArea->x1 + $i * $columnWidth;
+
+                    $point = current($pointList);
+                    next($pointList);
+
+                    $value = $point->getY();
+                    
+                    $y2 = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+                    // Draw line 
+                    if ($x1) {
+                        $primitive->line($x1, $y1, $x2, $y2, $lineColor, 4);
+                        $primitive->line($x1, $y1 - 1, $x2, $y2 - 1, $lineColorShadow, 2);
+                    }
+                    
+                    $x1 = $x2;
+                    $y1 = $y2;
+                }
+            }
+        }
+        
+        /**
+         * Renders the caption.
+         */
+        protected function printCaption() {
+            // Get the list of labels
+            $labelList = $this->dataSet->getTitleList();
+            
+            // Create the caption
+            $caption = new Caption();
+            $caption->setPlot($this->plot);
+            $caption->setLabelList($labelList);
+            
+            $palette = $this->plot->getPalette();
+            $lineColorSet = $palette->lineColorSet;
+            $caption->setColorSet($lineColorSet);
+            
+            // Render the caption
+            $caption->render();
+        }
+
+        /**
+         * Render the chart image.
+         *
+         * @param string name of the file to render the image to (optional)
+         */
+        public function render($fileName = null) {
+            // Check the data model
+            $this->checkDataModel();
+
+            $this->bound->computeBound($this->dataSet);
+            $this->computeAxis();
+            $this->computeLayout();
+            $this->createImage();
+            $this->plot->printLogo();
+            $this->plot->printTitle();
+            if (!$this->isEmptyDataSet(2)) {
+                $this->printAxis();
+                $this->printLine();
+                if ($this->hasSeveralSerie) {
+                    $this->printCaption();
+                }
+            }
+
+            $this->plot->render($fileName);
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/chart/PieChart.php b/lib/libchart/classes/view/chart/PieChart.php
new file mode 100644
index 00000000..44a679a5
--- /dev/null
+++ b/lib/libchart/classes/view/chart/PieChart.php
@@ -0,0 +1,264 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Pie chart.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class PieChart extends Chart {
+        protected $pieCenterX;
+        protected $pieCenterY;
+    
+        /**
+         * Constructor of a pie chart.
+         *
+         * @param integer width of the image
+         * @param integer height of the image
+         */
+        public function __construct($width = 600, $height = 250) {
+            parent::__construct($width, $height);
+            $this->plot->setGraphPadding(new Padding(15, 10, 30, 30));
+        }
+
+        /**
+         * Computes the layout.
+         */
+        protected function computeLayout() {
+            $this->plot->setHasCaption(true);
+            $this->plot->computeLayout();
+            
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+
+            // Compute the coordinates of the pie
+            $this->pieCenterX = $graphArea->x1 + ($graphArea->x2 - $graphArea->x1) / 2;
+            $this->pieCenterY = $graphArea->y1 + ($graphArea->y2 - $graphArea->y1) / 2;
+
+            $this->pieWidth = round(($graphArea->x2 - $graphArea->x1) * 4 / 5);
+            $this->pieHeight = round(($graphArea->y2 - $graphArea->y1) * 3.7 / 5);
+            $this->pieDepth = round($this->pieWidth * 0.05);
+        }
+        
+        /**
+         * Compare two sampling point values, order from biggest to lowest value.
+         *
+         * @param double first value
+         * @param double second value
+         * @return integer result of the comparison
+         */
+        protected function sortPie($v1, $v2) {
+            return $v1[0] == $v2[0] ? 0 : ($v1[0] > $v2[0] ? -1 : 1);
+        }
+        
+        /**
+         * Compute pie values in percentage and sort them.
+         */
+        protected function computePercent() {
+            $this->total = 0;
+            $this->percent = array();
+
+            $pointList = $this->dataSet->getPointList();
+            foreach ($pointList as $point) {
+                $this->total += $point->getY();
+            }
+
+            foreach ($pointList as $point) {
+                $percent = $this->total == 0 ? 0 : 100 * $point->getY() / $this->total;
+
+                array_push($this->percent, array($percent, $point));
+            }
+
+            // Sort data points
+            if ($this->config->getSortDataPoint()) {
+                usort($this->percent, array("PieChart", "sortPie"));
+            }
+        }
+
+        /**
+         * Creates the pie chart image.
+         */
+        protected function createImage() {
+            parent::createImage();
+
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $primitive = $this->plot->getPrimitive();
+            
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+
+            // Legend box
+            $primitive->outlinedBox($graphArea->x1, $graphArea->y1, $graphArea->x2, $graphArea->y2, $palette->axisColor[0], $palette->axisColor[1]);
+
+            // Aqua-like background
+            for ($i = $graphArea->y1 + 2; $i < $graphArea->y2 - 1; $i++) {
+                $color = $palette->backgroundColor[($i + 3) % 4];
+                $primitive->line($graphArea->x1 + 2, $i, $graphArea->x2 - 2, $i, $color);
+            }
+        }
+
+        /**
+         * Renders the caption.
+         */
+        protected function printCaption() {
+            // Create a list of labels
+            $labelList = array();
+            foreach($this->percent as $percent) {
+                list($percent, $point) = $percent;
+                $label = $point->getX();
+                
+                array_push($labelList, $label);
+            }
+            
+            // Create the caption
+            $caption = new Caption();
+            $caption->setPlot($this->plot);
+            $caption->setLabelList($labelList);
+            
+            $palette = $this->plot->getPalette();
+            $pieColorSet = $palette->pieColorSet;
+            $caption->setColorSet($pieColorSet);
+
+            // Render the caption
+            $caption->render();
+        }
+
+        /**
+         * Draw a 2D disc.
+         *
+         * @param integer Center coordinate (y)
+         * @param array Colors for each portion
+         * @param bitfield Drawing mode
+         */
+        protected function drawDisc($cy, $colorArray, $mode) {
+            // Get graphical obects
+            $img = $this->plot->getImg();
+
+            $i = 0;
+            $oldAngle = 0;
+            $percentTotal = 0;
+
+            foreach ($this->percent as $a) {
+                list ($percent, $point) = $a;
+
+                // If value is null, don't draw this arc
+                if ($percent <= 0) {
+                    continue;
+                }
+                
+                $color = $colorArray[$i % count($colorArray)];
+
+                $percentTotal += $percent;
+                $newAngle = $percentTotal * 360 / 100;
+
+                // imagefilledarc doesn't like null values (#1)
+                if ($newAngle - $oldAngle >= 1) {
+                    imagefilledarc($img, $this->pieCenterX, $cy, $this->pieWidth, $this->pieHeight, $oldAngle, $newAngle, $color->getColor($img), $mode);
+                }
+
+                $oldAngle = $newAngle;
+
+                $i++;
+            }
+        }
+
+        /**
+         * Print the percentage text.
+         */
+        protected function drawPercent() {
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            $primitive = $this->plot->getPrimitive();
+            
+            $angle1 = 0;
+            $percentTotal = 0;
+
+            foreach ($this->percent as $a) {
+                list ($percent, $point) = $a;
+
+                // If value is null, the arc isn't drawn, no need to display percent
+                if ($percent <= 0) {
+                    continue;
+                }
+
+                $percentTotal += $percent;
+                $angle2 = $percentTotal * 2 * M_PI / 100;
+
+                $angle = $angle1 + ($angle2 - $angle1) / 2;
+                $label = number_format($percent) . "%";
+
+                $x = cos($angle) * ($this->pieWidth + 35) / 2 + $this->pieCenterX;
+                $y = sin($angle) * ($this->pieHeight + 35) / 2 + $this->pieCenterY;
+
+                $text->printText($img, $x, $y, $this->plot->getTextColor(), $label, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN | $text->VERTICAL_CENTER_ALIGN);
+
+                $angle1 = $angle2;
+            }
+        }
+
+        /**
+         * Print the pie chart.
+         */
+        protected function printPie() {
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            $primitive = $this->plot->getPrimitive();
+
+            // Get the pie color set
+            $pieColorSet = $palette->pieColorSet;
+            $pieColorSet->reset();
+
+            // Silhouette
+            for ($cy = $this->pieCenterY + $this->pieDepth / 2; $cy >= $this->pieCenterY - $this->pieDepth / 2; $cy--) {
+                $this->drawDisc($cy, $palette->pieColorSet->shadowColorList, IMG_ARC_EDGED);
+            }
+
+            // Top
+            $this->drawDisc($this->pieCenterY - $this->pieDepth / 2, $palette->pieColorSet->colorList, IMG_ARC_PIE);
+
+            // Top Outline
+            if ($this->config->getShowPointCaption()) {
+                $this->drawPercent();
+            }
+        }
+
+        /**
+         * Render the chart image.
+         *
+         * @param string name of the file to render the image to (optional)
+         */
+        public function render($fileName = null) {
+            $this->computePercent();
+            $this->computeLayout();
+            $this->createImage();
+            $this->plot->printLogo();
+            $this->plot->printTitle();
+            $this->printPie();
+            $this->printCaption();
+
+            $this->plot->render($fileName);
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/chart/VerticalBarChart.php b/lib/libchart/classes/view/chart/VerticalBarChart.php
new file mode 100644
index 00000000..c1613cff
--- /dev/null
+++ b/lib/libchart/classes/view/chart/VerticalBarChart.php
@@ -0,0 +1,229 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Chart composed of vertical bars.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class VerticalBarChart extends BarChart {
+        /**
+         * Ratio of empty space beside the bars.
+         */
+        private $emptyToFullRatio;
+
+        /**
+         * Creates a new vertical bar chart
+         *
+         * @param integer width of the image
+         * @param integer height of the image
+         */
+        public function __construct($width = 600, $height = 250) {
+            parent::__construct($width, $height);
+
+            $this->emptyToFullRatio = 1 / 5;
+            $this->plot->setGraphPadding(new Padding(5, 30, 50, 50));
+        }
+
+        /**
+         * Computes the layout.
+         */
+        protected function computeLayout() {
+            if ($this->hasSeveralSerie) {
+                $this->plot->setHasCaption(true);
+            }
+            $this->plot->computeLayout();
+        }
+        
+        /**
+         * Print the horizontal and veritcal axis.
+         */
+        protected function printAxis() {
+            $minValue = $this->axis->getLowerBoundary();
+            $maxValue = $this->axis->getUpperBoundary();
+            $stepValue = $this->axis->getTics();
+
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+            
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+            
+            // Vertical axis
+            for ($value = $minValue; $value <= $maxValue; $value += $stepValue) {
+                $y = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+                imagerectangle($img, $graphArea->x1 - 3, $y, $graphArea->x1 - 2, $y + 1, $palette->axisColor[0]->getColor($img));
+                imagerectangle($img, $graphArea->x1 - 1, $y, $graphArea->x1, $y + 1, $palette->axisColor[1]->getColor($img));
+
+                $text->printText($img, $graphArea->x1 - 5, $y, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_RIGHT_ALIGN | $text->VERTICAL_CENTER_ALIGN);
+            }
+
+            // Get first serie of a list
+            $pointList = $this->getFirstSerieOfList();
+
+            // Horizontal Axis
+            $pointCount = count($pointList);
+            reset($pointList);
+            $columnWidth = ($graphArea->x2 - $graphArea->x1) / $pointCount;
+            for ($i = 0; $i <= $pointCount; $i++) {
+                $x = $graphArea->x1 + $i * $columnWidth;
+
+                imagerectangle($img, $x - 1, $graphArea->y2 + 2, $x, $graphArea->y2 + 3, $palette->axisColor[0]->getColor($img));
+                imagerectangle($img, $x - 1, $graphArea->y2, $x, $graphArea->y2 + 1, $palette->axisColor[1]->getColor($img));
+
+                if ($i < $pointCount) {
+                    $point = current($pointList);
+                    next($pointList);
+    
+                    $label = $point->getX();
+
+                    $text->printDiagonal($img, $x + $columnWidth * 1 / 3, $graphArea->y2 + 10, $this->plot->getTextColor(), $label);
+                }
+            }
+        }
+
+        /**
+         * Print the bars.
+         */
+        protected function printBar() {
+            // Get the data as a list of series for consistency
+            $serieList = $this->getDataAsSerieList();
+            
+            // Get graphical obects
+            $img = $this->plot->getImg();
+            $palette = $this->plot->getPalette();
+            $text = $this->plot->getText();
+
+            // Get the graph area
+            $graphArea = $this->plot->getGraphArea();
+
+            // Start from the first color for the first serie
+            $barColorSet = $palette->barColorSet;
+            $barColorSet->reset();
+
+            $minValue = $this->axis->getLowerBoundary();
+            $maxValue = $this->axis->getUpperBoundary();
+            $stepValue = $this->axis->getTics();
+
+            $serieCount = count($serieList);
+            for ($j = 0; $j < $serieCount; $j++) {
+                $serie = $serieList[$j];
+                $pointList = $serie->getPointList();
+                $pointCount = count($pointList);
+                reset($pointList);
+
+                // Select the next color for the next serie
+                if (!$this->config->getUseMultipleColor()) {
+                    $color = $barColorSet->currentColor();
+                    $shadowColor = $barColorSet->currentShadowColor();
+                    $barColorSet->next();
+                }
+
+                $columnWidth = ($graphArea->x2 - $graphArea->x1) / $pointCount;
+                for ($i = 0; $i < $pointCount; $i++) {
+                    $x = $graphArea->x1 + $i * $columnWidth;
+
+                    $point = current($pointList);
+                    next($pointList);
+
+                    $value = $point->getY();
+                    
+                    $ymin = $graphArea->y2 - ($value - $minValue) * ($graphArea->y2 - $graphArea->y1) / ($this->axis->displayDelta);
+
+                    // Bar dimensions
+                    $xWithMargin = $x + $columnWidth * $this->emptyToFullRatio;
+                    $columnWidthWithMargin = $columnWidth * (1 - $this->emptyToFullRatio * 2);
+                    $barWidth = $columnWidthWithMargin / $serieCount;
+                    $barOffset = $barWidth * $j;
+                    $x1 = $xWithMargin + $barOffset;
+                    $x2 = $xWithMargin + $barWidth + $barOffset - 1;
+
+                    // Select the next color for the next item in the serie
+                    if ($this->config->getUseMultipleColor()) {
+                        $color = $barColorSet->currentColor();
+                        $shadowColor = $barColorSet->currentShadowColor();
+                        $barColorSet->next();
+                    }
+                        
+                    // Draw caption text on bar
+                    if ($this->config->getShowPointCaption()) {
+                        $text->printText($img, $x1 + $barWidth / 2 , $ymin - 5, $this->plot->getTextColor(), $value, $text->fontCondensed, $text->HORIZONTAL_CENTER_ALIGN | $text->VERTICAL_BOTTOM_ALIGN);
+                    }
+
+                    // Draw the vertical bar
+                    imagefilledrectangle($img, $x1, $ymin, $x2, $graphArea->y2 - 1, $shadowColor->getColor($img));
+
+                    // Prevents drawing a small box when y = 0
+                    if ($ymin != $graphArea->y2) {
+                        imagefilledrectangle($img, $x1 + 1, $ymin + 1, $x2 - 4, $graphArea->y2 - 1, $color->getColor($img));
+                    }
+                }
+            }
+        }
+        
+        /**
+         * Renders the caption.
+         */
+        protected function printCaption() {
+            // Get the list of labels
+            $labelList = $this->dataSet->getTitleList();
+            
+            // Create the caption
+            $caption = new Caption();
+            $caption->setPlot($this->plot);
+            $caption->setLabelList($labelList);
+            
+            $palette = $this->plot->getPalette();
+            $barColorSet = $palette->barColorSet;
+            $caption->setColorSet($barColorSet);
+            
+            // Render the caption
+            $caption->render();
+        }
+
+        /**
+         * Render the chart image.
+         *
+         * @param string name of the file to render the image to (optional)
+         */
+        public function render($fileName = null) {
+            // Check the data model
+            $this->checkDataModel();
+            
+            $this->bound->computeBound($this->dataSet);
+            $this->computeAxis();
+            $this->computeLayout();
+            $this->createImage();
+            $this->plot->printLogo();
+            $this->plot->printTitle();
+            if (!$this->isEmptyDataSet(1)) {
+                $this->printAxis();
+                $this->printBar();
+                if ($this->hasSeveralSerie) {
+                    $this->printCaption();
+                }
+            }
+
+            $this->plot->render($fileName);
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/color/Color.php b/lib/libchart/classes/view/color/Color.php
new file mode 100644
index 00000000..56d12598
--- /dev/null
+++ b/lib/libchart/classes/view/color/Color.php
@@ -0,0 +1,99 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Color.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class Color {
+        private $red;
+        private $green;
+        private $blue;
+        private $alpha;
+        private $gdColor;
+    
+        /**
+         * Creates a new color
+         *
+         * @param integer red [0..255]
+         * @param integer green [0..255]
+         * @param integer blue [0..255]
+         * @param integer alpha [0..255]
+         */
+        public function __construct($red, $green, $blue, $alpha = 0) {
+            $this->red = (int) $red;
+            $this->green = (int) $green;
+            $this->blue = (int) $blue;
+            $this->alpha = (int) round($alpha * 127.0 / 255);
+            
+            $this->gdColor = null;
+        }
+        
+        /**
+         * Get GD color.
+         *
+         * @param $img GD image resource
+         */
+        public function getColor($img) {
+            // Checks if color has already been allocated
+            if (!$this->gdColor) {
+                if ($this->alpha == 0 || !function_exists('imagecolorallocatealpha')) {
+                    $this->gdColor = imagecolorallocate($img, $this->red, $this->green, $this->blue);
+                } else {
+                    $this->gdColor = imagecolorallocatealpha($img, $this->red, $this->green, $this->blue, $this->alpha);
+                }
+            }
+            
+            // Returns GD color
+            return $this->gdColor;
+        }
+        
+        /**
+         * Clip a color component in the interval [0..255]
+         *
+         * @param integer Component
+         * @return Clipped component
+         */
+        public function clip($component) {
+            if ($component < 0) {
+                $component = 0;
+            } else if ($component > 255) {
+                $component = 255;
+            }
+            
+            return $component;
+        }
+        
+        /**
+         * Return a new color, which is a shadow of this one.
+         *
+         * @param double Multiplication factor
+         * @return Shadow color
+         */
+        public function getShadowColor($shadowFactor) {
+            $red = $this->clip($this->red * $shadowFactor);
+            $green = $this->clip($this->green * $shadowFactor);
+            $blue = $this->clip($this->blue * $shadowFactor);
+            $shadowColor = new Color($red, $green, $blue);
+            
+            return $shadowColor;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/color/ColorSet.php b/lib/libchart/classes/view/color/ColorSet.php
new file mode 100644
index 00000000..e85dba7c
--- /dev/null
+++ b/lib/libchart/classes/view/color/ColorSet.php
@@ -0,0 +1,88 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * A set of colors, used for drawing series of data.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 26 july 2007
+     */
+    class ColorSet {
+        public $colorList;
+        public $shadowColorList;
+    
+        /**
+         * ColorSet constructor.
+         *
+         * @param $shadowFactor Shadow factor
+         * @param $colorArray Colors as an array
+         */
+        public function __construct($colorList, $shadowFactor) {
+            $this->colorList = $colorList;
+            $this->shadowColorList = array();
+
+            // Generate the shadow color set
+            foreach ($colorList as $color) {
+                $shadowColor = $color->getShadowColor($shadowFactor);
+
+                array_push($this->shadowColorList, $shadowColor);
+            }
+        }
+        
+        /**
+         * Reset the iterator over the collections of colors.
+         */
+        public function reset() {
+            reset($this->colorList);
+            reset($this->shadowColorList);
+        }
+
+        /**
+         * Iterate over the colors and shadow colors. When we go after the last one, loop over.
+         *
+         */
+        public function next() {
+            $value = next($this->colorList);
+            next($this->shadowColorList);
+            
+            // When we go after the last value, loop over.
+            if ($value == FALSE) {
+                $this->reset();
+            }
+        }
+
+        /**
+         * Returns the current color.
+         *
+         * @return Current color
+         */
+        public function currentColor() {
+            return current($this->colorList);
+        }
+
+        /**
+         * Returns the current shadow color.
+         *
+         * @return Current shadow color
+         */
+        public function currentShadowColor() {
+            return current($this->shadowColorList);
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/color/Palette.php b/lib/libchart/classes/view/color/Palette.php
new file mode 100644
index 00000000..efc0e146
--- /dev/null
+++ b/lib/libchart/classes/view/color/Palette.php
@@ -0,0 +1,156 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Color palette shared by all chart types.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 25 july 2007
+     */
+    class Palette {
+        // Plot attributes
+        public $red;
+        public $axisColor;
+        public $backgroundColor;
+        
+        // Specific chart attributes
+        public $barColorSet;
+        public $lineColorSet;
+        public $pieColorSet;
+    
+        /**
+         * Palette constructor.
+         */
+        public function __construct() {
+            $this->red = new Color(255, 0, 0);
+        
+            // Set the colors for the horizontal and vertical axis
+            $this->setAxisColor(array(
+                    new Color(201, 201, 201),
+                    new Color(158, 158, 158)
+            ));
+
+            // Set the colors for the background
+            $this->setBackgroundColor(array(
+                    new Color(242, 242, 242),
+                    new Color(231, 231, 231),
+                    new Color(239, 239, 239),
+                    new Color(253, 253, 253)
+            ));
+            
+            // Set the colors for the bars
+            $this->setBarColor(array(
+                    new Color(42, 71, 181),
+                    new Color(243, 198, 118),
+                    new Color(128, 63, 35),
+                    new Color(195, 45, 28),
+                    new Color(224, 198, 165),
+                    new Color(239, 238, 218),
+                    new Color(40, 72, 59),
+                    new Color(71, 112, 132),
+                    new Color(167, 192, 199),
+                    new Color(218, 233, 202)
+            ));
+
+            // Set the colors for the lines
+            $this->setLineColor(array(
+                    new Color(172, 172, 210),
+                    new Color(2, 78, 0),
+                    new Color(148, 170, 36),
+                    new Color(233, 191, 49),
+                    new Color(240, 127, 41),
+                    new Color(243, 63, 34),
+                    new Color(190, 71, 47),
+                    new Color(135, 81, 60),
+                    new Color(128, 78, 162),
+                    new Color(121, 75, 255),
+                    new Color(142, 165, 250),
+                    new Color(162, 254, 239),
+                    new Color(137, 240, 166),
+                    new Color(104, 221, 71),
+                    new Color(98, 174, 35),
+                    new Color(93, 129, 1)
+            ));
+
+            // Set the colors for the pie
+            $this->setPieColor(array(
+                    new Color(2, 78, 0),
+                    new Color(148, 170, 36),
+                    new Color(233, 191, 49),
+                    new Color(240, 127, 41),
+                    new Color(243, 63, 34),
+                    new Color(190, 71, 47),
+                    new Color(135, 81, 60),
+                    new Color(128, 78, 162),
+                    new Color(121, 75, 255),
+                    new Color(142, 165, 250),
+                    new Color(162, 254, 239),
+                    new Color(137, 240, 166),
+                    new Color(104, 221, 71),
+                    new Color(98, 174, 35),
+                    new Color(93, 129, 1)
+            ));
+        }
+        
+        /**
+         * Set the colors for the axis.
+         *
+         * @param colors Array of Color
+         */
+        public function setAxisColor($colors) {
+            $this->axisColor = $colors;
+        }
+        
+        /**
+         * Set the colors for the background.
+         *
+         * @param colors Array of Color
+         */
+        public function setBackgroundColor($colors) {
+            $this->backgroundColor = $colors;
+        }
+        
+        /**
+         * Set the colors for the bar charts.
+         *
+         * @param colors Array of Color
+         */
+        public function setBarColor($colors) {
+            $this->barColorSet = new ColorSet($colors, 0.75);
+        }
+        
+        /**
+         * Set the colors for the line charts.
+         *
+         * @param colors Array of Color
+         */
+        public function setLineColor($colors) {
+            $this->lineColorSet = new ColorSet($colors, 0.75);
+        }
+        
+        /**
+         * Set the colors for the pie charts.
+         *
+         * @param colors Array of Color
+         */
+        public function setPieColor($colors) {
+            $this->pieColorSet = new ColorSet($colors, 0.7);
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/plot/Plot.php b/lib/libchart/classes/view/plot/Plot.php
new file mode 100644
index 00000000..3f0f0145
--- /dev/null
+++ b/lib/libchart/classes/view/plot/Plot.php
@@ -0,0 +1,445 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * The plot holds graphical attributes, and is responsible for computing the layout of the graph.
+     * The layout is quite simple right now, with 4 areas laid out like that:
+     * (of course this is subject to change in the future).
+     *
+     * output area------------------------------------------------|
+     * |  (outer padding)                                         |
+     * |  image area--------------------------------------------| |
+     * |  | (title padding)                                     | |
+     * |  | title area----------------------------------------| | |
+     * |  | |-------------------------------------------------| | |
+     * |  |                                                     | |
+     * |  | (graph padding)              (caption padding)      | |
+     * |  | graph area----------------|  caption area---------| | |
+     * |  | |                         |  |                    | | |
+     * |  | |                         |  |                    | | |
+     * |  | |                         |  |                    | | |
+     * |  | |                         |  |                    | | |
+     * |  | |                         |  |                    | | |
+     * |  | |-------------------------|  |--------------------| | |
+     * |  |                                                     | |
+     * |  |-----------------------------------------------------| |
+     * |                                                          |
+     * |----------------------------------------------------------|
+     *
+     * All area dimensions are known in advance , and the optional logo is drawn in absolute coordinates.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * Created on 27 july 2007
+     */
+    class Plot {
+        // Style properties
+        protected $title;
+        
+        /**
+         * Location of the logo. Can be overriden to your personalized logo.
+         */
+        protected $logoFileName;
+        
+        /**
+         * Outer area, whose dimension is the same as the PNG returned.
+         */
+        protected $outputArea;
+        
+        /**
+         * Outer padding surrounding the whole image, everything outside is blank.
+         */
+        protected $outerPadding;
+        
+        /**
+         * Coordinates of the area inside the outer padding.
+         */
+        protected $imageArea;
+        
+        /**
+         * Fixed title height in pixels.
+         */
+        protected $titleHeight;
+        
+        /**
+         * Padding of the title area.
+         */
+        protected $titlePadding;
+        
+        /**
+         *  Coordinates of the title area.
+         */
+        protected $titleArea;
+        
+        /**
+         * True if the plot has a caption.
+         */
+        protected $hasCaption;
+        
+        /**
+         * Ratio of graph/caption in width.
+         */
+        protected $graphCaptionRatio;
+        
+        /**
+         * Padding of the graph area.
+         */
+        protected $graphPadding;
+        
+        /**
+         * Coordinates of the graph area.
+         */
+        protected $graphArea;
+        
+        /**
+         * Padding of the caption area.
+         */
+        protected $captionPadding;
+        
+        /**
+         * Coordinates of the caption area.
+         */
+        protected $captionArea;
+        
+        /**
+         * Text writer.
+         */
+        protected $text;
+        
+        /**
+         * Color palette.
+         */
+        protected $palette;
+        
+        /**
+         * GD image
+         */
+        protected $img;
+
+        /**
+         * Drawing primitives
+         */
+        protected $primitive;
+
+        protected $backGroundColor;
+        protected $textColor;
+
+        /**
+         * Constructor of Plot.
+         *
+         * @param integer width of the image
+         * @param integer height of the image
+         */
+        public function __construct($width, $height) {
+            $this->width = $width;
+            $this->height = $height;
+
+            $this->text = new Text();
+            $this->palette = new Palette();
+            
+            // Default layout
+            $this->outputArea = new Rectangle(0, 0, $width - 1, $height - 1);
+            $this->outerPadding = new Padding(5);
+            $this->titleHeight = 26;
+            $this->titlePadding = new Padding(5);
+            $this->hasCaption = false;
+            $this->graphCaptionRatio = 0.50;
+            $this->graphPadding = new Padding(50);
+            $this->captionPadding = new Padding(15);
+        }
+
+        /**
+         * Compute the area inside the outer padding (outside is white).
+         */
+        private function computeImageArea() {
+            $this->imageArea = $this->outputArea->getPaddedRectangle($this->outerPadding);
+        }
+        
+        /**
+         * Compute the title area.
+         */
+        private function computeTitleArea() {
+            $titleUnpaddedBottom = $this->imageArea->y1 + $this->titleHeight + $this->titlePadding->top + $this->titlePadding->bottom;
+            $titleArea = new Rectangle(
+                    $this->imageArea->x1,
+                    $this->imageArea->y1,
+                    $this->imageArea->x2,
+                    $titleUnpaddedBottom - 1
+            );
+            $this->titleArea = $titleArea->getPaddedRectangle($this->titlePadding);
+        }
+        
+        /**
+         * Compute the graph area.
+         */
+        private function computeGraphArea() {
+            $titleUnpaddedBottom = $this->imageArea->y1 + $this->titleHeight + $this->titlePadding->top + $this->titlePadding->bottom;
+            $graphArea = null;
+            if ($this->hasCaption) {
+                $graphUnpaddedRight = $this->imageArea->x1 + ($this->imageArea->x2 - $this->imageArea->x1) * $this->graphCaptionRatio
+                        + $this->graphPadding->left + $this->graphPadding->right;
+                $graphArea = new Rectangle(
+                        $this->imageArea->x1,
+                        $titleUnpaddedBottom,
+                        $graphUnpaddedRight - 1,
+                        $this->imageArea->y2
+                );
+            } else {
+                $graphArea = new Rectangle(
+                        $this->imageArea->x1,
+                        $titleUnpaddedBottom,
+                        $this->imageArea->x2,
+                        $this->imageArea->y2
+                );
+            }
+            $this->graphArea = $graphArea->getPaddedRectangle($this->graphPadding);
+        }
+        
+        /**
+         * Compute the caption area.
+         */
+        private function computeCaptionArea() {
+            $graphUnpaddedRight = $this->imageArea->x1 + ($this->imageArea->x2 - $this->imageArea->x1) * $this->graphCaptionRatio
+                    + $this->graphPadding->left + $this->graphPadding->right;
+            $titleUnpaddedBottom = $this->imageArea->y1 + $this->titleHeight + $this->titlePadding->top + $this->titlePadding->bottom;
+            $captionArea = new Rectangle(
+                    $graphUnpaddedRight,
+                    $titleUnpaddedBottom,
+                    $this->imageArea->x2,
+                    $this->imageArea->y2
+            );
+            $this->captionArea = $captionArea->getPaddedRectangle($this->captionPadding);
+        }
+        
+        /**
+         * Compute the layout of all areas of the graph.
+         */
+        public function computeLayout() {
+            $this->computeImageArea();
+            $this->computeTitleArea();
+            $this->computeGraphArea();
+            if ($this->hasCaption) {
+                $this->computeCaptionArea();
+            }
+        }
+        
+        /**
+         * Creates and initialize the image.
+         */
+        public function createImage() {
+            $this->img = imagecreatetruecolor($this->width, $this->height);
+            
+            $this->primitive = new Primitive($this->img);
+
+            $this->backGroundColor = new Color(255, 255, 255);
+            $this->textColor = new Color(0, 0, 0);
+
+            // White background
+            imagefilledrectangle($this->img, 0, 0, $this->width - 1, $this->height - 1, $this->backGroundColor->getColor($this->img));
+            
+            //imagerectangle($this->img, $this->imageArea->x1, $this->imageArea->y1, $this->imageArea->x2, $this->imageArea->y2, $this->palette->red->getColor($this->img));
+        }
+
+        /**
+         * Print the title to the image.
+         */
+        public function printTitle() {
+            $yCenter = $this->titleArea->y1 + ($this->titleArea->y2 - $this->titleArea->y1) / 2;
+            $this->text->printCentered($this->img, $yCenter, $this->textColor, $this->title, $this->text->fontCondensedBold);
+        }
+
+        /**
+         * Print the logo image to the image.
+         */
+        public function printLogo() {
+            if (!$this->logoFileName)
+                return;
+            @$logoImage = imageCreateFromPNG($this->logoFileName);
+
+            if ($logoImage) {
+                imagecopymerge($this->img, $logoImage, 2 * $this->outerPadding->left, $this->outerPadding->top, 0, 0, imagesx($logoImage), imagesy($logoImage), 100);
+            }
+        }
+
+        /**
+         * Renders to a file or to standard output.
+         *
+         * @param fileName File name (optional)
+         */
+        public function render($fileName) {
+            if (isset($fileName)) {
+                imagepng($this->img, $fileName);
+            } else {
+                imagepng($this->img);
+            }
+        }
+
+        /**
+         * Sets the title.
+         *
+         * @param string New title
+         */
+        public function setTitle($title) {
+            $this->title = $title;
+        }
+
+        /**
+         * Sets the logo image file name.
+         *
+         * @param string New logo image file name
+         */
+        public function setLogoFileName($logoFileName) {
+            $this->logoFileName = $logoFileName;
+        }
+
+        /**
+         * Return the GD image.
+         *
+         * @return GD Image
+         */
+        public function getImg() {
+            return $this->img;
+        }
+
+        /**
+         * Return the palette.
+         *
+         * @return palette
+         */
+        public function getPalette() {
+            return $this->palette;
+        }
+
+        /**
+         * Return the text.
+         *
+         * @return text
+         */
+        public function getText() {
+            return $this->text;
+        }
+
+        /**
+         * Return the primitive.
+         *
+         * @return primitive
+         */
+        public function getPrimitive() {
+            return $this->primitive;
+        }
+
+        /**
+         * Return the outer padding.
+         *
+         * @param integer Outer padding value in pixels
+         */
+        public function getOuterPadding() {
+            return $outerPadding;
+        }
+
+        /**
+         * Set the outer padding.
+         *
+         * @param integer Outer padding value in pixels
+         */
+        public function setOuterPadding($outerPadding) {
+            $this->outerPadding = $outerPadding;
+        }
+
+        /**
+         * Return the title height.
+         *
+         * @param integer title height
+         */
+        public function setTitleHeight($titleHeight) {
+            $this->titleHeight = $titleHeight;
+        }
+
+        /**
+         * Return the title padding.
+         *
+         * @param integer title padding
+         */
+        public function setTitlePadding($titlePadding) {
+            $this->titlePadding = $titlePadding;
+        }
+
+        /**
+         * Return the graph padding.
+         *
+         * @param integer graph padding
+         */
+        public function setGraphPadding($graphPadding) {
+            $this->graphPadding = $graphPadding;
+        }
+
+        /**
+         * Set if the graph has a caption.
+         *
+         * @param boolean graph has a caption
+         */
+        public function setHasCaption($hasCaption) {
+            $this->hasCaption = $hasCaption;
+        }
+
+        /**
+         * Set the caption padding.
+         *
+         * @param integer caption padding
+         */
+        public function setCaptionPadding($captionPadding) {
+            $this->captionPadding = $captionPadding;
+        }
+
+        /**
+         * Set the graph/caption ratio.
+         *
+         * @param integer caption padding
+         */
+        public function setGraphCaptionRatio($graphCaptionRatio) {
+            $this->graphCaptionRatio = $graphCaptionRatio;
+        }
+
+        /**
+         * Return the graph area.
+         *
+         * @return graph area
+         */
+        public function getGraphArea() {
+            return $this->graphArea;
+        }
+
+        /**
+         * Return the caption area.
+         *
+         * @return caption area
+         */
+        public function getCaptionArea() {
+            return $this->captionArea;
+        }
+
+        /**
+         * Return the text color.
+         *
+         * @return text color
+         */
+        public function getTextColor() {
+            return $this->textColor;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/primitive/Padding.php b/lib/libchart/classes/view/primitive/Padding.php
new file mode 100644
index 00000000..fdb1fa86
--- /dev/null
+++ b/lib/libchart/classes/view/primitive/Padding.php
@@ -0,0 +1,68 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Primitive geometric object representing a padding. 
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * @Created on 27 july 2007
+     */
+    class Padding {
+        /**
+         * Top padding.
+         */
+        public $top;
+        
+        /**
+         * Right padding.
+         */
+        public $right;
+        
+        /**
+         * Bottom padding.
+         */
+        public $bottom;
+    
+        /**
+         * Left padding.
+         */
+        public $left;
+
+        /**
+         * Creates a new padding.
+         *
+         * @param integer Top padding
+         * @param integer Right padding
+         * @param integer Bottom padding
+         * @param integer Left padding
+         */
+        public function __construct($top, $right = null, $bottom = null, $left = null) {
+            $this->top = $top;
+            if ($right == null) {
+                $this->right = $top;
+                $this->bottom = $top;
+                $this->left = $top;
+            } else {
+                $this->right = $right;
+                $this->bottom = $bottom;
+                $this->left = $left;
+            }
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/primitive/Primitive.php b/lib/libchart/classes/view/primitive/Primitive.php
new file mode 100644
index 00000000..f0d55fb4
--- /dev/null
+++ b/lib/libchart/classes/view/primitive/Primitive.php
@@ -0,0 +1,70 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Graphic primitives, extends GD with chart related primitives.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class Primitive {
+        private $img;
+    
+        /**
+         * Creates a new primitive object
+         *
+         * @param    resource    GD image resource
+         */
+        public function __construct($img) {
+            $this->img = $img;
+        }
+        
+        /**
+         * Draws a straight line.
+         *
+         * @param integer line start (X)
+         * @param integer line start (Y)
+         * @param integer line end (X)
+         * @param integer line end (Y)
+         * @param Color line color
+         */
+        public function line($x1, $y1, $x2, $y2, $color, $width = 1) {
+            imagefilledpolygon($this->img, array($x1, $y1 - $width / 2, $x1, $y1 + $width / 2, $x2, $y2 + $width / 2, $x2, $y2 - $width / 2), 4, $color->getColor($this->img));
+            // imageline($this->img, $x1, $y1, $x2, $y2, $color->getColor($this->img));
+        }
+
+        /**
+         * Draw a filled gray box with thick borders and darker corners.
+         *
+         * @param integer top left coordinate (x)
+         * @param integer top left coordinate (y)
+         * @param integer bottom right coordinate (x)
+         * @param integer bottom right coordinate (y)
+         * @param Color edge color
+         * @param Color corner color
+         */
+        public function outlinedBox($x1, $y1, $x2, $y2, $color0, $color1) {
+            imagefilledrectangle($this->img, $x1, $y1, $x2, $y2, $color0->getColor($this->img));
+            imagerectangle($this->img, $x1, $y1, $x1 + 1, $y1 + 1, $color1->getColor($this->img));
+            imagerectangle($this->img, $x2 - 1, $y1, $x2, $y1 + 1, $color1->getColor($this->img));
+            imagerectangle($this->img, $x1, $y2 - 1, $x1 + 1, $y2, $color1->getColor($this->img));
+            imagerectangle($this->img, $x2 - 1, $y2 - 1, $x2, $y2, $color1->getColor($this->img));
+        }
+
+    }
+?>
diff --git a/lib/libchart/classes/view/primitive/Rectangle.php b/lib/libchart/classes/view/primitive/Rectangle.php
new file mode 100644
index 00000000..badcde78
--- /dev/null
+++ b/lib/libchart/classes/view/primitive/Rectangle.php
@@ -0,0 +1,80 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * A rectangle identified by the top-left and the bottom-right corners.
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * @Created on 27 july 2007
+     */
+    class Rectangle {
+        /**
+         * Top left X.
+         */
+        public $x1;
+
+        /**
+         * Top left Y.
+         */
+        public $y1;
+        
+        /**
+         * Bottom right X.
+         */
+        public $x2;
+        
+        /**
+         * Bottom right Y.
+         */
+        public $y2;
+    
+        /**
+         * Constructor of Rectangle.
+         *
+         * @param x1 Left edge coordinate
+         * @param y1 Upper edge coordinate
+         * @param x2 Right edge coordinate
+         * @param y2 Bottom edge coordinate
+         */
+        public function __construct($x1, $y1, $x2, $y2) {
+            $this->x1 = $x1;
+            $this->y1 = $y1;
+            $this->x2 = $x2;
+            $this->y2 = $y2;
+        }
+        
+        /**
+         * Apply a padding and returns the resulting rectangle.
+         * The result is an enlarged rectangle.
+         *
+         * @return Padded rectangle
+         */
+        public function getPaddedRectangle($padding) {
+            $rectangle = new Rectangle(
+                    $this->x1 + $padding->left,
+                    $this->y1 + $padding->top,
+                    $this->x2 - $padding->right,
+                    $this->y2 - $padding->bottom
+            );
+            
+            //echo "(" . $this->x1 . "," . $this->y1 . ") (" . $this->x2 . "," . $this->y2 . ")<br>";
+            return $rectangle;
+        }
+    }
+?>
diff --git a/lib/libchart/classes/view/text/Text.php b/lib/libchart/classes/view/text/Text.php
new file mode 100644
index 00000000..3b2fb2d7
--- /dev/null
+++ b/lib/libchart/classes/view/text/Text.php
@@ -0,0 +1,129 @@
+<?php
+    /* Libchart - PHP chart library
+     * Copyright (C) 2005-2011 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     * 
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     * 
+     */
+    
+    /**
+     * Text drawing helper
+     *
+     * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
+     */
+    class Text {
+        public $HORIZONTAL_LEFT_ALIGN = 1;
+        public $HORIZONTAL_CENTER_ALIGN = 2;
+        public $HORIZONTAL_RIGHT_ALIGN = 4;
+        public $VERTICAL_TOP_ALIGN = 8;
+        public $VERTICAL_CENTER_ALIGN = 16;
+        public $VERTICAL_BOTTOM_ALIGN = 32;
+
+        /**
+         * Creates a new text drawing helper.
+         */
+        public function __construct() {
+            $baseDir = dirname(__FILE__) . "/../../../";
+        
+            // Free low-res fonts based on Bitstream Vera <http://dejavu.sourceforge.net/wiki/>
+            $this->fontCondensed = $baseDir . "fonts/DejaVuSansCondensed.ttf";
+            $this->fontCondensedBold = $baseDir . "fonts/DejaVuSansCondensed-Bold.ttf";
+        }
+
+        /**
+         * Print text.
+         *
+         * @param Image GD image
+         * @param integer text coordinate (x)
+         * @param integer text coordinate (y)
+         * @param Color text color
+         * @param string text value
+         * @param string font file name
+         * @param bitfield text alignment
+         */
+        public function printText($img, $px, $py, $color, $text, $fontFileName, $align = 0) {
+            if (!($align & $this->HORIZONTAL_CENTER_ALIGN) && !($align & $this->HORIZONTAL_RIGHT_ALIGN)) {
+                $align |= $this->HORIZONTAL_LEFT_ALIGN;
+            }
+
+            if (!($align & $this->VERTICAL_CENTER_ALIGN) && !($align & $this->VERTICAL_BOTTOM_ALIGN)) {
+                $align |= $this->VERTICAL_TOP_ALIGN;
+            }
+
+            $fontSize = 8;
+            $lineSpacing = 1;
+
+             list ($llx, $lly, $lrx, $lry, $urx, $ury, $ulx, $uly) = imageftbbox($fontSize, 0, $fontFileName, $text, array("linespacing" => $lineSpacing));
+
+            $textWidth = $lrx - $llx;
+            $textHeight = $lry - $ury;
+
+            $angle = 0;
+
+            if ($align & $this->HORIZONTAL_CENTER_ALIGN) {
+                $px -= $textWidth / 2;
+            }
+
+            if ($align & $this->HORIZONTAL_RIGHT_ALIGN) {
+                $px -= $textWidth;
+            }
+
+            if ($align & $this->VERTICAL_CENTER_ALIGN) {
+                $py += $textHeight / 2;
+            }
+
+            if ($align & $this->VERTICAL_TOP_ALIGN) {
+                $py += $textHeight;
+            }
+
+            imagettftext($img, $fontSize, $angle, $px, $py, $color->getColor($img), $fontFileName, $text);
+        }
+        
+        /**
+         * Print text centered horizontally on the image.
+         *
+         * @param Image GD image
+         * @param integer text coordinate (y)
+         * @param Color text color
+         * @param string text value
+         * @param string font file name
+         */
+        public function printCentered($img, $py, $color, $text, $fontFileName) {
+            $this->printText($img, imagesx($img) / 2, $py, $color, $text, $fontFileName, $this->HORIZONTAL_CENTER_ALIGN | $this->VERTICAL_CENTER_ALIGN);
+        }
+
+        /**
+         * Print text in diagonal.
+         *
+         * @param Image GD image
+         * @param integer text coordinate (x)
+         * @param integer text coordinate (y)
+         * @param Color text color
+         * @param string text value
+         */
+        public function printDiagonal($img, $px, $py, $color, $text) {
+            $fontSize = 8;
+            $fontFileName = $this->fontCondensed;
+
+            $lineSpacing = 1;
+
+             list ($lx, $ly, $rx, $ry) = imageftbbox($fontSize, 0, $fontFileName, $text, array("linespacing" => $lineSpacing));
+            $textWidth = $rx - $lx;
+
+            $angle = -45;
+
+            imagettftext($img, $fontSize, $angle, $px, $py, $color->getColor($img), $fontFileName, $text);
+        }
+    }
+?>
diff --git a/lib/libchart/doc/DEJAVU_LICENSE b/lib/libchart/doc/DEJAVU_LICENSE
new file mode 100644
index 00000000..6c87df40
--- /dev/null
+++ b/lib/libchart/doc/DEJAVU_LICENSE
@@ -0,0 +1,51 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org.
+
+$Id: LICENSE,v 1.1 2004/08/14 15:50:46 src Exp $
+
diff --git a/lib/libchart/doc/GNU_GPL_V3 b/lib/libchart/doc/GNU_GPL_V3
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/lib/libchart/doc/GNU_GPL_V3
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/lib/libchart/images/PoweredBy.png b/lib/libchart/images/PoweredBy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c5290c879c7fc6b8cfc0549ac2e3343d1eb2e2a
GIT binary patch
literal 1608
zcmV-O2DkZ%P)<h;3K|Lk000e1NJLTq00341000yS0ssI2n513D00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&n08Bn`uCvaJ9B03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00pc`L_t(o!`)bKOjB1B
zKd-O+6Rp(%)+`7`Yl#og_6a5}8ga^$7&S{)7ZS=Cw3}rN%LpM;F{o^$aq0rj$e3|1
z6*HzHIu;!eP~tw|f~BE<h>U_}7Pbg<ROs5*yARJj*%J!w_`r5@Kb&{ox#!*cd*}D=
zIS=!AD41E?9_q_)+UmY*vHfClIfntmLKh1}YZG#_cD}VIC5Vf|Y=Yw)SlEL3fZ)RA
zyN8cfI7j-X8bcOEg)Ui%0k%BiwepYO+4F|vzYYO-Jk+#9k$Wnf9~aISz8K3^%XXHw
z+%rw}G4wok{4p_81bU!<3ILEK85b9))9KKB3jj>3`<5BAKoFNU;do5z9BydEr=M$b
zUJn3bRu*6wh7fx8>{)DVti$1$=aj}Udh;yZx6CO^3yaE`{r6aZEk3H(lzi2AyDQ+e
z+U<5Om)qRjOp+u?lC7<+0I+@gcDLJo;J|_N=g-@0w!*@~k&%&%j0~AfcJACcdRI!N
z^2UuDEW2K>7mLLjjfVA<yu7^l`1mVVt^h!KdiwbI`19w_)6&xBN`#12TWAVI6K^xd
zgNH6HUM^zTv1Rum-z=Dx2mlZg5_0Cu8L?R0-Q8_47}l*@hY%_)E$!;+QYw{dwYsjZ
z?&{U6$B!TH=;%NQDHIB~+YJDnot+3FmOVN;y0^F2U@)+V(B0i_Hk)H&Vh}>7PoKVi
z{rat2w<;?u*-M%gg7TBsXv+^R-Qmktzx+Dzh2ebRh0AySg@Dm<9QSxUZnvAu<syWd
znwqMrs)~w=luD&ms~sL5-oJl8^Qs012LZtA^&*5=b`FO_$6-N0QIy;5#&H}W)ZgE)
zQmHf=jm2VNEon9)V4U2{t+aZy@)95~>;B>LQ``2HZQED&*%wXz(m^B=nayUC$s`hq
z06;F6U%Ys6!-fq!9?x#KM@B|QMMXV)_z)qa*XsoW0nG&fVA<EKS!1<Y`}+D=@gF^U
zWU*N2;IXl>PoF-u*=%C5nB~Uxy~@x<QG%$YwBFzQ;8lmQA;Zr@1^}=R{q~V2!!HP`
ztE;oKvjL#0stN#jJRSg~q@)1A{rmR;K&#c}<m3Rr=FOXff`XWdEW1vpQz#V4$;qtv
z<>loDgF&a$(U-}|$&-_le$)l@iNK3Ycx-N<Ez1N6UeDxA`&k;5G-$fEVCw>kqVn_e
zRVo!plK!0t81~Wuc|E>e7jpSiR#s-QSfo;^--n`ma`Yu<f|vO4<naY_Ji1vrHZykE
zoMEl4t@Z6tQBl#>);4XxSs<8n+Q*%)zf(P7+WaR|Gs)CUb<SRY-^|3s#C*MEl}Z)x
z+*u&-Qh#3i{>4}D&AmHbb$Cym-P&-hwc*%@dFlQ>J1i{h)f%R~y<IAmZrZe|p`if)
zG#X7}Vq$S|F#sGnazrAL$mQ~ql9H*FQcX<_0Gv2+f>!3OM_}p#$<~9k#p!gdA~L5I
z1%lPP0_YJ~I;(~u2%@vI)8%rNmX-p5(P$hS8w&~wLI|nV>VbiQ(a}++_@yf)zdC||
zdIXH4zg)k2$9e!5ce?URYCC><fGCedvi_`2#T=P_^$1gS48tgj@_N0Yp`jj+2gh-j
z%f;n#X$P;@i(we;SzTRy=gyrKD^}Fj*3uK{yMA>9fn-5AUl<Xc+GQM=wH6LI3#?YF
z(P)g1k4Fdzg+imz=yW;@3JMr!S_uvgb~qeQo;+bD2GAEy(_hZC^n-^kEndEsL4hxj
z9{%K8r_=TCAs`5XAPBi!&g>*JGm{{Q#>Pg3(9N4Slai8TGFfwTGYf*OtSp&KR!~qN
z5{c^T>!)rzDJh8|#k>&#0Df%md0%_-_rZINB{(cX5VLWmAQI=`sj|cma?_VC3Hv|)
zHKL{Eo~h>R+s2;W@v$MmFdkp9QA%ju-IXE{2JpXN0m@(L7zfUZ9pQuk0000<MNUMn
GLSTZ#Y6fQj

literal 0
HcmV?d00001

diff --git a/lib/libchart/libchart.php b/lib/libchart/libchart.php
deleted file mode 100644
index a9c39a89..00000000
--- a/lib/libchart/libchart.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?
-	/** Libchart - PHP chart library
-	*	
-	* Copyright (C) 2005-2006 Jean Marc Trémeaux (jm.tremeaux at gmail.com)
-	* 	
-	* This library is free software; you can redistribute it and/or
-	* modify it under the terms of the GNU Lesser General Public
-	* License as published by the Free Software Foundation; either
-	* version 2.1 of the License, or (at your option) any later version.
-	* 
-	* This library is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	* Lesser General Public License for more details.
-	* 
-	* You should have received a copy of the GNU Lesser General Public
-	* License along with this library; if not, write to the Free Software
-	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	* 
-	*/
-
-	require_once 'classes/Point.php';
-	require_once 'classes/Axis.php';
-	require_once 'classes/Color.php';
-	require_once 'classes/Primitive.php';
-	require_once 'classes/Text.php';
-	require_once 'classes/Chart.php';
-	require_once 'classes/PieChart.php';
-	require_once 'classes/BarChart.php';
-	require_once 'classes/LineChart.php';
-	require_once 'classes/VerticalChart.php';
-	require_once 'classes/HorizontalChart.php';
-?>
diff --git a/lib/libchart12/classes/view/chart/PieChart.php b/lib/libchart12/classes/view/chart/PieChart.php
index 63ab0168..ee71f1a7 100644
--- a/lib/libchart12/classes/view/chart/PieChart.php
+++ b/lib/libchart12/classes/view/chart/PieChart.php
@@ -64,9 +64,7 @@ protected function computeLayout() {
 		 * @return integer result of the comparison
 		 */
 		protected function sortPie($v1, $v2) {
-			return $v1[0] == $v2[0] ? 0 :
-				$v1[0] > $v2[0] ? -1 :
-				1;
+			return $v1[0] == $v2[0] ? 0 : ($v1[0] > $v2[0] ? -1 : 1);
 		}
 		
 		/**
@@ -250,4 +248,4 @@ public function render($imgType, $fileName = null) {
 			$this->plot->render($imgType, $fileName);
 		}
 	}
-?>
\ No newline at end of file
+?>
diff --git a/lib/listutils.php b/lib/listutils.php
index fb69f282..d9cfa0d5 100644
--- a/lib/listutils.php
+++ b/lib/listutils.php
@@ -51,10 +51,11 @@ function getAlphaListBlock($PHP_SELF, $HTTP_VARS) {
 				'order_by' => $HTTP_VARS ['order_by'],
 				'sortorder' => $HTTP_VARS ['sortorder'] );
 	}
+
+	$letter = $HTTP_VARS ['letter'] ?? '';
 	
-	foreach ( array_merge ( array (
-			'#' ), range ( 'A', 'Z' ) ) as $char ) {
-		if ($HTTP_VARS ['letter'] == $char) {
+	foreach ( array_merge ( array ('#' ), range ( 'A', 'Z' ) ) as $char ) {
+		if ($letter == $char) {
 			$buffer .= "<li class=\"current\">$char</li>";
 		} else {
 			$buffer .= "<li><a href=\"$PHP_SELF?" . get_url_string ( $context_vars, array (
@@ -63,9 +64,9 @@ function getAlphaListBlock($PHP_SELF, $HTTP_VARS) {
 		}
 	}
 	
-	if (strlen ( $HTTP_VARS ['letter'] ) > 0) {
-		$buffer .= "<li class=\"all\"><a href=\"$PHP_SELF?" . get_url_string ( $context_vars, array (
-				'letter' => '' ) ) . "\">" . get_opendb_lang_var ( 'all' ) . "</a></li>";
+	if (strlen( $letter ) > 0) {
+		$buffer .= "<li class=\"all\"><a href=\"$PHP_SELF?" . get_url_string ( $context_vars, array ( 'letter' => '' ) ) .
+				"\">" . get_opendb_lang_var ( 'all' ) . "</a></li>";
 	}
 	
 	$buffer .= '</ul>';
@@ -78,7 +79,7 @@ function getItemsPerPageControl($PHP_SELF, $HTTP_VARS) {
 	$items_per_page_options_r = get_opendb_config_var ( 'listings', 'items_per_page_options' );
 	if (is_not_empty_array ( $items_per_page_options_r )) {
 		$items_per_page_rs = array ();
-		while ( list ( , $items_per_page ) = each ( $items_per_page_options_r ) ) {
+		foreach ( $items_per_page_options_r as $items_per_page ) {
 			if ($items_per_page == '0')
 				$display = get_opendb_lang_var ( 'all' );
 			else
@@ -99,7 +100,7 @@ function getItemsPerPageControl($PHP_SELF, $HTTP_VARS) {
 * 				array('value'=>'display', 'value'=>'display')
 */
 function getToggleControl($PHP_SELF, $HTTP_VARS, $text, $fieldname, $value) {
-	$buffer .= "<form class=\"toggleControl\" id=\"toggle-$fieldname\" action=\"" . $PHP_SELF . "\" method=\"GET\">" . get_url_fields ( $HTTP_VARS, NULL, array (
+	$buffer = "<form class=\"toggleControl\" id=\"toggle-$fieldname\" action=\"" . $PHP_SELF . "\" method=\"GET\">" . get_url_fields ( $HTTP_VARS, NULL, array (
 			$fieldname ) ) . "<input type=\"hidden\" name=\"$fieldname\" value=\"$value\">" . "<label for=\"toggle-$fieldname-cbox\">" . $text . "</label><input type=\"checkbox\" class=\"checkbox\" id=\"toggle-$fieldname-cbox\" name=\"${fieldname}_cbox\" value=\"Y\" onclick=\"if(this.checked){this.form['${fieldname}'].value='Y';}else{this.form['${fieldname}'].value='N';} this.form.submit()\"" . (strcasecmp ( $value, 'Y' ) === 0 ? " CHECKED" : "") . ">" . "</form>";
 	return $buffer;
 }
@@ -136,7 +137,7 @@ function remove_array_values($old_item_array, $new_item_array, $checked_item_arr
 		$new_array = array ();
 		
 		reset ( $old_item_array );
-		while ( list ( , $value ) = each ( $old_item_array ) ) {
+		foreach ( $old_item_array as $value ) {
 			// $value must exist in $old_item_array.  If $new_item_array is not an array, or the 
 			// $value is not found, remove from $session_array
 			if (! (in_array ( $value, $checked_item_array ) && @! in_array ( $value, $new_item_array ))) {
@@ -158,7 +159,7 @@ function minus_array_values($old_item_array, $item_array) {
 		$new_array = array ();
 		
 		reset ( $old_item_array );
-		while ( list ( , $value ) = each ( $old_item_array ) ) {
+		foreach ( $old_item_array as $value ) {
 			if (! in_array ( $value, $item_array )) {
 				array_push ( $new_array, $value );
 			}
@@ -173,7 +174,7 @@ function convert_array_to_csv_list($array_list) {
 	
 	if (is_array ( $array_list )) {
 		reset ( $array_list );
-		while ( list ( , $value ) = each ( $array_list ) ) {
+		foreach ( $array_list as $value ) {
 			if (strlen ( $csvlist ) > 0)
 				$csvlist .= ',';
 			$csvlist .= $value;
@@ -181,4 +182,4 @@ function convert_array_to_csv_list($array_list) {
 	}
 	return $csvlist;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/logging.php b/lib/logging.php
index 22b000bc..dbbf804c 100644
--- a/lib/logging.php
+++ b/lib/logging.php
@@ -80,33 +80,33 @@ function fget_tokenised_log_entry(&$file) {
 		$line = trim ( fgets ( $file, 4096 ) );
 		
 		for($i = 0; $i < strlen ( $line ); $i ++) {
-			switch ($line {$i}) {
+			switch ($line[$i]) {
 				case "\\" :
-					if ($i < strlen ( $line + 1 ) && $line {$i + 1} != '"') {
-						$column .= $line {$i};
+					if ($i < strlen ( $line + 1 ) && $line[$i + 1] != '"') {
+						$column .= $line[$i];
 					}
 					break;
 				
 				case '"' :
-					if ($i == 0 || $line {$i - 1} != "\\") {
+					if ($i == 0 || $line[$i - 1] != "\\") {
 						$in_quote = ! $in_quote;
 					} else {
-						$column .= $line {$i};
+						$column .= $line[$i];
 					}
 					break;
 				
 				case '[' :
-					if (! $in_quote && $token_names [$count] == 'datetime') // only column allowed to be enclodes this way is datetime
+					if (! $in_quote && $token_names[$count] == 'datetime') // only column allowed to be enclodes this way is datetime
 						$in_bracket = TRUE;
 					else
-						$column .= $line {$i};
+						$column .= $line[$i];
 					break;
 				
 				case ']' :
-					if ($in_bracket && ! $in_quote && $token_names [$count] == 'datetime') // only column allowed to be enclodes this way is datetime
+					if ($in_bracket && ! $in_quote && $token_names[$count] == 'datetime') // only column allowed to be enclodes this way is datetime
 						$in_bracket = FALSE;
 					else
-						$column .= $line {$i};
+						$column .= $line[$i];
 					break;
 				
 				case ' ' :
@@ -114,30 +114,30 @@ function fget_tokenised_log_entry(&$file) {
 				case '\n' :
 					if (! $in_bracket && ! $in_quote) {
 						// end of column
-						$tokens [$token_names [$count]] = stripslashes ( trim ( $column ) );
+						$tokens[$token_names[$count]] = stripslashes ( trim ( $column ) );
 						
-						if (strlen ( $tokens [$token_names [$count]] ) == 0 || $tokens [$token_names [$count]] == '-')
+						if (strlen ( $tokens[$token_names[$count]] ) == 0 || $tokens[$token_names[$count]] == '-')
 							$tokens [$token_names [$count]] = NULL;
 						
 						$column = '';
 						$count ++;
 					}
 					
-					$column .= $line {$i};
+					$column .= $line[$id];
 					break;
 				
 				default :
-					$column .= $line {$i};
+					$column .= $line[$i];
 			}
 		}
 		
 		// todo - remove code duplication here!
 		if (! $in_bracket && ! $in_quote) {
 			// end of column
-			$tokens [$token_names [$count]] = stripslashes ( trim ( $column ) );
+			$tokens[$token_names[$count]] = stripslashes( trim( $column ) );
 			
-			if (strlen ( $tokens [$token_names [$count]] ) == 0 || $tokens [$token_names [$count]] == '-')
-				$tokens [$token_names [$count]] = NULL;
+			if (strlen ( $tokens[$token_names[$count]] ) == 0 || $tokens [$token_names [$count]] == '-')
+				$tokens[$token_names[$count]] = NULL;
 			
 			$column = '';
 			$count ++;
@@ -211,7 +211,7 @@ function opendb_logger($msgtype, $file, $function, $message = NULL, $params_r =
 		else
 			$entry ['message'] = '-';
 		
-		$fileptr = @fopen ( get_opendb_config_var ( 'logging', 'file' ), 'a' );
+		$fileptr = @fopen( get_opendb_config_var( 'logging', 'file' ), 'a' );
 		if ($fileptr) 		// verify file was opened
 {
 			$entry ['datetime'] = '[' . $entry ['datetime'] . ']';
@@ -236,7 +236,7 @@ function expand_opendb_logger_params($params_r) {
 		$params = $params_r;
 	} else {
 		reset ( $params_r );
-		while ( list ( $key, $value ) = each ( $params_r ) ) {
+		foreach ($params_r as $key => $value) {
 			if (strlen ( $params ) > 0)
 				$params .= ', ';
 			
@@ -256,4 +256,4 @@ function expand_opendb_logger_params($params_r) {
 	}
 	return $params;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/menu.php b/lib/menu.php
index 23fa49aa..606f1ff1 100644
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -236,11 +236,11 @@ function get_menu_options_list($options) {
 		$buffer .= "\n<ul class=\"menu\">";
 		
 		$startList = TRUE;
-		
-		while ( list ( $id, $option_rs ) = @each ( $options ) ) {
+
+		foreach ( $options as $id => $options_rs) {
 			$startListSection = TRUE;
-			
-			while ( list ( , $option_r ) = @each ( $option_rs ) ) {
+
+			foreach ( $options_rs as $key => $option_r ) {
 				$buffer .= "\n<li class=\"$id";
 				if (! $active_found && is_menu_option_active ( $option_r )) {
 					$buffer .= ' active';
@@ -266,9 +266,9 @@ function get_menu_options_list($options) {
 }
 
 function get_menu_option($option_r) {
-	$buffer = "<a href=\"" . $option_r ['url'] . "\" title=\"" . ifempty ( $option_r ['alt'], $option_r ['link'] ) . "\"";
+	$buffer = "<a href=\"" . $option_r['url'] . "\" title=\"" . ($option_r['alt'] ?? $option_r['link']) . "\"";
 	
-	if ($option_r ['target'] == '_new') {
+	if (isset($option_r['target']) && $option_r['target'] == '_new') {
 		$buffer .= ' target="_new"';
 	}
 	
@@ -289,9 +289,9 @@ function is_menu_option_active($option_r) {
 	if ($parse_r ['path'] == $php_self) {
 		$active = TRUE;
 		
-		parse_str ( $parse_r ['query'], $query_r );
+		parse_str ( $parse_r['query'] ?? '', $query_r );
 		if (is_array ( $query_r )) {
-			while ( list ( $name, $value ) = each ( $query_r ) ) {
+			foreach ( $query_r as $name => $value ) {
 				if (! isset ( $HTTP_VARS [$name] ) || $HTTP_VARS [$name] != $value) {
 					$active = FALSE;
 				}
@@ -300,4 +300,4 @@ function is_menu_option_active($option_r) {
 	}
 	return $active;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/opendbmailer.class.php b/lib/opendbmailer.class.php
index e38760bb..5ff9641e 100644
--- a/lib/opendbmailer.class.php
+++ b/lib/opendbmailer.class.php
@@ -18,8 +18,6 @@
 	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 require_once ('./lib/phpmailer/class.phpmailer.php');
-// hardcoded to english messages for now
-include_once("./lib/phpmailer/language/phpmailer.lang-en.php");
 
 include_once("./lib/config.php");
 include_once("./lib/logging.php");
@@ -33,7 +31,7 @@
 */
 class OpenDbMailer extends PHPMailer {
 
-	function OpenDbMailer($mailer) {
+	function __construct($mailer) {
 		$this->PluginDir = './lib/phpmailer/';
 		
 		if (get_opendb_config_var ( 'email', 'windows_smtp_server' ) === TRUE) {
@@ -75,17 +73,5 @@ function OpenDbMailer($mailer) {
 			}
 		}
 	}
-
-	/**
-	    Language variables are hardcoded to english at the moment.
-	*/
-	function Lang($key) {
-		global $PHPMAILER_LANG;
-		
-		if (isset ( $PHPMAILER_LANG [$key] ))
-			return $PHPMAILER_LANG [$key];
-		else
-			return "Language string failed to load: " . $key;
-	}
 }
 ?>
diff --git a/lib/parseutils.php b/lib/parseutils.php
index 29c82395..4648416b 100644
--- a/lib/parseutils.php
+++ b/lib/parseutils.php
@@ -218,6 +218,7 @@ function prc_args($args) {
 	$square_brace = 0;
 	$dbl_quote = FALSE;
 	$sgl_quote = FALSE;
+	$arguments = array ();
 	
 	for($i = 0; $i < strlen ( $args ); $i ++) {
 		switch ($args [$i]) {
@@ -416,22 +417,22 @@ function expand_number_range($range) {
 	$number = '';
 	$left_number = '';
 	$right_number = '';
-	while ( $i < strlen ( $range ) ) {
-		if (is_numeric ( $range {$i} )) {
-			if (is_numeric ( $left_number ))
-				$right_number .= $range {$i};
+	while ( $i < strlen( $range ) ) {
+		if (is_numeric( $range[$i] )) {
+			if (is_numeric( $left_number ))
+				$right_number .= $range[$i];
 			else
-				$number .= $range {$i};
-		} else if ($range {$i} == '-') 		// end of left range number
+				$number .= $range[$i];
+		} else if ($range[$i] == '-') 		// end of left range number
 {
 			$left_number = $number;
 			
 			//reset
 			$number = '';
-		} else if ($range {$i} == ',') 		// end of right range number, or lone number
+		} else if ($range[$i] == ',') 		// end of right range number, or lone number
 {
-			if (is_numeric ( $left_number ) && is_numeric ( $right_number )) {
-				$retval .= expand_range ( $left_number, $right_number );
+			if (is_numeric( $left_number ) && is_numeric( $right_number )) {
+				$retval .= expand_range( $left_number, $right_number );
 				
 				//reset
 				$left_number = '';
@@ -449,37 +450,37 @@ function expand_number_range($range) {
 		$i ++;
 	}
 	
-	if (is_numeric ( $left_number ) && is_numeric ( $right_number )) {
-		$retval .= expand_range ( $left_number, $right_number );
+	if (is_numeric( $left_number ) && is_numeric( $right_number )) {
+		$retval .= expand_range( $left_number, $right_number );
 	} else {
 		$retval .= $number;
 	}
 	
 	// get rid of last character, if a comma.
-	if ($retval {strlen ( $retval ) - 1} == ',')
-		$retval = substr ( $retval, 0, strlen ( $retval ) - 1 );
+	if ($retval[strlen( $retval ) - 1] == ',')
+		$retval = substr( $retval, 0, strlen( $retval ) - 1 );
 	
 	return $retval;
 }
 
 function get_array_variable_value($lookup_r, $value_column) {
-	if (is_array ( $lookup_r )) {
+	if (is_array( $lookup_r )) {
 		// Work out what to return, based on value_column specifier.
 		if ($value_column == 'key')
-			return $lookup_r ['key'];
+			return $lookup_r['key'];
 		else if ($value_column == 'valkey') 		// key is actual value, but not if numeric.
-{
+        {
 			// Use value, if 'key' column is auto generated numeric index.
-			if (! is_array ( $lookup_r ['value'] ) && is_numeric ( $lookup_r ['key'] ))
-				return $lookup_r ['value'];
+			if (! is_array( $lookup_r['value'] ) && is_numeric( $lookup_r['key'] ))
+				return $lookup_r['value'];
 			else
-				return $lookup_r ['key'];
-		} else if (! is_array ( $lookup_r ['value'] ) && $value_column == 'value')
-			return $lookup_r ['value'];
-		else if (is_array ( $lookup_r ['value'] ) && isset ( $lookup_r ['value'] [$value_column] ))
-			return $lookup_r ['value'] [$value_column];
-		else if (isset ( $lookup_r [$value_column] ))
-			return $lookup_r [$value_column];
+				return $lookup_r['key'];
+		} else if (isset($lookup_r['value']) && !is_array( $lookup_r['value'] ) && $value_column == 'value')
+			return $lookup_r['value'];
+		else if (isset($lookup_r['value']) && is_array( $lookup_r['value'] ) && isset( $lookup_r['value'][$value_column] ))
+			return $lookup_r['value'][$value_column];
+		else if (isset( $lookup_r[$value_column] ))
+			return $lookup_r[$value_column];
 	}
 	
 	return ''; // no value found
@@ -504,7 +505,7 @@ function expand_display_mask($display_mask, $values_r, $variable_char = "%") {
 	for($i = 0; $i < strlen ( $display_mask ); $i ++) {
 		if ($inside_variable) {
 			// If closing bracket
-			if ($display_mask [$i] == $variable_char && ($i == 0 || $display_mask [$i - 1] != '\\')) {
+			if ($display_mask[$i] == $variable_char && ($i == 0 || $display_mask[$i - 1] != '\\')) {
 				// Indicate close of reference.
 				$inside_variable = FALSE;
 				
@@ -514,9 +515,9 @@ function expand_display_mask($display_mask, $values_r, $variable_char = "%") {
 					$variable = '';
 				}
 			} else {
-				$variable .= $display_mask [$i];
+				$variable .= $display_mask[$i];
 			}
-		} else if ($display_mask [$i] == $variable_char && ($i == 0 || $display_mask [$i - 1] != '\\')) {
+		} else if ($display_mask[$i] == $variable_char && ($i == 0 || $display_mask[$i - 1] != '\\')) {
 			$inside_variable = TRUE;
 		}
 	}
@@ -526,4 +527,4 @@ function expand_display_mask($display_mask, $values_r, $variable_char = "%") {
 	else
 		return NULL;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/phpmailer/LICENSE b/lib/phpmailer/LICENSE
new file mode 100644
index 00000000..f166cc57
--- /dev/null
+++ b/lib/phpmailer/LICENSE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
\ No newline at end of file
diff --git a/lib/phpmailer/PHPMailerAutoload.php b/lib/phpmailer/PHPMailerAutoload.php
new file mode 100644
index 00000000..eaa2e303
--- /dev/null
+++ b/lib/phpmailer/PHPMailerAutoload.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * PHPMailer SPL autoloader.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer SPL autoloader.
+ * @param string $classname The name of the class to load
+ */
+function PHPMailerAutoload($classname)
+{
+    //Can't use __DIR__ as it's only in PHP 5.3+
+    $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
+    if (is_readable($filename)) {
+        require $filename;
+    }
+}
+
+if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
+    //SPL autoloading was introduced in PHP 5.1.2
+    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+        spl_autoload_register('PHPMailerAutoload', true, true);
+    } else {
+        spl_autoload_register('PHPMailerAutoload');
+    }
+} else {
+    /**
+     * Fall back to traditional autoload for old PHP versions
+     * @param string $classname The name of the class to load
+     */
+    function __autoload($classname)
+    {
+        PHPMailerAutoload($classname);
+    }
+}
diff --git a/lib/phpmailer/VERSION b/lib/phpmailer/VERSION
new file mode 100644
index 00000000..e25a4478
--- /dev/null
+++ b/lib/phpmailer/VERSION
@@ -0,0 +1 @@
+5.2.28
\ No newline at end of file
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
index 09479239..abb67961 100644
--- a/lib/phpmailer/class.phpmailer.php
+++ b/lib/phpmailer/class.phpmailer.php
@@ -1,2320 +1,4064 @@
 <?php
-/*~ class.phpmailer.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 5.1                                                            |
-|   Contact: via sourceforge.net support pages (also www.worxware.com)      |
-|      Info: http://phpmailer.sourceforge.net                               |
-|   Support: http://sourceforge.net/projects/phpmailer/                     |
-| ------------------------------------------------------------------------- |
-|     Admin: Andy Prevost (project admininistrator)                         |
-|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
-|   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-| ------------------------------------------------------------------------- |
-| We offer a number of paid services (www.worxware.com):                    |
-| - Web Hosting on highly optimized fast and secure servers                 |
-| - Technology Consulting                                                   |
-| - Oursourcing (highly qualified programmers and graphic designers)        |
-'---------------------------------------------------------------------------'
-*/
-
 /**
- * PHPMailer - PHP email transport class
- * NOTE: Requires PHP version 5 or later
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5
  * @package PHPMailer
- * @author Andy Prevost
- * @author Marcus Bointon
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @version $Id: class.phpmailer.php 447 2009-05-25 01:36:38Z codeworxtech $
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
-
-class PHPMailer {
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PUBLIC
-  /////////////////////////////////////////////////
-
-  /**
-   * Email priority (1 = High, 3 = Normal, 5 = low).
-   * @var int
-   */
-  public $Priority          = 3;
-
-  /**
-   * Sets the CharSet of the message.
-   * @var string
-   */
-  public $CharSet           = 'iso-8859-1';
-
-  /**
-   * Sets the Content-type of the message.
-   * @var string
-   */
-  public $ContentType       = 'text/plain';
-
-  /**
-   * Sets the Encoding of the message. Options for this are
-   *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
-   * @var string
-   */
-  public $Encoding          = '8bit';
-
-  /**
-   * Holds the most recent mailer error message.
-   * @var string
-   */
-  public $ErrorInfo         = '';
-
-  /**
-   * Sets the From email address for the message.
-   * @var string
-   */
-  public $From              = 'root@localhost';
-
-  /**
-   * Sets the From name of the message.
-   * @var string
-   */
-  public $FromName          = 'Root User';
-
-  /**
-   * Sets the Sender email (Return-Path) of the message.  If not empty,
-   * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
-   * @var string
-   */
-  public $Sender            = '';
-
-  /**
-   * Sets the Subject of the message.
-   * @var string
-   */
-  public $Subject           = '';
-
-  /**
-   * Sets the Body of the message.  This can be either an HTML or text body.
-   * If HTML then run IsHTML(true).
-   * @var string
-   */
-  public $Body              = '';
-
-  /**
-   * Sets the text-only body of the message.  This automatically sets the
-   * email to multipart/alternative.  This body can be read by mail
-   * clients that do not have HTML email capability such as mutt. Clients
-   * that can read HTML will view the normal Body.
-   * @var string
-   */
-  public $AltBody           = '';
-
-  /**
-   * Sets word wrapping on the body of the message to a given number of
-   * characters.
-   * @var int
-   */
-  public $WordWrap          = 0;
-
-  /**
-   * Method to send mail: ("mail", "sendmail", or "smtp").
-   * @var string
-   */
-  public $Mailer            = 'mail';
-
-  /**
-   * Sets the path of the sendmail program.
-   * @var string
-   */
-  public $Sendmail          = '/usr/sbin/sendmail';
-
-  /**
-   * Path to PHPMailer plugins.  Useful if the SMTP class
-   * is in a different directory than the PHP include path.
-   * @var string
-   */
-  public $PluginDir         = '';
-
-  /**
-   * Sets the email address that a reading confirmation will be sent.
-   * @var string
-   */
-  public $ConfirmReadingTo  = '';
-
-  /**
-   * Sets the hostname to use in Message-Id and Received headers
-   * and as default HELO string. If empty, the value returned
-   * by SERVER_NAME is used or 'localhost.localdomain'.
-   * @var string
-   */
-  public $Hostname          = '';
-
-  /**
-   * Sets the message ID to be used in the Message-Id header.
-   * If empty, a unique id will be generated.
-   * @var string
-   */
-  public $MessageID         = '';
-
-  /////////////////////////////////////////////////
-  // PROPERTIES FOR SMTP
-  /////////////////////////////////////////////////
-
-  /**
-   * Sets the SMTP hosts.  All hosts must be separated by a
-   * semicolon.  You can also specify a different port
-   * for each host by using this format: [hostname:port]
-   * (e.g. "smtp1.example.com:25;smtp2.example.com").
-   * Hosts will be tried in order.
-   * @var string
-   */
-  public $Host          = 'localhost';
-
-  /**
-   * Sets the default SMTP server port.
-   * @var int
-   */
-  public $Port          = 25;
-
-  /**
-   * Sets the SMTP HELO of the message (Default is $Hostname).
-   * @var string
-   */
-  public $Helo          = '';
-
-  /**
-   * Sets connection prefix.
-   * Options are "", "ssl" or "tls"
-   * @var string
-   */
-  public $SMTPSecure    = '';
-
-  /**
-   * Sets SMTP authentication. Utilizes the Username and Password variables.
-   * @var bool
-   */
-  public $SMTPAuth      = false;
-
-  /**
-   * Sets SMTP username.
-   * @var string
-   */
-  public $Username      = '';
-
-  /**
-   * Sets SMTP password.
-   * @var string
-   */
-  public $Password      = '';
-
-  /**
-   * Sets the SMTP server timeout in seconds.
-   * This function will not work with the win32 version.
-   * @var int
-   */
-  public $Timeout       = 10;
-
-  /**
-   * Sets SMTP class debugging on or off.
-   * @var bool
-   */
-  public $SMTPDebug     = false;
-
-  /**
-   * Prevents the SMTP connection from being closed after each mail
-   * sending.  If this is set to true then to close the connection
-   * requires an explicit call to SmtpClose().
-   * @var bool
-   */
-  public $SMTPKeepAlive = false;
-
-  /**
-   * Provides the ability to have the TO field process individual
-   * emails, instead of sending to entire TO addresses
-   * @var bool
-   */
-  public $SingleTo      = false;
-
-   /**
-   * If SingleTo is true, this provides the array to hold the email addresses
-   * @var bool
-   */
-  public $SingleToArray = array();
-
- /**
-   * Provides the ability to change the line ending
-   * @var string
-   */
-  public $LE              = "\n";
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * @var string
-   */
-  public $DKIM_selector   = 'phpmailer';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_identity   = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_domain     = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_private    = '';
-
-  /**
-   * Callback Action function name
-   * the function that handles the result of the send email action. Parameters:
-   *   bool    $result        result of the send action
-   *   string  $to            email address of the recipient
-   *   string  $cc            cc email addresses
-   *   string  $bcc           bcc email addresses
-   *   string  $subject       the subject
-   *   string  $body          the email body
-   * @var string
-   */
-  public $action_function = ''; //'callbackAction';
-
-  /**
-   * Sets the PHPMailer Version number
-   * @var string
-   */
-  public $Version         = '5.1';
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  private   $smtp           = NULL;
-  private   $to             = array();
-  private   $cc             = array();
-  private   $bcc            = array();
-  private   $ReplyTo        = array();
-  private   $all_recipients = array();
-  private   $attachment     = array();
-  private   $CustomHeader   = array();
-  private   $message_type   = '';
-  private   $boundary       = array();
-  protected $language       = array();
-  private   $error_count    = 0;
-  private   $sign_cert_file = "";
-  private   $sign_key_file  = "";
-  private   $sign_key_pass  = "";
-  private   $exceptions     = false;
-
-  /////////////////////////////////////////////////
-  // CONSTANTS
-  /////////////////////////////////////////////////
-
-  const STOP_MESSAGE  = 0; // message only, continue processing
-  const STOP_CONTINUE = 1; // message?, likely ok to continue processing
-  const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
-
-  /////////////////////////////////////////////////
-  // METHODS, VARIABLES
-  /////////////////////////////////////////////////
-
-  /**
-   * Constructor
-   * @param boolean $exceptions Should we throw external exceptions?
-   */
-  public function __construct($exceptions = false) {
-    $this->exceptions = ($exceptions == true);
-  }
-
-  /**
-   * Sets message type to HTML.
-   * @param bool $ishtml
-   * @return void
-   */
-  public function IsHTML($ishtml = true) {
-    if ($ishtml) {
-      $this->ContentType = 'text/html';
-    } else {
-      $this->ContentType = 'text/plain';
-    }
-  }
-
-  /**
-   * Sets Mailer to send message using SMTP.
-   * @return void
-   */
-  public function IsSMTP() {
-    $this->Mailer = 'smtp';
-  }
-
-  /**
-   * Sets Mailer to send message using PHP mail() function.
-   * @return void
-   */
-  public function IsMail() {
-    $this->Mailer = 'mail';
-  }
-
-  /**
-   * Sets Mailer to send message using the $Sendmail program.
-   * @return void
-   */
-  public function IsSendmail() {
-    if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer = 'sendmail';
-  }
-
-  /**
-   * Sets Mailer to send message using the qmail MTA.
-   * @return void
-   */
-  public function IsQmail() {
-    if (stristr(ini_get('sendmail_path'), 'qmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer = 'sendmail';
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, RECIPIENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds a "To" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddAddress($address, $name = '') {
-    return $this->AddAnAddress('to', $address, $name);
-  }
-
-  /**
-   * Adds a "Cc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddCC($address, $name = '') {
-    return $this->AddAnAddress('cc', $address, $name);
-  }
-
-  /**
-   * Adds a "Bcc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddBCC($address, $name = '') {
-    return $this->AddAnAddress('bcc', $address, $name);
-  }
-
-  /**
-   * Adds a "Reply-to" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean
-   */
-  public function AddReplyTo($address, $name = '') {
-    return $this->AddAnAddress('ReplyTo', $address, $name);
-  }
-
-  /**
-   * Adds an address to one of the recipient arrays
-   * Addresses that have been added already return false, but do not throw exceptions
-   * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-   * @param string $address The email address to send to
-   * @param string $name
-   * @return boolean true on success, false if address already used or invalid in some way
-   * @access private
-   */
-  private function AddAnAddress($kind, $address, $name = '') {
-    if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      echo 'Invalid recipient array: ' . kind;
-      return false;
-    }
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      echo $this->Lang('invalid_address').': '.$address;
-      return false;
-    }
-    if ($kind != 'ReplyTo') {
-      if (!isset($this->all_recipients[strtolower($address)])) {
-        array_push($this->$kind, array($address, $name));
-        $this->all_recipients[strtolower($address)] = true;
-        return true;
-      }
-    } else {
-      if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-        $this->ReplyTo[strtolower($address)] = array($address, $name);
-      return true;
-    }
-  }
-  return false;
-}
-
 /**
- * Set the From and FromName properties
- * @param string $address
- * @param string $name
- * @return boolean
+ * PHPMailer - PHP email creation and transport class.
+ * @package PHPMailer
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
  */
-  public function SetFrom($address, $name = '',$auto=1) {
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      echo $this->Lang('invalid_address').': '.$address;
-      return false;
-    }
-    $this->From = $address;
-    $this->FromName = $name;
-    if ($auto) {
-      if (empty($this->ReplyTo)) {
-        $this->AddAnAddress('ReplyTo', $address, $name);
-      }
-      if (empty($this->Sender)) {
-        $this->Sender = $address;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Check that a string looks roughly like an email address should
-   * Static so it can be used without instantiation
-   * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
-   * Conforms approximately to RFC2822
-   * @link http://www.hexillion.com/samples/#Regex Original pattern found here
-   * @param string $address The email address to check
-   * @return boolean
-   * @static
-   * @access public
-   */
-  public static function ValidateAddress($address) {
-    if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+class PHPMailer
+{
+    /**
+     * The PHPMailer Version number.
+     * @var string
+     */
+    public $Version = '5.2.28';
+
+    /**
+     * Email priority.
+     * Options: null (default), 1 = High, 3 = Normal, 5 = low.
+     * When null, the header is not set at all.
+     * @var integer
+     */
+    public $Priority = null;
+
+    /**
+     * The character set of the message.
+     * @var string
+     */
+    public $CharSet = 'iso-8859-1';
+
+    /**
+     * The MIME Content-type of the message.
+     * @var string
+     */
+    public $ContentType = 'text/plain';
+
+    /**
+     * The message encoding.
+     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     * @var string
+     */
+    public $Encoding = '8bit';
+
+    /**
+     * Holds the most recent mailer error message.
+     * @var string
+     */
+    public $ErrorInfo = '';
+
+    /**
+     * The From email address for the message.
+     * @var string
+     */
+    public $From = 'root@localhost';
+
+    /**
+     * The From name of the message.
+     * @var string
+     */
+    public $FromName = 'Root User';
+
+    /**
+     * The Sender email (Return-Path) of the message.
+     * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+     * @var string
+     */
+    public $Sender = '';
+
+    /**
+     * The Return-Path of the message.
+     * If empty, it will be set to either From or Sender.
+     * @var string
+     * @deprecated Email senders should never set a return-path header;
+     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
+     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
+     */
+    public $ReturnPath = '';
+
+    /**
+     * The Subject of the message.
+     * @var string
+     */
+    public $Subject = '';
+
+    /**
+     * An HTML or plain text message body.
+     * If HTML then call isHTML(true).
+     * @var string
+     */
+    public $Body = '';
+
+    /**
+     * The plain-text message body.
+     * This body can be read by mail clients that do not have HTML email
+     * capability such as mutt & Eudora.
+     * Clients that can read HTML will view the normal Body.
+     * @var string
+     */
+    public $AltBody = '';
+
+    /**
+     * An iCal message part body.
+     * Only supported in simple alt or alt_inline message types
+     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
+     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+     * @link http://kigkonsult.se/iCalcreator/
+     * @var string
+     */
+    public $Ical = '';
+
+    /**
+     * The complete compiled MIME message body.
+     * @access protected
+     * @var string
+     */
+    protected $MIMEBody = '';
+
+    /**
+     * The complete compiled MIME message headers.
+     * @var string
+     * @access protected
+     */
+    protected $MIMEHeader = '';
+
+    /**
+     * Extra headers that createHeader() doesn't fold in.
+     * @var string
+     * @access protected
+     */
+    protected $mailHeader = '';
+
+    /**
+     * Word-wrap the message body to this number of chars.
+     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+     * @var integer
+     */
+    public $WordWrap = 0;
+
+    /**
+     * Which method to use to send mail.
+     * Options: "mail", "sendmail", or "smtp".
+     * @var string
+     */
+    public $Mailer = 'mail';
+
+    /**
+     * The path to the sendmail program.
+     * @var string
+     */
+    public $Sendmail = '/usr/sbin/sendmail';
+
+    /**
+     * Whether mail() uses a fully sendmail-compatible MTA.
+     * One which supports sendmail's "-oi -f" options.
+     * @var boolean
+     */
+    public $UseSendmailOptions = true;
+
+    /**
+     * Path to PHPMailer plugins.
+     * Useful if the SMTP class is not in the PHP include path.
+     * @var string
+     * @deprecated Should not be needed now there is an autoloader.
+     */
+    public $PluginDir = '';
+
+    /**
+     * The email address that a reading confirmation should be sent to, also known as read receipt.
+     * @var string
+     */
+    public $ConfirmReadingTo = '';
+
+    /**
+     * The hostname to use in the Message-ID header and as default HELO string.
+     * If empty, PHPMailer attempts to find one with, in order,
+     * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
+     * 'localhost.localdomain'.
+     * @var string
+     */
+    public $Hostname = '';
+
+    /**
+     * An ID to be used in the Message-ID header.
+     * If empty, a unique id will be generated.
+     * You can set your own, but it must be in the format "<id@domain>",
+     * as defined in RFC5322 section 3.6.4 or it will be ignored.
+     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+     * @var string
+     */
+    public $MessageID = '';
+
+    /**
+     * The message Date to be used in the Date header.
+     * If empty, the current date will be added.
+     * @var string
+     */
+    public $MessageDate = '';
+
+    /**
+     * SMTP hosts.
+     * Either a single hostname or multiple semicolon-delimited hostnames.
+     * You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * You can also specify encryption type, for example:
+     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+     * Hosts will be tried in order.
+     * @var string
+     */
+    public $Host = 'localhost';
+
+    /**
+     * The default SMTP server port.
+     * @var integer
+     * @TODO Why is this needed when the SMTP class takes care of it?
+     */
+    public $Port = 25;
+
+    /**
+     * The SMTP HELO of the message.
+     * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
+     * one with the same method described above for $Hostname.
+     * @var string
+     * @see PHPMailer::$Hostname
+     */
+    public $Helo = '';
+
+    /**
+     * What kind of encryption to use on the SMTP connection.
+     * Options: '', 'ssl' or 'tls'
+     * @var string
+     */
+    public $SMTPSecure = '';
+
+    /**
+     * Whether to enable TLS encryption automatically if a server supports it,
+     * even if `SMTPSecure` is not set to 'tls'.
+     * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
+     * @var boolean
+     */
+    public $SMTPAutoTLS = true;
+
+    /**
+     * Whether to use SMTP authentication.
+     * Uses the Username and Password properties.
+     * @var boolean
+     * @see PHPMailer::$Username
+     * @see PHPMailer::$Password
+     */
+    public $SMTPAuth = false;
+
+    /**
+     * Options array passed to stream_context_create when connecting via SMTP.
+     * @var array
+     */
+    public $SMTPOptions = array();
+
+    /**
+     * SMTP username.
+     * @var string
+     */
+    public $Username = '';
+
+    /**
+     * SMTP password.
+     * @var string
+     */
+    public $Password = '';
+
+    /**
+     * SMTP auth type.
+     * Options are CRAM-MD5, LOGIN, PLAIN, NTLM, XOAUTH2, attempted in that order if not specified
+     * @var string
+     */
+    public $AuthType = '';
+
+    /**
+     * SMTP realm.
+     * Used for NTLM auth
+     * @var string
+     */
+    public $Realm = '';
+
+    /**
+     * SMTP workstation.
+     * Used for NTLM auth
+     * @var string
+     */
+    public $Workstation = '';
+
+    /**
+     * The SMTP server timeout in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @var integer
+     */
+    public $Timeout = 300;
+
+    /**
+     * SMTP class debug output mode.
+     * Debug output level.
+     * Options:
+     * * `0` No output
+     * * `1` Commands
+     * * `2` Data and commands
+     * * `3` As 2 plus connection status
+     * * `4` Low-level data output
+     * @var integer
+     * @see SMTP::$do_debug
+     */
+    public $SMTPDebug = 0;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @var string|callable
+     * @see SMTP::$Debugoutput
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to keep SMTP connection open after each message.
+     * If this is set to true then to close the connection
+     * requires an explicit call to smtpClose().
+     * @var boolean
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * Whether to split multiple to addresses into multiple messages
+     * or send them all in one message.
+     * Only supported in `mail` and `sendmail` transports, not in SMTP.
+     * @var boolean
+     */
+    public $SingleTo = false;
+
+    /**
+     * Storage for addresses when SingleTo is enabled.
+     * @var array
+     * @TODO This should really not be public
+     */
+    public $SingleToArray = array();
+
+    /**
+     * Whether to generate VERP addresses on send.
+     * Only applicable when sending via SMTP.
+     * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
+     * @var boolean
+     */
+    public $do_verp = false;
+
+    /**
+     * Whether to allow sending messages with an empty body.
+     * @var boolean
+     */
+    public $AllowEmpty = false;
+
+    /**
+     * The default line ending.
+     * @note The default remains "\n". We force CRLF where we know
+     *        it must be used via self::CRLF.
+     * @var string
+     */
+    public $LE = "\n";
+
+    /**
+     * DKIM selector.
+     * @var string
+     */
+    public $DKIM_selector = '';
+
+    /**
+     * DKIM Identity.
+     * Usually the email address used as the source of the email.
+     * @var string
+     */
+    public $DKIM_identity = '';
+
+    /**
+     * DKIM passphrase.
+     * Used if your key is encrypted.
+     * @var string
+     */
+    public $DKIM_passphrase = '';
+
+    /**
+     * DKIM signing domain name.
+     * @example 'example.com'
+     * @var string
+     */
+    public $DKIM_domain = '';
+
+    /**
+     * DKIM private key file path.
+     * @var string
+     */
+    public $DKIM_private = '';
+
+    /**
+     * DKIM private key string.
+     * If set, takes precedence over `$DKIM_private`.
+     * @var string
+     */
+    public $DKIM_private_string = '';
+
+    /**
+     * Callback Action function name.
+     *
+     * The function that handles the result of the send email action.
+     * It is called out by send() for each email sent.
+     *
+     * Value can be any php callable: http://www.php.net/is_callable
+     *
+     * Parameters:
+     *   boolean $result        result of the send action
+     *   array   $to            email addresses of the recipients
+     *   array   $cc            cc email addresses
+     *   array   $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     *   string  $from          email address of sender
+     * @var string
+     */
+    public $action_function = '';
+
+    /**
+     * What to put in the X-Mailer header.
+     * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
+     * @var string
+     */
+    public $XMailer = '';
+
+    /**
+     * Which validator to use by default when validating email addresses.
+     * May be a callable to inject your own validator, but there are several built-in validators.
+     * @see PHPMailer::validateAddress()
+     * @var string|callable
+     * @static
+     */
+    public static $validator = 'auto';
+
+    /**
+     * An instance of the SMTP sender class.
+     * @var SMTP
+     * @access protected
+     */
+    protected $smtp = null;
+
+    /**
+     * The array of 'to' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $to = array();
+
+    /**
+     * The array of 'cc' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $cc = array();
+
+    /**
+     * The array of 'bcc' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $bcc = array();
+
+    /**
+     * The array of reply-to names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $ReplyTo = array();
+
+    /**
+     * An array of all kinds of addresses.
+     * Includes all of $to, $cc, $bcc
+     * @var array
+     * @access protected
+     * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
+     */
+    protected $all_recipients = array();
+
+    /**
+     * An array of names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $all_recipients
+     * and one of $to, $cc, or $bcc.
+     * This array is used only for addresses with IDN.
+     * @var array
+     * @access protected
+     * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
+     * @see PHPMailer::$all_recipients
+     */
+    protected $RecipientsQueue = array();
+
+    /**
+     * An array of reply-to names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $ReplyTo.
+     * This array is used only for addresses with IDN.
+     * @var array
+     * @access protected
+     * @see PHPMailer::$ReplyTo
+     */
+    protected $ReplyToQueue = array();
+
+    /**
+     * The array of attachments.
+     * @var array
+     * @access protected
+     */
+    protected $attachment = array();
+
+    /**
+     * The array of custom headers.
+     * @var array
+     * @access protected
+     */
+    protected $CustomHeader = array();
+
+    /**
+     * The most recent Message-ID (including angular brackets).
+     * @var string
+     * @access protected
+     */
+    protected $lastMessageID = '';
+
+    /**
+     * The message's MIME type.
+     * @var string
+     * @access protected
+     */
+    protected $message_type = '';
+
+    /**
+     * The array of MIME boundary strings.
+     * @var array
+     * @access protected
+     */
+    protected $boundary = array();
+
+    /**
+     * The array of available languages.
+     * @var array
+     * @access protected
+     */
+    protected $language = array();
+
+    /**
+     * The number of errors encountered.
+     * @var integer
+     * @access protected
+     */
+    protected $error_count = 0;
+
+    /**
+     * The S/MIME certificate file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_cert_file = '';
+
+    /**
+     * The S/MIME key file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_key_file = '';
+
+    /**
+     * The optional S/MIME extra certificates ("CA Chain") file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_extracerts_file = '';
+
+    /**
+     * The S/MIME password for the key.
+     * Used only if the key is encrypted.
+     * @var string
+     * @access protected
+     */
+    protected $sign_key_pass = '';
+
+    /**
+     * Whether to throw exceptions for errors.
+     * @var boolean
+     * @access protected
+     */
+    protected $exceptions = false;
+
+    /**
+     * Unique ID used for message ID and boundaries.
+     * @var string
+     * @access protected
+     */
+    protected $uniqueid = '';
+
+    /**
+     * Error severity: message only, continue processing.
+     */
+    const STOP_MESSAGE = 0;
+
+    /**
+     * Error severity: message, likely ok to continue processing.
+     */
+    const STOP_CONTINUE = 1;
+
+    /**
+     * Error severity: message, plus full stop, critical error reached.
+     */
+    const STOP_CRITICAL = 2;
+
+    /**
+     * SMTP RFC standard line ending.
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1
+     * @var integer
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Constructor.
+     * @param boolean $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = null)
+    {
+        if ($exceptions !== null) {
+            $this->exceptions = (boolean)$exceptions;
+        }
+        //Pick an appropriate debug output format automatically
+        $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        //Close any open SMTP connection nicely
+        $this->smtpClose();
+    }
+
+    /**
+     * Call mail() in a safe_mode-aware fashion.
+     * Also, unless sendmail_path points to sendmail (or something that
+     * claims to be sendmail), don't pass params (not a perfect fix,
+     * but it will do)
+     * @param string $to To
+     * @param string $subject Subject
+     * @param string $body Message Body
+     * @param string $header Additional Header(s)
+     * @param string $params Params
+     * @access private
+     * @return boolean
+     */
+    private function mailPassthru($to, $subject, $body, $header, $params)
+    {
+        //Check overloading of mail function to avoid double-encoding
+        if (ini_get('mbstring.func_overload') & 1) {
+            $subject = $this->secureHeader($subject);
+        } else {
+            $subject = $this->encodeHeader($this->secureHeader($subject));
+        }
+
+        //Can't use additional_parameters in safe_mode, calling mail() with null params breaks
+        //@link http://php.net/manual/en/function.mail.php
+        if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
+            $result = @mail($to, $subject, $body, $header);
+        } else {
+            $result = @mail($to, $subject, $body, $header, $params);
+        }
+        return $result;
+    }
+    /**
+     * Output debugging info via user-defined method.
+     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+     * @see PHPMailer::$Debugoutput
+     * @see PHPMailer::$SMTPDebug
+     * @param string $str
+     */
+    protected function edebug($str)
+    {
+        if ($this->SMTPDebug <= 0) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                )
+                . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/\r\n?/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                ) . "\n";
+        }
+    }
+
+    /**
+     * Sets message type to HTML or plain.
+     * @param boolean $isHtml True for HTML mode.
+     * @return void
+     */
+    public function isHTML($isHtml = true)
+    {
+        if ($isHtml) {
+            $this->ContentType = 'text/html';
+        } else {
+            $this->ContentType = 'text/plain';
+        }
+    }
+
+    /**
+     * Send messages using SMTP.
+     * @return void
+     */
+    public function isSMTP()
+    {
+        $this->Mailer = 'smtp';
+    }
+
+    /**
+     * Send messages using PHP's mail() function.
+     * @return void
+     */
+    public function isMail()
+    {
+        $this->Mailer = 'mail';
+    }
+
+    /**
+     * Send messages using $Sendmail.
+     * @return void
+     */
+    public function isSendmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'sendmail')) {
+            $this->Sendmail = '/usr/sbin/sendmail';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'sendmail';
+    }
+
+    /**
+     * Send messages using qmail.
+     * @return void
+     */
+    public function isQmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'qmail')) {
+            $this->Sendmail = '/var/qmail/bin/qmail-inject';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'qmail';
+    }
+
+    /**
+     * Add a "To" address.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addAddress($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('to', $address, $name);
+    }
+
+    /**
+     * Add a "CC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('cc', $address, $name);
+    }
+
+    /**
+     * Add a "BCC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addBCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('bcc', $address, $name);
+    }
+
+    /**
+     * Add a "Reply-To" address.
+     * @param string $address The email address to reply to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addReplyTo($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('Reply-To', $address, $name);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer
+     * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still
+     * be modified after calling this function), addition of such addresses is delayed until send().
+     * Addresses that have been added already return false, but do not throw exceptions.
+     * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     * @throws phpmailerException
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access protected
+     */
+    protected function addOrEnqueueAnAddress($kind, $address, $name)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        if (($pos = strrpos($address, '@')) === false) {
+            // At-sign is misssing.
+            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        $params = array($kind, $address, $name);
+        // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        if ($this->has8bitChars(substr($address, ++$pos)) and $this->idnSupported()) {
+            if ($kind != 'Reply-To') {
+                if (!array_key_exists($address, $this->RecipientsQueue)) {
+                    $this->RecipientsQueue[$address] = $params;
+                    return true;
+                }
+            } else {
+                if (!array_key_exists($address, $this->ReplyToQueue)) {
+                    $this->ReplyToQueue[$address] = $params;
+                    return true;
+                }
+            }
+            return false;
+        }
+        // Immediately add standard addresses without IDN.
+        return call_user_func_array(array($this, 'addAnAddress'), $params);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array.
+     * Addresses that have been added already return false, but do not throw exceptions.
+     * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     * @throws phpmailerException
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access protected
+     */
+    protected function addAnAddress($kind, $address, $name = '')
+    {
+        if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) {
+            $error_message = $this->lang('Invalid recipient kind: ') . $kind;
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        if (!$this->validateAddress($address)) {
+            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        if ($kind != 'Reply-To') {
+            if (!array_key_exists(strtolower($address), $this->all_recipients)) {
+                array_push($this->$kind, array($address, $name));
+                $this->all_recipients[strtolower($address)] = true;
+                return true;
+            }
+        } else {
+            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+                $this->ReplyTo[strtolower($address)] = array($address, $name);
+                return true;
+            }
+        }
         return false;
-      } else {
-        return true;
-      }
-    } else {
-      return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
-    }
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, MAIL SENDING
-  /////////////////////////////////////////////////
-
-  /**
-   * Creates message and assigns Mailer. If the message is
-   * not sent successfully then it returns false.  Use the ErrorInfo
-   * variable to view description of the error.
-   * @return bool
-   */
-  public function Send() {
-    try {
-      if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-        throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
-      }
-
-      // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
-        $this->ContentType = 'multipart/alternative';
-      }
-
-      $this->error_count = 0; // reset errors
-      $this->SetMessageType();
-      $header = $this->CreateHeader();
-      $body = $this->CreateBody();
-
-      if (empty($this->Body)) {
-        throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
-      }
-
-      // digitally sign with DKIM if enabled
-      if ($this->DKIM_domain && $this->DKIM_private) {
-        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
-        $header = str_replace("\r\n","\n",$header_dkim) . $header;
-      }
-
-      // Choose the mailer and send through it
-      switch($this->Mailer) {
-        case 'sendmail':
-          return $this->SendmailSend($header, $body);
-        case 'smtp':
-          return $this->SmtpSend($header, $body);
-        default:
-          return $this->MailSend($header, $body);
-      }
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      echo $e->getMessage()."\n";
-      return false;
-    }
-  }
-
-  /**
-   * Sends mail using the $Sendmail program.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @access protected
-   * @return bool
-   */
-  protected function SendmailSend($header, $body) {
-    if ($this->Sender != '') {
-      $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-    } else {
-      $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
-    }
-    if ($this->SingleTo === true) {
-      foreach ($this->SingleToArray as $key => $val) {
-        if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-        }
-        fputs($mail, "To: " . $val . "\n");
-        fputs($mail, $header);
-        fputs($mail, $body);
-        $result = pclose($mail);
-        // implement call back function if it exists
-        $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-        }
-      }
-    } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
-      fputs($mail, $header);
-      fputs($mail, $body);
-      $result = pclose($mail);
-      // implement call back function if it exists
-      $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-      if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Sends mail using the PHP mail() function.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @access protected
-   * @return bool
-   */
-  protected function MailSend($header, $body) {
-    $toArr = array();
-    foreach($this->to as $t) {
-      $toArr[] = $this->AddrFormat($t);
-    }
-    $to = implode(', ', $toArr);
-
-    $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
-      $old_from = ini_get('sendmail_from');
-      ini_set('sendmail_from', $this->Sender);
-      if ($this->SingleTo === true && count($toArr) > 1) {
-        foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-        // implement call back function if it exists
-        $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
-    } else {
-      if ($this->SingleTo === true && count($toArr) > 1) {
-        foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        }
-      } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
-        // implement call back function if it exists
-        $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
-    }
-    if (isset($old_from)) {
-      ini_set('sendmail_from', $old_from);
-    }
-    if(!$rt) {
-      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
-    }
-    return true;
-  }
-
-  /**
-   * Sends mail via SMTP using PhpSMTP
-   * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @uses SMTP
-   * @access protected
-   * @return bool
-   */
-  protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'class.smtp.php';
-    $bad_rcpt = array();
-
-    if(!$this->SmtpConnect()) {
-      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
-    }
-    $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
-    }
-
-    // Attempt to send attach all recipients
-    foreach($this->to as $to) {
-      if (!$this->smtp->Recipient($to[0])) {
-        $bad_rcpt[] = $to[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      }
-    }
-    foreach($this->cc as $cc) {
-      if (!$this->smtp->Recipient($cc[0])) {
-        $bad_rcpt[] = $cc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      }
-    }
-    foreach($this->bcc as $bcc) {
-      if (!$this->smtp->Recipient($bcc[0])) {
-        $bad_rcpt[] = $bcc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      }
-    }
-
-
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
-      $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
-    }
-    if(!$this->smtp->Data($header . $body)) {
-      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
-    }
-    if($this->SMTPKeepAlive == true) {
-      $this->smtp->Reset();
-    }
-    return true;
-  }
-
-  /**
-   * Initiates a connection to an SMTP server.
-   * Returns false if the operation failed.
-   * @uses SMTP
-   * @access public
-   * @return bool
-   */
-  public function SmtpConnect() {
-    if(is_null($this->smtp)) {
-      $this->smtp = new SMTP();
-    }
-
-    $this->smtp->do_debug = $this->SMTPDebug;
-    $hosts = explode(';', $this->Host);
-    $index = 0;
-    $connection = $this->smtp->Connected();
-
-    // Retry while there is no connection
-    try {
-      while($index < count($hosts) && !$connection) {
-        $hostinfo = array();
-        if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
-          $host = $hostinfo[1];
-          $port = $hostinfo[2];
+    }
+
+    /**
+     * Parse and validate a string containing one or more RFC822-style comma-separated email addresses
+     * of the form "display name <address>" into an array of name/address pairs.
+     * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
+     * Note that quotes in the name part are removed.
+     * @param string $addrstr The address list string
+     * @param bool $useimap Whether to use the IMAP extension to parse the list
+     * @return array
+     * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
+     */
+    public function parseAddresses($addrstr, $useimap = true)
+    {
+        $addresses = array();
+        if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
+            //Use this built-in parser if it's available
+            $list = imap_rfc822_parse_adrlist($addrstr, '');
+            foreach ($list as $address) {
+                if ($address->host != '.SYNTAX-ERROR.') {
+                    if ($this->validateAddress($address->mailbox . '@' . $address->host)) {
+                        $addresses[] = array(
+                            'name' => (property_exists($address, 'personal') ? $address->personal : ''),
+                            'address' => $address->mailbox . '@' . $address->host
+                        );
+                    }
+                }
+            }
         } else {
-          $host = $hosts[$index];
-          $port = $this->Port;
-        }
-
-        $tls = ($this->SMTPSecure == 'tls');
-        $ssl = ($this->SMTPSecure == 'ssl');
-
-        if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
-
-          $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
-          $this->smtp->Hello($hello);
-
-          if ($tls) {
-            if (!$this->smtp->StartTLS()) {
-              throw new phpmailerException($this->Lang('tls'));
-            }
-
-            //We must resend HELO after tls negotiation
-            $this->smtp->Hello($hello);
-          }
-
-          $connection = true;
-          if ($this->SMTPAuth) {
-            if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
-              throw new phpmailerException($this->Lang('authenticate'));
-            }
-          }
-        }
-        $index++;
-        if (!$connection) {
-          throw new phpmailerException($this->Lang('connect_host'));
-        }
-      }
-    } catch (phpmailerException $e) {
-      $this->smtp->Reset();
-      throw $e;
-    }
-    return true;
-  }
-
-  /**
-   * Closes the active SMTP session if one exists.
-   * @return void
-   */
-  public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
-        $this->smtp->Quit();
-        $this->smtp->Close();
-      }
-    }
-  }
-
-  /**
-  * Sets the language for all class error messages.
-  * Returns false if it cannot load the language file.  The default language is English.
-  * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
-  * @param string $lang_path Path to the language file directory
-  * @access public
-  */
-  function SetLanguage($langcode = 'en', $lang_path = 'language/') {
-    //Define full set of translatable strings
-    $PHPMAILER_LANG = array(
-      'provide_address' => 'You must provide at least one recipient email address.',
-      'mailer_not_supported' => ' mailer is not supported.',
-      'execute' => 'Could not execute: ',
-      'instantiate' => 'Could not instantiate mail function.',
-      'authenticate' => 'SMTP Error: Could not authenticate.',
-      'from_failed' => 'The following From address failed: ',
-      'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-      'data_not_accepted' => 'SMTP Error: Data not accepted.',
-      'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-      'file_access' => 'Could not access file: ',
-      'file_open' => 'File Error: Could not open file: ',
-      'encoding' => 'Unknown encoding: ',
-      'signing' => 'Signing Error: ',
-      'smtp_error' => 'SMTP server error: ',
-      'empty_message' => 'Message body empty',
-      'invalid_address' => 'Invalid address',
-      'variable_set' => 'Cannot set or reset variable: '
-    );
-    //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
-    $l = true;
-    if ($langcode != 'en') { //There is no English translation file
-      $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
-    }
-    $this->language = $PHPMAILER_LANG;
-    return ($l == true); //Returns false if language not found
-  }
-
-  /**
-  * Return the current array of language strings
-  * @return array
-  */
-  public function GetTranslations() {
-    return $this->language;
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, MESSAGE CREATION
-  /////////////////////////////////////////////////
-
-  /**
-   * Creates recipient headers.
-   * @access public
-   * @return string
-   */
-  public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
-    $addresses = array();
-    foreach ($addr as $a) {
-      $addresses[] = $this->AddrFormat($a);
-    }
-    $addr_str .= implode(', ', $addresses);
-    $addr_str .= $this->LE;
-
-    return $addr_str;
-  }
-
-  /**
-   * Formats an address correctly.
-   * @access public
-   * @return string
-   */
-  public function AddrFormat($addr) {
-    if (empty($addr[1])) {
-      return $this->SecureHeader($addr[0]);
-    } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
-    }
-  }
-
-  /**
-   * Wraps message for use with mailers that do not
-   * automatically perform wrapping and for quoted-printable.
-   * Original written by philippe.
-   * @param string $message The message to wrap
-   * @param integer $length The line length to wrap to
-   * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-   * @access public
-   * @return string
-   */
-  public function WrapText($message, $length, $qp_mode = false) {
-    $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
-    // If utf-8 encoding is used, we will need to make sure we don't
-    // split multibyte characters when we wrap
-    $is_utf8 = (strtolower($this->CharSet) == "utf-8");
-
-    $message = $this->FixEOL($message);
-    if (substr($message, -1) == $this->LE) {
-      $message = substr($message, 0, -1);
-    }
-
-    $line = explode($this->LE, $message);
-    $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
-      $line_part = explode(' ', $line[$i]);
-      $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
-        $word = $line_part[$e];
-        if ($qp_mode and (strlen($word) > $length)) {
-          $space_left = $length - strlen($buf) - 1;
-          if ($e != 0) {
-            if ($space_left > 20) {
-              $len = $space_left;
-              if ($is_utf8) {
-                $len = $this->UTF8CharBoundary($word, $len);
-              } elseif (substr($word, $len - 1, 1) == "=") {
-                $len--;
-              } elseif (substr($word, $len - 2, 1) == "=") {
-                $len -= 2;
-              }
-              $part = substr($word, 0, $len);
-              $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+            //Use this simpler parser
+            $list = explode(',', $addrstr);
+            foreach ($list as $address) {
+                $address = trim($address);
+                //Is there a separate name part?
+                if (strpos($address, '<') === false) {
+                    //No separate name, just use the whole thing
+                    if ($this->validateAddress($address)) {
+                        $addresses[] = array(
+                            'name' => '',
+                            'address' => $address
+                        );
+                    }
+                } else {
+                    list($name, $email) = explode('<', $address);
+                    $email = trim(str_replace('>', '', $email));
+                    if ($this->validateAddress($email)) {
+                        $addresses[] = array(
+                            'name' => trim(str_replace(array('"', "'"), '', $name)),
+                            'address' => $email
+                        );
+                    }
+                }
+            }
+        }
+        return $addresses;
+    }
+
+    /**
+     * Set the From and FromName properties.
+     * @param string $address
+     * @param string $name
+     * @param boolean $auto Whether to also set the Sender address, defaults to true
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function setFrom($address, $name = '', $auto = true)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        // Don't validate now addresses with IDN. Will be done in send().
+        if (($pos = strrpos($address, '@')) === false or
+            (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and
+            !$this->validateAddress($address)) {
+            $error_message = $this->lang('invalid_address') . " (setFrom) $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        $this->From = $address;
+        $this->FromName = $name;
+        if ($auto) {
+            if (empty($this->Sender)) {
+                $this->Sender = $address;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Return the Message-ID header of the last email.
+     * Technically this is the value from the last time the headers were created,
+     * but it's also the message ID of the last sent message except in
+     * pathological cases.
+     * @return string
+     */
+    public function getLastMessageID()
+    {
+        return $this->lastMessageID;
+    }
+
+    /**
+     * Check that a string looks like an email address.
+     * @param string $address The email address to check
+     * @param string|callable $patternselect A selector for the validation pattern to use :
+     * * `auto` Pick best pattern automatically;
+     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
+     * * `pcre` Use old PCRE implementation;
+     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
+     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `noregex` Don't use a regex: super fast, really dumb.
+     * Alternatively you may pass in a callable to inject your own validator, for example:
+     * PHPMailer::validateAddress('user@example.com', function($address) {
+     *     return (strpos($address, '@') !== false);
+     * });
+     * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator.
+     * @return boolean
+     * @static
+     * @access public
+     */
+    public static function validateAddress($address, $patternselect = null)
+    {
+        if (is_null($patternselect)) {
+            $patternselect = self::$validator;
+        }
+        if (is_callable($patternselect)) {
+            return call_user_func($patternselect, $address);
+        }
+        //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
+        if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) {
+            return false;
+        }
+        if (!$patternselect or $patternselect == 'auto') {
+            //Check this constant first so it works when extension_loaded() is disabled by safe mode
+            //Constant was added in PHP 5.2.4
+            if (defined('PCRE_VERSION')) {
+                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
+                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
+                    $patternselect = 'pcre8';
+                } else {
+                    $patternselect = 'pcre';
+                }
+            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
+                //Fall back to older PCRE
+                $patternselect = 'pcre';
             } else {
-              $message .= $buf . $soft_break;
+                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
+                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
+                    $patternselect = 'php';
+                } else {
+                    $patternselect = 'noregex';
+                }
             }
-            $buf = '';
-          }
-          while (strlen($word) > 0) {
-            $len = $length;
-            if ($is_utf8) {
-              $len = $this->UTF8CharBoundary($word, $len);
-            } elseif (substr($word, $len - 1, 1) == "=") {
-              $len--;
-            } elseif (substr($word, $len - 2, 1) == "=") {
-              $len -= 2;
-            }
-            $part = substr($word, 0, $len);
-            $word = substr($word, $len);
-
-            if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+        }
+        switch ($patternselect) {
+            case 'pcre8':
+                /**
+                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
+                 * @link http://squiloople.com/2009/12/20/email-address-validation/
+                 * @copyright 2009-2010 Michael Rushton
+                 * Feel free to use and redistribute this code. But please keep this copyright notice.
+                 */
+                return (boolean)preg_match(
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
+                    $address
+                );
+            case 'pcre':
+                //An older regex that doesn't need a recent PCRE
+                return (boolean)preg_match(
+                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
+                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
+                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
+                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
+                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
+                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
+                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
+                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
+                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
+                    $address
+                );
+            case 'html5':
+                /**
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
+                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+                 */
+                return (boolean)preg_match(
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
+                    $address
+                );
+            case 'noregex':
+                //No PCRE! Do something _very_ approximate!
+                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
+                return (strlen($address) >= 3
+                    and strpos($address, '@') >= 1
+                    and strpos($address, '@') != strlen($address) - 1);
+            case 'php':
+            default:
+                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
+        }
+    }
+
+    /**
+     * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the
+     * "intl" and "mbstring" PHP extensions.
+     * @return bool "true" if required functions for IDN support are present
+     */
+    public function idnSupported()
+    {
+        // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2.
+        return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding');
+    }
+
+    /**
+     * Converts IDN in given email address to its ASCII form, also known as punycode, if possible.
+     * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet.
+     * This function silently returns unmodified address if:
+     * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form)
+     * - Conversion to punycode is impossible (e.g. required PHP functions are not available)
+     *   or fails for any reason (e.g. domain has characters not allowed in an IDN)
+     * @see PHPMailer::$CharSet
+     * @param string $address The email address to convert
+     * @return string The encoded address in ASCII form
+     */
+    public function punyencodeAddress($address)
+    {
+        // Verify we have required functions, CharSet, and at-sign.
+        if ($this->idnSupported() and
+            !empty($this->CharSet) and
+            ($pos = strrpos($address, '@')) !== false) {
+            $domain = substr($address, ++$pos);
+            // Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
+            if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) {
+                $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
+                if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ?
+                    idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) :
+                    idn_to_ascii($domain)) !== false) {
+                    return substr($address, 0, $pos) . $punycode;
+                }
+            }
+        }
+        return $address;
+    }
+
+    /**
+     * Create a message and send it.
+     * Uses the sending method specified by $Mailer.
+     * @throws phpmailerException
+     * @return boolean false on error - See the ErrorInfo property for details of the error.
+     */
+    public function send()
+    {
+        try {
+            if (!$this->preSend()) {
+                return false;
+            }
+            return $this->postSend();
+        } catch (phpmailerException $exc) {
+            $this->mailHeader = '';
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Prepare a message for sending.
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function preSend()
+    {
+        try {
+            $this->error_count = 0; // Reset errors
+            $this->mailHeader = '';
+
+            // Dequeue recipient and Reply-To addresses with IDN
+            foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
+                $params[1] = $this->punyencodeAddress($params[1]);
+                call_user_func_array(array($this, 'addAnAddress'), $params);
+            }
+            if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+                throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
+            }
+
+            // Validate From, Sender, and ConfirmReadingTo addresses
+            foreach (array('From', 'Sender', 'ConfirmReadingTo') as $address_kind) {
+                $this->$address_kind = trim($this->$address_kind);
+                if (empty($this->$address_kind)) {
+                    continue;
+                }
+                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
+                if (!$this->validateAddress($this->$address_kind)) {
+                    $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind;
+                    $this->setError($error_message);
+                    $this->edebug($error_message);
+                    if ($this->exceptions) {
+                        throw new phpmailerException($error_message);
+                    }
+                    return false;
+                }
+            }
+
+            // Set whether the message is multipart/alternative
+            if ($this->alternativeExists()) {
+                $this->ContentType = 'multipart/alternative';
+            }
+
+            $this->setMessageType();
+            // Refuse to send an empty message unless we are specifically allowing it
+            if (!$this->AllowEmpty and empty($this->Body)) {
+                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+
+            // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
+            $this->MIMEHeader = '';
+            $this->MIMEBody = $this->createBody();
+            // createBody may have added some headers, so retain them
+            $tempheaders = $this->MIMEHeader;
+            $this->MIMEHeader = $this->createHeader();
+            $this->MIMEHeader .= $tempheaders;
+
+            // To capture the complete message when using mail(), create
+            // an extra header list which createHeader() doesn't fold in
+            if ($this->Mailer == 'mail') {
+                if (count($this->to) > 0) {
+                    $this->mailHeader .= $this->addrAppend('To', $this->to);
+                } else {
+                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
+                }
+                $this->mailHeader .= $this->headerLine(
+                    'Subject',
+                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
+                );
+            }
+
+            // Sign with DKIM if enabled
+            if (!empty($this->DKIM_domain)
+                and !empty($this->DKIM_selector)
+                and (!empty($this->DKIM_private_string)
+                    or (!empty($this->DKIM_private)
+                        and self::isPermittedPath($this->DKIM_private)
+                        and file_exists($this->DKIM_private)
+                    )
+                )
+            ) {
+                $header_dkim = $this->DKIM_Add(
+                    $this->MIMEHeader . $this->mailHeader,
+                    $this->encodeHeader($this->secureHeader($this->Subject)),
+                    $this->MIMEBody
+                );
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
+                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
+            }
+            return true;
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Actually send a message.
+     * Send the email via the selected mechanism
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function postSend()
+    {
+        try {
+            // Choose the mailer and send through it
+            switch ($this->Mailer) {
+                case 'sendmail':
+                case 'qmail':
+                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
+                case 'smtp':
+                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
+                case 'mail':
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+                default:
+                    $sendMethod = $this->Mailer.'Send';
+                    if (method_exists($this, $sendMethod)) {
+                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                    }
+
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+            }
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Send mail using the $Sendmail program.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @see PHPMailer::$Sendmail
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function sendmailSend($header, $body)
+    {
+        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+        if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
+            if ($this->Mailer == 'qmail') {
+                $sendmailFmt = '%s -f%s';
             } else {
-              $buf = $part;
+                $sendmailFmt = '%s -oi -f%s -t';
             }
-          }
         } else {
-          $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
-
-          if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
-            $buf = $word;
-          }
-        }
-      }
-      $message .= $buf . $this->LE;
-    }
-
-    return $message;
-  }
-
-  /**
-   * Finds last character boundary prior to maxLength in a utf-8
-   * quoted (printable) encoded string.
-   * Original written by Colin Brown.
-   * @access public
-   * @param string $encodedText utf-8 QP text
-   * @param int    $maxLength   find last character boundary prior to this length
-   * @return int
-   */
-  public function UTF8CharBoundary($encodedText, $maxLength) {
-    $foundSplitPos = false;
-    $lookBack = 3;
-    while (!$foundSplitPos) {
-      $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-      $encodedCharPos = strpos($lastChunk, "=");
-      if ($encodedCharPos !== false) {
-        // Found start of encoded character byte within $lookBack block.
-        // Check the encoded byte value (the 2 chars after the '=')
-        $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-        $dec = hexdec($hex);
-        if ($dec < 128) { // Single byte character.
-          // If the encoded char was found at pos 0, it will fit
-          // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec >= 192) { // First byte of a multi byte character
-          // Reduce maxLength to split at start of character
-          $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-          $lookBack += 3;
-        }
-      } else {
-        // No encoded character found
-        $foundSplitPos = true;
-      }
-    }
-    return $maxLength;
-  }
-
-
-  /**
-   * Set the body wrapping.
-   * @access public
-   * @return void
-   */
-  public function SetWordWrap() {
-    if($this->WordWrap < 1) {
-      return;
-    }
-
-    switch($this->message_type) {
-      case 'alt':
-      case 'alt_attachments':
-        $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
-        break;
-      default:
-        $this->Body = $this->WrapText($this->Body, $this->WordWrap);
-        break;
-    }
-  }
-
-  /**
-   * Assembles message header.
-   * @access public
-   * @return string The assembled header
-   */
-  public function CreateHeader() {
-    $result = '';
-
-    // Set the boundaries
-    $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
-
-    $result .= $this->HeaderLine('Date', self::RFCDate());
-    if($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
-    } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
-    }
-
-    // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
-      if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
-          $this->SingleToArray[] = $this->AddrFormat($t);
-        }
-      } else {
-        if(count($this->to) > 0) {
-          $result .= $this->AddrAppend('To', $this->to);
-        } elseif (count($this->cc) == 0) {
-          $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
-        }
-      }
-    }
-
-    $from = array();
-    $from[0][0] = trim($this->From);
-    $from[0][1] = $this->FromName;
-    $result .= $this->AddrAppend('From', $from);
-
-    // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
-      $result .= $this->AddrAppend('Cc', $this->cc);
-    }
-
-    // sendmail and mail() extract Bcc from the header before sending
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
-      $result .= $this->AddrAppend('Bcc', $this->bcc);
-    }
-
-    if(count($this->ReplyTo) > 0) {
-      $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
-    }
-
-    // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
-      $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
-    }
-
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
-    } else {
-      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
-    }
-    $result .= $this->HeaderLine('X-Priority', $this->Priority);
-    $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
+            if ($this->Mailer == 'qmail') {
+                $sendmailFmt = '%s';
+            } else {
+                $sendmailFmt = '%s -oi -t';
+            }
+        }
 
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+        // TODO: If possible, this should be changed to escapeshellarg.  Needs thorough testing.
+        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
+
+        if ($this->SingleTo) {
+            foreach ($this->SingleToArray as $toAddr) {
+                if (!@$mail = popen($sendmail, 'w')) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+                fputs($mail, 'To: ' . $toAddr . "\n");
+                fputs($mail, $header);
+                fputs($mail, $body);
+                $result = pclose($mail);
+                $this->doCallback(
+                    ($result == 0),
+                    array($toAddr),
+                    $this->cc,
+                    $this->bcc,
+                    $this->Subject,
+                    $body,
+                    $this->From
+                );
+                if ($result != 0) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+            }
+        } else {
+            if (!@$mail = popen($sendmail, 'w')) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+            fputs($mail, $header);
+            fputs($mail, $body);
+            $result = pclose($mail);
+            $this->doCallback(
+                ($result == 0),
+                $this->to,
+                $this->cc,
+                $this->bcc,
+                $this->Subject,
+                $body,
+                $this->From
+            );
+            if ($result != 0) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+        }
+        return true;
     }
 
-    // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
-      $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
+    /**
+     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
+     *
+     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
+     * @param string $string The string to be validated
+     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
+     * @access protected
+     * @return boolean
+     */
+    protected static function isShellSafe($string)
+    {
+        // Future-proof
+        if (escapeshellcmd($string) !== $string
+            or !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))
+        ) {
+            return false;
+        }
+
+        $length = strlen($string);
+
+        for ($i = 0; $i < $length; $i++) {
+            $c = $string[$i];
+
+            // All other characters have a special meaning in at least one common shell, including = and +.
+            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
+                return false;
+            }
+        }
+
+        return true;
     }
-    if (!$this->sign_key_file) {
-      $result .= $this->HeaderLine('MIME-Version', '1.0');
-      $result .= $this->GetMailMIME();
+
+    /**
+     * Check whether a file path is of a permitted type.
+     * Used to reject URLs and phar files from functions that access local file paths,
+     * such as addAttachment.
+     * @param string $path A relative or absolute path to a file.
+     * @return bool
+     */
+    protected static function isPermittedPath($path)
+    {
+        return !preg_match('#^[a-z]+://#i', $path);
+    }
+
+    /**
+     * Send mail using the PHP mail() function.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @link http://www.php.net/manual/en/book.mail.php
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function mailSend($header, $body)
+    {
+        $toArr = array();
+        foreach ($this->to as $toaddr) {
+            $toArr[] = $this->addrFormat($toaddr);
+        }
+        $to = implode(', ', $toArr);
+
+        $params = null;
+        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
+        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
+            // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+            if (self::isShellSafe($this->Sender)) {
+                $params = sprintf('-f%s', $this->Sender);
+            }
+        }
+        if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) {
+            $old_from = ini_get('sendmail_from');
+            ini_set('sendmail_from', $this->Sender);
+        }
+        $result = false;
+        if ($this->SingleTo and count($toArr) > 1) {
+            foreach ($toArr as $toAddr) {
+                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
+                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+            }
+        } else {
+            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
+            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+        }
+        if (isset($old_from)) {
+            ini_set('sendmail_from', $old_from);
+        }
+        if (!$result) {
+            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
+        }
+        return true;
     }
 
-    return $result;
-  }
-
-  /**
-   * Returns the message MIME.
-   * @access public
-   * @return string
-   */
-  public function GetMailMIME() {
-    $result = '';
-    switch($this->message_type) {
-      case 'plain':
-        $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
-        $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
-        break;
-      case 'attachments':
-      case 'alt_attachments':
-        if($this->InlineImageExists()){
-          $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
+    /**
+     * Get an instance to use for SMTP operations.
+     * Override this function to load your own SMTP implementation
+     * @return SMTP
+     */
+    public function getSMTPInstance()
+    {
+        if (!is_object($this->smtp)) {
+            $this->smtp = new SMTP;
+        }
+        return $this->smtp;
+    }
+
+    /**
+     * Send mail via SMTP.
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     * Uses the PHPMailerSMTP class by default.
+     * @see PHPMailer::getSMTPInstance() to use a different class.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @throws phpmailerException
+     * @uses SMTP
+     * @access protected
+     * @return boolean
+     */
+    protected function smtpSend($header, $body)
+    {
+        $bad_rcpt = array();
+        if (!$this->smtpConnect($this->SMTPOptions)) {
+            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        }
+        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
+            $smtp_from = $this->Sender;
         } else {
-          $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        }
-        break;
-      case 'alt':
-        $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        break;
-    }
-
-    if($this->Mailer != 'mail') {
-      $result .= $this->LE.$this->LE;
-    }
-
-    return $result;
-  }
-
-  /**
-   * Assembles the message body.  Returns an empty string on failure.
-   * @access public
-   * @return string The assembled message body
-   */
-  public function CreateBody() {
-    $body = '';
-
-    if ($this->sign_key_file) {
-      $body .= $this->GetMailMIME();
-    }
-
-    $this->SetWordWrap();
-
-    switch($this->message_type) {
-      case 'alt':
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[1]);
-        break;
-      case 'plain':
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        break;
-      case 'attachments':
-        $body .= $this->GetBoundary($this->boundary[1], '', '', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE;
-        $body .= $this->AttachAll();
-        break;
-      case 'alt_attachments':
-        $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[2]);
-        $body .= $this->AttachAll();
-        break;
-    }
-
-    if ($this->IsError()) {
-      $body = '';
-    } elseif ($this->sign_key_file) {
-      try {
-        $file = tempnam('', 'mail');
-        file_put_contents($file, $body); //TODO check this worked
-        $signed = tempnam("", "signed");
-        if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
-          @unlink($file);
-          @unlink($signed);
-          $body = file_get_contents($signed);
+            $smtp_from = $this->From;
+        }
+        if (!$this->smtp->mail($smtp_from)) {
+            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
+        }
+
+        // Attempt to send to all recipients
+        foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
+            foreach ($togroup as $to) {
+                if (!$this->smtp->recipient($to[0])) {
+                    $error = $this->smtp->getError();
+                    $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
+                    $isSent = false;
+                } else {
+                    $isSent = true;
+                }
+                $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
+            }
+        }
+
+        // Only send the DATA command if we have viable recipients
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
+        }
+        if ($this->SMTPKeepAlive) {
+            $this->smtp->reset();
         } else {
-          @unlink($file);
-          @unlink($signed);
-          throw new phpmailerException($this->Lang("signing").openssl_error_string());
+            $this->smtp->quit();
+            $this->smtp->close();
+        }
+        //Create error message for any bad addresses
+        if (count($bad_rcpt) > 0) {
+            $errstr = '';
+            foreach ($bad_rcpt as $bad) {
+                $errstr .= $bad['to'] . ': ' . $bad['error'];
+            }
+            throw new phpmailerException(
+                $this->lang('recipients_failed') . $errstr,
+                self::STOP_CONTINUE
+            );
+        }
+        return true;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Returns false if the operation failed.
+     * @param array $options An array of options compatible with stream_context_create()
+     * @uses SMTP
+     * @access public
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function smtpConnect($options = null)
+    {
+        if (is_null($this->smtp)) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        //If no options are provided, use whatever is set in the instance
+        if (is_null($options)) {
+            $options = $this->SMTPOptions;
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = array();
+            if (!preg_match(
+                '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/',
+                trim($hostentry),
+                $hostinfo
+            )) {
+                // Not a valid host entry
+                $this->edebug('Ignoring invalid host: ' . $hostentry);
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+            $prefix = '';
+            $secure = $this->SMTPSecure;
+            $tls = ($this->SMTPSecure == 'tls');
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
+            } elseif ($hostinfo[2] == 'tls') {
+                $tls = true;
+                // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            $sslext = defined('OPENSSL_ALGO_SHA1');
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!$sslext) {
+                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
+                }
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (integer)$hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+                    //Automatically enable TLS encryption if:
+                    // * it's not disabled
+                    // * we have openssl extension
+                    // * we are not already using SSL
+                    // * the server offers STARTTLS
+                    if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
+                        $tls = true;
+                    }
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new phpmailerException($this->lang('connect_host'));
+                        }
+                        // We must resend EHLO after TLS negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->Realm,
+                            $this->Workstation
+                        )
+                        ) {
+                            throw new phpmailerException($this->lang('authenticate'));
+                        }
+                    }
+                    return true;
+                } catch (phpmailerException $exc) {
+                    $lastexception = $exc;
+                    $this->edebug($exc->getMessage());
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and !is_null($lastexception)) {
+            throw $lastexception;
         }
-      } catch (phpmailerException $e) {
-        $body = '';
-        if ($this->exceptions) {
-          throw $e;
-        }
-      }
-    }
-
-    return $body;
-  }
-
-  /**
-   * Returns the start of a message boundary.
-   * @access private
-   */
-  private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
-    $result = '';
-    if($charSet == '') {
-      $charSet = $this->CharSet;
-    }
-    if($contentType == '') {
-      $contentType = $this->ContentType;
-    }
-    if($encoding == '') {
-      $encoding = $this->Encoding;
-    }
-    $result .= $this->TextLine('--' . $boundary);
-    $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
-    $result .= $this->LE;
-    $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
-    $result .= $this->LE;
-
-    return $result;
-  }
-
-  /**
-   * Returns the end of a message boundary.
-   * @access private
-   */
-  private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
-  }
-
-  /**
-   * Sets the message type.
-   * @access private
-   * @return void
-   */
-  private function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
-      $this->message_type = 'plain';
-    } else {
-      if(count($this->attachment) > 0) {
-        $this->message_type = 'attachments';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
-        $this->message_type = 'alt';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
-        $this->message_type = 'alt_attachments';
-      }
-    }
-  }
-
-  /**
-   *  Returns a formatted header line.
-   * @access public
-   * @return string
-   */
-  public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
-  }
-
-  /**
-   * Returns a formatted mail line.
-   * @access public
-   * @return string
-   */
-  public function TextLine($value) {
-    return $value . $this->LE;
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, ATTACHMENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds an attachment from a path on the filesystem.
-   * Returns false if the file could not be found
-   * or accessed.
-   * @param string $path Path to the attachment.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-    try {
-      if ( !@is_file($path) ) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
-      }
-      $filename = basename($path);
-      if ( $name == '' ) {
-        $name = $filename;
-      }
-
-      $this->attachment[] = array(
-        0 => $path,
-        1 => $filename,
-        2 => $name,
-        3 => $encoding,
-        4 => $type,
-        5 => false,  // isStringAttachment
-        6 => 'attachment',
-        7 => 0
-      );
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      echo $e->getMessage()."\n";
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
         return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-  * Return the current array of attachments
-  * @return array
-  */
-  public function GetAttachments() {
-    return $this->attachment;
-  }
-
-  /**
-   * Attaches all fs, string, and binary attachments to the message.
-   * Returns an empty string on failure.
-   * @access private
-   * @return string
-   */
-  private function AttachAll() {
-    // Return text of body
-    $mime = array();
-    $cidUniq = array();
-    $incl = array();
-
-    // Add all attachments
-    foreach ($this->attachment as $attachment) {
-      // Check for string attachment
-      $bString = $attachment[5];
-      if ($bString) {
-        $string = $attachment[0];
-      } else {
-        $path = $attachment[0];
-      }
-
-      if (in_array($attachment[0], $incl)) { continue; }
-      $filename    = $attachment[1];
-      $name        = $attachment[2];
-      $encoding    = $attachment[3];
-      $type        = $attachment[4];
-      $disposition = $attachment[6];
-      $cid         = $attachment[7];
-      $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
-      $cidUniq[$cid] = true;
-
-      $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-      $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
-      $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-
-      if($disposition == 'inline') {
-        $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
-      }
-
-      $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
-
-      // Encode as string attachment
-      if($bString) {
-        $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
-          return '';
-        }
-        $mime[] = $this->LE.$this->LE;
-      } else {
-        $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
-          return '';
-        }
-        $mime[] = $this->LE.$this->LE;
-      }
-    }
-
-    $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
-
-    return join('', $mime);
-  }
-
-  /**
-   * Encodes attachment in requested format.
-   * Returns an empty string on failure.
-   * @param string $path The full path to the file
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @see EncodeFile()
-   * @access private
-   * @return string
-   */
-  private function EncodeFile($path, $encoding = 'base64') {
-    try {
-      if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
-      }
-      if (function_exists('get_magic_quotes')) {
-        function get_magic_quotes() {
-          return false;
-        }
-      }
-      if (PHP_VERSION < 6) {
-        $magic_quotes = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-      }
-      $file_buffer  = file_get_contents($path);
-      $file_buffer  = $this->EncodeString($file_buffer, $encoding);
-      if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
-      return $file_buffer;
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      return '';
-    }
-  }
-
-  /**
-   * Encodes string to requested format.
-   * Returns an empty string on failure.
-   * @param string $str The text to encode
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @access public
-   * @return string
-   */
-  public function EncodeString ($str, $encoding = 'base64') {
-    $encoded = '';
-    switch(strtolower($encoding)) {
-      case 'base64':
-        $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-        break;
-      case '7bit':
-      case '8bit':
-        $encoded = $this->FixEOL($str);
-        //Make sure it ends with a line break
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
-        break;
-      case 'binary':
-        $encoded = $str;
-        break;
-      case 'quoted-printable':
-        $encoded = $this->EncodeQP($str);
-        break;
-      default:
-        $this->SetError($this->Lang('encoding') . $encoding);
-        break;
-    }
-    return $encoded;
-  }
-
-  /**
-   * Encode a header string to best (shortest) of Q, B, quoted or none.
-   * @access public
-   * @return string
-   */
-  public function EncodeHeader($str, $position = 'text') {
-    $x = 0;
-
-    switch (strtolower($position)) {
-      case 'phrase':
-        if (!preg_match('/[\200-\377]/', $str)) {
-          // Can't use addslashes as we don't know what value has magic_quotes_sybase
-          $encoded = addcslashes($str, "\0..\37\177\\\"");
-          if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-            return ($encoded);
-          } else {
-            return ("\"$encoded\"");
-          }
-        }
-        $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-        break;
-      case 'comment':
-        $x = preg_match_all('/[()"]/', $str, $matches);
-        // Fall-through
-      case 'text':
-      default:
-        $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-        break;
-    }
-
-    if ($x == 0) {
-      return ($str);
-    }
-
-    $maxlen = 75 - 7 - strlen($this->CharSet);
-    // Try to select the encoding which should produce the shortest output
-    if (strlen($str)/3 < $x) {
-      $encoding = 'B';
-      if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
-        // Use a custom function which correctly encodes and wraps long
-        // multibyte strings without breaking lines within a character
-        $encoded = $this->Base64EncodeWrapMB($str);
-      } else {
-        $encoded = base64_encode($str);
-        $maxlen -= $maxlen % 4;
-        $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-      }
-    } else {
-      $encoding = 'Q';
-      $encoded = $this->EncodeQ($str, $position);
-      $encoded = $this->WrapText($encoded, $maxlen, true);
-      $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
-    }
-
-    $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
-    $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-    return $encoded;
-  }
-
-  /**
-   * Checks if a string contains multibyte characters.
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @return bool
-   */
-  public function HasMultiBytes($str) {
-    if (function_exists('mb_strlen')) {
-      return (strlen($str) > mb_strlen($str, $this->CharSet));
-    } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-      return false;
-    }
-  }
-
-  /**
-   * Correctly encodes and wraps long multibyte strings for mail headers
-   * without breaking lines within a character.
-   * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @return string
-   */
-  public function Base64EncodeWrapMB($str) {
-    $start = "=?".$this->CharSet."?B?";
-    $end = "?=";
-    $encoded = "";
-
-    $mb_length = mb_strlen($str, $this->CharSet);
-    // Each line must have length <= 75, including $start and $end
-    $length = 75 - strlen($start) - strlen($end);
-    // Average multi-byte ratio
-    $ratio = $mb_length / strlen($str);
-    // Base64 has a 4:3 ratio
-    $offset = $avgLength = floor($length * $ratio * .75);
-
-    for ($i = 0; $i < $mb_length; $i += $offset) {
-      $lookBack = 0;
-
-      do {
-        $offset = $avgLength - $lookBack;
-        $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-        $chunk = base64_encode($chunk);
-        $lookBack++;
-      }
-      while (strlen($chunk) > $length);
-
-      $encoded .= $chunk . $this->LE;
-    }
-
-    // Chomp the last linefeed
-    $encoded = substr($encoded, 0, -strlen($this->LE));
-    return $encoded;
-  }
-
-  /**
-  * Encode string to quoted-printable.
-  * Only uses standard PHP, slow, but will always work
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @return string
-  */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-    $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
-    $eol = "\r\n";
-    $escape = '=';
-    $output = '';
-    while( list(, $line) = each($lines) ) {
-      $linlen = strlen($line);
-      $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
-          $c = '=2E';
-        }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
-            $c = '=20';
-          } else if ( $space_conv ) {
-            $c = '=20';
-          }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
-          $c = $escape.$hex[$h2].$hex[$h1];
-        }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
-          $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
-          $newline = '';
-          // check if newline first character will be point or not
-          if ( $dec == 46 ) {
-            $c = '=2E';
-          }
-        }
-        $newline .= $c;
-      } // end of for
-      $output .= $newline.$eol;
-    } // end of while
-    return $output;
-  }
-
-  /**
-  * Encode string to RFC2045 (6.7) quoted-printable format
-  * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
-  * Also results in same content as you started with after decoding
-  * @see EncodeQPphp()
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
-  * @return string
-  * @author Marcus Bointon
-  */
-  public function EncodeQP($string, $line_max = 76, $space_conv = false) {
-    if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
-      return quoted_printable_encode($string);
-    }
-    $filters = stream_get_filters();
-    if (!in_array('convert.*', $filters)) { //Got convert stream filter?
-      return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
-    }
-    $fp = fopen('php://temp/', 'r+');
-    $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
-    $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
-    $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
-    fputs($fp, $string);
-    rewind($fp);
-    $out = stream_get_contents($fp);
-    stream_filter_remove($s);
-    $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
-    fclose($fp);
-    return $out;
-  }
-
-  /**
-   * Encode string to q encoding.
-   * @link http://tools.ietf.org/html/rfc2047
-   * @param string $str the text to encode
-   * @param string $position Where the text is going to be used, see the RFC for what that means
-   * @access public
-   * @return string
-   */
-  public function EncodeQ ($str, $position = 'text') {
-    // There should not be any EOL in the string
-    $encoded = preg_replace('/[\r\n]*/', '', $str);
-
-    switch (strtolower($position)) {
-      case 'phrase':
-        $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        break;
-      case 'comment':
-        $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-      case 'text':
-      default:
-        // Replace every high ascii, control =, ? and _ characters
-        //TODO using /e (equivalent to eval()) is probably not a good idea
-        $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
-              "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        break;
-    }
-
-    // Replace every spaces to _ (more readable than =20)
-    $encoded = str_replace(' ', '_', $encoded);
-
-    return $encoded;
-  }
-
-  /**
-   * Adds a string or binary attachment (non-filesystem) to the list.
-   * This method can be used to attach ascii or binary data,
-   * such as a BLOB record from a database.
-   * @param string $string String attachment data.
-   * @param string $filename Name of the attachment.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return void
-   */
-  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $string,
-      1 => $filename,
-      2 => basename($filename),
-      3 => $encoding,
-      4 => $type,
-      5 => true,  // isStringAttachment
-      6 => 'attachment',
-      7 => 0
-    );
-  }
-
-  /**
-   * Adds an embedded attachment.  This can include images, sounds, and
-   * just about any other document.  Make sure to set the $type to an
-   * image type.  For JPEG images use "image/jpeg" and for GIF images
-   * use "image/gif".
-   * @param string $path Path to the attachment.
-   * @param string $cid Content ID of the attachment.  Use this to identify
-   *        the Id for accessing the image in an HTML form.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-
-    if ( !@is_file($path) ) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
-    }
-
-    $filename = basename($path);
-    if ( $name == '' ) {
-      $name = $filename;
-    }
-
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $path,
-      1 => $filename,
-      2 => $name,
-      3 => $encoding,
-      4 => $type,
-      5 => false,  // isStringAttachment
-      6 => 'inline',
-      7 => $cid
-    );
-
-    return true;
-  }
-
-  /**
-   * Returns true if an inline attachment is present.
-   * @access public
-   * @return bool
-   */
-  public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
-      if ($attachment[6] == 'inline') {
+    }
+
+    /**
+     * Close the active SMTP session if one exists.
+     * @return void
+     */
+    public function smtpClose()
+    {
+        if (is_a($this->smtp, 'SMTP')) {
+            if ($this->smtp->connected()) {
+                $this->smtp->quit();
+                $this->smtp->close();
+            }
+        }
+    }
+
+    /**
+     * Set the language for error messages.
+     * Returns false if it cannot load the language file.
+     * The default language is English.
+     * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
+     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+     * @return boolean
+     * @access public
+     */
+    public function setLanguage($langcode = 'en', $lang_path = '')
+    {
+        // Backwards compatibility for renamed language codes
+        $renamed_langcodes = array(
+            'br' => 'pt_br',
+            'cz' => 'cs',
+            'dk' => 'da',
+            'no' => 'nb',
+            'se' => 'sv',
+            'sr' => 'rs'
+        );
+
+        if (isset($renamed_langcodes[$langcode])) {
+            $langcode = $renamed_langcodes[$langcode];
+        }
+
+        // Define full set of translatable strings in English
+        $PHPMAILER_LANG = array(
+            'authenticate' => 'SMTP Error: Could not authenticate.',
+            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+            'data_not_accepted' => 'SMTP Error: data not accepted.',
+            'empty_message' => 'Message body empty',
+            'encoding' => 'Unknown encoding: ',
+            'execute' => 'Could not execute: ',
+            'file_access' => 'Could not access file: ',
+            'file_open' => 'File Error: Could not open file: ',
+            'from_failed' => 'The following From address failed: ',
+            'instantiate' => 'Could not instantiate mail function.',
+            'invalid_address' => 'Invalid address: ',
+            'mailer_not_supported' => ' mailer is not supported.',
+            'provide_address' => 'You must provide at least one recipient email address.',
+            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+            'signing' => 'Signing Error: ',
+            'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_error' => 'SMTP server error: ',
+            'variable_set' => 'Cannot set or reset variable: ',
+            'extension_missing' => 'Extension missing: '
+        );
+        if (empty($lang_path)) {
+            // Calculate an absolute path so it can work if CWD is not here
+            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
+        }
+        //Validate $langcode
+        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+            $langcode = 'en';
+        }
+        $foundlang = true;
+        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        // There is no English translation file
+        if ($langcode != 'en') {
+            // Make sure language file path is readable
+            if (!self::isPermittedPath($lang_file) or !is_readable($lang_file)) {
+                $foundlang = false;
+            } else {
+                // Overwrite language-specific strings.
+                // This way we'll never have missing translation keys.
+                $foundlang = include $lang_file;
+            }
+        }
+        $this->language = $PHPMAILER_LANG;
+        return (boolean)$foundlang; // Returns false if language not found
+    }
+
+    /**
+     * Get the array of strings for the current language.
+     * @return array
+     */
+    public function getTranslations()
+    {
+        return $this->language;
+    }
+
+    /**
+     * Create recipient headers.
+     * @access public
+     * @param string $type
+     * @param array $addr An array of recipient,
+     * where each recipient is a 2-element indexed array with element 0 containing an address
+     * and element 1 containing a name, like:
+     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
+     * @return string
+     */
+    public function addrAppend($type, $addr)
+    {
+        $addresses = array();
+        foreach ($addr as $address) {
+            $addresses[] = $this->addrFormat($address);
+        }
+        return $type . ': ' . implode(', ', $addresses) . $this->LE;
+    }
+
+    /**
+     * Format an address for use in a message header.
+     * @access public
+     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
+     *      like array('joe@example.com', 'Joe User')
+     * @return string
+     */
+    public function addrFormat($addr)
+    {
+        if (empty($addr[1])) { // No name provided
+            return $this->secureHeader($addr[0]);
+        } else {
+            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+                $addr[0]
+            ) . '>';
+        }
+    }
+
+    /**
+     * Word-wrap message.
+     * For use with mailers that do not automatically perform wrapping
+     * and for quoted-printable encoded messages.
+     * Original written by philippe.
+     * @param string $message The message to wrap
+     * @param integer $length The line length to wrap to
+     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+     * @access public
+     * @return string
+     */
+    public function wrapText($message, $length, $qp_mode = false)
+    {
+        if ($qp_mode) {
+            $soft_break = sprintf(' =%s', $this->LE);
+        } else {
+            $soft_break = $this->LE;
+        }
+        // If utf-8 encoding is used, we will need to make sure we don't
+        // split multibyte characters when we wrap
+        $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
+        $lelen = strlen($this->LE);
+        $crlflen = strlen(self::CRLF);
+
+        $message = $this->fixEOL($message);
+        //Remove a trailing line break
+        if (substr($message, -$lelen) == $this->LE) {
+            $message = substr($message, 0, -$lelen);
+        }
+
+        //Split message into lines
+        $lines = explode($this->LE, $message);
+        //Message will be rebuilt in here
+        $message = '';
+        foreach ($lines as $line) {
+            $words = explode(' ', $line);
+            $buf = '';
+            $firstword = true;
+            foreach ($words as $word) {
+                if ($qp_mode and (strlen($word) > $length)) {
+                    $space_left = $length - strlen($buf) - $crlflen;
+                    if (!$firstword) {
+                        if ($space_left > 20) {
+                            $len = $space_left;
+                            if ($is_utf8) {
+                                $len = $this->utf8CharBoundary($word, $len);
+                            } elseif (substr($word, $len - 1, 1) == '=') {
+                                $len--;
+                            } elseif (substr($word, $len - 2, 1) == '=') {
+                                $len -= 2;
+                            }
+                            $part = substr($word, 0, $len);
+                            $word = substr($word, $len);
+                            $buf .= ' ' . $part;
+                            $message .= $buf . sprintf('=%s', self::CRLF);
+                        } else {
+                            $message .= $buf . $soft_break;
+                        }
+                        $buf = '';
+                    }
+                    while (strlen($word) > 0) {
+                        if ($length <= 0) {
+                            break;
+                        }
+                        $len = $length;
+                        if ($is_utf8) {
+                            $len = $this->utf8CharBoundary($word, $len);
+                        } elseif (substr($word, $len - 1, 1) == '=') {
+                            $len--;
+                        } elseif (substr($word, $len - 2, 1) == '=') {
+                            $len -= 2;
+                        }
+                        $part = substr($word, 0, $len);
+                        $word = substr($word, $len);
+
+                        if (strlen($word) > 0) {
+                            $message .= $part . sprintf('=%s', self::CRLF);
+                        } else {
+                            $buf = $part;
+                        }
+                    }
+                } else {
+                    $buf_o = $buf;
+                    if (!$firstword) {
+                        $buf .= ' ';
+                    }
+                    $buf .= $word;
+
+                    if (strlen($buf) > $length and $buf_o != '') {
+                        $message .= $buf_o . $soft_break;
+                        $buf = $word;
+                    }
+                }
+                $firstword = false;
+            }
+            $message .= $buf . self::CRLF;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Find the last character boundary prior to $maxLength in a utf-8
+     * quoted-printable encoded string.
+     * Original written by Colin Brown.
+     * @access public
+     * @param string $encodedText utf-8 QP text
+     * @param integer $maxLength Find the last character boundary prior to this length
+     * @return integer
+     */
+    public function utf8CharBoundary($encodedText, $maxLength)
+    {
+        $foundSplitPos = false;
+        $lookBack = 3;
+        while (!$foundSplitPos) {
+            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+            $encodedCharPos = strpos($lastChunk, '=');
+            if (false !== $encodedCharPos) {
+                // Found start of encoded character byte within $lookBack block.
+                // Check the encoded byte value (the 2 chars after the '=')
+                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+                $dec = hexdec($hex);
+                if ($dec < 128) {
+                    // Single byte character.
+                    // If the encoded char was found at pos 0, it will fit
+                    // otherwise reduce maxLength to start of the encoded char
+                    if ($encodedCharPos > 0) {
+                        $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+                    }
+                    $foundSplitPos = true;
+                } elseif ($dec >= 192) {
+                    // First byte of a multi byte character
+                    // Reduce maxLength to split at start of character
+                    $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+                    $foundSplitPos = true;
+                } elseif ($dec < 192) {
+                    // Middle byte of a multi byte character, look further back
+                    $lookBack += 3;
+                }
+            } else {
+                // No encoded character found
+                $foundSplitPos = true;
+            }
+        }
+        return $maxLength;
+    }
+
+    /**
+     * Apply word wrapping to the message body.
+     * Wraps the message body to the number of chars set in the WordWrap property.
+     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
+     * This is called automatically by createBody(), so you don't need to call it yourself.
+     * @access public
+     * @return void
+     */
+    public function setWordWrap()
+    {
+        if ($this->WordWrap < 1) {
+            return;
+        }
+
+        switch ($this->message_type) {
+            case 'alt':
+            case 'alt_inline':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
+                break;
+            default:
+                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
+                break;
+        }
+    }
+
+    /**
+     * Assemble message headers.
+     * @access public
+     * @return string The assembled headers
+     */
+    public function createHeader()
+    {
+        $result = '';
+
+        $result .= $this->headerLine('Date', $this->MessageDate == '' ? self::rfcDate() : $this->MessageDate);
+
+        // To be created automatically by mail()
+        if ($this->SingleTo) {
+            if ($this->Mailer != 'mail') {
+                foreach ($this->to as $toaddr) {
+                    $this->SingleToArray[] = $this->addrFormat($toaddr);
+                }
+            }
+        } else {
+            if (count($this->to) > 0) {
+                if ($this->Mailer != 'mail') {
+                    $result .= $this->addrAppend('To', $this->to);
+                }
+            } elseif (count($this->cc) == 0) {
+                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
+            }
+        }
+
+        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
+
+        // sendmail and mail() extract Cc from the header before sending
+        if (count($this->cc) > 0) {
+            $result .= $this->addrAppend('Cc', $this->cc);
+        }
+
+        // sendmail and mail() extract Bcc from the header before sending
+        if ((
+                $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
+            )
+            and count($this->bcc) > 0
+        ) {
+            $result .= $this->addrAppend('Bcc', $this->bcc);
+        }
+
+        if (count($this->ReplyTo) > 0) {
+            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
+        }
+
+        // mail() sets the subject itself
+        if ($this->Mailer != 'mail') {
+            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
+        }
+
+        // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
+        // https://tools.ietf.org/html/rfc5322#section-3.6.4
+        if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
+            $this->lastMessageID = $this->MessageID;
+        } else {
+            $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
+        }
+        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
+        if (!is_null($this->Priority)) {
+            $result .= $this->headerLine('X-Priority', $this->Priority);
+        }
+        if ($this->XMailer == '') {
+            $result .= $this->headerLine(
+                'X-Mailer',
+                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)'
+            );
+        } else {
+            $myXmailer = trim($this->XMailer);
+            if ($myXmailer) {
+                $result .= $this->headerLine('X-Mailer', $myXmailer);
+            }
+        }
+
+        if ($this->ConfirmReadingTo != '') {
+            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+        }
+
+        // Add custom headers
+        foreach ($this->CustomHeader as $header) {
+            $result .= $this->headerLine(
+                trim($header[0]),
+                $this->encodeHeader(trim($header[1]))
+            );
+        }
+        if (!$this->sign_key_file) {
+            $result .= $this->headerLine('MIME-Version', '1.0');
+            $result .= $this->getMailMIME();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get the message MIME type headers.
+     * @access public
+     * @return string
+     */
+    public function getMailMIME()
+    {
+        $result = '';
+        $ismultipart = true;
+        switch ($this->message_type) {
+            case 'inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/related;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'attach':
+            case 'inline_attach':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'alt':
+            case 'alt_inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            default:
+                // Catches case 'plain': and case '':
+                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $ismultipart = false;
+                break;
+        }
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($this->Encoding != '7bit') {
+            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+            if ($ismultipart) {
+                if ($this->Encoding == '8bit') {
+                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
+                }
+                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+            } else {
+                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
+            }
+        }
+
+        if ($this->Mailer != 'mail') {
+            $result .= $this->LE;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the whole MIME message.
+     * Includes complete headers and body.
+     * Only valid post preSend().
+     * @see PHPMailer::preSend()
+     * @access public
+     * @return string
+     */
+    public function getSentMIMEMessage()
+    {
+        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody;
+    }
+
+    /**
+     * Create unique ID
+     * @return string
+     */
+    protected function generateId() {
+        return md5(uniqid(time()));
+    }
+
+    /**
+     * Assemble the message body.
+     * Returns an empty string on failure.
+     * @access public
+     * @throws phpmailerException
+     * @return string The assembled message body
+     */
+    public function createBody()
+    {
+        $body = '';
+        //Create unique IDs and preset boundaries
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1_' . $this->uniqueid;
+        $this->boundary[2] = 'b2_' . $this->uniqueid;
+        $this->boundary[3] = 'b3_' . $this->uniqueid;
+
+        if ($this->sign_key_file) {
+            $body .= $this->getMailMIME() . $this->LE;
+        }
+
+        $this->setWordWrap();
+
+        $bodyEncoding = $this->Encoding;
+        $bodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
+            $bodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $bodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the body part only
+        if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) {
+            $bodyEncoding = 'quoted-printable';
+        }
+
+        $altBodyEncoding = $this->Encoding;
+        $altBodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
+            $altBodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $altBodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the alt body part only
+        if ('base64' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) {
+            $altBodyEncoding = 'quoted-printable';
+        }
+        //Use this as a preamble in all multipart message types
+        $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
+        switch ($this->message_type) {
+            case 'inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[1]);
+                break;
+            case 'attach':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                    $body .= $this->LE . $this->LE;
+                }
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt_inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[3]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            default:
+                // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
+                //Reset the `Encoding` property in case we changed it for line length reasons
+                $this->Encoding = $bodyEncoding;
+                $body .= $this->encodeString($this->Body, $this->Encoding);
+                break;
+        }
+
+        if ($this->isError()) {
+            $body = '';
+        } elseif ($this->sign_key_file) {
+            try {
+                if (!defined('PKCS7_TEXT')) {
+                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+                }
+                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
+                $file = tempnam(sys_get_temp_dir(), 'mail');
+                if (false === file_put_contents($file, $body)) {
+                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
+                }
+                $signed = tempnam(sys_get_temp_dir(), 'signed');
+                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
+                if (empty($this->sign_extracerts_file)) {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        null
+                    );
+                } else {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        null,
+                        PKCS7_DETACHED,
+                        $this->sign_extracerts_file
+                    );
+                }
+                if ($sign) {
+                    @unlink($file);
+                    $body = file_get_contents($signed);
+                    @unlink($signed);
+                    //The message returned by openssl contains both headers and body, so need to split them up
+                    $parts = explode("\n\n", $body, 2);
+                    $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
+                    $body = $parts[1];
+                } else {
+                    @unlink($file);
+                    @unlink($signed);
+                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
+                }
+            } catch (phpmailerException $exc) {
+                $body = '';
+                if ($this->exceptions) {
+                    throw $exc;
+                }
+            }
+        }
+        return $body;
+    }
+
+    /**
+     * Return the start of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @param string $charSet
+     * @param string $contentType
+     * @param string $encoding
+     * @return string
+     */
+    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
+    {
+        $result = '';
+        if ($charSet == '') {
+            $charSet = $this->CharSet;
+        }
+        if ($contentType == '') {
+            $contentType = $this->ContentType;
+        }
+        if ($encoding == '') {
+            $encoding = $this->Encoding;
+        }
+        $result .= $this->textLine('--' . $boundary);
+        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
+        $result .= $this->LE;
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($encoding != '7bit') {
+            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
+        }
+        $result .= $this->LE;
+
+        return $result;
+    }
+
+    /**
+     * Return the end of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @return string
+     */
+    protected function endBoundary($boundary)
+    {
+        return $this->LE . '--' . $boundary . '--' . $this->LE;
+    }
+
+    /**
+     * Set the message type.
+     * PHPMailer only supports some preset message types, not arbitrary MIME structures.
+     * @access protected
+     * @return void
+     */
+    protected function setMessageType()
+    {
+        $type = array();
+        if ($this->alternativeExists()) {
+            $type[] = 'alt';
+        }
+        if ($this->inlineImageExists()) {
+            $type[] = 'inline';
+        }
+        if ($this->attachmentExists()) {
+            $type[] = 'attach';
+        }
+        $this->message_type = implode('_', $type);
+        if ($this->message_type == '') {
+            //The 'plain' message_type refers to the message having a single body element, not that it is plain-text
+            $this->message_type = 'plain';
+        }
+    }
+
+    /**
+     * Format a header line.
+     * @access public
+     * @param string $name
+     * @param string $value
+     * @return string
+     */
+    public function headerLine($name, $value)
+    {
+        return $name . ': ' . $value . $this->LE;
+    }
+
+    /**
+     * Return a formatted mail line.
+     * @access public
+     * @param string $value
+     * @return string
+     */
+    public function textLine($value)
+    {
+        return $value . $this->LE;
+    }
+
+    /**
+     * Add an attachment from a path on the filesystem.
+     * Never use a user-supplied path to a file!
+     * Returns false if the file could not be found or read.
+     * Explicitly *does not* support passing URLs; PHPMailer is not an HTTP client.
+     * If you need to do that, fetch the resource yourself and pass it in via a local file or string.
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
+    {
+        try {
+            if (!self::isPermittedPath($path) or !@is_file($path)) {
+                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
+            }
+
+            // If a MIME type is not specified, try to work it out from the file name
+            if ($type == '') {
+                $type = self::filenameToType($path);
+            }
+
+            $filename = basename($path);
+            if ($name == '') {
+                $name = $filename;
+            }
+
+            $this->attachment[] = array(
+                0 => $path,
+                1 => $filename,
+                2 => $name,
+                3 => $encoding,
+                4 => $type,
+                5 => false, // isStringAttachment
+                6 => $disposition,
+                7 => 0
+            );
+
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
         return true;
-      }
-    }
-    return false;
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MESSAGE RESET
-  /////////////////////////////////////////////////
-
-  /**
-   * Clears all recipients assigned in the TO array.  Returns void.
-   * @return void
-   */
-  public function ClearAddresses() {
-    foreach($this->to as $to) {
-      unset($this->all_recipients[strtolower($to[0])]);
-    }
-    $this->to = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the CC array.  Returns void.
-   * @return void
-   */
-  public function ClearCCs() {
-    foreach($this->cc as $cc) {
-      unset($this->all_recipients[strtolower($cc[0])]);
-    }
-    $this->cc = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the BCC array.  Returns void.
-   * @return void
-   */
-  public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
-      unset($this->all_recipients[strtolower($bcc[0])]);
-    }
-    $this->bcc = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the ReplyTo array.  Returns void.
-   * @return void
-   */
-  public function ClearReplyTos() {
-    $this->ReplyTo = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the TO, CC and BCC
-   * array.  Returns void.
-   * @return void
-   */
-  public function ClearAllRecipients() {
-    $this->to = array();
-    $this->cc = array();
-    $this->bcc = array();
-    $this->all_recipients = array();
-  }
-
-  /**
-   * Clears all previously set filesystem, string, and binary
-   * attachments.  Returns void.
-   * @return void
-   */
-  public function ClearAttachments() {
-    $this->attachment = array();
-  }
-
-  /**
-   * Clears all custom headers.  Returns void.
-   * @return void
-   */
-  public function ClearCustomHeaders() {
-    $this->CustomHeader = array();
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MISCELLANEOUS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds the error message to the error container.
-   * @access protected
-   * @return void
-   */
-  protected function SetError($msg) {
-    $this->error_count++;
-    if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-      $lasterror = $this->smtp->getError();
-      if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-      }
-    }
-    $this->ErrorInfo = $msg;
-  }
-
-  /**
-   * Returns the proper RFC 822 formatted date.
-   * @access public
-   * @return string
-   * @static
-   */
-  public static function RFCDate() {
-    $tz = date('Z');
-    $tzs = ($tz < 0) ? '-' : '+';
-    $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
-    $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
-
-    return $result;
-  }
-
-  /**
-   * Returns the server hostname or 'localhost.localdomain' if unknown.
-   * @access private
-   * @return string
-   */
-  private function ServerHostname() {
-    if (!empty($this->Hostname)) {
-      $result = $this->Hostname;
-    } elseif (isset($_SERVER['SERVER_NAME'])) {
-      $result = $_SERVER['SERVER_NAME'];
-    } else {
-      $result = 'localhost.localdomain';
-    }
-
-    return $result;
-  }
-
-  /**
-   * Returns a message in the appropriate language.
-   * @access private
-   * @return string
-   */
-  private function Lang($key) {
-    if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
-    }
-
-    if(isset($this->language[$key])) {
-      return $this->language[$key];
-    } else {
-      return 'Language string failed to load: ' . $key;
-    }
-  }
-
-  /**
-   * Returns true if an error occurred.
-   * @access public
-   * @return bool
-   */
-  public function IsError() {
-    return ($this->error_count > 0);
-  }
-
-  /**
-   * Changes every end of line from CR or LF to CRLF.
-   * @access private
-   * @return string
-   */
-  private function FixEOL($str) {
-    $str = str_replace("\r\n", "\n", $str);
-    $str = str_replace("\r", "\n", $str);
-    $str = str_replace("\n", $this->LE, $str);
-    return $str;
-  }
-
-  /**
-   * Adds a custom header.
-   * @access public
-   * @return void
-   */
-  public function AddCustomHeader($custom_header) {
-    $this->CustomHeader[] = explode(':', $custom_header, 2);
-  }
-
-  /**
-   * Evaluates the message and returns modifications for inline images and backgrounds
-   * @access public
-   * @return $message
-   */
-  public function MsgHTML($message, $basedir = '') {
-    preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
-        // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('#^[A-z]+://#',$url)) {
-          $filename = basename($url);
-          $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
-          $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
-            $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
-          }
-        }
-      }
-    }
-    $this->IsHTML(true);
-    $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
-    if (!empty($textMsg) && empty($this->AltBody)) {
-      $this->AltBody = html_entity_decode($textMsg);
-    }
-    if (empty($this->AltBody)) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
-    }
-  }
-
-  /**
-   * Gets the MIME type of the embedded or inline image
-   * @param string File extension
-   * @access public
-   * @return string MIME type of ext
-   * @static
-   */
-  public static function _mime_types($ext = '') {
-    $mimes = array(
-      'hqx'   =>  'application/mac-binhex40',
-      'cpt'   =>  'application/mac-compactpro',
-      'doc'   =>  'application/msword',
-      'bin'   =>  'application/macbinary',
-      'dms'   =>  'application/octet-stream',
-      'lha'   =>  'application/octet-stream',
-      'lzh'   =>  'application/octet-stream',
-      'exe'   =>  'application/octet-stream',
-      'class' =>  'application/octet-stream',
-      'psd'   =>  'application/octet-stream',
-      'so'    =>  'application/octet-stream',
-      'sea'   =>  'application/octet-stream',
-      'dll'   =>  'application/octet-stream',
-      'oda'   =>  'application/oda',
-      'pdf'   =>  'application/pdf',
-      'ai'    =>  'application/postscript',
-      'eps'   =>  'application/postscript',
-      'ps'    =>  'application/postscript',
-      'smi'   =>  'application/smil',
-      'smil'  =>  'application/smil',
-      'mif'   =>  'application/vnd.mif',
-      'xls'   =>  'application/vnd.ms-excel',
-      'ppt'   =>  'application/vnd.ms-powerpoint',
-      'wbxml' =>  'application/vnd.wap.wbxml',
-      'wmlc'  =>  'application/vnd.wap.wmlc',
-      'dcr'   =>  'application/x-director',
-      'dir'   =>  'application/x-director',
-      'dxr'   =>  'application/x-director',
-      'dvi'   =>  'application/x-dvi',
-      'gtar'  =>  'application/x-gtar',
-      'php'   =>  'application/x-httpd-php',
-      'php4'  =>  'application/x-httpd-php',
-      'php3'  =>  'application/x-httpd-php',
-      'phtml' =>  'application/x-httpd-php',
-      'phps'  =>  'application/x-httpd-php-source',
-      'js'    =>  'application/x-javascript',
-      'swf'   =>  'application/x-shockwave-flash',
-      'sit'   =>  'application/x-stuffit',
-      'tar'   =>  'application/x-tar',
-      'tgz'   =>  'application/x-tar',
-      'xhtml' =>  'application/xhtml+xml',
-      'xht'   =>  'application/xhtml+xml',
-      'zip'   =>  'application/zip',
-      'mid'   =>  'audio/midi',
-      'midi'  =>  'audio/midi',
-      'mpga'  =>  'audio/mpeg',
-      'mp2'   =>  'audio/mpeg',
-      'mp3'   =>  'audio/mpeg',
-      'aif'   =>  'audio/x-aiff',
-      'aiff'  =>  'audio/x-aiff',
-      'aifc'  =>  'audio/x-aiff',
-      'ram'   =>  'audio/x-pn-realaudio',
-      'rm'    =>  'audio/x-pn-realaudio',
-      'rpm'   =>  'audio/x-pn-realaudio-plugin',
-      'ra'    =>  'audio/x-realaudio',
-      'rv'    =>  'video/vnd.rn-realvideo',
-      'wav'   =>  'audio/x-wav',
-      'bmp'   =>  'image/bmp',
-      'gif'   =>  'image/gif',
-      'jpeg'  =>  'image/jpeg',
-      'jpg'   =>  'image/jpeg',
-      'jpe'   =>  'image/jpeg',
-      'png'   =>  'image/png',
-      'tiff'  =>  'image/tiff',
-      'tif'   =>  'image/tiff',
-      'css'   =>  'text/css',
-      'html'  =>  'text/html',
-      'htm'   =>  'text/html',
-      'shtml' =>  'text/html',
-      'txt'   =>  'text/plain',
-      'text'  =>  'text/plain',
-      'log'   =>  'text/plain',
-      'rtx'   =>  'text/richtext',
-      'rtf'   =>  'text/rtf',
-      'xml'   =>  'text/xml',
-      'xsl'   =>  'text/xml',
-      'mpeg'  =>  'video/mpeg',
-      'mpg'   =>  'video/mpeg',
-      'mpe'   =>  'video/mpeg',
-      'qt'    =>  'video/quicktime',
-      'mov'   =>  'video/quicktime',
-      'avi'   =>  'video/x-msvideo',
-      'movie' =>  'video/x-sgi-movie',
-      'doc'   =>  'application/msword',
-      'word'  =>  'application/msword',
-      'xl'    =>  'application/excel',
-      'eml'   =>  'message/rfc822'
-    );
-    return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
-  }
-
-  /**
-  * Set (or reset) Class Objects (variables)
-  *
-  * Usage Example:
-  * $page->set('X-Priority', '3');
-  *
-  * @access public
-  * @param string $name Parameter Name
-  * @param mixed $value Parameter Value
-  * NOTE: will not work with arrays, there are no arrays to set/reset
-  * @todo Should this not be using __set() magic function?
-  */
-  public function set($name, $value = '') {
-    try {
-      if (isset($this->$name) ) {
-        $this->$name = $value;
-      } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
-      }
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      if ($e->getCode() == self::STOP_CRITICAL) {
+    }
+
+    /**
+     * Return the array of attachments.
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachment;
+    }
+
+    /**
+     * Attach all file, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     * @access protected
+     * @param string $disposition_type
+     * @param string $boundary
+     * @return string
+     */
+    protected function attachAll($disposition_type, $boundary)
+    {
+        // Return text of body
+        $mime = array();
+        $cidUniq = array();
+        $incl = array();
+
+        // Add all attachments
+        foreach ($this->attachment as $attachment) {
+            // Check if it is a valid disposition_filter
+            if ($attachment[6] == $disposition_type) {
+                // Check for string attachment
+                $string = '';
+                $path = '';
+                $bString = $attachment[5];
+                if ($bString) {
+                    $string = $attachment[0];
+                } else {
+                    $path = $attachment[0];
+                }
+
+                $inclhash = md5(serialize($attachment));
+                if (in_array($inclhash, $incl)) {
+                    continue;
+                }
+                $incl[] = $inclhash;
+                $name = $attachment[2];
+                $encoding = $attachment[3];
+                $type = $attachment[4];
+                $disposition = $attachment[6];
+                $cid = $attachment[7];
+                if ($disposition == 'inline' && array_key_exists($cid, $cidUniq)) {
+                    continue;
+                }
+                $cidUniq[$cid] = true;
+
+                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
+                //Only include a filename property if we have one
+                if (!empty($name)) {
+                    $mime[] = sprintf(
+                        'Content-Type: %s; name="%s"%s',
+                        $type,
+                        $this->encodeHeader($this->secureHeader($name)),
+                        $this->LE
+                    );
+                } else {
+                    $mime[] = sprintf(
+                        'Content-Type: %s%s',
+                        $type,
+                        $this->LE
+                    );
+                }
+                // RFC1341 part 5 says 7bit is assumed if not specified
+                if ($encoding != '7bit') {
+                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
+                }
+
+                if ($disposition == 'inline') {
+                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
+                }
+
+                // If a filename contains any of these chars, it should be quoted,
+                // but not otherwise: RFC2183 & RFC2045 5.1
+                // Fixes a warning in IETF's msglint MIME checker
+                // Allow for bypassing the Content-Disposition header totally
+                if (!(empty($disposition))) {
+                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
+                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
+                        $mime[] = sprintf(
+                            'Content-Disposition: %s; filename="%s"%s',
+                            $disposition,
+                            $encoded_name,
+                            $this->LE . $this->LE
+                        );
+                    } else {
+                        if (!empty($encoded_name)) {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s; filename=%s%s',
+                                $disposition,
+                                $encoded_name,
+                                $this->LE . $this->LE
+                            );
+                        } else {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s%s',
+                                $disposition,
+                                $this->LE . $this->LE
+                            );
+                        }
+                    }
+                } else {
+                    $mime[] = $this->LE;
+                }
+
+                // Encode as string attachment
+                if ($bString) {
+                    $mime[] = $this->encodeString($string, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                } else {
+                    $mime[] = $this->encodeFile($path, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                }
+            }
+        }
+
+        $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
+
+        return implode('', $mime);
+    }
+
+    /**
+     * Encode a file attachment in requested format.
+     * Returns an empty string on failure.
+     * @param string $path The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @throws phpmailerException
+     * @access protected
+     * @return string
+     */
+    protected function encodeFile($path, $encoding = 'base64')
+    {
+        try {
+            if (!self::isPermittedPath($path) or !file_exists($path)) {
+                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $magic_quotes = false;
+            if( version_compare(PHP_VERSION, '7.4.0', '<') ) {
+                $magic_quotes = get_magic_quotes_runtime();
+            }
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime(false);
+                } else {
+                    //Doesn't exist in PHP 5.4, but we don't need to check because
+                    //get_magic_quotes_runtime always returns false in 5.4+
+                    //so it will never get here
+                    ini_set('magic_quotes_runtime', false);
+                }
+            }
+            $file_buffer = file_get_contents($path);
+            $file_buffer = $this->encodeString($file_buffer, $encoding);
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime($magic_quotes);
+                } else {
+                    ini_set('magic_quotes_runtime', $magic_quotes);
+                }
+            }
+            return $file_buffer;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            return '';
+        }
+    }
+
+    /**
+     * Encode a string in requested format.
+     * Returns an empty string on failure.
+     * @param string $str The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @access public
+     * @return string
+     */
+    public function encodeString($str, $encoding = 'base64')
+    {
+        $encoded = '';
+        switch (strtolower($encoding)) {
+            case 'base64':
+                $encoded = chunk_split(base64_encode($str), 76, $this->LE);
+                break;
+            case '7bit':
+            case '8bit':
+                $encoded = $this->fixEOL($str);
+                // Make sure it ends with a line break
+                if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                    $encoded .= $this->LE;
+                }
+                break;
+            case 'binary':
+                $encoded = $str;
+                break;
+            case 'quoted-printable':
+                $encoded = $this->encodeQP($str);
+                break;
+            default:
+                $this->setError($this->lang('encoding') . $encoding);
+                break;
+        }
+        return $encoded;
+    }
+
+    /**
+     * Encode a header string optimally.
+     * Picks shortest of Q, B, quoted-printable or none.
+     * @access public
+     * @param string $str
+     * @param string $position
+     * @return string
+     */
+    public function encodeHeader($str, $position = 'text')
+    {
+        $matchcount = 0;
+        switch (strtolower($position)) {
+            case 'phrase':
+                if (!preg_match('/[\200-\377]/', $str)) {
+                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
+                    $encoded = addcslashes($str, "\0..\37\177\\\"");
+                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+                        return ($encoded);
+                    } else {
+                        return ("\"$encoded\"");
+                    }
+                }
+                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $matchcount = preg_match_all('/[()"]/', $str, $matches);
+                // Intentional fall-through
+            case 'text':
+            default:
+                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+                break;
+        }
+
+        //There are no chars that need encoding
+        if ($matchcount == 0) {
+            return ($str);
+        }
+
+        $maxlen = 75 - 7 - strlen($this->CharSet);
+        // Try to select the encoding which should produce the shortest output
+        if ($matchcount > strlen($str) / 3) {
+            // More than a third of the content will need encoding, so B encoding will be most efficient
+            $encoding = 'B';
+            if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
+                // Use a custom function which correctly encodes and wraps long
+                // multibyte strings without breaking lines within a character
+                $encoded = $this->base64EncodeWrapMB($str, "\n");
+            } else {
+                $encoded = base64_encode($str);
+                $maxlen -= $maxlen % 4;
+                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+            }
+        } else {
+            $encoding = 'Q';
+            $encoded = $this->encodeQ($str, $position);
+            $encoded = $this->wrapText($encoded, $maxlen, true);
+            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
+        }
+
+        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        $encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+        return $encoded;
+    }
+
+    /**
+     * Check if a string contains multi-byte characters.
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return boolean
+     */
+    public function hasMultiBytes($str)
+    {
+        if (function_exists('mb_strlen')) {
+            return (strlen($str) > mb_strlen($str, $this->CharSet));
+        } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+            return false;
+        }
+    }
+
+    /**
+     * Does a string contain any 8-bit chars (in any charset)?
+     * @param string $text
+     * @return boolean
+     */
+    public function has8bitChars($text)
+    {
+        return (boolean)preg_match('/[\x80-\xFF]/', $text);
+    }
+
+    /**
+     * Encode and wrap long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid
+     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @param string $linebreak string to use as linefeed/end-of-line
+     * @return string
+     */
+    public function base64EncodeWrapMB($str, $linebreak = null)
+    {
+        $start = '=?' . $this->CharSet . '?B?';
+        $end = '?=';
+        $encoded = '';
+        if ($linebreak === null) {
+            $linebreak = $this->LE;
+        }
+
+        $mb_length = mb_strlen($str, $this->CharSet);
+        // Each line must have length <= 75, including $start and $end
+        $length = 75 - strlen($start) - strlen($end);
+        // Average multi-byte ratio
+        $ratio = $mb_length / strlen($str);
+        // Base64 has a 4:3 ratio
+        $avgLength = floor($length * $ratio * .75);
+
+        for ($i = 0; $i < $mb_length; $i += $offset) {
+            $lookBack = 0;
+            do {
+                $offset = $avgLength - $lookBack;
+                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
+                $chunk = base64_encode($chunk);
+                $lookBack++;
+            } while (strlen($chunk) > $length);
+            $encoded .= $chunk . $linebreak;
+        }
+
+        // Chomp the last linefeed
+        $encoded = substr($encoded, 0, -strlen($linebreak));
+        return $encoded;
+    }
+
+    /**
+     * Encode a string in quoted-printable format.
+     * According to RFC2045 section 6.7.
+     * @access public
+     * @param string $string The text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @return string
+     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
+     */
+    public function encodeQP($string, $line_max = 76)
+    {
+        // Use native function if it's available (>= PHP5.3)
+        if (function_exists('quoted_printable_encode')) {
+            return quoted_printable_encode($string);
+        }
+        // Fall back to a pure PHP implementation
+        $string = str_replace(
+            array('%20', '%0D%0A.', '%0D%0A', '%'),
+            array(' ', "\r\n=2E", "\r\n", '='),
+            rawurlencode($string)
+        );
+        return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
+    }
+
+    /**
+     * Backward compatibility wrapper for an old QP encoding function that was removed.
+     * @see PHPMailer::encodeQP()
+     * @access public
+     * @param string $string
+     * @param integer $line_max
+     * @param boolean $space_conv
+     * @return string
+     * @deprecated Use encodeQP instead.
+     */
+    public function encodeQPphp(
+        $string,
+        $line_max = 76,
+        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
+    ) {
+        return $this->encodeQP($string, $line_max);
+    }
+
+    /**
+     * Encode a string using Q encoding.
+     * @link http://tools.ietf.org/html/rfc2047
+     * @param string $str the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     * @access public
+     * @return string
+     */
+    public function encodeQ($str, $position = 'text')
+    {
+        // There should not be any EOL in the string
+        $pattern = '';
+        $encoded = str_replace(array("\r", "\n"), '', $str);
+        switch (strtolower($position)) {
+            case 'phrase':
+                // RFC 2047 section 5.3
+                $pattern = '^A-Za-z0-9!*+\/ -';
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                // RFC 2047 section 5.2
+                $pattern = '\(\)"';
+                // intentional fall-through
+                // for this reason we build the $pattern without including delimiters and []
+            case 'text':
+            default:
+                // RFC 2047 section 5.1
+                // Replace every high ascii, control, =, ? and _ characters
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                break;
+        }
+        $matches = array();
+        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
+            // If the string contains an '=', make sure it's the first thing we replace
+            // so as to avoid double-encoding
+            $eqkey = array_search('=', $matches[0]);
+            if (false !== $eqkey) {
+                unset($matches[0][$eqkey]);
+                array_unshift($matches[0], '=');
+            }
+            foreach (array_unique($matches[0]) as $char) {
+                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+            }
+        }
+        // Replace every spaces to _ (more readable than =20)
+        return str_replace(' ', '_', $encoded);
+    }
+
+    /**
+     * Add a string or binary attachment (non-filesystem).
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @return void
+     */
+    public function addStringAttachment(
+        $string,
+        $filename,
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'attachment'
+    ) {
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($filename);
+        }
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $filename,
+            2 => basename($filename),
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => 0
+        );
+    }
+
+    /**
+     * Add an embedded (inline) attachment from a file.
+     * This can include images, sounds, and just about any other document type.
+     * These differ from 'regular' attachments in that they are intended to be
+     * displayed inline with the message, not just attached for download.
+     * This is used in HTML messages that embed the images
+     * the HTML refers to using the $cid value.
+     * Never use a user-supplied path to a file!
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
+    {
+        if (!self::isPermittedPath($path) or !@is_file($path)) {
+            $this->setError($this->lang('file_access') . $path);
+            return false;
+        }
+
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($path);
+        }
+
+        $filename = basename($path);
+        if ($name == '') {
+            $name = $filename;
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $path,
+            1 => $filename,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => false, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
+        return true;
+    }
+
+    /**
+     * Add an embedded stringified attachment.
+     * This can include images, sounds, and just about any other document type.
+     * Be sure to set the $type to an image type for images:
+     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
+     * @param string $string The attachment binary data.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'inline'
+    ) {
+        // If a MIME type is not specified, try to work it out from the name
+        if ($type == '' and !empty($name)) {
+            $type = self::filenameToType($name);
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $name,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
+        return true;
+    }
+
+    /**
+     * Check if an inline attachment is present.
+     * @access public
+     * @return boolean
+     */
+    public function inlineImageExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'inline') {
+                return true;
+            }
+        }
         return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Strips newlines to prevent header injection.
-   * @access public
-   * @param string $str String
-   * @return string
-   */
-  public function SecureHeader($str) {
-    $str = str_replace("\r", '', $str);
-    $str = str_replace("\n", '', $str);
-    return trim($str);
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
-   */
-  public function Sign($cert_filename, $key_filename, $key_pass) {
-    $this->sign_cert_file = $cert_filename;
-    $this->sign_key_file = $key_filename;
-    $this->sign_key_pass = $key_pass;
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
-   */
-  public function DKIM_QP($txt) {
-    $tmp="";
-    $line="";
-    for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line.=$txt[$i];
-      } else {
-        $line.="=".sprintf("%02X",$ord);
-      }
-    }
-    return $line;
-  }
-
-  /**
-   * Generate DKIM signature
-   *
-   * @access public
-   * @param string $s Header
-   */
-  public function DKIM_Sign($s) {
-    $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
-    } else {
-      $privKey = $privKeyStr;
-    }
-    if (openssl_sign($s, $signature, $privKey)) {
-      return base64_encode($signature);
-    }
-  }
-
-  /**
-   * Generate DKIM Canonicalization Header
-   *
-   * @access public
-   * @param string $s Header
-   */
-  public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$s);
-    foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
-    }
-    $s=implode("\r\n",$lines);
-    return $s;
-  }
-
-  /**
-   * Generate DKIM Canonicalization Body
-   *
-   * @access public
-   * @param string $body Message Body
-   */
-  public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
-    // stabilize line endings
-    $body=str_replace("\r\n","\n",$body);
-    $body=str_replace("\n","\r\n",$body);
-    // END stabilize line endings
-    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
-    }
-    return $body;
-  }
-
-  /**
-   * Create the DKIM header, body, as new header
-   *
-   * @access public
-   * @param string $headers_line Header lines
-   * @param string $subject Subject
-   * @param string $body Body
-   */
-  public function DKIM_Add($headers_line,$subject,$body) {
-    $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
-    $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
-    $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
-    $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
-      }
-    }
-    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
-    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
-    $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
-                "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
-                "\tz=$from\r\n".
-                "\t|$to\r\n".
-                "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
-                "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
-    $signed   = $this->DKIM_Sign($toSign);
-    return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
-  }
-
-  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
-    if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
-    }
-  }
+    }
+
+    /**
+     * Check if an attachment (non-inline) is present.
+     * @return boolean
+     */
+    public function attachmentExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'attachment') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if this message has an alternative body set.
+     * @return boolean
+     */
+    public function alternativeExists()
+    {
+        return !empty($this->AltBody);
+    }
+
+    /**
+     * Clear queued addresses of given kind.
+     * @access protected
+     * @param string $kind 'to', 'cc', or 'bcc'
+     * @return void
+     */
+    public function clearQueuedAddresses($kind)
+    {
+        $RecipientsQueue = $this->RecipientsQueue;
+        foreach ($RecipientsQueue as $address => $params) {
+            if ($params[0] == $kind) {
+                unset($this->RecipientsQueue[$address]);
+            }
+        }
+    }
+
+    /**
+     * Clear all To recipients.
+     * @return void
+     */
+    public function clearAddresses()
+    {
+        foreach ($this->to as $to) {
+            unset($this->all_recipients[strtolower($to[0])]);
+        }
+        $this->to = array();
+        $this->clearQueuedAddresses('to');
+    }
+
+    /**
+     * Clear all CC recipients.
+     * @return void
+     */
+    public function clearCCs()
+    {
+        foreach ($this->cc as $cc) {
+            unset($this->all_recipients[strtolower($cc[0])]);
+        }
+        $this->cc = array();
+        $this->clearQueuedAddresses('cc');
+    }
+
+    /**
+     * Clear all BCC recipients.
+     * @return void
+     */
+    public function clearBCCs()
+    {
+        foreach ($this->bcc as $bcc) {
+            unset($this->all_recipients[strtolower($bcc[0])]);
+        }
+        $this->bcc = array();
+        $this->clearQueuedAddresses('bcc');
+    }
+
+    /**
+     * Clear all ReplyTo recipients.
+     * @return void
+     */
+    public function clearReplyTos()
+    {
+        $this->ReplyTo = array();
+        $this->ReplyToQueue = array();
+    }
+
+    /**
+     * Clear all recipient types.
+     * @return void
+     */
+    public function clearAllRecipients()
+    {
+        $this->to = array();
+        $this->cc = array();
+        $this->bcc = array();
+        $this->all_recipients = array();
+        $this->RecipientsQueue = array();
+    }
+
+    /**
+     * Clear all filesystem, string, and binary attachments.
+     * @return void
+     */
+    public function clearAttachments()
+    {
+        $this->attachment = array();
+    }
+
+    /**
+     * Clear all custom headers.
+     * @return void
+     */
+    public function clearCustomHeaders()
+    {
+        $this->CustomHeader = array();
+    }
+
+    /**
+     * Add an error message to the error container.
+     * @access protected
+     * @param string $msg
+     * @return void
+     */
+    protected function setError($msg)
+    {
+        $this->error_count++;
+        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+            $lasterror = $this->smtp->getError();
+            if (!empty($lasterror['error'])) {
+                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                if (!empty($lasterror['detail'])) {
+                    $msg .= ' Detail: '. $lasterror['detail'];
+                }
+                if (!empty($lasterror['smtp_code'])) {
+                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                }
+                if (!empty($lasterror['smtp_code_ex'])) {
+                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                }
+            }
+        }
+        $this->ErrorInfo = $msg;
+    }
+
+    /**
+     * Return an RFC 822 formatted date.
+     * @access public
+     * @return string
+     * @static
+     */
+    public static function rfcDate()
+    {
+        // Set the time zone to whatever the default is to avoid 500 errors
+        // Will default to UTC if it's not set properly in php.ini
+        date_default_timezone_set(@date_default_timezone_get());
+        return date('D, j M Y H:i:s O');
+    }
+
+    /**
+     * Get the server hostname.
+     * Returns 'localhost.localdomain' if unknown.
+     * @access protected
+     * @return string
+     */
+    protected function serverHostname()
+    {
+        $result = 'localhost.localdomain';
+        if (!empty($this->Hostname)) {
+            $result = $this->Hostname;
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+            $result = $_SERVER['SERVER_NAME'];
+        } elseif (function_exists('gethostname') && gethostname() !== false) {
+            $result = gethostname();
+        } elseif (php_uname('n') !== false) {
+            $result = php_uname('n');
+        }
+        return $result;
+    }
+
+    /**
+     * Get an error message in the current language.
+     * @access protected
+     * @param string $key
+     * @return string
+     */
+    protected function lang($key)
+    {
+        if (count($this->language) < 1) {
+            $this->setLanguage('en'); // set the default language
+        }
+
+        if (array_key_exists($key, $this->language)) {
+            if ($key == 'smtp_connect_failed') {
+                //Include a link to troubleshooting docs on SMTP connection failure
+                //this is by far the biggest cause of support questions
+                //but it's usually not PHPMailer's fault.
+                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+            }
+            return $this->language[$key];
+        } else {
+            //Return the key as a fallback
+            return $key;
+        }
+    }
+
+    /**
+     * Check if an error occurred.
+     * @access public
+     * @return boolean True if an error did occur.
+     */
+    public function isError()
+    {
+        return ($this->error_count > 0);
+    }
+
+    /**
+     * Ensure consistent line endings in a string.
+     * Changes every end of line from CRLF, CR or LF to $this->LE.
+     * @access public
+     * @param string $str String to fixEOL
+     * @return string
+     */
+    public function fixEOL($str)
+    {
+        // Normalise to \n
+        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
+        // Now convert LE as needed
+        if ($this->LE !== "\n") {
+            $nstr = str_replace("\n", $this->LE, $nstr);
+        }
+        return $nstr;
+    }
+
+    /**
+     * Add a custom header.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value)
+     * @access public
+     * @param string $name Custom header name
+     * @param string $value Header value
+     * @return void
+     */
+    public function addCustomHeader($name, $value = null)
+    {
+        if ($value === null) {
+            // Value passed in as name:value
+            $this->CustomHeader[] = explode(':', $name, 2);
+        } else {
+            $this->CustomHeader[] = array($name, $value);
+        }
+    }
+
+    /**
+     * Returns all custom headers.
+     * @return array
+     */
+    public function getCustomHeaders()
+    {
+        return $this->CustomHeader;
+    }
+
+    /**
+     * Create a message body from an HTML string.
+     * Automatically inlines images and creates a plain-text version by converting the HTML,
+     * overwriting any existing values in Body and AltBody.
+     * Do not source $message content from user input!
+     * $basedir is prepended when handling relative URLs, e.g. <img src="/images/a.png"> and must not be empty
+     * will look for an image file in $basedir/images/a.png and convert it to inline.
+     * If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email)
+     * If you don't want to apply these transformations to your HTML, just set Body and AltBody directly.
+     * @access public
+     * @param string $message HTML message string
+     * @param string $basedir Absolute path to a base directory to prepend to relative paths to images
+     * @param boolean|callable $advanced Whether to use the internal HTML to text converter
+     *    or your own custom converter @see PHPMailer::html2text()
+     * @return string $message The transformed message Body
+     */
+    public function msgHTML($message, $basedir = '', $advanced = false)
+    {
+        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
+        if (array_key_exists(2, $images)) {
+            if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
+                // Ensure $basedir has a trailing /
+                $basedir .= '/';
+            }
+            foreach ($images[2] as $imgindex => $url) {
+                // Convert data URIs into embedded images
+                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
+                    $data = substr($url, strpos($url, ','));
+                    if ($match[2]) {
+                        $data = base64_decode($data);
+                    } else {
+                        $data = rawurldecode($data);
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) {
+                        $message = str_replace(
+                            $images[0][$imgindex],
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                    continue;
+                }
+                if (
+                    // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+                    !empty($basedir)
+                    // Ignore URLs containing parent dir traversal (..)
+                    && (strpos($url, '..') === false)
+                    // Do not change urls that are already inline images
+                    && substr($url, 0, 4) !== 'cid:'
+                    // Do not change absolute URLs, including anonymous protocol
+                    && !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
+                ) {
+                    $filename = basename($url);
+                    $directory = dirname($url);
+                    if ($directory == '.') {
+                        $directory = '';
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
+                        $directory .= '/';
+                    }
+                    if ($this->addEmbeddedImage(
+                        $basedir . $directory . $filename,
+                        $cid,
+                        $filename,
+                        'base64',
+                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                    )
+                    ) {
+                        $message = preg_replace(
+                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                }
+            }
+        }
+        $this->isHTML(true);
+        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
+        $this->Body = $this->normalizeBreaks($message);
+        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
+        if (!$this->alternativeExists()) {
+            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
+                self::CRLF . self::CRLF;
+        }
+        return $this->Body;
+    }
+
+    /**
+     * Convert an HTML string into plain text.
+     * This is used by msgHTML().
+     * Note - older versions of this function used a bundled advanced converter
+     * which was been removed for license reasons in #232.
+     * Example usage:
+     * <code>
+     * // Use default conversion
+     * $plain = $mail->html2text($html);
+     * // Use your own custom converter
+     * $plain = $mail->html2text($html, function($html) {
+     *     $converter = new MyHtml2text($html);
+     *     return $converter->get_text();
+     * });
+     * </code>
+     * @param string $html The HTML text to convert
+     * @param boolean|callable $advanced Any boolean value to use the internal converter,
+     *   or provide your own callable for custom conversion.
+     * @return string
+     */
+    public function html2text($html, $advanced = false)
+    {
+        if (is_callable($advanced)) {
+            return call_user_func($advanced, $html);
+        }
+        return html_entity_decode(
+            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
+            ENT_QUOTES,
+            $this->CharSet
+        );
+    }
+
+    /**
+     * Get the MIME type for a file extension.
+     * @param string $ext File extension
+     * @access public
+     * @return string MIME type of file.
+     * @static
+     */
+    public static function _mime_types($ext = '')
+    {
+        $mimes = array(
+            'xl'    => 'application/excel',
+            'js'    => 'application/javascript',
+            'hqx'   => 'application/mac-binhex40',
+            'cpt'   => 'application/mac-compactpro',
+            'bin'   => 'application/macbinary',
+            'doc'   => 'application/msword',
+            'word'  => 'application/msword',
+            'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'xltx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+            'potx'  => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+            'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+            'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+            'sldx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+            'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'dotx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+            'xlam'  => 'application/vnd.ms-excel.addin.macroEnabled.12',
+            'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+            'class' => 'application/octet-stream',
+            'dll'   => 'application/octet-stream',
+            'dms'   => 'application/octet-stream',
+            'exe'   => 'application/octet-stream',
+            'lha'   => 'application/octet-stream',
+            'lzh'   => 'application/octet-stream',
+            'psd'   => 'application/octet-stream',
+            'sea'   => 'application/octet-stream',
+            'so'    => 'application/octet-stream',
+            'oda'   => 'application/oda',
+            'pdf'   => 'application/pdf',
+            'ai'    => 'application/postscript',
+            'eps'   => 'application/postscript',
+            'ps'    => 'application/postscript',
+            'smi'   => 'application/smil',
+            'smil'  => 'application/smil',
+            'mif'   => 'application/vnd.mif',
+            'xls'   => 'application/vnd.ms-excel',
+            'ppt'   => 'application/vnd.ms-powerpoint',
+            'wbxml' => 'application/vnd.wap.wbxml',
+            'wmlc'  => 'application/vnd.wap.wmlc',
+            'dcr'   => 'application/x-director',
+            'dir'   => 'application/x-director',
+            'dxr'   => 'application/x-director',
+            'dvi'   => 'application/x-dvi',
+            'gtar'  => 'application/x-gtar',
+            'php3'  => 'application/x-httpd-php',
+            'php4'  => 'application/x-httpd-php',
+            'php'   => 'application/x-httpd-php',
+            'phtml' => 'application/x-httpd-php',
+            'phps'  => 'application/x-httpd-php-source',
+            'swf'   => 'application/x-shockwave-flash',
+            'sit'   => 'application/x-stuffit',
+            'tar'   => 'application/x-tar',
+            'tgz'   => 'application/x-tar',
+            'xht'   => 'application/xhtml+xml',
+            'xhtml' => 'application/xhtml+xml',
+            'zip'   => 'application/zip',
+            'mid'   => 'audio/midi',
+            'midi'  => 'audio/midi',
+            'mp2'   => 'audio/mpeg',
+            'mp3'   => 'audio/mpeg',
+            'mpga'  => 'audio/mpeg',
+            'aif'   => 'audio/x-aiff',
+            'aifc'  => 'audio/x-aiff',
+            'aiff'  => 'audio/x-aiff',
+            'ram'   => 'audio/x-pn-realaudio',
+            'rm'    => 'audio/x-pn-realaudio',
+            'rpm'   => 'audio/x-pn-realaudio-plugin',
+            'ra'    => 'audio/x-realaudio',
+            'wav'   => 'audio/x-wav',
+            'bmp'   => 'image/bmp',
+            'gif'   => 'image/gif',
+            'jpeg'  => 'image/jpeg',
+            'jpe'   => 'image/jpeg',
+            'jpg'   => 'image/jpeg',
+            'png'   => 'image/png',
+            'tiff'  => 'image/tiff',
+            'tif'   => 'image/tiff',
+            'eml'   => 'message/rfc822',
+            'css'   => 'text/css',
+            'html'  => 'text/html',
+            'htm'   => 'text/html',
+            'shtml' => 'text/html',
+            'log'   => 'text/plain',
+            'text'  => 'text/plain',
+            'txt'   => 'text/plain',
+            'rtx'   => 'text/richtext',
+            'rtf'   => 'text/rtf',
+            'vcf'   => 'text/vcard',
+            'vcard' => 'text/vcard',
+            'xml'   => 'text/xml',
+            'xsl'   => 'text/xml',
+            'mpeg'  => 'video/mpeg',
+            'mpe'   => 'video/mpeg',
+            'mpg'   => 'video/mpeg',
+            'mov'   => 'video/quicktime',
+            'qt'    => 'video/quicktime',
+            'rv'    => 'video/vnd.rn-realvideo',
+            'avi'   => 'video/x-msvideo',
+            'movie' => 'video/x-sgi-movie'
+        );
+        if (array_key_exists(strtolower($ext), $mimes)) {
+            return $mimes[strtolower($ext)];
+        }
+        return 'application/octet-stream';
+    }
+
+    /**
+     * Map a file name to a MIME type.
+     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+     * @param string $filename A file name or full path, does not need to exist as a file
+     * @return string
+     * @static
+     */
+    public static function filenameToType($filename)
+    {
+        // In case the path is a URL, strip any query string before getting extension
+        $qpos = strpos($filename, '?');
+        if (false !== $qpos) {
+            $filename = substr($filename, 0, $qpos);
+        }
+        $pathinfo = self::mb_pathinfo($filename);
+        return self::_mime_types($pathinfo['extension']);
+    }
+
+    /**
+     * Multi-byte-safe pathinfo replacement.
+     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
+     * Works similarly to the one in PHP >= 5.2.0
+     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
+     * @param string $path A filename or path, does not need to exist as a file
+     * @param integer|string $options Either a PATHINFO_* constant,
+     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
+     * @return string|array
+     * @static
+     */
+    public static function mb_pathinfo($path, $options = null)
+    {
+        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
+        $pathinfo = array();
+        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
+            if (array_key_exists(1, $pathinfo)) {
+                $ret['dirname'] = $pathinfo[1];
+            }
+            if (array_key_exists(2, $pathinfo)) {
+                $ret['basename'] = $pathinfo[2];
+            }
+            if (array_key_exists(5, $pathinfo)) {
+                $ret['extension'] = $pathinfo[5];
+            }
+            if (array_key_exists(3, $pathinfo)) {
+                $ret['filename'] = $pathinfo[3];
+            }
+        }
+        switch ($options) {
+            case PATHINFO_DIRNAME:
+            case 'dirname':
+                return $ret['dirname'];
+            case PATHINFO_BASENAME:
+            case 'basename':
+                return $ret['basename'];
+            case PATHINFO_EXTENSION:
+            case 'extension':
+                return $ret['extension'];
+            case PATHINFO_FILENAME:
+            case 'filename':
+                return $ret['filename'];
+            default:
+                return $ret;
+        }
+    }
+
+    /**
+     * Set or reset instance properties.
+     * You should avoid this function - it's more verbose, less efficient, more error-prone and
+     * harder to debug than setting properties directly.
+     * Usage Example:
+     * `$mail->set('SMTPSecure', 'tls');`
+     *   is the same as:
+     * `$mail->SMTPSecure = 'tls';`
+     * @access public
+     * @param string $name The property name to set
+     * @param mixed $value The value to set the property to
+     * @return boolean
+     * @TODO Should this not be using the __set() magic function?
+     */
+    public function set($name, $value = '')
+    {
+        if (property_exists($this, $name)) {
+            $this->$name = $value;
+            return true;
+        } else {
+            $this->setError($this->lang('variable_set') . $name);
+            return false;
+        }
+    }
+
+    /**
+     * Strip newlines to prevent header injection.
+     * @access public
+     * @param string $str
+     * @return string
+     */
+    public function secureHeader($str)
+    {
+        return trim(str_replace(array("\r", "\n"), '', $str));
+    }
+
+    /**
+     * Normalize line breaks in a string.
+     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
+     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+     * @param string $text
+     * @param string $breaktype What kind of line break to use, defaults to CRLF
+     * @return string
+     * @access public
+     * @static
+     */
+    public static function normalizeBreaks($text, $breaktype = "\r\n")
+    {
+        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
+    }
+
+    /**
+     * Set the public and private key files and password for S/MIME signing.
+     * @access public
+     * @param string $cert_filename
+     * @param string $key_filename
+     * @param string $key_pass Password for private key
+     * @param string $extracerts_filename Optional path to chain certificate
+     */
+    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
+    {
+        $this->sign_cert_file = $cert_filename;
+        $this->sign_key_file = $key_filename;
+        $this->sign_key_pass = $key_pass;
+        $this->sign_extracerts_file = $extracerts_filename;
+    }
+
+    /**
+     * Quoted-Printable-encode a DKIM header.
+     * @access public
+     * @param string $txt
+     * @return string
+     */
+    public function DKIM_QP($txt)
+    {
+        $line = '';
+        for ($i = 0; $i < strlen($txt); $i++) {
+            $ord = ord($txt[$i]);
+            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+                $line .= $txt[$i];
+            } else {
+                $line .= '=' . sprintf('%02X', $ord);
+            }
+        }
+        return $line;
+    }
+
+    /**
+     * Generate a DKIM signature.
+     * @access public
+     * @param string $signHeader
+     * @throws phpmailerException
+     * @return string The DKIM signature value
+     */
+    public function DKIM_Sign($signHeader)
+    {
+        if (!defined('PKCS7_TEXT')) {
+            if ($this->exceptions) {
+                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+            }
+            return '';
+        }
+        $privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private);
+        if ('' != $this->DKIM_passphrase) {
+            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
+        } else {
+            $privKey = openssl_pkey_get_private($privKeyStr);
+        }
+        //Workaround for missing digest algorithms in old PHP & OpenSSL versions
+        //@link http://stackoverflow.com/a/11117338/333340
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0 and
+            in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) {
+            if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
+                openssl_pkey_free($privKey);
+                return base64_encode($signature);
+            }
+        } else {
+            $pinfo = openssl_pkey_get_details($privKey);
+            $hash = hash('sha256', $signHeader);
+            //'Magic' constant for SHA256 from RFC3447
+            //@link https://tools.ietf.org/html/rfc3447#page-43
+            $t = '3031300d060960864801650304020105000420' . $hash;
+            $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
+            $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
+
+            if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
+                openssl_pkey_free($privKey);
+                return base64_encode($signature);
+            }
+        }
+        openssl_pkey_free($privKey);
+        return '';
+    }
+
+    /**
+     * Generate a DKIM canonicalization header.
+     * @access public
+     * @param string $signHeader Header
+     * @return string
+     */
+    public function DKIM_HeaderC($signHeader)
+    {
+        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
+        $lines = explode("\r\n", $signHeader);
+        foreach ($lines as $key => $line) {
+            list($heading, $value) = explode(':', $line, 2);
+            $heading = strtolower($heading);
+            $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
+            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
+        }
+        $signHeader = implode("\r\n", $lines);
+        return $signHeader;
+    }
+
+    /**
+     * Generate a DKIM canonicalization body.
+     * @access public
+     * @param string $body Message Body
+     * @return string
+     */
+    public function DKIM_BodyC($body)
+    {
+        if ($body == '') {
+            return "\r\n";
+        }
+        // stabilize line endings
+        $body = str_replace("\r\n", "\n", $body);
+        $body = str_replace("\n", "\r\n", $body);
+        // END stabilize line endings
+        while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+            $body = substr($body, 0, strlen($body) - 2);
+        }
+        return $body;
+    }
+
+    /**
+     * Create the DKIM header and body in a new message header.
+     * @access public
+     * @param string $headers_line Header lines
+     * @param string $subject Subject
+     * @param string $body Body
+     * @return string
+     */
+    public function DKIM_Add($headers_line, $subject, $body)
+    {
+        $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
+        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+        $DKIMquery = 'dns/txt'; // Query method
+        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+        $subject_header = "Subject: $subject";
+        $headers = explode($this->LE, $headers_line);
+        $from_header = '';
+        $to_header = '';
+        $date_header = '';
+        $current = '';
+        foreach ($headers as $header) {
+            if (strpos($header, 'From:') === 0) {
+                $from_header = $header;
+                $current = 'from_header';
+            } elseif (strpos($header, 'To:') === 0) {
+                $to_header = $header;
+                $current = 'to_header';
+            } elseif (strpos($header, 'Date:') === 0) {
+                $date_header = $header;
+                $current = 'date_header';
+            } else {
+                if (!empty($$current) && strpos($header, ' =?') === 0) {
+                    $$current .= $header;
+                } else {
+                    $current = '';
+                }
+            }
+        }
+        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+        $date = str_replace('|', '=7C', $this->DKIM_QP($date_header));
+        $subject = str_replace(
+            '|',
+            '=7C',
+            $this->DKIM_QP($subject_header)
+        ); // Copied header fields (dkim-quoted-printable)
+        $body = $this->DKIM_BodyC($body);
+        $DKIMlen = strlen($body); // Length of body
+        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
+        if ('' == $this->DKIM_identity) {
+            $ident = '';
+        } else {
+            $ident = ' i=' . $this->DKIM_identity . ';';
+        }
+        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
+            $DKIMsignatureType . '; q=' .
+            $DKIMquery . '; l=' .
+            $DKIMlen . '; s=' .
+            $this->DKIM_selector .
+            ";\r\n" .
+            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
+            "\th=From:To:Date:Subject;\r\n" .
+            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
+            "\tz=$from\r\n" .
+            "\t|$to\r\n" .
+            "\t|$date\r\n" .
+            "\t|$subject;\r\n" .
+            "\tbh=" . $DKIMb64 . ";\r\n" .
+            "\tb=";
+        $toSign = $this->DKIM_HeaderC(
+            $from_header . "\r\n" .
+            $to_header . "\r\n" .
+            $date_header . "\r\n" .
+            $subject_header . "\r\n" .
+            $dkimhdrs
+        );
+        $signed = $this->DKIM_Sign($toSign);
+        return $dkimhdrs . $signed . "\r\n";
+    }
+
+    /**
+     * Detect if a string contains a line longer than the maximum line length allowed.
+     * @param string $str
+     * @return boolean
+     * @static
+     */
+    public static function hasLineLongerThanMax($str)
+    {
+        //+2 to include CRLF line break for a 1000 total
+        return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
+    }
+
+    /**
+     * Allows for public read access to 'to' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getToAddresses()
+    {
+        return $this->to;
+    }
+
+    /**
+     * Allows for public read access to 'cc' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getCcAddresses()
+    {
+        return $this->cc;
+    }
+
+    /**
+     * Allows for public read access to 'bcc' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getBccAddresses()
+    {
+        return $this->bcc;
+    }
+
+    /**
+     * Allows for public read access to 'ReplyTo' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getReplyToAddresses()
+    {
+        return $this->ReplyTo;
+    }
+
+    /**
+     * Allows for public read access to 'all_recipients' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getAllRecipientAddresses()
+    {
+        return $this->all_recipients;
+    }
+
+    /**
+     * Perform a callback.
+     * @param boolean $isSent
+     * @param array $to
+     * @param array $cc
+     * @param array $bcc
+     * @param string $subject
+     * @param string $body
+     * @param string $from
+     */
+    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
+    {
+        if (!empty($this->action_function) && is_callable($this->action_function)) {
+            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
+            call_user_func_array($this->action_function, $params);
+        }
+    }
 }
 
-class phpmailerException extends Exception {
-  public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
-    return $errorMsg;
-  }
+/**
+ * PHPMailer exception handler
+ * @package PHPMailer
+ */
+class phpmailerException extends Exception
+{
+    /**
+     * Prettify error message output
+     * @return string
+     */
+    public function errorMessage()
+    {
+        $errorMsg = '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+        return $errorMsg;
+    }
 }
-?>
\ No newline at end of file
diff --git a/lib/phpmailer/class.phpmaileroauth.php b/lib/phpmailer/class.phpmaileroauth.php
new file mode 100644
index 00000000..b1bb09f0
--- /dev/null
+++ b/lib/phpmailer/class.phpmaileroauth.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.4
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailerOAuth - PHPMailer subclass adding OAuth support.
+ * @package PHPMailer
+ * @author @sherryl4george
+ * @author Marcus Bointon (@Synchro) <phpmailer@synchromedia.co.uk>
+ */
+class PHPMailerOAuth extends PHPMailer
+{
+    /**
+     * The OAuth user's email address
+     * @var string
+     */
+    public $oauthUserEmail = '';
+
+    /**
+     * The OAuth refresh token
+     * @var string
+     */
+    public $oauthRefreshToken = '';
+
+    /**
+     * The OAuth client ID
+     * @var string
+     */
+    public $oauthClientId = '';
+
+    /**
+     * The OAuth client secret
+     * @var string
+     */
+    public $oauthClientSecret = '';
+
+    /**
+     * An instance of the PHPMailerOAuthGoogle class.
+     * @var PHPMailerOAuthGoogle
+     * @access protected
+     */
+    protected $oauth = null;
+
+    /**
+     * Get a PHPMailerOAuthGoogle instance to use.
+     * @return PHPMailerOAuthGoogle
+     */
+    public function getOAUTHInstance()
+    {
+        if (!is_object($this->oauth)) {
+            $this->oauth = new PHPMailerOAuthGoogle(
+                $this->oauthUserEmail,
+                $this->oauthClientSecret,
+                $this->oauthClientId,
+                $this->oauthRefreshToken
+            );
+        }
+        return $this->oauth;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Overrides the original smtpConnect method to add support for OAuth.
+     * @param array $options An array of options compatible with stream_context_create()
+     * @uses SMTP
+     * @access public
+     * @return bool
+     * @throws phpmailerException
+     */
+    public function smtpConnect($options = array())
+    {
+        if (is_null($this->smtp)) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        if (is_null($this->oauth)) {
+            $this->oauth = $this->getOAUTHInstance();
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = array();
+            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
+                // Not a valid host entry
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+            $prefix = '';
+            $secure = $this->SMTPSecure;
+            $tls = ($this->SMTPSecure == 'tls');
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
+            } elseif ($hostinfo[2] == 'tls') {
+                $tls = true;
+                // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            $sslext = defined('OPENSSL_ALGO_SHA1');
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!$sslext) {
+                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
+                }
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (integer)$hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+                    //Automatically enable TLS encryption if:
+                    // * it's not disabled
+                    // * we have openssl extension
+                    // * we are not already using SSL
+                    // * the server offers STARTTLS
+                    if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
+                        $tls = true;
+                    }
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new phpmailerException($this->lang('connect_host'));
+                        }
+                        // We must resend HELO after tls negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->Realm,
+                            $this->Workstation,
+                            $this->oauth
+                        )
+                        ) {
+                            throw new phpmailerException($this->lang('authenticate'));
+                        }
+                    }
+                    return true;
+                } catch (phpmailerException $exc) {
+                    $lastexception = $exc;
+                    $this->edebug($exc->getMessage());
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and !is_null($lastexception)) {
+            throw $lastexception;
+        }
+        return false;
+    }
+}
diff --git a/lib/phpmailer/class.phpmaileroauthgoogle.php b/lib/phpmailer/class.phpmaileroauthgoogle.php
new file mode 100644
index 00000000..71c9bd32
--- /dev/null
+++ b/lib/phpmailer/class.phpmaileroauthgoogle.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.4
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailerOAuthGoogle - Wrapper for League OAuth2 Google provider.
+ * @package PHPMailer
+ * @author @sherryl4george
+ * @author Marcus Bointon (@Synchro) <phpmailer@synchromedia.co.uk>
+ * @link https://github.com/thephpleague/oauth2-client
+ */
+class PHPMailerOAuthGoogle
+{
+    private $oauthUserEmail = '';
+    private $oauthRefreshToken = '';
+    private $oauthClientId = '';
+    private $oauthClientSecret = '';
+
+    /**
+     * @param string $UserEmail
+     * @param string $ClientSecret
+     * @param string $ClientId
+     * @param string $RefreshToken
+     */
+    public function __construct(
+        $UserEmail,
+        $ClientSecret,
+        $ClientId,
+        $RefreshToken
+    ) {
+        $this->oauthClientId = $ClientId;
+        $this->oauthClientSecret = $ClientSecret;
+        $this->oauthRefreshToken = $RefreshToken;
+        $this->oauthUserEmail = $UserEmail;
+    }
+
+    private function getProvider()
+    {
+        return new League\OAuth2\Client\Provider\Google([
+            'clientId' => $this->oauthClientId,
+            'clientSecret' => $this->oauthClientSecret
+        ]);
+    }
+
+    private function getGrant()
+    {
+        return new \League\OAuth2\Client\Grant\RefreshToken();
+    }
+
+    private function getToken()
+    {
+        $provider = $this->getProvider();
+        $grant = $this->getGrant();
+        return $provider->getAccessToken($grant, ['refresh_token' => $this->oauthRefreshToken]);
+    }
+
+    public function getOauth64()
+    {
+        $token = $this->getToken();
+        return base64_encode("user=" . $this->oauthUserEmail . "\001auth=Bearer " . $token . "\001\001");
+    }
+}
diff --git a/lib/phpmailer/class.pop3.php b/lib/phpmailer/class.pop3.php
index f9fd3b2e..e07a5697 100644
--- a/lib/phpmailer/class.pop3.php
+++ b/lib/phpmailer/class.pop3.php
@@ -1,407 +1,407 @@
 <?php
-/*~ class.pop3.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 5.1                                                            |
-|   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
-|      Info: http://phpmailer.sourceforge.net                               |
-|   Support: http://sourceforge.net/projects/phpmailer/                     |
-| ------------------------------------------------------------------------- |
-|     Admin: Andy Prevost (project admininistrator)                         |
-|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
-|   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-| ------------------------------------------------------------------------- |
-| We offer a number of paid services (www.codeworxtech.com):                |
-| - Web Hosting on highly optimized fast and secure servers                 |
-| - Technology Consulting                                                   |
-| - Oursourcing (highly qualified programmers and graphic designers)        |
-'---------------------------------------------------------------------------'
-*/
-
 /**
- * PHPMailer - PHP POP Before SMTP Authentication Class
- * NOTE: Designed for use with PHP version 5 and up
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * PHP Version 5
  * @package PHPMailer
- * @author Andy Prevost
- * @author Marcus Bointon
+ * @link https://github.com/PHPMailer/PHPMailer/
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
- * @version $Id: class.pop3.php 444 2009-05-05 11:22:26Z coolbru $
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 /**
- * POP Before SMTP Authentication Class
- * Version 5.0.0
- *
- * Author: Richard Davey (rich@corephp.co.uk)
- * Modifications: Andy Prevost
- * License: LGPL, see PHPMailer License
- *
- * Specifically for PHPMailer to allow POP before SMTP authentication.
- * Does not yet work with APOP - if you have an APOP account, contact Richard Davey
- * and we can test changes to this script.
- *
- * This class is based on the structure of the SMTP class originally authored by Chris Ryan
- *
- * This class is rfc 1939 compliant and implements all the commands
- * required for POP3 connection, authentication and disconnection.
- *
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
+ * Does not support APOP.
  * @package PHPMailer
- * @author Richard Davey
+ * @author Richard Davey (original author) <rich@corephp.co.uk>
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  */
-
-class POP3 {
-  /**
-   * Default POP3 port
-   * @var int
-   */
-  public $POP3_PORT = 110;
-
-  /**
-   * Default Timeout
-   * @var int
-   */
-  public $POP3_TIMEOUT = 30;
-
-  /**
-   * POP3 Carriage Return + Line Feed
-   * @var string
-   */
-  public $CRLF = "\r\n";
-
-  /**
-   * Displaying Debug warnings? (0 = now, 1+ = yes)
-   * @var int
-   */
-  public $do_debug = 2;
-
-  /**
-   * POP3 Mail Server
-   * @var string
-   */
-  public $host;
-
-  /**
-   * POP3 Port
-   * @var int
-   */
-  public $port;
-
-  /**
-   * POP3 Timeout Value
-   * @var int
-   */
-  public $tval;
-
-  /**
-   * POP3 Username
-   * @var string
-   */
-  public $username;
-
-  /**
-   * POP3 Password
-   * @var string
-   */
-  public $password;
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  private $pop_conn;
-  private $connected;
-  private $error;     //  Error log array
-
-  /**
-   * Constructor, sets the initial values
-   * @access public
-   * @return POP3
-   */
-  public function __construct() {
-    $this->pop_conn  = 0;
-    $this->connected = false;
-    $this->error     = null;
-  }
-
-  /**
-   * Combination of public events - connect, login, disconnect
-   * @access public
-   * @param string $host
-   * @param integer $port
-   * @param integer $tval
-   * @param string $username
-   * @param string $password
-   */
-  public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
-    $this->host = $host;
-
-    //  If no port value is passed, retrieve it
-    if ($port == false) {
-      $this->port = $this->POP3_PORT;
-    } else {
-      $this->port = $port;
-    }
-
-    //  If no port value is passed, retrieve it
-    if ($tval == false) {
-      $this->tval = $this->POP3_TIMEOUT;
-    } else {
-      $this->tval = $tval;
-    }
-
-    $this->do_debug = $debug_level;
-    $this->username = $username;
-    $this->password = $password;
-
-    //  Refresh the error log
-    $this->error = null;
-
-    //  Connect
-    $result = $this->Connect($this->host, $this->port, $this->tval);
-
-    if ($result) {
-      $login_result = $this->Login($this->username, $this->password);
-
-      if ($login_result) {
-        $this->Disconnect();
-
-        return true;
-      }
-
+class POP3
+{
+    /**
+     * The POP3 PHPMailer Version number.
+     * @var string
+     * @access public
+     */
+    public $Version = '5.2.28';
+
+    /**
+     * Default POP3 port number.
+     * @var integer
+     * @access public
+     */
+    public $POP3_PORT = 110;
+
+    /**
+     * Default timeout in seconds.
+     * @var integer
+     * @access public
+     */
+    public $POP3_TIMEOUT = 30;
+
+    /**
+     * POP3 Carriage Return + Line Feed.
+     * @var string
+     * @access public
+     * @deprecated Use the constant instead
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Debug display level.
+     * Options: 0 = no, 1+ = yes
+     * @var integer
+     * @access public
+     */
+    public $do_debug = 0;
+
+    /**
+     * POP3 mail server hostname.
+     * @var string
+     * @access public
+     */
+    public $host;
+
+    /**
+     * POP3 port number.
+     * @var integer
+     * @access public
+     */
+    public $port;
+
+    /**
+     * POP3 Timeout Value in seconds.
+     * @var integer
+     * @access public
+     */
+    public $tval;
+
+    /**
+     * POP3 username
+     * @var string
+     * @access public
+     */
+    public $username;
+
+    /**
+     * POP3 password.
+     * @var string
+     * @access public
+     */
+    public $password;
+
+    /**
+     * Resource handle for the POP3 connection socket.
+     * @var resource
+     * @access protected
+     */
+    protected $pop_conn;
+
+    /**
+     * Are we connected?
+     * @var boolean
+     * @access protected
+     */
+    protected $connected = false;
+
+    /**
+     * Error container.
+     * @var array
+     * @access protected
+     */
+    protected $errors = array();
+
+    /**
+     * Line break constant
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * Simple static wrapper for all-in-one POP before SMTP
+     * @param $host
+     * @param integer|boolean $port The port number to connect to
+     * @param integer|boolean $timeout The timeout value
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public static function popBeforeSmtp(
+        $host,
+        $port = false,
+        $timeout = false,
+        $username = '',
+        $password = '',
+        $debug_level = 0
+    ) {
+        $pop = new POP3;
+        return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
     }
 
-    //  We need to disconnect regardless if the login succeeded
-    $this->Disconnect();
-
-    return false;
-  }
-
-  /**
-   * Connect to the POP3 server
-   * @access public
-   * @param string $host
-   * @param integer $port
-   * @param integer $tval
-   * @return boolean
-   */
-  public function Connect ($host, $port = false, $tval = 30) {
-    //  Are we already connected?
-    if ($this->connected) {
-      return true;
+    /**
+     * Authenticate with a POP3 server.
+     * A connect, login, disconnect sequence
+     * appropriate for POP-before SMTP authorisation.
+     * @access public
+     * @param string $host The hostname to connect to
+     * @param integer|boolean $port The port number to connect to
+     * @param integer|boolean $timeout The timeout value
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
+    {
+        $this->host = $host;
+        // If no port value provided, use default
+        if (false === $port) {
+            $this->port = $this->POP3_PORT;
+        } else {
+            $this->port = (integer)$port;
+        }
+        // If no timeout value provided, use default
+        if (false === $timeout) {
+            $this->tval = $this->POP3_TIMEOUT;
+        } else {
+            $this->tval = (integer)$timeout;
+        }
+        $this->do_debug = $debug_level;
+        $this->username = $username;
+        $this->password = $password;
+        //  Reset the error log
+        $this->errors = array();
+        //  connect
+        $result = $this->connect($this->host, $this->port, $this->tval);
+        if ($result) {
+            $login_result = $this->login($this->username, $this->password);
+            if ($login_result) {
+                $this->disconnect();
+                return true;
+            }
+        }
+        // We need to disconnect regardless of whether the login succeeded
+        $this->disconnect();
+        return false;
     }
 
-    /*
-    On Windows this will raise a PHP Warning error if the hostname doesn't exist.
-    Rather than supress it with @fsockopen, let's capture it cleanly instead
-    */
-
-    set_error_handler(array(&$this, 'catchWarning'));
-
-    //  Connect to the POP3 server
-    $this->pop_conn = fsockopen($host,    //  POP3 Host
-                  $port,    //  Port #
-                  $errno,   //  Error Number
-                  $errstr,  //  Error Message
-                  $tval);   //  Timeout (seconds)
-
-    //  Restore the error handler
-    restore_error_handler();
-
-    //  Does the Error Log now contain anything?
-    if ($this->error && $this->do_debug >= 1) {
-      $this->displayErrors();
+    /**
+     * Connect to a POP3 server.
+     * @access public
+     * @param string $host
+     * @param integer|boolean $port
+     * @param integer $tval
+     * @return boolean
+     */
+    public function connect($host, $port = false, $tval = 30)
+    {
+        //  Are we already connected?
+        if ($this->connected) {
+            return true;
+        }
+
+        //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
+        //Rather than suppress it with @fsockopen, capture it cleanly instead
+        set_error_handler(array($this, 'catchWarning'));
+
+        if (false === $port) {
+            $port = $this->POP3_PORT;
+        }
+
+        //  connect to the POP3 server
+        $this->pop_conn = fsockopen(
+            $host, //  POP3 Host
+            $port, //  Port #
+            $errno, //  Error Number
+            $errstr, //  Error Message
+            $tval
+        ); //  Timeout (seconds)
+        //  Restore the error handler
+        restore_error_handler();
+
+        //  Did we connect?
+        if (false === $this->pop_conn) {
+            //  It would appear not...
+            $this->setError(array(
+                'error' => "Failed to connect to server $host on port $port",
+                'errno' => $errno,
+                'errstr' => $errstr
+            ));
+            return false;
+        }
+
+        //  Increase the stream time-out
+        stream_set_timeout($this->pop_conn, $tval, 0);
+
+        //  Get the POP3 server response
+        $pop3_response = $this->getResponse();
+        //  Check for the +OK
+        if ($this->checkResponse($pop3_response)) {
+            //  The connection is established and the POP3 server is talking
+            $this->connected = true;
+            return true;
+        }
+        return false;
     }
 
-    //  Did we connect?
-    if ($this->pop_conn == false) {
-      //  It would appear not...
-      $this->error = array(
-        'error' => "Failed to connect to server $host on port $port",
-        'errno' => $errno,
-        'errstr' => $errstr
-      );
-
-      if ($this->do_debug >= 1) {
-        $this->displayErrors();
-      }
-
-      return false;
+    /**
+     * Log in to the POP3 server.
+     * Does not support APOP (RFC 2828, 4949).
+     * @access public
+     * @param string $username
+     * @param string $password
+     * @return boolean
+     */
+    public function login($username = '', $password = '')
+    {
+        if (!$this->connected) {
+            $this->setError('Not connected to POP3 server');
+        }
+        if (empty($username)) {
+            $username = $this->username;
+        }
+        if (empty($password)) {
+            $password = $this->password;
+        }
+
+        // Send the Username
+        $this->sendString("USER $username" . self::CRLF);
+        $pop3_response = $this->getResponse();
+        if ($this->checkResponse($pop3_response)) {
+            // Send the Password
+            $this->sendString("PASS $password" . self::CRLF);
+            $pop3_response = $this->getResponse();
+            if ($this->checkResponse($pop3_response)) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    //  Increase the stream time-out
-
-    //  Check for PHP 4.3.0 or later
-    if (version_compare(phpversion(), '5.0.0', 'ge')) {
-      stream_set_timeout($this->pop_conn, $tval, 0);
-    } else {
-      //  Does not work on Windows
-      if (substr(PHP_OS, 0, 3) !== 'WIN') {
-        socket_set_timeout($this->pop_conn, $tval, 0);
-      }
+    /**
+     * Disconnect from the POP3 server.
+     * @access public
+     */
+    public function disconnect()
+    {
+        $this->sendString('QUIT');
+        //The QUIT command may cause the daemon to exit, which will kill our connection
+        //So ignore errors here
+        try {
+            @fclose($this->pop_conn);
+        } catch (Exception $e) {
+            //Do nothing
+        };
     }
 
-    //  Get the POP3 server response
-    $pop3_response = $this->getResponse();
-
-    //  Check for the +OK
-    if ($this->checkResponse($pop3_response)) {
-    //  The connection is established and the POP3 server is talking
-    $this->connected = true;
-      return true;
+    /**
+     * Get a response from the POP3 server.
+     * $size is the maximum number of bytes to retrieve
+     * @param integer $size
+     * @return string
+     * @access protected
+     */
+    protected function getResponse($size = 128)
+    {
+        $response = fgets($this->pop_conn, $size);
+        if ($this->do_debug >= 1) {
+            echo "Server -> Client: $response";
+        }
+        return $response;
     }
 
-  }
-
-  /**
-   * Login to the POP3 server (does not support APOP yet)
-   * @access public
-   * @param string $username
-   * @param string $password
-   * @return boolean
-   */
-  public function Login ($username = '', $password = '') {
-    if ($this->connected == false) {
-      $this->error = 'Not connected to POP3 server';
-
-      if ($this->do_debug >= 1) {
-        $this->displayErrors();
-      }
+    /**
+     * Send raw data to the POP3 server.
+     * @param string $string
+     * @return integer
+     * @access protected
+     */
+    protected function sendString($string)
+    {
+        if ($this->pop_conn) {
+            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+                echo "Client -> Server: $string";
+            }
+            return fwrite($this->pop_conn, $string, strlen($string));
+        }
+        return 0;
     }
 
-    if (empty($username)) {
-      $username = $this->username;
+    /**
+     * Checks the POP3 server response.
+     * Looks for for +OK or -ERR.
+     * @param string $string
+     * @return boolean
+     * @access protected
+     */
+    protected function checkResponse($string)
+    {
+        if (substr($string, 0, 3) !== '+OK') {
+            $this->setError(array(
+                'error' => "Server reported an error: $string",
+                'errno' => 0,
+                'errstr' => ''
+            ));
+            return false;
+        } else {
+            return true;
+        }
     }
 
-    if (empty($password)) {
-      $password = $this->password;
+    /**
+     * Add an error to the internal error store.
+     * Also display debug output if it's enabled.
+     * @param $error
+     * @access protected
+     */
+    protected function setError($error)
+    {
+        $this->errors[] = $error;
+        if ($this->do_debug >= 1) {
+            echo '<pre>';
+            foreach ($this->errors as $error) {
+                print_r($error);
+            }
+            echo '</pre>';
+        }
     }
 
-    $pop_username = "USER $username" . $this->CRLF;
-    $pop_password = "PASS $password" . $this->CRLF;
-
-    //  Send the Username
-    $this->sendString($pop_username);
-    $pop3_response = $this->getResponse();
-
-    if ($this->checkResponse($pop3_response)) {
-      //  Send the Password
-      $this->sendString($pop_password);
-      $pop3_response = $this->getResponse();
-
-      if ($this->checkResponse($pop3_response)) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Disconnect from the POP3 server
-   * @access public
-   */
-  public function Disconnect () {
-    $this->sendString('QUIT');
-
-    fclose($this->pop_conn);
-  }
-
-  /////////////////////////////////////////////////
-  //  Private Methods
-  /////////////////////////////////////////////////
-
-  /**
-   * Get the socket response back.
-   * $size is the maximum number of bytes to retrieve
-   * @access private
-   * @param integer $size
-   * @return string
-   */
-  private function getResponse ($size = 128) {
-    $pop3_response = fgets($this->pop_conn, $size);
-
-    return $pop3_response;
-  }
-
-  /**
-   * Send a string down the open socket connection to the POP3 server
-   * @access private
-   * @param string $string
-   * @return integer
-   */
-  private function sendString ($string) {
-    $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
-
-    return $bytes_sent;
-  }
-
-  /**
-   * Checks the POP3 server response for +OK or -ERR
-   * @access private
-   * @param string $string
-   * @return boolean
-   */
-  private function checkResponse ($string) {
-    if (substr($string, 0, 3) !== '+OK') {
-      $this->error = array(
-        'error' => "Server reported an error: $string",
-        'errno' => 0,
-        'errstr' => ''
-      );
-
-      if ($this->do_debug >= 1) {
-        $this->displayErrors();
-      }
-
-      return false;
-    } else {
-      return true;
+    /**
+     * Get an array of error messages, if any.
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->errors;
     }
 
-  }
-
-  /**
-   * If debug is enabled, display the error message array
-   * @access private
-   */
-  private function displayErrors () {
-    echo '<pre>';
-
-    foreach ($this->error as $single_error) {
-      print_r($single_error);
+    /**
+     * POP3 connection error handler.
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     * @access protected
+     */
+    protected function catchWarning($errno, $errstr, $errfile, $errline)
+    {
+        $this->setError(array(
+            'error' => "Connecting to the POP3 server raised a PHP warning: ",
+            'errno' => $errno,
+            'errstr' => $errstr,
+            'errfile' => $errfile,
+            'errline' => $errline
+        ));
     }
-
-    echo '</pre>';
-  }
-
-  /**
-   * Takes over from PHP for the socket warning handler
-   * @access private
-   * @param integer $errno
-   * @param string $errstr
-   * @param string $errfile
-   * @param integer $errline
-   */
-  private function catchWarning ($errno, $errstr, $errfile, $errline) {
-    $this->error[] = array(
-      'error' => "Connecting to the POP3 server raised a PHP warning: ",
-      'errno' => $errno,
-      'errstr' => $errstr
-    );
-  }
-
-  //  End of class
 }
-?>
\ No newline at end of file
diff --git a/lib/phpmailer/class.smtp.php b/lib/phpmailer/class.smtp.php
index c2ca1cb3..d2b9a0ab 100644
--- a/lib/phpmailer/class.smtp.php
+++ b/lib/phpmailer/class.smtp.php
@@ -1,814 +1,1276 @@
-<?php
-/*~ class.smtp.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 5.1                                                            |
-|   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
-|      Info: http://phpmailer.sourceforge.net                               |
-|   Support: http://sourceforge.net/projects/phpmailer/                     |
-| ------------------------------------------------------------------------- |
-|     Admin: Andy Prevost (project admininistrator)                         |
-|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
-|   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-| ------------------------------------------------------------------------- |
-| We offer a number of paid services (www.codeworxtech.com):                |
-| - Web Hosting on highly optimized fast and secure servers                 |
-| - Technology Consulting                                                   |
-| - Oursourcing (highly qualified programmers and graphic designers)        |
-'---------------------------------------------------------------------------'
-*/
-
-/**
- * PHPMailer - PHP SMTP email transport class
- * NOTE: Designed for use with PHP version 5 and up
- * @package PHPMailer
- * @author Andy Prevost
- * @author Marcus Bointon
- * @copyright 2004 - 2008 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
- * @version $Id: class.smtp.php 444 2009-05-05 11:22:26Z coolbru $
- */
-
-/**
- * SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
- * commands except TURN which will always return a not implemented
- * error. SMTP also provides some utility methods for sending mail
- * to an SMTP server.
- * original author: Chris Ryan
- */
-
-class SMTP {
-  /**
-   *  SMTP server port
-   *  @var int
-   */
-  public $SMTP_PORT = 25;
-
-  /**
-   *  SMTP reply line ending
-   *  @var string
-   */
-  public $CRLF = "\r\n";
-
-  /**
-   *  Sets whether debugging is turned on
-   *  @var bool
-   */
-  public $do_debug;       // the level of debug to perform
-
-  /**
-   *  Sets VERP use on/off (default is off)
-   *  @var bool
-   */
-  public $do_verp = false;
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  private $smtp_conn; // the socket to the server
-  private $error;     // error if any on the last call
-  private $helo_rply; // the reply the server sent to us for HELO
-
-  /**
-   * Initialize the class so that the data is in a known state.
-   * @access public
-   * @return void
-   */
-  public function __construct() {
-    $this->smtp_conn = 0;
-    $this->error = null;
-    $this->helo_rply = null;
-
-    $this->do_debug = 0;
-  }
-
-  /////////////////////////////////////////////////
-  // CONNECTION FUNCTIONS
-  /////////////////////////////////////////////////
-
-  /**
-   * Connect to the server specified on the port specified.
-   * If the port is not specified use the default SMTP_PORT.
-   * If tval is specified then a connection will try and be
-   * established with the server for that number of seconds.
-   * If tval is not specified the default is 30 seconds to
-   * try on the connection.
-   *
-   * SMTP CODE SUCCESS: 220
-   * SMTP CODE FAILURE: 421
-   * @access public
-   * @return bool
-   */
-  public function Connect($host, $port = 0, $tval = 30) {
-    // set the error val to null so there is no confusion
-    $this->error = null;
-
-    // make sure we are __not__ connected
-    if($this->connected()) {
-      // already connected, generate error
-      $this->error = array("error" => "Already connected to a server");
-      return false;
-    }
-
-    if(empty($port)) {
-      $port = $this->SMTP_PORT;
-    }
-
-    // connect to the smtp server
-    $this->smtp_conn = @fsockopen($host,    // the host of the server
-                                 $port,    // the port to use
-                                 $errno,   // error number if any
-                                 $errstr,  // error message if any
-                                 $tval);   // give up after ? secs
-    // verify we connected properly
-    if(empty($this->smtp_conn)) {
-      $this->error = array("error" => "Failed to connect to server",
-                           "errno" => $errno,
-                           "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // SMTP server can take longer to respond, give longer timeout for first read
-    // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
-
-    // get any announcement
-    $announce = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
-    }
-
-    return true;
-  }
-
-  /**
-   * Initiate a TLS communication with the server.
-   *
-   * SMTP CODE 220 Ready to start TLS
-   * SMTP CODE 501 Syntax error (no parameters allowed)
-   * SMTP CODE 454 TLS not available due to temporary reason
-   * @access public
-   * @return bool success
-   */
-  public function StartTLS() {
-    $this->error = null; # to avoid confusion
-
-    if(!$this->connected()) {
-      $this->error = array("error" => "Called StartTLS() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 220) {
-      $this->error =
-         array("error"     => "STARTTLS not accepted from server",
-               "smtp_code" => $code,
-               "smtp_msg"  => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // Begin encrypted connection
-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-      return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Performs SMTP authentication.  Must be run after running the
-   * Hello() method.  Returns true if successfully authenticated.
-   * @access public
-   * @return bool
-   */
-  public function Authenticate($username, $password) {
-    // Start authentication
-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "AUTH not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // Send encoded username
-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 334) {
-      $this->error =
-        array("error" => "Username not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    // Send encoded password
-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($code != 235) {
-      $this->error =
-        array("error" => "Password not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Returns true if connected to a server otherwise false
-   * @access public
-   * @return bool
-   */
-  public function Connected() {
-    if(!empty($this->smtp_conn)) {
-      $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
-        // the socket is valid but we are not connected
-        if($this->do_debug >= 1) {
-            echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
-        }
-        $this->Close();
-        return false;
-      }
-      return true; // everything looks good
-    }
-    return false;
-  }
-
-  /**
-   * Closes the socket and cleans up the state of the class.
-   * It is not considered good to use this function without
-   * first trying to use QUIT.
-   * @access public
-   * @return void
-   */
-  public function Close() {
-    $this->error = null; // so there is no confusion
-    $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
-      // close the connection and cleanup
-      fclose($this->smtp_conn);
-      $this->smtp_conn = 0;
-    }
-  }
-
-  /////////////////////////////////////////////////
-  // SMTP COMMANDS
-  /////////////////////////////////////////////////
-
-  /**
-   * Issues a data command and sends the msg_data to the server
-   * finializing the mail transaction. $msg_data is the message
-   * that is to be send with the headers. Each header needs to be
-   * on a single line followed by a <CRLF> with the message headers
-   * and the message body being seperated by and additional <CRLF>.
-   *
-   * Implements rfc 821: DATA <CRLF>
-   *
-   * SMTP CODE INTERMEDIATE: 354
-   *     [data]
-   *     <CRLF>.<CRLF>
-   *     SMTP CODE SUCCESS: 250
-   *     SMTP CODE FAILURE: 552,554,451,452
-   * SMTP CODE FAILURE: 451,554
-   * SMTP CODE ERROR  : 500,501,503,421
-   * @access public
-   * @return bool
-   */
-  public function Data($msg_data) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Data() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 354) {
-      $this->error =
-        array("error" => "DATA command not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    /* the server is ready to accept data!
-     * according to rfc 821 we should not send more than 1000
-     * including the CRLF
-     * characters on a single line so we will break the data up
-     * into lines by \r and/or \n then if needed we will break
-     * each of those into smaller lines to fit within the limit.
-     * in addition we will be looking for lines that start with
-     * a period '.' and append and additional period '.' to that
-     * line. NOTE: this does not count towards limit.
-     */
-
-    // normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
-
-    /* we need to find a good way to determine is headers are
-     * in the msg_data or if it is a straight msg body
-     * currently I am assuming rfc 822 definitions of msg headers
-     * and if the first field of the first line (':' sperated)
-     * does not contain a space then it _should_ be a header
-     * and we can process all lines before a blank "" line as
-     * headers.
-     */
-
-    $field = substr($lines[0],0,strpos($lines[0],":"));
-    $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
-      $in_headers = true;
-    }
-
-    $max_line_length = 998; // used below; set here for ease in change
-
-    while(list(,$line) = @each($lines)) {
-      $lines_out = null;
-      if($line == "" && $in_headers) {
-        $in_headers = false;
-      }
-      // ok we need to break this line up into several smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
-
-        // Patch to fix DOS attack
-        if(!$pos) {
-          $pos = $max_line_length - 1;
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos);
-        } else {
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos + 1);
-        }
-
-        /* if processing headers add a LWSP-char to the front of new line
-         * rfc 822 on long msg headers
-         */
-        if($in_headers) {
-          $line = "\t" . $line;
-        }
-      }
-      $lines_out[] = $line;
-
-      // send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
-        {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
-          }
-        }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
-      }
-    }
-
-    // message data has been sent
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "DATA not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Sends the HELO command to the smtp server.
-   * This makes sure that we and the server are in
-   * the same known state.
-   *
-   * Implements from rfc 821: HELO <SP> <domain> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE ERROR  : 500, 501, 504, 421
-   * @access public
-   * @return bool
-   */
-  public function Hello($host = '') {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-            "error" => "Called Hello() without being connected");
-      return false;
-    }
-
-    // if hostname for HELO was not specified send default
-    if(empty($host)) {
-      // determine appropriate default to send to server
-      $host = "localhost";
-    }
-
-    // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host)) {
-      if(!$this->SendHello("HELO", $host)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Sends a HELO/EHLO command.
-   * @access private
-   * @return bool
-   */
-  private function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => $hello . " not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    $this->helo_rply = $rply;
-
-    return true;
-  }
-
-  /**
-   * Starts a mail transaction from the email address specified in
-   * $from. Returns true if successful or false otherwise. If True
-   * the mail transaction is started and then one or more Recipient
-   * commands may be called followed by a Data command.
-   *
-   * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE SUCCESS: 552,451,452
-   * SMTP CODE SUCCESS: 500,501,421
-   * @access public
-   * @return bool
-   */
-  public function Mail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Mail() without being connected");
-      return false;
-    }
-
-    $useVerp = ($this->do_verp ? "XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "MAIL not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Sends the quit command to the server and then closes the socket
-   * if there is no error or the $close_on_error argument is true.
-   *
-   * Implements from rfc 821: QUIT <CRLF>
-   *
-   * SMTP CODE SUCCESS: 221
-   * SMTP CODE ERROR  : 500
-   * @access public
-   * @return bool
-   */
-  public function Quit($close_on_error = true) {
-    $this->error = null; // so there is no confusion
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Quit() without being connected");
-      return false;
-    }
-
-    // send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
-
-    // get any good-bye messages
-    $byemsg = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
-    }
-
-    $rval = true;
-    $e = null;
-
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
-      // use e as a tmp var cause Close will overwrite $this->error
-      $e = array("error" => "SMTP server rejected quit command",
-                 "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
-      $rval = false;
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
-      }
-    }
-
-    if(empty($e) || $close_on_error) {
-      $this->Close();
-    }
-
-    return $rval;
-  }
-
-  /**
-   * Sends the command RCPT to the SMTP server with the TO: argument of $to.
-   * Returns true if the recipient was accepted false if it was rejected.
-   *
-   * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250,251
-   * SMTP CODE FAILURE: 550,551,552,553,450,451,452
-   * SMTP CODE ERROR  : 500,501,503,421
-   * @access public
-   * @return bool
-   */
-  public function Recipient($to) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Recipient() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250 && $code != 251) {
-      $this->error =
-        array("error" => "RCPT not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Sends the RSET command to abort and transaction that is
-   * currently in progress. Returns true if successful false
-   * otherwise.
-   *
-   * Implements rfc 821: RSET <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE ERROR  : 500,501,504,421
-   * @access public
-   * @return bool
-   */
-  public function Reset() {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Reset() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "RSET failed",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Starts a mail transaction from the email address specified in
-   * $from. Returns true if successful or false otherwise. If True
-   * the mail transaction is started and then one or more Recipient
-   * commands may be called followed by a Data command. This command
-   * will send the message to the users terminal if they are logged
-   * in and send them an email.
-   *
-   * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE SUCCESS: 552,451,452
-   * SMTP CODE SUCCESS: 500,501,502,421
-   * @access public
-   * @return bool
-   */
-  public function SendAndMail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-          "error" => "Called SendAndMail() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "SAML not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * This is an optional command for SMTP that this class does not
-   * support. This method is here to make the RFC821 Definition
-   * complete for this class and __may__ be implimented in the future
-   *
-   * Implements from rfc 821: TURN <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE FAILURE: 502
-   * SMTP CODE ERROR  : 500, 503
-   * @access public
-   * @return bool
-   */
-  public function Turn() {
-    $this->error = array("error" => "This method, TURN, of the SMTP ".
-                                    "is not implemented");
-    if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
-    }
-    return false;
-  }
-
-  /**
-  * Get the current error
-  * @access public
-  * @return array
-  */
-  public function getError() {
-    return $this->error;
-  }
-
-  /////////////////////////////////////////////////
-  // INTERNAL FUNCTIONS
-  /////////////////////////////////////////////////
-
-  /**
-   * Read in as many lines as possible
-   * either before eof or socket timeout occurs on the operation.
-   * With SMTP we can tell if we have more lines to read if the
-   * 4th character is '-' symbol. If it is a space then we don't
-   * need to read anything else.
-   * @access private
-   * @return string
-   */
-  private function get_lines() {
-    $data = "";
-    while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
-        echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
-      }
-      $data .= $str;
-      if($this->do_debug >= 4) {
-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
-      }
-      // if 4th character is a space, we are done reading, break the loop
-      if(substr($str,3,1) == " ") { break; }
-    }
-    return $data;
-  }
-
-}
-
-?>
\ No newline at end of file
+<?php
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
+ * @package PHPMailer
+ * @author Chris Ryan
+ * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
+ */
+class SMTP
+{
+    /**
+     * The PHPMailer SMTP version number.
+     * @var string
+     */
+    const VERSION = '5.2.28';
+
+    /**
+     * SMTP line break constant.
+     * @var string
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * The SMTP port to use if one is not specified.
+     * @var integer
+     */
+    const DEFAULT_SMTP_PORT = 25;
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1
+     * @var integer
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Debug level for no output
+     */
+    const DEBUG_OFF = 0;
+
+    /**
+     * Debug level to show client -> server messages
+     */
+    const DEBUG_CLIENT = 1;
+
+    /**
+     * Debug level to show client -> server and server -> client messages
+     */
+    const DEBUG_SERVER = 2;
+
+    /**
+     * Debug level to show connection status, client -> server and server -> client messages
+     */
+    const DEBUG_CONNECTION = 3;
+
+    /**
+     * Debug level to show all messages
+     */
+    const DEBUG_LOWLEVEL = 4;
+
+    /**
+     * The PHPMailer SMTP Version number.
+     * @var string
+     * @deprecated Use the `VERSION` constant instead
+     * @see SMTP::VERSION
+     */
+    public $Version = '5.2.28';
+
+    /**
+     * SMTP server port number.
+     * @var integer
+     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
+     * @see SMTP::DEFAULT_SMTP_PORT
+     */
+    public $SMTP_PORT = 25;
+
+    /**
+     * SMTP reply line ending.
+     * @var string
+     * @deprecated Use the `CRLF` constant instead
+     * @see SMTP::CRLF
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Debug output level.
+     * Options:
+     * * self::DEBUG_OFF (`0`) No debug output, default
+     * * self::DEBUG_CLIENT (`1`) Client commands
+     * * self::DEBUG_SERVER (`2`) Client commands and server responses
+     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
+     * @var integer
+     */
+    public $do_debug = self::DEBUG_OFF;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @var string|callable
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to use VERP.
+     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Info on VERP
+     * @var boolean
+     */
+    public $do_verp = false;
+
+    /**
+     * The timeout value for connection, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
+     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+     * @var integer
+     */
+    public $Timeout = 300;
+
+    /**
+     * How long to wait for commands to complete, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @var integer
+     */
+    public $Timelimit = 300;
+
+    /**
+     * @var array Patterns to extract an SMTP transaction id from reply to a DATA command.
+     * The first capture group in each regex will be used as the ID.
+     */
+    protected $smtp_transaction_id_patterns = array(
+        'exim' => '/[0-9]{3} OK id=(.*)/',
+        'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
+        'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
+    );
+
+    /**
+     * @var string The last transaction ID issued in response to a DATA command,
+     * if one was detected
+     */
+    protected $last_smtp_transaction_id;
+
+    /**
+     * The socket for the server connection.
+     * @var resource
+     */
+    protected $smtp_conn;
+
+    /**
+     * Error information, if any, for the last SMTP command.
+     * @var array
+     */
+    protected $error = array(
+        'error' => '',
+        'detail' => '',
+        'smtp_code' => '',
+        'smtp_code_ex' => ''
+    );
+
+    /**
+     * The reply the server sent to us for HELO.
+     * If null, no HELO string has yet been received.
+     * @var string|null
+     */
+    protected $helo_rply = null;
+
+    /**
+     * The set of SMTP extensions sent in reply to EHLO command.
+     * Indexes of the array are extension names.
+     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
+     * represents the server name. In case of HELO it is the only element of the array.
+     * Other values can be boolean TRUE or an array containing extension options.
+     * If null, no HELO/EHLO string has yet been received.
+     * @var array|null
+     */
+    protected $server_caps = null;
+
+    /**
+     * The most recent reply received from the server.
+     * @var string
+     */
+    protected $last_reply = '';
+
+    /**
+     * Output debugging info via a user-selected method.
+     * @see SMTP::$Debugoutput
+     * @see SMTP::$do_debug
+     * @param string $str Debug string to output
+     * @param integer $level The debug level of this message; see DEBUG_* constants
+     * @return void
+     */
+    protected function edebug($str, $level = 0)
+    {
+        if ($level > $this->do_debug) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $level);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                ) . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                ) . "\n";
+        }
+    }
+
+    /**
+     * Connect to an SMTP server.
+     * @param string $host SMTP server IP or host name
+     * @param integer $port The port number to connect to
+     * @param integer $timeout How long to wait for the connection to open
+     * @param array $options An array of options for stream_context_create()
+     * @access public
+     * @return boolean
+     */
+    public function connect($host, $port = null, $timeout = 30, $options = array())
+    {
+        static $streamok;
+        //This is enabled by default since 5.0.0 but some providers disable it
+        //Check this once and cache the result
+        if (is_null($streamok)) {
+            $streamok = function_exists('stream_socket_client');
+        }
+        // Clear errors to avoid confusion
+        $this->setError('');
+        // Make sure we are __not__ connected
+        if ($this->connected()) {
+            // Already connected, generate error
+            $this->setError('Already connected to a server');
+            return false;
+        }
+        if (empty($port)) {
+            $port = self::DEFAULT_SMTP_PORT;
+        }
+        // Connect to the SMTP server
+        $this->edebug(
+            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            var_export($options, true),
+            self::DEBUG_CONNECTION
+        );
+        $errno = 0;
+        $errstr = '';
+        if ($streamok) {
+            $socket_context = stream_context_create($options);
+            set_error_handler(array($this, 'errorHandler'));
+            $this->smtp_conn = stream_socket_client(
+                $host . ":" . $port,
+                $errno,
+                $errstr,
+                $timeout,
+                STREAM_CLIENT_CONNECT,
+                $socket_context
+            );
+            restore_error_handler();
+        } else {
+            //Fall back to fsockopen which should work in more places, but is missing some features
+            $this->edebug(
+                "Connection: stream_socket_client not available, falling back to fsockopen",
+                self::DEBUG_CONNECTION
+            );
+            set_error_handler(array($this, 'errorHandler'));
+            $this->smtp_conn = fsockopen(
+                $host,
+                $port,
+                $errno,
+                $errstr,
+                $timeout
+            );
+            restore_error_handler();
+        }
+        // Verify we connected properly
+        if (!is_resource($this->smtp_conn)) {
+            $this->setError(
+                'Failed to connect to server',
+                $errno,
+                $errstr
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error']
+                . ": $errstr ($errno)",
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+        // SMTP server can take longer to respond, give longer timeout for first read
+        // Windows does not have support for this timeout function
+        if (substr(PHP_OS, 0, 3) != 'WIN') {
+            $max = ini_get('max_execution_time');
+            // Don't bother if unlimited
+            if ($max != 0 && $timeout > $max) {
+                @set_time_limit($timeout);
+            }
+            stream_set_timeout($this->smtp_conn, $timeout, 0);
+        }
+        // Get any announcement
+        $announce = $this->get_lines();
+        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        return true;
+    }
+
+    /**
+     * Initiate a TLS (encrypted) session.
+     * @access public
+     * @return boolean
+     */
+    public function startTLS()
+    {
+        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+            return false;
+        }
+
+        //Allow the best TLS version(s) we can
+        $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+
+        //PHP 5.6.7 dropped inclusion of TLS 1.1 and 1.2 in STREAM_CRYPTO_METHOD_TLS_CLIENT
+        //so add them back in manually if we can
+        if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+        }
+
+        // Begin encrypted connection
+        set_error_handler(array($this, 'errorHandler'));
+        $crypto_ok = stream_socket_enable_crypto(
+            $this->smtp_conn,
+            true,
+            $crypto_method
+        );
+        restore_error_handler();
+        return $crypto_ok;
+    }
+
+    /**
+     * Perform SMTP authentication.
+     * Must be run after hello().
+     * @see hello()
+     * @param string $username The user name
+     * @param string $password The password
+     * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2)
+     * @param string $realm The auth realm for NTLM
+     * @param string $workstation The auth workstation for NTLM
+     * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth)
+     * @return bool True if successfully authenticated.* @access public
+     */
+    public function authenticate(
+        $username,
+        $password,
+        $authtype = null,
+        $realm = '',
+        $workstation = '',
+        $OAuth = null
+    ) {
+        if (!$this->server_caps) {
+            $this->setError('Authentication is not allowed before HELO/EHLO');
+            return false;
+        }
+
+        if (array_key_exists('EHLO', $this->server_caps)) {
+            // SMTP extensions are available; try to find a proper authentication method
+            if (!array_key_exists('AUTH', $this->server_caps)) {
+                $this->setError('Authentication is not allowed at this stage');
+                // 'at this stage' means that auth may be allowed after the stage changes
+                // e.g. after STARTTLS
+                return false;
+            }
+
+            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug(
+                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                self::DEBUG_LOWLEVEL
+            );
+
+            if (empty($authtype)) {
+                foreach (array('CRAM-MD5', 'LOGIN', 'PLAIN', 'NTLM', 'XOAUTH2') as $method) {
+                    if (in_array($method, $this->server_caps['AUTH'])) {
+                        $authtype = $method;
+                        break;
+                    }
+                }
+                if (empty($authtype)) {
+                    $this->setError('No supported authentication methods found');
+                    return false;
+                }
+                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+            }
+
+            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+                $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
+                return false;
+            }
+        } elseif (empty($authtype)) {
+            $authtype = 'LOGIN';
+        }
+        switch ($authtype) {
+            case 'PLAIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+                    return false;
+                }
+                // Send encoded username and password
+                if (!$this->sendCommand(
+                    'User & Password',
+                    base64_encode("\0" . $username . "\0" . $password),
+                    235
+                )
+                ) {
+                    return false;
+                }
+                break;
+            case 'LOGIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+                    return false;
+                }
+                break;
+            case 'XOAUTH2':
+                //If the OAuth Instance is not set. Can be a case when PHPMailer is used
+                //instead of PHPMailerOAuth
+                if (is_null($OAuth)) {
+                    return false;
+                }
+                $oauth = $OAuth->getOauth64();
+
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                    return false;
+                }
+                break;
+            case 'NTLM':
+                /*
+                 * ntlm_sasl_client.php
+                 * Bundled with Permission
+                 *
+                 * How to telnet in windows:
+                 * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
+                 * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
+                 */
+                require_once 'extras/ntlm_sasl_client.php';
+                $temp = new stdClass;
+                $ntlm_client = new ntlm_sasl_client_class;
+                //Check that functions are available
+                if (!$ntlm_client->initialize($temp)) {
+                    $this->setError($temp->error);
+                    $this->edebug(
+                        'You need to enable some modules in your php.ini file: '
+                        . $this->error['error'],
+                        self::DEBUG_CLIENT
+                    );
+                    return false;
+                }
+                //msg1
+                $msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1
+
+                if (!$this->sendCommand(
+                    'AUTH NTLM',
+                    'AUTH NTLM ' . base64_encode($msg1),
+                    334
+                )
+                ) {
+                    return false;
+                }
+                //Though 0 based, there is a white space after the 3 digit number
+                //msg2
+                $challenge = substr($this->last_reply, 3);
+                $challenge = base64_decode($challenge);
+                $ntlm_res = $ntlm_client->NTLMResponse(
+                    substr($challenge, 24, 8),
+                    $password
+                );
+                //msg3
+                $msg3 = $ntlm_client->typeMsg3(
+                    $ntlm_res,
+                    $username,
+                    $realm,
+                    $workstation
+                );
+                // send encoded username
+                return $this->sendCommand('Username', base64_encode($msg3), 235);
+            case 'CRAM-MD5':
+                // Start authentication
+                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+                    return false;
+                }
+                // Get the challenge
+                $challenge = base64_decode(substr($this->last_reply, 4));
+
+                // Build the response
+                $response = $username . ' ' . $this->hmac($challenge, $password);
+
+                // send encoded credentials
+                return $this->sendCommand('Username', base64_encode($response), 235);
+            default:
+                $this->setError("Authentication method \"$authtype\" is not supported");
+                return false;
+        }
+        return true;
+    }
+
+    /**
+     * Calculate an MD5 HMAC hash.
+     * Works like hash_hmac('md5', $data, $key)
+     * in case that function is not available
+     * @param string $data The data to hash
+     * @param string $key The key to hash with
+     * @access protected
+     * @return string
+     */
+    protected function hmac($data, $key)
+    {
+        if (function_exists('hash_hmac')) {
+            return hash_hmac('md5', $data, $key);
+        }
+
+        // The following borrowed from
+        // http://php.net/manual/en/function.mhash.php#27225
+
+        // RFC 2104 HMAC implementation for php.
+        // Creates an md5 HMAC.
+        // Eliminates the need to install mhash to compute a HMAC
+        // by Lance Rushing
+
+        $bytelen = 64; // byte length for md5
+        if (strlen($key) > $bytelen) {
+            $key = pack('H*', md5($key));
+        }
+        $key = str_pad($key, $bytelen, chr(0x00));
+        $ipad = str_pad('', $bytelen, chr(0x36));
+        $opad = str_pad('', $bytelen, chr(0x5c));
+        $k_ipad = $key ^ $ipad;
+        $k_opad = $key ^ $opad;
+
+        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+    }
+
+    /**
+     * Check connection state.
+     * @access public
+     * @return boolean True if connected.
+     */
+    public function connected()
+    {
+        if (is_resource($this->smtp_conn)) {
+            $sock_status = stream_get_meta_data($this->smtp_conn);
+            if ($sock_status['eof']) {
+                // The socket is valid but we are not connected
+                $this->edebug(
+                    'SMTP NOTICE: EOF caught while checking if connected',
+                    self::DEBUG_CLIENT
+                );
+                $this->close();
+                return false;
+            }
+            return true; // everything looks good
+        }
+        return false;
+    }
+
+    /**
+     * Close the socket and clean up the state of the class.
+     * Don't use this function without first trying to use QUIT.
+     * @see quit()
+     * @access public
+     * @return void
+     */
+    public function close()
+    {
+        $this->setError('');
+        $this->server_caps = null;
+        $this->helo_rply = null;
+        if (is_resource($this->smtp_conn)) {
+            // close the connection and cleanup
+            fclose($this->smtp_conn);
+            $this->smtp_conn = null; //Makes for cleaner serialization
+            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
+        }
+    }
+
+    /**
+     * Send an SMTP DATA command.
+     * Issues a data command and sends the msg_data to the server,
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message headers
+     * and the message body being separated by and additional <CRLF>.
+     * Implements rfc 821: DATA <CRLF>
+     * @param string $msg_data Message data to send
+     * @access public
+     * @return boolean
+     */
+    public function data($msg_data)
+    {
+        //This will use the standard timelimit
+        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+            return false;
+        }
+
+        /* The server is ready to accept data!
+         * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
+         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
+         * smaller lines to fit within the limit.
+         * We will also look for lines that start with a '.' and prepend an additional '.'.
+         * NOTE: this does not count towards line-length limit.
+         */
+
+        // Normalize line breaks before exploding
+        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
+
+        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
+         * process all lines before a blank line as headers.
+         */
+
+        $field = substr($lines[0], 0, strpos($lines[0], ':'));
+        $in_headers = false;
+        if (!empty($field) && strpos($field, ' ') === false) {
+            $in_headers = true;
+        }
+
+        foreach ($lines as $line) {
+            $lines_out = array();
+            if ($in_headers and $line == '') {
+                $in_headers = false;
+            }
+            //Break this line up into several smaller lines if it's too long
+            //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
+            while (isset($line[self::MAX_LINE_LENGTH])) {
+                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+                //so as to avoid breaking in the middle of a word
+                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+                //Deliberately matches both false and 0
+                if (!$pos) {
+                    //No nice break found, add a hard break
+                    $pos = self::MAX_LINE_LENGTH - 1;
+                    $lines_out[] = substr($line, 0, $pos);
+                    $line = substr($line, $pos);
+                } else {
+                    //Break at the found point
+                    $lines_out[] = substr($line, 0, $pos);
+                    //Move along by the amount we dealt with
+                    $line = substr($line, $pos + 1);
+                }
+                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+                if ($in_headers) {
+                    $line = "\t" . $line;
+                }
+            }
+            $lines_out[] = $line;
+
+            //Send the lines to the server
+            foreach ($lines_out as $line_out) {
+                //RFC2821 section 4.5.2
+                if (!empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.' . $line_out;
+                }
+                $this->client_send($line_out . self::CRLF);
+            }
+        }
+
+        //Message data has been sent, complete the command
+        //Increase timelimit for end of DATA command
+        $savetimelimit = $this->Timelimit;
+        $this->Timelimit = $this->Timelimit * 2;
+        $result = $this->sendCommand('DATA END', '.', 250);
+        $this->recordLastTransactionID();
+        //Restore timelimit
+        $this->Timelimit = $savetimelimit;
+        return $result;
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Used to identify the sending server to the receiving server.
+     * This makes sure that client and server are in a known state.
+     * Implements RFC 821: HELO <SP> <domain> <CRLF>
+     * and RFC 2821 EHLO.
+     * @param string $host The host name or IP to connect to
+     * @access public
+     * @return boolean
+     */
+    public function hello($host = '')
+    {
+        //Try extended hello first (RFC 2821)
+        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Low-level implementation used by hello()
+     * @see hello()
+     * @param string $hello The HELO string
+     * @param string $host The hostname to say we are
+     * @access protected
+     * @return boolean
+     */
+    protected function sendHello($hello, $host)
+    {
+        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $this->helo_rply = $this->last_reply;
+        if ($noerror) {
+            $this->parseHelloFields($hello);
+        } else {
+            $this->server_caps = null;
+        }
+        return $noerror;
+    }
+
+    /**
+     * Parse a reply to HELO/EHLO command to discover server extensions.
+     * In case of HELO, the only parameter that can be discovered is a server name.
+     * @access protected
+     * @param string $type - 'HELO' or 'EHLO'
+     */
+    protected function parseHelloFields($type)
+    {
+        $this->server_caps = array();
+        $lines = explode("\n", $this->helo_rply);
+
+        foreach ($lines as $n => $s) {
+            //First 4 chars contain response code followed by - or space
+            $s = trim(substr($s, 4));
+            if (empty($s)) {
+                continue;
+            }
+            $fields = explode(' ', $s);
+            if (!empty($fields)) {
+                if (!$n) {
+                    $name = $type;
+                    $fields = $fields[0];
+                } else {
+                    $name = array_shift($fields);
+                    switch ($name) {
+                        case 'SIZE':
+                            $fields = ($fields ? $fields[0] : 0);
+                            break;
+                        case 'AUTH':
+                            if (!is_array($fields)) {
+                                $fields = array();
+                            }
+                            break;
+                        default:
+                            $fields = true;
+                    }
+                }
+                $this->server_caps[$name] = $fields;
+            }
+        }
+    }
+
+    /**
+     * Send an SMTP MAIL command.
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command.
+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from Source address of this message
+     * @access public
+     * @return boolean
+     */
+    public function mail($from)
+    {
+        $useVerp = ($this->do_verp ? ' XVERP' : '');
+        return $this->sendCommand(
+            'MAIL FROM',
+            'MAIL FROM:<' . $from . '>' . $useVerp,
+            250
+        );
+    }
+
+    /**
+     * Send an SMTP QUIT command.
+     * Closes the socket if there is no error or the $close_on_error argument is true.
+     * Implements from rfc 821: QUIT <CRLF>
+     * @param boolean $close_on_error Should the connection close if an error occurs?
+     * @access public
+     * @return boolean
+     */
+    public function quit($close_on_error = true)
+    {
+        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
+        $err = $this->error; //Save any error
+        if ($noerror or $close_on_error) {
+            $this->close();
+            $this->error = $err; //Restore any error from the quit command
+        }
+        return $noerror;
+    }
+
+    /**
+     * Send an SMTP RCPT command.
+     * Sets the TO argument to $toaddr.
+     * Returns true if the recipient was accepted false if it was rejected.
+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+     * @param string $address The address the message is being sent to
+     * @access public
+     * @return boolean
+     */
+    public function recipient($address)
+    {
+        return $this->sendCommand(
+            'RCPT TO',
+            'RCPT TO:<' . $address . '>',
+            array(250, 251)
+        );
+    }
+
+    /**
+     * Send an SMTP RSET command.
+     * Abort any transaction that is currently in progress.
+     * Implements rfc 821: RSET <CRLF>
+     * @access public
+     * @return boolean True on success.
+     */
+    public function reset()
+    {
+        return $this->sendCommand('RSET', 'RSET', 250);
+    }
+
+    /**
+     * Send a command to an SMTP server and check its return code.
+     * @param string $command The command name - not sent to the server
+     * @param string $commandstring The actual command to send
+     * @param integer|array $expect One or more expected integer success codes
+     * @access protected
+     * @return boolean True on success.
+     */
+    protected function sendCommand($command, $commandstring, $expect)
+    {
+        if (!$this->connected()) {
+            $this->setError("Called $command without being connected");
+            return false;
+        }
+        //Reject line breaks in all commands
+        if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
+            $this->setError("Command '$command' contained line breaks");
+            return false;
+        }
+        $this->client_send($commandstring . self::CRLF);
+
+        $this->last_reply = $this->get_lines();
+        // Fetch SMTP code and possible error code explanation
+        $matches = array();
+        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
+            $code = $matches[1];
+            $code_ex = (count($matches) > 2 ? $matches[2] : null);
+            // Cut off error code from each response line
+            $detail = preg_replace(
+                "/{$code}[ -]" .
+                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . "/m",
+                '',
+                $this->last_reply
+            );
+        } else {
+            // Fall back to simple parsing if regex fails
+            $code = substr($this->last_reply, 0, 3);
+            $code_ex = null;
+            $detail = substr($this->last_reply, 4);
+        }
+
+        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+
+        if (!in_array($code, (array)$expect)) {
+            $this->setError(
+                "$command command failed",
+                $detail,
+                $code,
+                $code_ex
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+
+        $this->setError('');
+        return true;
+    }
+
+    /**
+     * Send an SMTP SAML command.
+     * Starts a mail transaction from the email address specified in $from.
+     * Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command. This command
+     * will send the message to the users terminal if they are logged
+     * in and send them an email.
+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from The address the message is from
+     * @access public
+     * @return boolean
+     */
+    public function sendAndMail($from)
+    {
+        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
+    }
+
+    /**
+     * Send an SMTP VRFY command.
+     * @param string $name The name to verify
+     * @access public
+     * @return boolean
+     */
+    public function verify($name)
+    {
+        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
+    }
+
+    /**
+     * Send an SMTP NOOP command.
+     * Used to keep keep-alives alive, doesn't actually do anything
+     * @access public
+     * @return boolean
+     */
+    public function noop()
+    {
+        return $this->sendCommand('NOOP', 'NOOP', 250);
+    }
+
+    /**
+     * Send an SMTP TURN command.
+     * This is an optional command for SMTP that this class does not support.
+     * This method is here to make the RFC821 Definition complete for this class
+     * and _may_ be implemented in future
+     * Implements from rfc 821: TURN <CRLF>
+     * @access public
+     * @return boolean
+     */
+    public function turn()
+    {
+        $this->setError('The SMTP TURN command is not implemented');
+        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        return false;
+    }
+
+    /**
+     * Send raw data to the server.
+     * @param string $data The data to send
+     * @access public
+     * @return integer|boolean The number of bytes sent to the server or false on error
+     */
+    public function client_send($data)
+    {
+        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
+        set_error_handler(array($this, 'errorHandler'));
+        $result = fwrite($this->smtp_conn, $data);
+        restore_error_handler();
+        return $result;
+    }
+
+    /**
+     * Get the latest error.
+     * @access public
+     * @return array
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Get SMTP extensions available on the server
+     * @access public
+     * @return array|null
+     */
+    public function getServerExtList()
+    {
+        return $this->server_caps;
+    }
+
+    /**
+     * A multipurpose method
+     * The method works in three ways, dependent on argument value and current state
+     *   1. HELO/EHLO was not sent - returns null and set up $this->error
+     *   2. HELO was sent
+     *     $name = 'HELO': returns server name
+     *     $name = 'EHLO': returns boolean false
+     *     $name = any string: returns null and set up $this->error
+     *   3. EHLO was sent
+     *     $name = 'HELO'|'EHLO': returns server name
+     *     $name = any string: if extension $name exists, returns boolean True
+     *       or its options. Otherwise returns boolean False
+     * In other words, one can use this method to detect 3 conditions:
+     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
+     *  - false returned: the requested feature exactly not exists
+     *  - positive value returned: the requested feature exists
+     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
+     * @return mixed
+     */
+    public function getServerExt($name)
+    {
+        if (!$this->server_caps) {
+            $this->setError('No HELO/EHLO was sent');
+            return null;
+        }
+
+        // the tight logic knot ;)
+        if (!array_key_exists($name, $this->server_caps)) {
+            if ($name == 'HELO') {
+                return $this->server_caps['EHLO'];
+            }
+            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
+                return false;
+            }
+            $this->setError('HELO handshake was used. Client knows nothing about server extensions');
+            return null;
+        }
+
+        return $this->server_caps[$name];
+    }
+
+    /**
+     * Get the last reply from the server.
+     * @access public
+     * @return string
+     */
+    public function getLastReply()
+    {
+        return $this->last_reply;
+    }
+
+    /**
+     * Read the SMTP server's response.
+     * Either before eof or socket timeout occurs on the operation.
+     * With SMTP we can tell if we have more lines to read if the
+     * 4th character is '-' symbol. If it is a space then we don't
+     * need to read anything else.
+     * @access protected
+     * @return string
+     */
+    protected function get_lines()
+    {
+        // If the connection is bad, give up straight away
+        if (!is_resource($this->smtp_conn)) {
+            return '';
+        }
+        $data = '';
+        $endtime = 0;
+        stream_set_timeout($this->smtp_conn, $this->Timeout);
+        if ($this->Timelimit > 0) {
+            $endtime = time() + $this->Timelimit;
+        }
+        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+            $str = @fgets($this->smtp_conn, 515);
+            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+            $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
+            $data .= $str;
+            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            // or 4th character is a space, we are done reading, break the loop,
+            // string array access is a micro-optimisation over strlen
+            if (!isset($str[3]) or (isset($str[3]) and $str[3] == ' ')) {
+                break;
+            }
+            // Timed-out? Log and break
+            $info = stream_get_meta_data($this->smtp_conn);
+            if ($info['timed_out']) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+            // Now check if reads took too long
+            if ($endtime and time() > $endtime) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timelimit reached (' .
+                    $this->Timelimit . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Enable or disable VERP address generation.
+     * @param boolean $enabled
+     */
+    public function setVerp($enabled = false)
+    {
+        $this->do_verp = $enabled;
+    }
+
+    /**
+     * Get VERP address generation mode.
+     * @return boolean
+     */
+    public function getVerp()
+    {
+        return $this->do_verp;
+    }
+
+    /**
+     * Set error messages and codes.
+     * @param string $message The error message
+     * @param string $detail Further detail on the error
+     * @param string $smtp_code An associated SMTP error code
+     * @param string $smtp_code_ex Extended SMTP code
+     */
+    protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
+    {
+        $this->error = array(
+            'error' => $message,
+            'detail' => $detail,
+            'smtp_code' => $smtp_code,
+            'smtp_code_ex' => $smtp_code_ex
+        );
+    }
+
+    /**
+     * Set debug output method.
+     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
+     */
+    public function setDebugOutput($method = 'echo')
+    {
+        $this->Debugoutput = $method;
+    }
+
+    /**
+     * Get debug output method.
+     * @return string
+     */
+    public function getDebugOutput()
+    {
+        return $this->Debugoutput;
+    }
+
+    /**
+     * Set debug output level.
+     * @param integer $level
+     */
+    public function setDebugLevel($level = 0)
+    {
+        $this->do_debug = $level;
+    }
+
+    /**
+     * Get debug output level.
+     * @return integer
+     */
+    public function getDebugLevel()
+    {
+        return $this->do_debug;
+    }
+
+    /**
+     * Set SMTP timeout.
+     * @param integer $timeout
+     */
+    public function setTimeout($timeout = 0)
+    {
+        $this->Timeout = $timeout;
+    }
+
+    /**
+     * Get SMTP timeout.
+     * @return integer
+     */
+    public function getTimeout()
+    {
+        return $this->Timeout;
+    }
+
+    /**
+     * Reports an error number and string.
+     * @param integer $errno The error number returned by PHP.
+     * @param string $errmsg The error message returned by PHP.
+     * @param string $errfile The file the error occurred in
+     * @param integer $errline The line number the error occurred on
+     */
+    protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0)
+    {
+        $notice = 'Connection failed.';
+        $this->setError(
+            $notice,
+            $errno,
+            $errmsg
+        );
+        $this->edebug(
+            $notice . ' Error #' . $errno . ': ' . $errmsg . " [$errfile line $errline]",
+            self::DEBUG_CONNECTION
+        );
+    }
+
+    /**
+     * Extract and return the ID of the last SMTP transaction based on
+     * a list of patterns provided in SMTP::$smtp_transaction_id_patterns.
+     * Relies on the host providing the ID in response to a DATA command.
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     */
+    protected function recordLastTransactionID()
+    {
+        $reply = $this->getLastReply();
+
+        if (empty($reply)) {
+            $this->last_smtp_transaction_id = null;
+        } else {
+            $this->last_smtp_transaction_id = false;
+            foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
+                if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
+                    $this->last_smtp_transaction_id = $matches[1];
+                }
+            }
+        }
+
+        return $this->last_smtp_transaction_id;
+    }
+
+    /**
+     * Get the queue/transaction ID of the last SMTP transaction
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     * @see recordLastTransactionID()
+     */
+    public function getLastTransactionID()
+    {
+        return $this->last_smtp_transaction_id;
+    }
+}
diff --git a/lib/phpmailer/get_oauth_token.php b/lib/phpmailer/get_oauth_token.php
new file mode 100644
index 00000000..2c26d0fa
--- /dev/null
+++ b/lib/phpmailer/get_oauth_token.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Get an OAuth2 token from Google.
+ * * Install this script on your server so that it's accessible
+ * as [https/http]://<yourdomain>/<folder>/get_oauth_token.php
+ * e.g.: http://localhost/phpmail/get_oauth_token.php
+ * * Ensure dependencies are installed with 'composer install'
+ * * Set up an app in your Google developer console
+ * * Set the script address as the app's redirect URL
+ * If no refresh token is obtained when running this file, revoke access to your app
+ * using link: https://accounts.google.com/b/0/IssuedAuthSubTokens and run the script again.
+ * This script requires PHP 5.4 or later
+ * PHP Version 5.4
+ */
+
+namespace League\OAuth2\Client\Provider;
+
+require 'vendor/autoload.php';
+
+use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
+use League\OAuth2\Client\Token\AccessToken;
+use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
+use Psr\Http\Message\ResponseInterface;
+
+session_start();
+
+//If this automatic URL doesn't work, set it yourself manually
+$redirectUri = isset($_SERVER['HTTPS']) ? 'https://' : 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
+//$redirectUri = 'http://localhost/phpmailer/get_oauth_token.php';
+
+//These details obtained are by setting up app in Google developer console.
+$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
+$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
+
+class Google extends AbstractProvider
+{
+    use BearerAuthorizationTrait;
+
+    const ACCESS_TOKEN_RESOURCE_OWNER_ID = 'id';
+
+    /**
+     * @var string If set, this will be sent to google as the "access_type" parameter.
+     * @link https://developers.google.com/accounts/docs/OAuth2WebServer#offline
+     */
+    protected $accessType;
+
+    /**
+     * @var string If set, this will be sent to google as the "hd" parameter.
+     * @link https://developers.google.com/accounts/docs/OAuth2Login#hd-param
+     */
+    protected $hostedDomain;
+
+    /**
+     * @var string If set, this will be sent to google as the "scope" parameter.
+     * @link https://developers.google.com/gmail/api/auth/scopes
+     */
+    protected $scope;
+
+    public function getBaseAuthorizationUrl()
+    {
+        return 'https://accounts.google.com/o/oauth2/auth';
+    }
+
+    public function getBaseAccessTokenUrl(array $params)
+    {
+        return 'https://accounts.google.com/o/oauth2/token';
+    }
+
+    public function getResourceOwnerDetailsUrl(AccessToken $token)
+    {
+	return ' ';
+    }
+
+    protected function getAuthorizationParameters(array $options)
+    {
+	if (is_array($this->scope)) {
+            $separator = $this->getScopeSeparator();
+            $this->scope = implode($separator, $this->scope);
+        }
+
+        $params = array_merge(
+            parent::getAuthorizationParameters($options),
+            array_filter([
+                'hd'          => $this->hostedDomain,
+                'access_type' => $this->accessType,
+		'scope'       => $this->scope,
+                // if the user is logged in with more than one account ask which one to use for the login!
+                'authuser'    => '-1'
+            ])
+        );
+        return $params;
+    }
+
+    protected function getDefaultScopes()
+    {
+        return [
+            'email',
+            'openid',
+            'profile',
+        ];
+    }
+
+    protected function getScopeSeparator()
+    {
+        return ' ';
+    }
+
+    protected function checkResponse(ResponseInterface $response, $data)
+    {
+        if (!empty($data['error'])) {
+            $code  = 0;
+            $error = $data['error'];
+
+            if (is_array($error)) {
+                $code  = $error['code'];
+                $error = $error['message'];
+            }
+
+            throw new IdentityProviderException($error, $code, $data);
+        }
+    }
+
+    protected function createResourceOwner(array $response, AccessToken $token)
+    {
+        return new GoogleUser($response);
+    }
+}
+
+
+//Set Redirect URI in Developer Console as [https/http]://<yourdomain>/<folder>/get_oauth_token.php
+$provider = new Google(
+    array(
+        'clientId' => $clientId,
+        'clientSecret' => $clientSecret,
+        'redirectUri' => $redirectUri,
+        'scope' => array('https://mail.google.com/'),
+	'accessType' => 'offline'
+    )
+);
+
+if (!isset($_GET['code'])) {
+    // If we don't have an authorization code then get one
+    $authUrl = $provider->getAuthorizationUrl();
+    $_SESSION['oauth2state'] = $provider->getState();
+    header('Location: ' . $authUrl);
+    exit;
+// Check given state against previously stored one to mitigate CSRF attack
+} elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
+    unset($_SESSION['oauth2state']);
+    exit('Invalid state');
+} else {
+    // Try to get an access token (using the authorization code grant)
+    $token = $provider->getAccessToken(
+        'authorization_code',
+        array(
+            'code' => $_GET['code']
+        )
+    );
+
+    // Use this to get a new access token if the old one expires
+    echo 'Refresh Token: ' . $token->getRefreshToken();
+}
diff --git a/lib/phpmailer/language/phpmailer.lang-am.php b/lib/phpmailer/language/phpmailer.lang-am.php
new file mode 100644
index 00000000..ff2a9695
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-am.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Armenian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Hrayr Grigoryan <hrayr@bits.am>
+ */
+ 
+$PHPMAILER_LANG['authenticate']         = 'SMTP -Õ« Õ½Õ­Õ¡Õ¬: Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ½Õ¿Õ¸Ö‚Õ£Õ¥Õ¬ Õ«Õ½Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP -Õ« Õ½Õ­Õ¡Õ¬: Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ¯Õ¡Õº Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ SMTP Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ°Õ¥Õ¿.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP -Õ« Õ½Õ­Õ¡Õ¬: Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¾Õ¡Õ® Õ¹Õ¥Õ¶.';
+$PHPMAILER_LANG['empty_message']        = 'Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¤Õ¡Õ¿Õ¡Ö€Õ¯ Õ§';
+$PHPMAILER_LANG['encoding']             = 'Ô¿Õ¸Õ¤Õ¡Õ¾Õ¸Ö€Õ´Õ¡Õ¶ Õ¡Õ¶Õ°Õ¡ÕµÕ¿ Õ¿Õ¥Õ½Õ¡Õ¯: ';
+$PHPMAILER_LANG['execute']              = 'Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ«Ö€Õ¡Õ¯Õ¡Õ¶Õ¡Ö�Õ¶Õ¥Õ¬ Õ°Ö€Õ¡Õ´Õ¡Õ¶Õ¨: ';
+$PHPMAILER_LANG['file_access']          = 'Õ–Õ¡ÕµÕ¬Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¹Õ§: ';
+$PHPMAILER_LANG['file_open']            = 'Õ–Õ¡ÕµÕ¬Õ« Õ½Õ­Õ¡Õ¬: Ö†Õ¡ÕµÕ¬Õ¨ Õ¹Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö� Õ¢Õ¡Ö�Õ¥Õ¬: ';
+$PHPMAILER_LANG['from_failed']          = 'ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ¸Õ²Õ« Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ°Õ¡Õ½Ö�Õ¥Õ¶ Õ½Õ­Õ¡Õ¬ Õ§: ';
+$PHPMAILER_LANG['instantiate']          = 'Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ¯Õ¡Õ¶Õ¹Õ¥Õ¬ mail Ö†Õ¸Ö‚Õ¶Õ¯Ö�Õ«Õ¡Õ¶.';
+$PHPMAILER_LANG['invalid_address']      = 'Õ€Õ¡Õ½Ö�Õ¥Õ¶ Õ½Õ­Õ¡Õ¬ Õ§: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' ÖƒÕ¸Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ°Õ¥Õ¿ Õ¹Õ« Õ¡Õ·Õ­Õ¡Õ¿Õ¸Ö‚Õ´.';
+$PHPMAILER_LANG['provide_address']      = 'Ô±Õ¶Õ°Ö€Õ¡ÕªÕ¥Õ·Õ¿ Õ§ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¥Õ¬ Õ£Õ¸Õ¶Õ¥ Õ´Õ¥Õ¯ Õ½Õ¿Õ¡Ö�Õ¸Õ²Õ« e-mail Õ°Õ¡Õ½Ö�Õ¥.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP -Õ« Õ½Õ­Õ¡Õ¬: Õ¹Õ« Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Õ¬ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ½Õ¿Õ¡Ö�Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ½Ö�Õ¥Õ¶Õ¥Ö€Õ«Õ¶: ';
+$PHPMAILER_LANG['signing']              = 'Õ�Õ¿Õ¸Ö€Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ½Õ­Õ¡Õ¬: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP -Õ« connect() Ö†Õ¸Ö‚Õ¶Õ¯Ö�Õ«Õ¡Õ¶ Õ¹Õ« Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Õ¬';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ½Õ­Õ¡Õ¬: ';
+$PHPMAILER_LANG['variable_set']         = 'Õ‰Õ« Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¸Ö‚Õ´ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¯Õ¡Õ´ Õ¾Õ¥Ö€Õ¡ÖƒÕ¸Õ­Õ¥Õ¬ ÖƒÕ¸ÖƒÕ¸Õ­Õ¡Õ¯Õ¡Õ¶Õ¨: ';
+$PHPMAILER_LANG['extension_missing']    = 'Õ€Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ¨ Õ¢Õ¡Ö�Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´ Õ§: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ar.php b/lib/phpmailer/language/phpmailer.lang-ar.php
new file mode 100644
index 00000000..790e2a5e
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ar.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Arabic PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author bahjat al mostafa <bahjat983@hotmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'خطأ SMTP : لا يمكن تأكيد الهوية.';
+$PHPMAILER_LANG['connect_host']         = 'خطأ SMTP: لا يمكن الاتصال بالخادم SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'خطأ SMTP: لم يتم قبول المعلومات .';
+$PHPMAILER_LANG['empty_message']        = 'نص الرسالة �ارغ';
+$PHPMAILER_LANG['encoding']             = 'ترميز غير معرو�: ';
+$PHPMAILER_LANG['execute']              = 'لا يمكن تن�يذ : ';
+$PHPMAILER_LANG['file_access']          = 'لا يمكن الوصول للمل�: ';
+$PHPMAILER_LANG['file_open']            = 'خطأ �ي المل�: لا يمكن �تحه: ';
+$PHPMAILER_LANG['from_failed']          = 'خطأ على مستوى عنوان المرسل : ';
+$PHPMAILER_LANG['instantiate']          = 'لا يمكن تو�ير خدمة البريد.';
+$PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
+$PHPMAILER_LANG['provide_address']      = 'يجب تو�ير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
+                                          '�شل �ي الارسال لكل من : ';
+$PHPMAILER_LANG['signing']              = 'خطأ �ي التوقيع: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
+$PHPMAILER_LANG['smtp_error']           = 'خطأ على مستوى الخادم SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'لا يمكن تعيين أو إعادة تعيين متغير: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-az.php b/lib/phpmailer/language/phpmailer.lang-az.php
new file mode 100644
index 00000000..3749d83d
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-az.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Azerbaijani PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author @mirjalal
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP xətası: Giriş uğursuz oldu.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP xətası: SMTP serverinə qoşulma uğursuz oldu.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP xətası: Verilənlər qəbul edilməyib.';
+$PHPMAILER_LANG['empty_message']        = 'Boş mesaj göndərilə bilməz.';
+$PHPMAILER_LANG['encoding']             = 'Qeyri-müəyyən kodlaşdırma: ';
+$PHPMAILER_LANG['execute']              = '�mr yerinə yetirilmədi: ';
+$PHPMAILER_LANG['file_access']          = 'Fayla giriÅŸ yoxdur: ';
+$PHPMAILER_LANG['file_open']            = 'Fayl xətası: Fayl açıla bilmədi: ';
+$PHPMAILER_LANG['from_failed']          = 'Göstərilən poçtlara göndərmə uğursuz oldu: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail funksiyası işə salına bilmədi.';
+$PHPMAILER_LANG['invalid_address']      = 'Düzgün olmayan e-mail adresi: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - e-mail kitabxanası dəstəklənmir.';
+$PHPMAILER_LANG['provide_address']      = '�n azı bir e-mail adresi daxil edilməlidir.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP xətası: Aşağıdakı ünvanlar üzrə alıcılara göndərmə uğursuzdur: ';
+$PHPMAILER_LANG['signing']              = 'İmzalama xətası: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP serverinÉ™ qoÅŸulma uÄŸursuz oldu.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP serveri xətası: ';
+$PHPMAILER_LANG['variable_set']         = 'Dəyişənin quraşdırılması uğursuz oldu: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ba.php b/lib/phpmailer/language/phpmailer.lang-ba.php
new file mode 100644
index 00000000..095dee3e
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ba.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Bosnian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ermin Islamagić <ermin@islamagic.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Greška: Neuspjela prijava.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Greška: Ne moguće se spojiti sa SMTP serverom.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Greška: Podatci nisu prihvaćeni.';
+$PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznata kriptografija: ';
+$PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: ';
+$PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: ';
+$PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP Greška: Slanje sa navedenih e-mail adresa nije uspjelo: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Greška: Slanje na navedene e-mail adrese nije uspjelo: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne mogu pokrenuti mail funkcionalnost.';
+$PHPMAILER_LANG['invalid_address']      = 'E-mail nije poslan. Neispravna e-mail adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nije podržan.';
+$PHPMAILER_LANG['provide_address']      = 'Definišite barem jednu adresu primaoca.';
+$PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP server nije uspjelo.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP greška: ';
+$PHPMAILER_LANG['variable_set']         = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nedostaje ekstenzija: ';
\ No newline at end of file
diff --git a/lib/phpmailer/language/phpmailer.lang-be.php b/lib/phpmailer/language/phpmailer.lang-be.php
new file mode 100644
index 00000000..e2f98f0f
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-be.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Belarusian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Aleksander Maksymiuk <info@setpro.pl>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Памылка SMTP: памылка ід�нтыфікацыі.';
+$PHPMAILER_LANG['connect_host']         = 'Памылка SMTP: нельга ў�танавіць �ув�зь з SMTP-�ерверам.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Памылка SMTP: зве�ткі непрын�ты�.';
+$PHPMAILER_LANG['empty_message']        = 'Пу�тое паведамленне.';
+$PHPMAILER_LANG['encoding']             = '�ев�дома� кадыроўка т�к�ту: ';
+$PHPMAILER_LANG['execute']              = '�ельга выканаць каманду: ';
+$PHPMAILER_LANG['file_access']          = '��ма до�тупу да файла: ';
+$PHPMAILER_LANG['file_open']            = '�ельга адкрыць файл: ';
+$PHPMAILER_LANG['from_failed']          = '��правільны адра� адпраўніка: ';
+$PHPMAILER_LANG['instantiate']          = '�ельга прым�ніць функцыю mail().';
+$PHPMAILER_LANG['invalid_address']      = '�ельга да�лаць паведамленне, н�правільны email атрымальніка: ';
+$PHPMAILER_LANG['provide_address']      = 'Запоўніце, калі ла�ка, правільны email атрымальніка.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - паштовы �ервер не падтрымліваецца.';
+$PHPMAILER_LANG['recipients_failed']    = 'Памылка SMTP: н�правільны� атрымальнікі: ';
+$PHPMAILER_LANG['signing']              = 'Памылка подпі�у паведамленн�: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Памылка �ув�зі з SMTP-�ерверам.';
+$PHPMAILER_LANG['smtp_error']           = 'Памылка SMTP: ';
+$PHPMAILER_LANG['variable_set']         = '�ельга ў�танавіць або перам�ніць знач�нне пераменнай: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-bg.php b/lib/phpmailer/language/phpmailer.lang-bg.php
new file mode 100644
index 00000000..b22941f6
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-bg.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Bulgarian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mikhail Kyosev <mialygk@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP грешка: �е може да �е удо�товери пред �ървъра.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP грешка: �е може да �е �върже � SMTP хо�та.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP грешка: данните не �а приети.';
+$PHPMAILER_LANG['empty_message']        = 'Съдържанието на �ъобщението е празно';
+$PHPMAILER_LANG['encoding']             = '�еизве�тно кодиране: ';
+$PHPMAILER_LANG['execute']              = '�е може да �е изпълни: ';
+$PHPMAILER_LANG['file_access']          = '��ма до�тъп до файл: ';
+$PHPMAILER_LANG['file_open']            = 'Файлова грешка: �е може да �е отвори файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Следните адре�и за подател �а невалидни: ';
+$PHPMAILER_LANG['instantiate']          = '�е може да �е ин�танцира функци�та mail.';
+$PHPMAILER_LANG['invalid_address']      = '�евалиден адре�: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - пощен�ки �ървър не �е поддържа.';
+$PHPMAILER_LANG['provide_address']      = 'Тр�бва да предо�тавите поне един email адре� за получател.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP грешка: Следните адре�и за Получател �а невалидни: ';
+$PHPMAILER_LANG['signing']              = 'Грешка при подпи�ване: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP провален connect().';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP �ървърна грешка: ';
+$PHPMAILER_LANG['variable_set']         = '�е може да �е у�танови или въз�танови променлива: ';
+$PHPMAILER_LANG['extension_missing']    = 'Лип�ва разширение: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ca.php b/lib/phpmailer/language/phpmailer.lang-ca.php
new file mode 100644
index 00000000..4117596c
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ca.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Catalan PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ivan <web AT microstudi DOT com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Error SMTP: No s’ha pogut autenticar.';
+$PHPMAILER_LANG['connect_host']         = 'Error SMTP: No es pot connectar al servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Dades no acceptades.';
+$PHPMAILER_LANG['empty_message']        = 'El cos del missatge està buit.';
+$PHPMAILER_LANG['encoding']             = 'Codificació desconeguda: ';
+$PHPMAILER_LANG['execute']              = 'No es pot executar: ';
+$PHPMAILER_LANG['file_access']          = 'No es pot accedir a l’arxiu: ';
+$PHPMAILER_LANG['file_open']            = 'Error d’Arxiu: No es pot obrir l’arxiu: ';
+$PHPMAILER_LANG['from_failed']          = 'La(s) següent(s) adreces de remitent han fallat: ';
+$PHPMAILER_LANG['instantiate']          = 'No s’ha pogut crear una instància de la funció Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Adreça d’email invalida: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no està suportat';
+$PHPMAILER_LANG['provide_address']      = 'S’ha de proveir almenys una adreça d’email com a destinatari.';
+$PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Els següents destinataris han fallat: ';
+$PHPMAILER_LANG['signing']              = 'Error al signar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ha fallat el SMTP Connect().';
+$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'No s’ha pogut establir o restablir la variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ch.php b/lib/phpmailer/language/phpmailer.lang-ch.php
new file mode 100644
index 00000000..4fda6b85
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ch.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author LiuXin <http://www.80x86.cn/blog/>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：身份验�失败。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 错误: �能连接SMTP主机。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误: 数���接�。';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = '未知编�：';
+$PHPMAILER_LANG['execute']              = '�能执行: ';
+$PHPMAILER_LANG['file_access']          = '�能访问文件：';
+$PHPMAILER_LANG['file_open']            = '文件错误：�能打开文件：';
+$PHPMAILER_LANG['from_failed']          = '下�的��地�邮件��失败了： ';
+$PHPMAILER_LANG['instantiate']          = '�能实现mail方法。';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的��邮件的方法并�支�。';
+$PHPMAILER_LANG['provide_address']      = '您必须�供至少一个 收信人的email地�。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误： 下�的 收件人失败了： ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-cs.php b/lib/phpmailer/language/phpmailer.lang-cs.php
new file mode 100644
index 00000000..1160cf0c
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-cs.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Czech PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Chyba SMTP: Autentizace selhala.';
+$PHPMAILER_LANG['connect_host']         = 'Chyba SMTP: Nelze navázat spojení se SMTP serverem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Chyba SMTP: Data nebyla přijata.';
+$PHPMAILER_LANG['empty_message']        = 'Prázdné tělo zprávy';
+$PHPMAILER_LANG['encoding']             = 'Neznámé kódování: ';
+$PHPMAILER_LANG['execute']              = 'Nelze provést: ';
+$PHPMAILER_LANG['file_access']          = 'Nelze získat přístup k souboru: ';
+$PHPMAILER_LANG['file_open']            = 'Chyba souboru: Nelze otevřít soubor pro �tení: ';
+$PHPMAILER_LANG['from_failed']          = 'Následující adresa odesílatele je nesprávná: ';
+$PHPMAILER_LANG['instantiate']          = 'Nelze vytvořit instanci emailové funkce.';
+$PHPMAILER_LANG['invalid_address']      = 'Neplatná adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer není podporován.';
+$PHPMAILER_LANG['provide_address']      = 'Musíte zadat alespoň jednu emailovou adresu příjemce.';
+$PHPMAILER_LANG['recipients_failed']    = 'Chyba SMTP: Následující adresy příjemců nejsou správně: ';
+$PHPMAILER_LANG['signing']              = 'Chyba přihlašování: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() selhal.';
+$PHPMAILER_LANG['smtp_error']           = 'Chyba SMTP serveru: ';
+$PHPMAILER_LANG['variable_set']         = 'Nelze nastavit nebo změnit proměnnou: ';
+$PHPMAILER_LANG['extension_missing']    = 'Chybí rozšíření: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-da.php b/lib/phpmailer/language/phpmailer.lang-da.php
new file mode 100644
index 00000000..e725f4b4
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-da.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Danish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mikael Stokkebro <info@stokkebro.dk>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP fejl: Kunne ikke logge på.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data kunne ikke accepteres.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke køre: ';
+$PHPMAILER_LANG['file_access']          = 'Ingen adgang til fil: ';
+$PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
+$PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere email funktionen.';
+//$PHPMAILER_LANG['invalid_address']        = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
+$PHPMAILER_LANG['provide_address']      = 'Du skal indtaste mindst en modtagers emailadresse.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-de.php b/lib/phpmailer/language/phpmailer.lang-de.php
new file mode 100644
index 00000000..aa987a9c
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-de.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * German PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP-Fehler: Authentifizierung fehlgeschlagen.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-Fehler: Konnte keine Verbindung zum SMTP-Host herstellen.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-Fehler: Daten werden nicht akzeptiert.';
+$PHPMAILER_LANG['empty_message']        = 'E-Mail-Inhalt ist leer.';
+$PHPMAILER_LANG['encoding']             = 'Unbekannte Kodierung: ';
+$PHPMAILER_LANG['execute']              = 'Konnte folgenden Befehl nicht ausführen: ';
+$PHPMAILER_LANG['file_access']          = 'Zugriff auf folgende Datei fehlgeschlagen: ';
+$PHPMAILER_LANG['file_open']            = 'Dateifehler: Konnte folgende Datei nicht öffnen: ';
+$PHPMAILER_LANG['from_failed']          = 'Die folgende Absenderadresse ist nicht korrekt: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail-Funktion konnte nicht initialisiert werden.';
+$PHPMAILER_LANG['invalid_address']      = 'Die Adresse ist ungültig: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.';
+$PHPMAILER_LANG['provide_address']      = 'Bitte geben Sie mindestens eine Empfängeradresse an.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-Fehler: Die folgenden Empfänger sind nicht korrekt: ';
+$PHPMAILER_LANG['signing']              = 'Fehler beim Signieren: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Verbindung zum SMTP-Server fehlgeschlagen.';
+$PHPMAILER_LANG['smtp_error']           = 'Fehler vom SMTP-Server: ';
+$PHPMAILER_LANG['variable_set']         = 'Kann Variable nicht setzen oder zurücksetzen: ';
+$PHPMAILER_LANG['extension_missing']    = 'Fehlende Erweiterung: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-el.php b/lib/phpmailer/language/phpmailer.lang-el.php
new file mode 100644
index 00000000..7109641e
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-el.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Greek PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Σφάλμα: Αδυναμία πιστοποίησης (authentication).';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Σφάλμα: Αδυναμία σ�νδεσης στον SMTP-Host.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Σφάλμα: Τα δεδομένα δεν έγιναν αποδεκτά.';
+$PHPMAILER_LANG['empty_message']        = 'Το E-Mail δεν έχει πε�ιεχόμενο .';
+$PHPMAILER_LANG['encoding']             = 'Αγνωστο Encoding-Format: ';
+$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης ακόλουθης εντολής: ';
+$PHPMAILER_LANG['file_access']          = 'Αδυναμία π�οσπέλασης του α�χείου: ';
+$PHPMAILER_LANG['file_open']            = 'Σφάλμα Α�χείου: Δεν είναι δυνατό το άνοιγμα του ακόλουθου α�χείου: ';
+$PHPMAILER_LANG['from_failed']          = 'Η πα�ακάτω διε�θυνση αποστολέα δεν είναι σωστή: ';
+$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης Mail function.';
+$PHPMAILER_LANG['invalid_address']      = 'Το μήνυμα δεν εστάλη, η διε�θυνση δεν είναι έγκυ�η: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer δεν υποστη�ίζεται.';
+$PHPMAILER_LANG['provide_address']      = 'Πα�ακαλο�με δώστε τουλάχιστον μια e-mail διε�θυνση πα�αλήπτη.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Σφάλμα: Οι πα�ακάτω διευθ�νσεις πα�αλήπτη δεν είναι έγκυ�ες: ';
+$PHPMAILER_LANG['signing']              = 'Σφάλμα υπογ�αφής: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σ�νδεσης στον SMTP Server.';
+$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα από τον SMTP Server: ';
+$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ο�ισμο� ή α�χικοποίησης μεταβλητής: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-en.php b/lib/phpmailer/language/phpmailer.lang-en.php
deleted file mode 100755
index 14b677ff..00000000
--- a/lib/phpmailer/language/phpmailer.lang-en.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * PHPMailer language file.  
- * English Version
- */
-
-$PHPMAILER_LANG = array();
-
-$PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' .
-                                     'recipient email address.';
-$PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
-$PHPMAILER_LANG["execute"] = 'Could not execute: ';
-$PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.';
-$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.';
-$PHPMAILER_LANG["from_failed"] = 'The following From address failed: ';
-$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' .
-                                       'recipients failed: ';
-$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.';
-$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.';
-$PHPMAILER_LANG["file_access"] = 'Could not access file: ';
-$PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: ';
-$PHPMAILER_LANG["encoding"] = 'Unknown encoding: ';
-?>
diff --git a/lib/phpmailer/language/phpmailer.lang-eo.php b/lib/phpmailer/language/phpmailer.lang-eo.php
new file mode 100644
index 00000000..2cf7d5c7
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-eo.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Esperanto PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Eraro de servilo SMTP : aŭtentigo malsukcesis.';
+$PHPMAILER_LANG['connect_host']         = 'Eraro de servilo SMTP : konektado al servilo malsukcesis.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Eraro de servilo SMTP : ne�ustaj datumoj.';
+$PHPMAILER_LANG['empty_message']        = 'Teksto de mesa�o mankas.';
+$PHPMAILER_LANG['encoding']             = 'Nekonata kodoprezento: ';
+$PHPMAILER_LANG['execute']              = 'Lanĉi rulumadon ne eblis: ';
+$PHPMAILER_LANG['file_access']          = 'Aliro al dosiero ne sukcesis: ';
+$PHPMAILER_LANG['file_open']            = 'Eraro de dosiero: malfermo neeblas: ';
+$PHPMAILER_LANG['from_failed']          = 'Jena adreso de sendinto malsukcesis: ';
+$PHPMAILER_LANG['instantiate']          = 'Genero de retmesa�a funkcio neeblis.';
+$PHPMAILER_LANG['invalid_address']      = 'Retadreso ne validas: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mesa�ilo ne subtenata.';
+$PHPMAILER_LANG['provide_address']      = 'Vi devas tajpi almenaÅ­ unu recevontan retadreson.';
+$PHPMAILER_LANG['recipients_failed']    = 'Eraro de servilo SMTP : la jenaj po�trecivuloj kaŭzis eraron: ';
+$PHPMAILER_LANG['signing']              = 'Eraro de subskribo: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP konektado malsukcesis.';
+$PHPMAILER_LANG['smtp_error']           = 'Eraro de servilo SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Variablo ne pravalorizeblas aÅ­ ne repravalorizeblas: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-es.php b/lib/phpmailer/language/phpmailer.lang-es.php
new file mode 100644
index 00000000..d2eac8d3
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-es.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Spanish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Matt Sturdy <matt.sturdy@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Error SMTP: Imposible autentificar.';
+$PHPMAILER_LANG['connect_host']         = 'Error SMTP: Imposible conectar al servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Datos no aceptados.';
+$PHPMAILER_LANG['empty_message']        = 'El cuerpo del mensaje está vacío';
+$PHPMAILER_LANG['encoding']             = 'Codificación desconocida: ';
+$PHPMAILER_LANG['execute']              = 'Imposible ejecutar: ';
+$PHPMAILER_LANG['file_access']          = 'Imposible acceder al archivo: ';
+$PHPMAILER_LANG['file_open']            = 'Error de Archivo: Imposible abrir el archivo: ';
+$PHPMAILER_LANG['from_failed']          = 'La(s) siguiente(s) direcciones de remitente fallaron: ';
+$PHPMAILER_LANG['instantiate']          = 'Imposible crear una instancia de la función Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Imposible enviar: dirección de email inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.';
+$PHPMAILER_LANG['provide_address']      = 'Debe proporcionar al menos una dirección de email de destino.';
+$PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Los siguientes destinos fallaron: ';
+$PHPMAILER_LANG['signing']              = 'Error al firmar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
+$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-et.php b/lib/phpmailer/language/phpmailer.lang-et.php
new file mode 100644
index 00000000..7e06da13
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-et.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Estonian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Indrek Päri
+ * @author Elan Ruusamäe <glen@delfi.ee>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Viga: Autoriseerimise viga.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Viga: Vigased andmed.';
+$PHPMAILER_LANG['empty_message']        = 'Tühi kirja sisu';
+$PHPMAILER_LANG["encoding"]             = 'Tundmatu kodeering: ';
+$PHPMAILER_LANG['execute']              = 'Tegevus ebaõnnestus: ';
+$PHPMAILER_LANG['file_access']          = 'Pole piisavalt õiguseid järgneva faili avamiseks: ';
+$PHPMAILER_LANG['file_open']            = 'Faili Viga: Faili avamine ebaõnnestus: ';
+$PHPMAILER_LANG['from_failed']          = 'Järgnev saatja e-posti aadress on vigane: ';
+$PHPMAILER_LANG['instantiate']          = 'mail funktiooni käivitamine ebaõnnestus.';
+$PHPMAILER_LANG['invalid_address']      = 'Saatmine peatatud, e-posti address vigane: ';
+$PHPMAILER_LANG['provide_address']      = 'Te peate määrama vähemalt ühe saaja e-posti aadressi.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' maileri tugi puudub.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Viga: Järgnevate saajate e-posti aadressid on vigased: ';
+$PHPMAILER_LANG["signing"]              = 'Viga allkirjastamisel: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() ebaõnnestus.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP serveri viga: ';
+$PHPMAILER_LANG['variable_set']         = 'Ei õnnestunud määrata või lähtestada muutujat: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nõutud laiendus on puudu: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-fa.php b/lib/phpmailer/language/phpmailer.lang-fa.php
new file mode 100644
index 00000000..ad0745c5
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-fa.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Persian/Farsi PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ali Jazayeri <jaza.ali@gmail.com>
+ * @author Mohammad Hossein Mojtahedi <mhm5000@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'خطای SMTP: احراز هویت با شکست مواجه شد.';
+$PHPMAILER_LANG['connect_host']         = 'خطای SMTP: اتصال به سرور SMTP برقرار نشد.';
+$PHPMAILER_LANG['data_not_accepted']    = 'خطای SMTP: داده‌ها نا‌درست هستند.';
+$PHPMAILER_LANG['empty_message']        = 'بخش متن پیام خالی است.';
+$PHPMAILER_LANG['encoding']             = 'کد‌گذاری نا‌شناخته: ';
+$PHPMAILER_LANG['execute']              = 'امکان اجرا وجود ندارد: ';
+$PHPMAILER_LANG['file_access']          = 'امکان دسترسی به �ایل وجود ندارد: ';
+$PHPMAILER_LANG['file_open']            = 'خطای File: امکان بازکردن �ایل وجود ندارد: ';
+$PHPMAILER_LANG['from_failed']          = 'آدرس �رستنده اشتباه است: ';
+$PHPMAILER_LANG['instantiate']          = 'امکان معر�ی تابع ایمیل وجود ندارد.';
+$PHPMAILER_LANG['invalid_address']      = 'آدرس ایمیل معتبر نیست: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer پشتیبانی نمی‌شود.';
+$PHPMAILER_LANG['provide_address']      = 'باید حداقل یک آدرس گیرنده وارد کنید.';
+$PHPMAILER_LANG['recipients_failed']    = 'خطای SMTP: ارسال به آدرس گیرنده با خطا مواجه شد: ';
+$PHPMAILER_LANG['signing']              = 'خطا در امضا: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'خطا در اتصال به SMTP.';
+$PHPMAILER_LANG['smtp_error']           = 'خطا در SMTP Server: ';
+$PHPMAILER_LANG['variable_set']         = 'امکان ارسال یا ارسال مجدد متغیر‌ها وجود ندارد: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-fi.php b/lib/phpmailer/language/phpmailer.lang-fi.php
new file mode 100644
index 00000000..ec4e7523
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-fi.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Finnish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Jyry Kuukanen
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP-virhe: käyttäjätunnistus epäonnistui.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-virhe: yhteys palvelimeen ei onnistu.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-virhe: data on virheellinen.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Tuntematon koodaustyyppi: ';
+$PHPMAILER_LANG['execute']              = 'Suoritus epäonnistui: ';
+$PHPMAILER_LANG['file_access']          = 'Seuraavaan tiedostoon ei ole oikeuksia: ';
+$PHPMAILER_LANG['file_open']            = 'Tiedostovirhe: Ei voida avata tiedostoa: ';
+$PHPMAILER_LANG['from_failed']          = 'Seuraava lähettäjän osoite on virheellinen: ';
+$PHPMAILER_LANG['instantiate']          = 'mail-funktion luonti epäonnistui.';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.';
+$PHPMAILER_LANG['provide_address']      = 'Aseta vähintään yksi vastaanottajan sähk&ouml;postiosoite.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.';
+$PHPMAILER_LANG['encoding']             = 'Tuntematon koodaustyyppi: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-fo.php b/lib/phpmailer/language/phpmailer.lang-fo.php
new file mode 100644
index 00000000..68cdef1d
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-fo.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Faroese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Dávur Sørensen <http://www.profo-webdesign.dk>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP feilur: Kundi ikki góðkenna.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP feilur: Kundi ikki knýta samband við SMTP vert.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP feilur: Data ikki góðkent.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Ókend encoding: ';
+$PHPMAILER_LANG['execute']              = 'Kundi ikki útføra: ';
+$PHPMAILER_LANG['file_access']          = 'Kundi ikki tilganga fílu: ';
+$PHPMAILER_LANG['file_open']            = 'Fílu feilur: Kundi ikki opna fílu: ';
+$PHPMAILER_LANG['from_failed']          = 'fylgjandi Frá/From adressa miseydnaðist: ';
+$PHPMAILER_LANG['instantiate']          = 'Kuni ikki instantiera mail funktión.';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' er ikki supporterað.';
+$PHPMAILER_LANG['provide_address']      = 'Tú skal uppgeva minst móttakara-emailadressu(r).';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feilur: Fylgjandi móttakarar miseydnaðust: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-fr.php b/lib/phpmailer/language/phpmailer.lang-fr.php
new file mode 100644
index 00000000..a661f98d
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-fr.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * French PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * Some French punctuation requires a thin non-breaking space (U+202F) character before it,
+ * for example before a colon or exclamation mark.
+ * There is one of these characters between these quotes: " "
+ * @link http://unicode.org/udhr/n/notes_fra.html
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l\'authentification.';
+$PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : impossible de se connecter au serveur SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : données incorrectes.';
+$PHPMAILER_LANG['empty_message']        = 'Corps du message vide.';
+$PHPMAILER_LANG['encoding']             = 'Encodage inconnu : ';
+$PHPMAILER_LANG['execute']              = 'Impossible de lancer l\'exécution : ';
+$PHPMAILER_LANG['file_access']          = 'Impossible d\'accéder au fichier : ';
+$PHPMAILER_LANG['file_open']            = 'Ouverture du fichier impossible : ';
+$PHPMAILER_LANG['from_failed']          = 'L\'adresse d\'expéditeur suivante a échoué : ';
+$PHPMAILER_LANG['instantiate']          = 'Impossible d\'instancier la fonction mail.';
+$PHPMAILER_LANG['invalid_address']      = 'L\'adresse courriel n\'est pas valide : ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
+$PHPMAILER_LANG['provide_address']      = 'Vous devez fournir au moins une adresse de destinataire.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires suivants sont en erreur : ';
+$PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Échec de la connexion SMTP.';
+$PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Impossible d\'initialiser ou de réinitialiser une variable : ';
+$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';
diff --git a/lib/phpmailer/language/phpmailer.lang-gl.php b/lib/phpmailer/language/phpmailer.lang-gl.php
new file mode 100644
index 00000000..9b4ce4d8
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-gl.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Galician PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author by Donato Rouco <donatorouco@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erro SMTP: Non puido ser autentificado.';
+$PHPMAILER_LANG['connect_host']         = 'Erro SMTP: Non puido conectar co servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro SMTP: Datos non aceptados.';
+$PHPMAILER_LANG['empty_message']        = 'Corpo da mensaxe vacía';
+$PHPMAILER_LANG['encoding']             = 'Codificación descoñecida: ';
+$PHPMAILER_LANG['execute']              = 'Non puido ser executado: ';
+$PHPMAILER_LANG['file_access']          = 'Nob puido acceder ó arquivo: ';
+$PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: No puido abrir o arquivo: ';
+$PHPMAILER_LANG['from_failed']          = 'A(s) seguinte(s) dirección(s) de remitente(s) deron erro: ';
+$PHPMAILER_LANG['instantiate']          = 'Non puido crear unha instancia da función Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Non puido envia-lo correo: dirección de email inválida: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer non está soportado.';
+$PHPMAILER_LANG['provide_address']      = 'Debe engadir polo menos unha dirección de email coma destino.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro SMTP: Os seguintes destinos fallaron: ';
+$PHPMAILER_LANG['signing']              = 'Erro ó firmar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fallou.';
+$PHPMAILER_LANG['smtp_error']           = 'Erro do servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Non puidemos axustar ou reaxustar a variábel: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-he.php b/lib/phpmailer/language/phpmailer.lang-he.php
new file mode 100644
index 00000000..70eb7175
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-he.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Hebrew PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ronny Sherer <ronny@hoojima.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'שגי�ת SMTP: פעולת ה�ימות נכשלה.';
+$PHPMAILER_LANG['connect_host']         = 'שגי�ת SMTP: ל� הצלחתי להתחבר לשרת SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'שגי�ת SMTP: מידע ל� התקבל.';
+$PHPMAILER_LANG['empty_message']        = 'גוף ההודעה ריק';
+$PHPMAILER_LANG['invalid_address']      = 'כתובת שגויה: ';
+$PHPMAILER_LANG['encoding']             = 'קידוד ל� מוכר: ';
+$PHPMAILER_LANG['execute']              = 'ל� הצלחתי להפעיל �ת: ';
+$PHPMAILER_LANG['file_access']          = 'ל� ניתן לגשת לקובץ: ';
+$PHPMAILER_LANG['file_open']            = 'שגי�ת קובץ: ל� ניתן לגשת לקובץ: ';
+$PHPMAILER_LANG['from_failed']          = 'כתובות הנמעני� הב�ות נכשלו: ';
+$PHPMAILER_LANG['instantiate']          = 'ל� הצלחתי להפעיל �ת פונקציית המייל.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' �ינה נתמכת.';
+$PHPMAILER_LANG['provide_address']      = 'חובה לספק לפחות כתובת �חת של מקבל המייל.';
+$PHPMAILER_LANG['recipients_failed']    = 'שגי�ת SMTP: הנמעני� הב�י� נכשלו: ';
+$PHPMAILER_LANG['signing']              = 'שגי�ת חתימה: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+$PHPMAILER_LANG['smtp_error']           = 'שגי�ת שרת SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'ל� ניתן לקבוע �ו לשנות �ת המשתנה: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-hr.php b/lib/phpmailer/language/phpmailer.lang-hr.php
new file mode 100644
index 00000000..3822920a
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-hr.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Croatian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Hrvoj3e <hrvoj3e@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Greška: Neuspjela autentikacija.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Greška: Ne mogu se spojiti na SMTP poslužitelj.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Greška: Podatci nisu prihvaćeni.';
+$PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznati encoding: ';
+$PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: ';
+$PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: ';
+$PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP Greška: Slanje s navedenih e-mail adresa nije uspjelo: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Greška: Slanje na navedenih e-mail adresa nije uspjelo: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne mogu pokrenuti mail funkcionalnost.';
+$PHPMAILER_LANG['invalid_address']      = 'E-mail nije poslan. Neispravna e-mail adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nije podržan.';
+$PHPMAILER_LANG['provide_address']      = 'Definirajte barem jednu adresu primatelja.';
+$PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP poslužitelj nije uspjelo.';
+$PHPMAILER_LANG['smtp_error']           = 'Greška SMTP poslužitelja: ';
+$PHPMAILER_LANG['variable_set']         = 'Ne mogu postaviti varijablu niti ju vratiti nazad: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nedostaje proširenje: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-hu.php b/lib/phpmailer/language/phpmailer.lang-hu.php
new file mode 100644
index 00000000..d7ca8887
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-hu.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Hungarian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author @dominicus-75
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP hiba: az azonosítás sikertelen.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP hiba: nem lehet kapcsolódni az SMTP-szerverhez.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP hiba: adatok visszautasítva.';
+$PHPMAILER_LANG['empty_message']        = 'Üres az üzenettörzs.';
+$PHPMAILER_LANG['encoding']             = 'Ismeretlen kódolás: ';
+$PHPMAILER_LANG['execute']              = 'Nem lehet végrehajtani: ';
+$PHPMAILER_LANG['file_access']          = 'A következő fájl nem elérhető: ';
+$PHPMAILER_LANG['file_open']            = 'Fájl hiba: a következő fájlt nem lehet megnyitni: ';
+$PHPMAILER_LANG['from_failed']          = 'A feladóként megadott következő cím hibás: ';
+$PHPMAILER_LANG['instantiate']          = 'A PHP mail() függvényt nem sikerült végrehajtani.';
+$PHPMAILER_LANG['invalid_address']      = 'Érvénytelen cím: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' a mailer-osztály nem támogatott.';
+$PHPMAILER_LANG['provide_address']      = 'Legalább egy címzettet fel kell tüntetni.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP hiba: a címzettként megadott következő címek hibásak: ';
+$PHPMAILER_LANG['signing']              = 'Hibás aláírás: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Hiba az SMTP-kapcsolatban.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP-szerver hiba: ';
+$PHPMAILER_LANG['variable_set']         = 'A következő változók beállítása nem sikerült: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-id.php b/lib/phpmailer/language/phpmailer.lang-id.php
new file mode 100644
index 00000000..e57b5240
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-id.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Indonesian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Cecep Prawiro <cecep.prawiro@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Kesalahan SMTP: Tidak dapat mengautentikasi.';
+$PHPMAILER_LANG['connect_host']         = 'Kesalahan SMTP: Tidak dapat terhubung ke host SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Kesalahan SMTP: Data tidak diterima peladen.';
+$PHPMAILER_LANG['empty_message']        = 'Isi pesan kosong';
+$PHPMAILER_LANG['encoding']             = 'Pengkodean karakter tidak dikenali: ';
+$PHPMAILER_LANG['execute']              = 'Tidak dapat menjalankan proses : ';
+$PHPMAILER_LANG['file_access']          = 'Tidak dapat mengakses berkas : ';
+$PHPMAILER_LANG['file_open']            = 'Kesalahan File: Berkas tidak bisa dibuka : ';
+$PHPMAILER_LANG['from_failed']          = 'Alamat pengirim berikut mengakibatkan error : ';
+$PHPMAILER_LANG['instantiate']          = 'Tidak dapat menginisialisasi fungsi email';
+$PHPMAILER_LANG['invalid_address']      = 'Gagal terkirim, alamat email tidak valid : ';
+$PHPMAILER_LANG['provide_address']      = 'Harus disediakan minimal satu alamat tujuan';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer tidak didukung';
+$PHPMAILER_LANG['recipients_failed']    = 'Kesalahan SMTP: Alamat tujuan berikut menghasilkan error : ';
+$PHPMAILER_LANG['signing']              = 'Kesalahan dalam tanda tangan : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() gagal.';
+$PHPMAILER_LANG['smtp_error']           = 'Kesalahan peladen SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Tidak berhasil mengatur atau mengatur ulang variable : ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-it.php b/lib/phpmailer/language/phpmailer.lang-it.php
new file mode 100644
index 00000000..d2f4643e
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-it.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Italian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ilias Bartolini <brain79@inwind.it>
+ * @author Stefano Sabatini <sabas88@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Error: Impossibile autenticarsi.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Impossibile connettersi all\'host SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Error: Dati non accettati dal server.';
+$PHPMAILER_LANG['empty_message']        = 'Il corpo del messaggio è vuoto';
+$PHPMAILER_LANG['encoding']             = 'Codifica dei caratteri sconosciuta: ';
+$PHPMAILER_LANG['execute']              = 'Impossibile eseguire l\'operazione: ';
+$PHPMAILER_LANG['file_access']          = 'Impossibile accedere al file: ';
+$PHPMAILER_LANG['file_open']            = 'File Error: Impossibile aprire il file: ';
+$PHPMAILER_LANG['from_failed']          = 'I seguenti indirizzi mittenti hanno generato errore: ';
+$PHPMAILER_LANG['instantiate']          = 'Impossibile istanziare la funzione mail';
+$PHPMAILER_LANG['invalid_address']      = 'Impossibile inviare, l\'indirizzo email non è valido: ';
+$PHPMAILER_LANG['provide_address']      = 'Deve essere fornito almeno un indirizzo ricevente';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer non supportato';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: I seguenti indirizzi destinatari hanno generato un errore: ';
+$PHPMAILER_LANG['signing']              = 'Errore nella firma: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fallita.';
+$PHPMAILER_LANG['smtp_error']           = 'Errore del server SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Impossibile impostare o resettare la variabile: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ja.php b/lib/phpmailer/language/phpmailer.lang-ja.php
new file mode 100644
index 00000000..2d778728
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ja.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Japanese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mitsuhiro Yoshida <http://mitstek.com/>
+ * @author Yoshi Sakai <http://bluemooninc.jp/>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTPエラー: �証����ん���。';
+$PHPMAILER_LANG['connect_host']         = 'SMTPエラー: SMTPホスト�接続����ん���。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTPエラー: データ���付�られ��ん���。';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = '�明�エンコーディング: ';
+$PHPMAILER_LANG['execute']              = '実行����ん���: ';
+$PHPMAILER_LANG['file_access']          = 'ファイル�アクセス����ん: ';
+$PHPMAILER_LANG['file_open']            = 'ファイルエラー: ファイルを開���ん: ';
+$PHPMAILER_LANG['from_failed']          = 'Fromアドレスを登録�る際�エラー�発生����: ';
+$PHPMAILER_LANG['instantiate']          = 'メール関数�正常�動作���ん���。';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['provide_address']      = '少���も1�メールアドレスを 指定�る必���り��。';
+$PHPMAILER_LANG['mailer_not_supported'] = ' メーラー�サ�ート�れ����ん。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTPエラー: 次��信者アドレス� 間����り��: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ka.php b/lib/phpmailer/language/phpmailer.lang-ka.php
new file mode 100644
index 00000000..dd1af8ab
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ka.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Georgian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Avtandil Kikabidze aka LONGMAN <akalongman@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP შეცდ�მ�: �ვტ�რიზ�ცი� შეუძლებელი�.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP შეცდ�მ�: SMTP სერვერთ�ნ დ�კ�ვშირებ� შეუძლებელი�.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP შეცდ�მ�: მ�ნ�ცემები �რ იქნ� მიღებული.';
+$PHPMAILER_LANG['encoding']             = 'კ�დირების უცნ�ბი ტიპი: ';
+$PHPMAILER_LANG['execute']              = 'შეუძლებელი� შემდეგი ბრძ�ნების შესრულებ�: ';
+$PHPMAILER_LANG['file_access']          = 'შეუძლებელი� წვდ�მ� ფ�ილთ�ნ: ';
+$PHPMAILER_LANG['file_open']            = 'ფ�ილური სისტემის შეცდ�მ�: �რ იხსნებ� ფ�ილი: ';
+$PHPMAILER_LANG['from_failed']          = 'გ�მგზ�ვნის �რ�სწ�რი მის�მ�რთი: ';
+$PHPMAILER_LANG['instantiate']          = 'mail ფუნქციის გ�შვებ� ვერ ხერხდებ�.';
+$PHPMAILER_LANG['provide_address']      = 'გთხ�ვთ მიუთით�თ ერთი �დრეს�ტის e-mail მის�მ�რთი მ�ინც.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - ს�ფ�სტ� სერვერის მხ�რდ�ჭერ� �რ �რის.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP შეცდ�მ�: შემდეგ მის�მ�რთებზე გ�გზ�ვნ� ვერ მ�ხერხდ�: ';
+$PHPMAILER_LANG['empty_message']        = 'შეტყ�ბინებ� ც�რიელი�';
+$PHPMAILER_LANG['invalid_address']      = '�რ გ�იგზ�ვნ�, e-mail მის�მ�რთის �რ�სწ�რი ფ�რმ�ტი: ';
+$PHPMAILER_LANG['signing']              = 'ხელმ�წერის შეცდ�მ�: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'შეცდ�მ� SMTP სერვერთ�ნ დ�კ�ვშირების�ს';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP სერვერის შეცდ�მ�: ';
+$PHPMAILER_LANG['variable_set']         = 'შეუძლებელი� შემდეგი ცვლ�დის შექმნ� �ნ შეცვლ�: ';
+$PHPMAILER_LANG['extension_missing']    = 'ბიბლი�თეკ� �რ �რსებ�ბს: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ko.php b/lib/phpmailer/language/phpmailer.lang-ko.php
new file mode 100644
index 00000000..9599fa68
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ko.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Korean PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author ChalkPE <amato0617@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 오류: ��할 수 없습니다.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 오류: SMTP 호스트� 접�할 수 없습니다.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 오류: ��터가 받아들여지지 않았습니다.';
+$PHPMAILER_LANG['empty_message']        = '메세지 내용� 없습니다';
+$PHPMAILER_LANG['encoding']             = '알 수 없는 �코딩: ';
+$PHPMAILER_LANG['execute']              = '실행 불가: ';
+$PHPMAILER_LANG['file_access']          = '파� 접근 불가: ';
+$PHPMAILER_LANG['file_open']            = '파� 오류: 파�� 열 수 없습니다: ';
+$PHPMAILER_LANG['from_failed']          = '다� From 주소�서 오류가 발�했습니다: ';
+$PHPMAILER_LANG['instantiate']          = 'mail 함수를 �스턴스화할 수 없습니다';
+$PHPMAILER_LANG['invalid_address']      = '잘못� 주소: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' 메�러는 지��지 않습니다.';
+$PHPMAILER_LANG['provide_address']      = '�어� 한 개 ��� 수신� 메� 주소를 제공해야 합니다.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 오류: 다� 수신��서 오류가 발�했습니다: ';
+$PHPMAILER_LANG['signing']              = '서명 오류: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP 연결� 실패하였습니다.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP 서버 오류: ';
+$PHPMAILER_LANG['variable_set']         = '변수 설정 � 초기화 불가: ';
+$PHPMAILER_LANG['extension_missing']    = '확장� 없�: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-lt.php b/lib/phpmailer/language/phpmailer.lang-lt.php
new file mode 100644
index 00000000..1253a4fd
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-lt.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Lithuanian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Dainius Kaupaitis <dk@sum.lt>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP klaida: autentifikacija nepavyko.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP klaida: nepavyksta prisijungti prie SMTP stoties.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP klaida: duomenys nepriimti.';
+$PHPMAILER_LANG['empty_message']        = 'Laiško turinys tuš�ias';
+$PHPMAILER_LANG['encoding']             = 'Neatpažinta koduotė: ';
+$PHPMAILER_LANG['execute']              = 'Nepavyko įvykdyti komandos: ';
+$PHPMAILER_LANG['file_access']          = 'Byla nepasiekiama: ';
+$PHPMAILER_LANG['file_open']            = 'Bylos klaida: Nepavyksta atidaryti: ';
+$PHPMAILER_LANG['from_failed']          = 'Neteisingas siuntÄ—jo adresas: ';
+$PHPMAILER_LANG['instantiate']          = 'Nepavyko paleisti mail funkcijos.';
+$PHPMAILER_LANG['invalid_address']      = 'Neteisingas adresas: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' pašto stotis nepalaikoma.';
+$PHPMAILER_LANG['provide_address']      = 'Nurodykite bent vienÄ… gavÄ—jo adresÄ….';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP klaida: nepavyko išsiųsti šiems gavėjams: ';
+$PHPMAILER_LANG['signing']              = 'Prisijungimo klaida: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP susijungimo klaida';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP stoties klaida: ';
+$PHPMAILER_LANG['variable_set']         = 'Nepavyko priskirti reikšmės kintamajam: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-lv.php b/lib/phpmailer/language/phpmailer.lang-lv.php
new file mode 100644
index 00000000..39bf9a19
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-lv.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Latvian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Eduards M. <e@npd.lv>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP kļūda: Autoriz�cija neizdev�s.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Kļūda: Nevar izveidot savienojumu ar SMTP serveri.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Kļūda: Nepieņem inform�ciju.';
+$PHPMAILER_LANG['empty_message']        = 'Ziņojuma teksts ir tukšs';
+$PHPMAILER_LANG['encoding']             = 'Neatpazīts kodējums: ';
+$PHPMAILER_LANG['execute']              = 'Neizdev�s izpildīt komandu: ';
+$PHPMAILER_LANG['file_access']          = 'Fails nav pieejams: ';
+$PHPMAILER_LANG['file_open']            = 'Faila kļūda: Nevar atvērt failu: ';
+$PHPMAILER_LANG['from_failed']          = 'Nepareiza sūtīt�ja adrese: ';
+$PHPMAILER_LANG['instantiate']          = 'Nevar palaist sūtīšanas funkciju.';
+$PHPMAILER_LANG['invalid_address']      = 'Nepareiza adrese: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' sūtīt�js netiek atbalstīts.';
+$PHPMAILER_LANG['provide_address']      = 'Lūdzu, nor�diet vismaz vienu adres�tu.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP kļūda: neizdev�s nosūtīt š�diem saņēmējiem: ';
+$PHPMAILER_LANG['signing']              = 'Autoriz�cijas kļūda: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP savienojuma kļūda';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP servera kļūda: ';
+$PHPMAILER_LANG['variable_set']         = 'Nevar piešķirt mainīg� vērtību: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ms.php b/lib/phpmailer/language/phpmailer.lang-ms.php
new file mode 100644
index 00000000..4e2c3408
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ms.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Malaysian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Nawawi Jamili <nawawi@rutweb.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Ralat SMTP: Tidak dapat pengesahan.';
+$PHPMAILER_LANG['connect_host']         = 'Ralat SMTP: Tidak dapat menghubungi hos pelayan SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Ralat SMTP: Data tidak diterima oleh pelayan.';
+$PHPMAILER_LANG['empty_message']        = 'Tiada isi untuk mesej';
+$PHPMAILER_LANG['encoding']             = 'Pengekodan tidak diketahui: ';
+$PHPMAILER_LANG['execute']              = 'Tidak dapat melaksanakan: ';
+$PHPMAILER_LANG['file_access']          = 'Tidak dapat mengakses fail: ';
+$PHPMAILER_LANG['file_open']            = 'Ralat Fail: Tidak dapat membuka fail: ';
+$PHPMAILER_LANG['from_failed']          = 'Berikut merupakan ralat dari alamat e-mel: ';
+$PHPMAILER_LANG['instantiate']          = 'Tidak dapat memberi contoh fungsi e-mel.';
+$PHPMAILER_LANG['invalid_address']      = 'Alamat emel tidak sah: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' jenis penghantar emel tidak disokong.';
+$PHPMAILER_LANG['provide_address']      = 'Anda perlu menyediakan sekurang-kurangnya satu alamat e-mel penerima.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ralat SMTP: Penerima e-mel berikut telah gagal: ';
+$PHPMAILER_LANG['signing']              = 'Ralat pada tanda tangan: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() telah gagal.';
+$PHPMAILER_LANG['smtp_error']           = 'Ralat pada pelayan SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Tidak boleh menetapkan atau menetapkan semula pembolehubah: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-nb.php b/lib/phpmailer/language/phpmailer.lang-nb.php
new file mode 100644
index 00000000..44610542
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-nb.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke autentisere.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP tjener.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Datainnhold ikke akseptert.';
+$PHPMAILER_LANG['empty_message']        = 'Melding kropp tomt';
+$PHPMAILER_LANG['encoding']             = 'Ukjent koding: ';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: ';
+$PHPMAILER_LANG['file_access']          = 'FÃ¥r ikke tilgang til filen: ';
+$PHPMAILER_LANG['file_open']            = 'Fil Feil: Kunne ikke åpne filen: ';
+$PHPMAILER_LANG['from_failed']          = 'Følgende Frå adresse feilet: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere post funksjon.';
+$PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.';
+$PHPMAILER_LANG['provide_address']      = 'Du må opppgi minst en mottakeradresse.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: ';
+$PHPMAILER_LANG['signing']              = 'Signering Feil: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() feilet.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server feil: ';
+$PHPMAILER_LANG['variable_set']         = 'Kan ikke skrive eller omskrive variabel: ';
+$PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-nl.php b/lib/phpmailer/language/phpmailer.lang-nl.php
new file mode 100644
index 00000000..0fc38bec
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-nl.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Dutch PHPMailer language file: refer to class.phpmailer.php for definitive list.
+ * @package PHPMailer
+ * @author Tuxion <team@tuxion.nl>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP-fout: authenticatie mislukt.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon niet verbinden met SMTP-host.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data niet geaccepteerd.';
+$PHPMAILER_LANG['empty_message']        = 'Berichttekst is leeg';
+$PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';
+$PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';
+$PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';
+$PHPMAILER_LANG['file_open']            = 'Bestandsfout: kon bestand niet openen: ';
+$PHPMAILER_LANG['from_failed']          = 'Het volgende afzendersadres is mislukt: ';
+$PHPMAILER_LANG['instantiate']          = 'Kon mailfunctie niet initialiseren.';
+$PHPMAILER_LANG['invalid_address']      = 'Ongeldig adres: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
+$PHPMAILER_LANG['provide_address']      = 'Er moet minstens één ontvanger worden opgegeven.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';
+$PHPMAILER_LANG['signing']              = 'Signeerfout: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Verbinding mislukt.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';
+$PHPMAILER_LANG['variable_set']         = 'Kan de volgende variabele niet instellen of resetten: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-pl.php b/lib/phpmailer/language/phpmailer.lang-pl.php
new file mode 100644
index 00000000..3da0dee9
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-pl.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Polish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Błąd SMTP: Nie można przeprowadzić uwierzytelnienia.';
+$PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
+$PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
+$PHPMAILER_LANG['encoding']             = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
+$PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
+$PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
+$PHPMAILER_LANG['from_failed']          = 'Następujący adres Nadawcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
+$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, '.
+    'następujący adres Odbiorcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
+$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_error']           = 'BÅ‚Ä…d SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
+$PHPMAILER_LANG['extension_missing']    = 'BrakujÄ…ce rozszerzenie: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-pt.php b/lib/phpmailer/language/phpmailer.lang-pt.php
new file mode 100644
index 00000000..f365d5d0
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-pt.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Portuguese (European) PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Jonadabe <jonadabe@hotmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erro do SMTP: Não foi possível realizar a autenticação.';
+$PHPMAILER_LANG['connect_host']         = 'Erro do SMTP: Não foi possível realizar ligação com o servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro do SMTP: Os dados foram rejeitados.';
+$PHPMAILER_LANG['empty_message']        = 'A mensagem no e-mail está vazia.';
+$PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
+$PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível aceder o ficheiro: ';
+$PHPMAILER_LANG['file_open']            = 'Abertura do ficheiro: Não foi possível abrir o ficheiro: ';
+$PHPMAILER_LANG['from_failed']          = 'Ocorreram falhas nos endereços dos seguintes remententes: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível iniciar uma instância da função mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Não foi enviado nenhum e-mail para o endereço de e-mail inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
+$PHPMAILER_LANG['provide_address']      = 'Tem de fornecer pelo menos um endereço como destinatário do e-mail.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro do SMTP: O endereço do seguinte destinatário falhou: ';
+$PHPMAILER_LANG['signing']              = 'Erro ao assinar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
+$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensão em falta: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-pt_br.php b/lib/phpmailer/language/phpmailer.lang-pt_br.php
new file mode 100644
index 00000000..4ec10f77
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-pt_br.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Brazilian Portuguese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Paulo Henrique Garcia <paulo@controllerweb.com.br>
+ * @author Lucas Guimarães <lucas@lucasguimaraes.com>
+ * @author Phelipe Alves <phelipealvesdesouza@gmail.com>
+ * @author Fabio Beneditto <fabiobeneditto@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.';
+$PHPMAILER_LANG['connect_host']         = 'Erro de SMTP: Não foi possível conectar ao servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro de SMTP: Dados rejeitados.';
+$PHPMAILER_LANG['empty_message']        = 'Mensagem vazia';
+$PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
+$PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: ';
+$PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
+$PHPMAILER_LANG['from_failed']          = 'Os seguintes remetentes falharam: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
+$PHPMAILER_LANG['provide_address']      = 'Você deve informar pelo menos um destinatário.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro de SMTP: Os seguintes destinatários falharam: ';
+$PHPMAILER_LANG['signing']              = 'Erro de Assinatura: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
+$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensão ausente: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ro.php b/lib/phpmailer/language/phpmailer.lang-ro.php
new file mode 100644
index 00000000..fa100eaa
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ro.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Romanian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Alex Florea <alecz.fia@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Eroare SMTP: Autentificarea a eșuat.';
+$PHPMAILER_LANG['connect_host']         = 'Eroare SMTP: Conectarea la serverul SMTP a eșuat.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Eroare SMTP: Datele nu au fost acceptate.';
+$PHPMAILER_LANG['empty_message']        = 'Mesajul este gol.';
+$PHPMAILER_LANG['encoding']             = 'Encodare necunoscută: ';
+$PHPMAILER_LANG['execute']              = 'Nu se poate executa următoarea comandă:  ';
+$PHPMAILER_LANG['file_access']          = 'Nu se poate accesa următorul fișier: ';
+$PHPMAILER_LANG['file_open']            = 'Eroare fișier: Nu se poate deschide următorul fișier: ';
+$PHPMAILER_LANG['from_failed']          = 'Următoarele adrese From au dat eroare: ';
+$PHPMAILER_LANG['instantiate']          = 'Funcția mail nu a putut fi inițializată.';
+$PHPMAILER_LANG['invalid_address']      = 'Adresa de email nu este validă: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.';
+$PHPMAILER_LANG['provide_address']      = 'Trebuie să adăugați cel puțin o adresă de email.';
+$PHPMAILER_LANG['recipients_failed']    = 'Eroare SMTP: Următoarele adrese de email au eșuat: ';
+$PHPMAILER_LANG['signing']              = 'A aparut o problemă la semnarea emailului. ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Conectarea la serverul SMTP a eșuat.';
+$PHPMAILER_LANG['smtp_error']           = 'Eroare server SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Nu se poate seta/reseta variabila. ';
+$PHPMAILER_LANG['extension_missing']    = 'Lipsește extensia: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-rs.php b/lib/phpmailer/language/phpmailer.lang-rs.php
new file mode 100644
index 00000000..0502f021
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-rs.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Serbian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author �лек�андар Јевремовић <ajevremovic@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP грешка: аутентификација није у�пела.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP грешка: није могуће повезивање �а SMTP �ервером.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP грешка: подаци ни�у прихваћени.';
+$PHPMAILER_LANG['empty_message']        = 'Садржај поруке је празан.';
+$PHPMAILER_LANG['encoding']             = '�епознато кодовање: ';
+$PHPMAILER_LANG['execute']              = '�ије могуће извршити наредбу: ';
+$PHPMAILER_LANG['file_access']          = '�ије могуће при�тупити датотеци: ';
+$PHPMAILER_LANG['file_open']            = '�ије могуће отворити датотеку: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP грешка: �лање �а �ледећих адре�а није у�пело: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP грешка: �лање на �ледеће адре�е није у�пело: ';
+$PHPMAILER_LANG['instantiate']          = '�ије могуће покренути mail функцију.';
+$PHPMAILER_LANG['invalid_address']      = 'Порука није по�лата због неи�правне адре�е: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' мејлер није подржан.';
+$PHPMAILER_LANG['provide_address']      = 'Потребно је задати најмање једну адре�у.';
+$PHPMAILER_LANG['signing']              = 'Грешка приликом пријављивања: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање �а SMTP �ервером није у�пело.';
+$PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP �ервера: ';
+$PHPMAILER_LANG['variable_set']         = '�ије могуће задати променљиву, нити је вратити уназад: ';
+$PHPMAILER_LANG['extension_missing']    = '�едо�таје проширење: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-ru.php b/lib/phpmailer/language/phpmailer.lang-ru.php
new file mode 100644
index 00000000..4066f6b4
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-ru.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Russian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Alexey Chumakov <alex@chumakov.ru>
+ * @author Foster Snowhill <i18n@forstwoof.ru>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удает�� подключить�� к �ерверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не прин�ты.';
+$PHPMAILER_LANG['encoding']             = '�еизве�тный вид кодировки: ';
+$PHPMAILER_LANG['execute']              = '�евозможно выполнить команду: ';
+$PHPMAILER_LANG['file_access']          = '�ет до�тупа к файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Файлова� ошибка: не удает�� открыть файл: ';
+$PHPMAILER_LANG['from_failed']          = '�еверный адре� отправител�: ';
+$PHPMAILER_LANG['instantiate']          = '�евозможно запу�тить функцию mail.';
+$PHPMAILER_LANG['provide_address']      = 'Пожалуй�та, введите хот� бы один адре� e-mail получател�.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый �ервер не поддерживает��.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: отправка по �ледующим адре�ам получателей не удала�ь: ';
+$PHPMAILER_LANG['empty_message']        = 'Пу�тое �ообщение';
+$PHPMAILER_LANG['invalid_address']      = '�е ото�лано, неправильный формат email адре�а: ';
+$PHPMAILER_LANG['signing']              = 'Ошибка подпи�и: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка �оединени� � SMTP-�ервером';
+$PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-�ервера: ';
+$PHPMAILER_LANG['variable_set']         = '�евозможно у�тановить или переу�тановить переменную: ';
+$PHPMAILER_LANG['extension_missing']    = 'Ра�ширение от�ут�твует: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-sk.php b/lib/phpmailer/language/phpmailer.lang-sk.php
new file mode 100644
index 00000000..a38f4e52
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-sk.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Slovak PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Michal Tinka <michaltinka@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Error: Chyba autentifikácie.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Nebolo možné nadviazať spojenie so SMTP serverom.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Error: Dáta neboli prijaté';
+$PHPMAILER_LANG['empty_message']        = 'Prázdne telo správy.';
+$PHPMAILER_LANG['encoding']             = 'Neznáme kódovanie: ';
+$PHPMAILER_LANG['execute']              = 'Nedá sa vykonať: ';
+$PHPMAILER_LANG['file_access']          = 'Súbor nebol nájdený: ';
+$PHPMAILER_LANG['file_open']            = 'File Error: Súbor sa otvoriť pre �ítanie: ';
+$PHPMAILER_LANG['from_failed']          = 'Následujúca adresa From je nesprávna: ';
+$PHPMAILER_LANG['instantiate']          = 'Nedá sa vytvoriť inštancia emailovej funkcie.';
+$PHPMAILER_LANG['invalid_address']      = 'Neodoslané, emailová adresa je nesprávna: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' emailový klient nieje podporovaný.';
+$PHPMAILER_LANG['provide_address']      = 'Musíte zadať aspoň jednu emailovú adresu príjemcu.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: Adresy príjemcov niesu správne ';
+$PHPMAILER_LANG['signing']              = 'Chyba prihlasovania: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zlyhalo.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP chyba serveru: ';
+$PHPMAILER_LANG['variable_set']         = 'Nemožno nastaviť alebo resetovať premennú: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-sl.php b/lib/phpmailer/language/phpmailer.lang-sl.php
new file mode 100644
index 00000000..54c95725
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-sl.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Slovene PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Klemen Tušar <techouse@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP napaka: Avtentikacija ni uspela.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP napaka: Ne morem vzpostaviti povezave s SMTP gostiteljem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP napaka: Strežnik zavra�a podatke.';
+$PHPMAILER_LANG['empty_message']        = 'E-poštno sporo�ilo nima vsebine.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznan tip kodiranja: ';
+$PHPMAILER_LANG['execute']              = 'Operacija ni uspela: ';
+$PHPMAILER_LANG['file_access']          = 'Nimam dostopa do datoteke: ';
+$PHPMAILER_LANG['file_open']            = 'Ne morem odpreti datoteke: ';
+$PHPMAILER_LANG['from_failed']          = 'Neveljaven e-naslov pošiljatelja: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne morem inicializirati mail funkcije.';
+$PHPMAILER_LANG['invalid_address']      = 'E-poštno sporo�ilo ni bilo poslano. E-naslov je neveljaven: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
+$PHPMAILER_LANG['provide_address']      = 'Prosim vnesite vsaj enega naslovnika.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP napaka: Slede�i naslovniki so neveljavni: ';
+$PHPMAILER_LANG['signing']              = 'Napaka pri podpisovanju: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
+$PHPMAILER_LANG['smtp_error']           = 'Napaka SMTP strežnika: ';
+$PHPMAILER_LANG['variable_set']         = 'Ne morem nastaviti oz. ponastaviti spremenljivke: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-sv.php b/lib/phpmailer/language/phpmailer.lang-sv.php
new file mode 100644
index 00000000..4408e63e
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-sv.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Swedish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Johan Linnér <johan@linner.biz>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP fel: Kunde inte autentisera.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP fel: Kunde inte ansluta till SMTP-server.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fel: Data accepterades inte.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Okänt encode-format: ';
+$PHPMAILER_LANG['execute']              = 'Kunde inte köra: ';
+$PHPMAILER_LANG['file_access']          = 'Ingen åtkomst till fil: ';
+$PHPMAILER_LANG['file_open']            = 'Fil fel: Kunde inte öppna fil: ';
+$PHPMAILER_LANG['from_failed']          = 'Följande avsändaradress är felaktig: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunde inte initiera e-postfunktion.';
+$PHPMAILER_LANG['invalid_address']      = 'Felaktig adress: ';
+$PHPMAILER_LANG['provide_address']      = 'Du måste ange minst en mottagares e-postadress.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fel: Följande mottagare är felaktig: ';
+$PHPMAILER_LANG['signing']              = 'Signerings fel: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() misslyckades.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server fel: ';
+$PHPMAILER_LANG['variable_set']         = 'Kunde inte definiera eller återställa variabel: ';
+$PHPMAILER_LANG['extension_missing']    = 'Tillägg ej tillgängligt: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-tr.php b/lib/phpmailer/language/phpmailer.lang-tr.php
new file mode 100644
index 00000000..cfe8eaae
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-tr.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Turkish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Elçin Özel
+ * @author Can Yılmaz
+ * @author Mehmet BenlioÄŸlu
+ * @author @yasinaydin
+ * @author Ogün Karakuş
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Hatası: Oturum açılamadı.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Hatası: SMTP sunucusuna bağlanılamadı.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Hatası: Veri kabul edilmedi.';
+$PHPMAILER_LANG['empty_message']        = 'Mesajın içeriği boş';
+$PHPMAILER_LANG['encoding']             = 'Bilinmeyen karakter kodlama: ';
+$PHPMAILER_LANG['execute']              = 'Çalıştırılamadı: ';
+$PHPMAILER_LANG['file_access']          = 'Dosyaya eriÅŸilemedi: ';
+$PHPMAILER_LANG['file_open']            = 'Dosya Hatası: Dosya açılamadı: ';
+$PHPMAILER_LANG['from_failed']          = 'Belirtilen adreslere gönderme başarısız: ';
+$PHPMAILER_LANG['instantiate']          = 'Örnek e-posta fonksiyonu oluşturulamadı.';
+$PHPMAILER_LANG['invalid_address']      = 'Geçersiz e-posta adresi: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' e-posta kütüphanesi desteklenmiyor.';
+$PHPMAILER_LANG['provide_address']      = 'En az bir alıcı e-posta adresi belirtmelisiniz.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Hatası: Belirtilen alıcılara ulaşılamadı: ';
+$PHPMAILER_LANG['signing']              = 'İmzalama hatası: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: ';
+$PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: ';
+$PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-uk.php b/lib/phpmailer/language/phpmailer.lang-uk.php
new file mode 100644
index 00000000..9a7b3467
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-uk.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Ukrainian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Yuriy Rudyy <yrudyy@prs.net.ua>
+ * @fixed by Boris Yurchenko <boris@yurchenko.pp.ua>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Помилка SMTP: помилка авторизації.';
+$PHPMAILER_LANG['connect_host']         = 'Помилка SMTP: не вдаєть�� під\'єднати�� до �ерверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Помилка SMTP: дані не прийн�ті.';
+$PHPMAILER_LANG['encoding']             = '�евідомий тип кодуванн�: ';
+$PHPMAILER_LANG['execute']              = '�еможливо виконати команду: ';
+$PHPMAILER_LANG['file_access']          = '�емає до�тупу до файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Помилка файлової �и�теми: не вдаєть�� відкрити файл: ';
+$PHPMAILER_LANG['from_failed']          = '�евірна адре�а відправника: ';
+$PHPMAILER_LANG['instantiate']          = '�еможливо запу�тити функцію mail.';
+$PHPMAILER_LANG['provide_address']      = 'Будь-ла�ка, введіть хоча б одну адре�у e-mail отримувача.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий �ервер не підтримуєть��.';
+$PHPMAILER_LANG['recipients_failed']    = 'Помилка SMTP: відправленн� на�тупним отримувачам не вдало��: ';
+$PHPMAILER_LANG['empty_message']        = 'Пу�те тіло повідомленн�';
+$PHPMAILER_LANG['invalid_address']      = '�е відправлено, невірний формат адре�и e-mail: ';
+$PHPMAILER_LANG['signing']              = 'Помилка підпи�у: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка з\'єднанн� із SMTP-�ервером';
+$PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-�ервера: ';
+$PHPMAILER_LANG['variable_set']         = '�еможливо в�тановити або перев�тановити змінну: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-vi.php b/lib/phpmailer/language/phpmailer.lang-vi.php
new file mode 100644
index 00000000..c60dadeb
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-vi.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Vietnamese (Tiếng Việt) PHPMailer language file: refer to English translation for definitive list.
+ * @package PHPMailer
+ * @author VINADES.,JSC <contact@vinades.vn>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Lỗi SMTP: Không thể xác thực.';
+$PHPMAILER_LANG['connect_host']         = 'Lỗi SMTP: Không thể kết nối máy chủ SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Lỗi SMTP: Dữ liệu không được chấp nhận.';
+$PHPMAILER_LANG['empty_message']        = 'Không có nội dung';
+$PHPMAILER_LANG['encoding']             = 'Mã hóa không xác định: ';
+$PHPMAILER_LANG['execute']              = 'Không thực hiện được: ';
+$PHPMAILER_LANG['file_access']          = 'Không thể truy cập tệp tin ';
+$PHPMAILER_LANG['file_open']            = 'Lỗi Tập tin: Không thể mở tệp tin: ';
+$PHPMAILER_LANG['from_failed']          = 'Lỗi địa chỉ gửi đi: ';
+$PHPMAILER_LANG['instantiate']          = 'Không dùng được các hàm gửi thư.';
+$PHPMAILER_LANG['invalid_address']      = '�ại chỉ emai không đúng: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' trình gửi thư không được hỗ trợ.';
+$PHPMAILER_LANG['provide_address']      = 'Bạn phải cung cấp ít nhất một địa chỉ ngư�i nhận.';
+$PHPMAILER_LANG['recipients_failed']    = 'Lỗi SMTP: lỗi địa chỉ ngư�i nhận: ';
+$PHPMAILER_LANG['signing']              = 'Lỗi đăng nhập: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Lỗi kết nối với SMTP';
+$PHPMAILER_LANG['smtp_error']           = 'Lỗi máy chủ smtp ';
+$PHPMAILER_LANG['variable_set']         = 'Không thể thiết lập hoặc thiết lập lại biến: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-zh.php b/lib/phpmailer/language/phpmailer.lang-zh.php
new file mode 100644
index 00000000..3e9e358c
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-zh.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Traditional Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author liqwei <liqwei@liqwei.com>
+ * @author Peter Dave Hello <@PeterDaveHello/>
+ * @author Jason Chiang <xcojad@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 錯誤：登入失敗。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 錯誤：無法連線到 SMTP 主機。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 錯誤：無法接�的資料。';
+$PHPMAILER_LANG['empty_message']        = '郵件內容為空';
+$PHPMAILER_LANG['encoding']             = '未知編碼: ';
+$PHPMAILER_LANG['execute']              = '無法執行：';
+$PHPMAILER_LANG['file_access']          = '無法存�檔案：';
+$PHPMAILER_LANG['file_open']            = '檔案錯誤：無法開啟檔案：';
+$PHPMAILER_LANG['from_failed']          = '發�地�錯誤：';
+$PHPMAILER_LANG['instantiate']          = '未知函數呼�。';
+$PHPMAILER_LANG['invalid_address']      = '因為電�郵件地�無效，無法傳�: ';
+$PHPMAILER_LANG['mailer_not_supported'] = '�支�的發信客戶端。';
+$PHPMAILER_LANG['provide_address']      = '必須�供至少一個收件人地�。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 錯誤：以下收件人地�錯誤：';
+$PHPMAILER_LANG['signing']              = '電�簽章錯誤: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP 連線失敗';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP 伺�器錯誤: ';
+$PHPMAILER_LANG['variable_set']         = '無法設定或�設變數: ';
+$PHPMAILER_LANG['extension_missing']    = '�失模組 Extension: ';
diff --git a/lib/phpmailer/language/phpmailer.lang-zh_cn.php b/lib/phpmailer/language/phpmailer.lang-zh_cn.php
new file mode 100644
index 00000000..37537802
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-zh_cn.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Simplified Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author liqwei <liqwei@liqwei.com>
+ * @author young <masxy@foxmail.com>
+ * @author Teddysun <i@teddysun.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：登录失败。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 错误：无法连接到 SMTP 主机。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误：数��被接�。';
+$PHPMAILER_LANG['empty_message']        = '邮件正文为空。';
+$PHPMAILER_LANG['encoding']             = '未知编�：';
+$PHPMAILER_LANG['execute']              = '无法执行：';
+$PHPMAILER_LANG['file_access']          = '无法访问文件：';
+$PHPMAILER_LANG['file_open']            = '文件错误：无法打开文件：';
+$PHPMAILER_LANG['from_failed']          = '��地�错误：';
+$PHPMAILER_LANG['instantiate']          = '未知函数调用。';
+$PHPMAILER_LANG['invalid_address']      = '��失败，电�邮箱地�是无效的：';
+$PHPMAILER_LANG['mailer_not_supported'] = '�信客户端�被支�。';
+$PHPMAILER_LANG['provide_address']      = '必须�供至少一个收件人地�。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误：收件人地�错误：';
+$PHPMAILER_LANG['signing']              = '登录失败：';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP�务器连接失败。';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP�务器出错：';
+$PHPMAILER_LANG['variable_set']         = '无法设置或�置��：';
+$PHPMAILER_LANG['extension_missing']    = '丢失模� Extension：';
diff --git a/lib/phpsniff/phpSniff.class.php b/lib/phpsniff/phpSniff.class.php
index 8a98b415..192fa53a 100644
--- a/lib/phpsniff/phpSniff.class.php
+++ b/lib/phpsniff/phpSniff.class.php
@@ -301,11 +301,11 @@ class phpSniff
      *  @return object phpSniff object
      */
     
-    function phpSniff($UA='',$settings = true)
-    {   //  populate the HTTP_USER_AGENT string
+    function __construct($UA='',$settings = true) {
+        //  populate the HTTP_USER_AGENT string
         //  20020425 :: rraymond
         //      routine for easier configuration of the client at runtime
-        if(is_array($settings)) {
+        if (is_array($settings)) {
             $run = true;
             extract($settings);
             $this->_check_cookies = $check_cookies;
@@ -317,10 +317,10 @@ function phpSniff($UA='',$settings = true)
         }
         
         // if the user agent is empty, see if it exists somewhere
-        if(empty($UA)) {
-            if(isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) {
+        if (empty($UA)) {
+            if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) {
                 $UA = $HTTP_SERVER_VARS['HTTP_USER_AGENT'];
-            } elseif(isset($_SERVER['HTTP_USER_AGENT'])) {
+            } elseif (isset($_SERVER['HTTP_USER_AGENT'])) {
                 $UA = $_SERVER['HTTP_USER_AGENT'];
             } else {
                 // try to use the getenv function as a last resort
@@ -329,10 +329,10 @@ function phpSniff($UA='',$settings = true)
         }
         
         // if it's still empty, just return false as there is nothing to do
-        if(empty($UA)) return false;
+        if (empty($UA)) return false;
         
-        $this->_set_browser('ua',$UA);
-        if($run) $this->init();
+        $this->_set_browser('ua', $UA);
+        if ($run) $this->init();
     }
 
     function init ()
@@ -753,10 +753,10 @@ function _get_ip ()
     /**
      *  @access private
      */
-    function _build_regex ()
-    {   $browsers = '';
-        while(list($k,) = each($this->_browsers))
-        {   if(!empty($browsers)) $browsers .= "|";
+    function _build_regex () {
+        $browsers = '';
+        foreach ($this->_browsers as $k => $v) {
+            if (!empty($browsers)) $browsers .= "|";
             $browsers .= $k;
         }
         $version_string = "[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?";
@@ -774,8 +774,8 @@ function _get_short_name ($long_name)
      *  @access private
      */
     // medianes :: new test cookie routine
-    function _test_cookies()
-    {   global $HTTP_COOKIE_VARS;
+    function _test_cookies() {
+        global $HTTP_COOKIE_VARS;
         $cookies = array();
         if(isset($_COOKIE)) {
             $cookies = $_COOKIE;
@@ -819,28 +819,28 @@ function _test_cookies()
     function _get_javascript()
     {   $set=false;
 		// see if we have any matches
-        while(list($version,$browser) = each($this->_javascript_versions))
-        {   $browser = explode(',',$browser);
-            while(list(,$search) = each($browser))
-            {   if($this->is('b:'.$search))
-                {   $this->_set_browser('javascript',$version);
+        foreach ($this->_javascript_versions as $version => $browser) {
+            $browser = explode(',',$browser);
+            foreach ($browser as $search) {
+                if($this->is('b:'.$search)) {
+                    $this->_set_browser('javascript',$version);
                     $set = true;
                     break;
                 }
             }
-        if($set) break;
+            if ($set) break;
         }
     }
 	
     /**
      *  @access private
      */
-	function _get_features ()
-	{	while(list($feature,$browser) = each($this->_browser_features))
-		{	$browser = explode(',',$browser);
-			while(list(,$search) = each($browser))
-			{	if($this->browser_is($search))
-				{	$this->_set_feature($feature);
+	function _get_features () {
+        foreach ($this->_browser_features as $feature => $browser) {
+            $browser = explode(',',$browser);
+            foreach ($browser as $search) {
+                if ($this->browser_is($search)) {
+                    $this->_set_feature($feature);
 					break;
 				}
 			}
@@ -850,12 +850,12 @@ function _get_features ()
     /**
      *  @access private
      */
-	function _get_quirks ()
-	{	while(list($quirk,$browser) = each($this->_browser_quirks))
-		{	$browser = explode(',',$browser);
-			while(list(,$search) = each($browser))
-			{	if($this->browser_is($search))
-				{	$this->_set_quirk($quirk);
+	function _get_quirks () {
+        foreach ($this->_browser_quirks as $quirk => $browser) {
+            $browser = explode(',',$browser);
+            foreach ($browser as $search) {
+                if($this->browser_is($search)) {
+                    $this->_set_quirk($quirk);
 					break;
 				}
 			}
@@ -865,9 +865,9 @@ function _get_quirks ()
     /**
      *  @access private
      */
-    function _get_gecko ()
-	{	if(preg_match('/gecko\/([0-9]+)/i',$this->property('ua'),$match))
-		{	$this->_set_browser('gecko',$match[1]);
+    function _get_gecko () {
+        if (preg_match('/gecko\/([0-9]+)/i',$this->property('ua'),$match)) {
+            $this->_set_browser('gecko',$match[1]);
             if (preg_match('/rv[: ]?([0-9a-z.+]+)/i',$this->property('ua'),$mozv)) {   
 				// mozilla release
 				$this->_set_browser('gecko_ver',$mozv[1]);
@@ -912,4 +912,4 @@ function _set_quirk ($k)
     {   $this->_quirks[strtolower($k)] = true;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/phpthumb/.gitattributes b/lib/phpthumb/.gitattributes
new file mode 100644
index 00000000..412eeda7
--- /dev/null
+++ b/lib/phpthumb/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/lib/phpthumb/.gitignore b/lib/phpthumb/.gitignore
new file mode 100644
index 00000000..565cebe6
--- /dev/null
+++ b/lib/phpthumb/.gitignore
@@ -0,0 +1,234 @@
+phpThumbCacheIMcommandlineBase.txt
+phpThumbCacheIMversion.txt
+phpThumbCacheStats.txt
+phpThumb.config.php
+cache/*
+*.bmp
+*.eps
+*.gif
+*.ico
+*.jpeg
+*.jpg
+*.pdf
+*.png
+*.tif
+*.tiff
+*.ttf
+*.wmf
+php_error.log
+
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
diff --git a/lib/phpthumb/README.md b/lib/phpthumb/README.md
new file mode 100644
index 00000000..9c6f88bb
--- /dev/null
+++ b/lib/phpthumb/README.md
@@ -0,0 +1,12 @@
+phpThumb
+========
+
+phpThumb() - The PHP thumbnail generator
+
+phpThumb() uses the GD library and/or ImageMagick to create thumbnails from images (GIF, PNG or JPEG) on the fly.
+The output size is configurable (can be larger or smaller than the source), and the source may be the entire
+image or only a portion of the original image. True color and resampling is used if GD v2.0+ is available,
+otherwise low-color and simple resizing is used. Source image can be a physical file on the server or can be
+retrieved from a database. GIFs are supported on all versions of GD even if GD does not have native GIF support
+thanks to the GIFutil class by Fabien Ezber. AntiHotlinking feature prevents other people from using your server
+to resize their thumbnails, or link to your images from another server. The cache feature reduces server load.
diff --git a/lib/phpthumb/composer.json b/lib/phpthumb/composer.json
new file mode 100644
index 00000000..5b84b243
--- /dev/null
+++ b/lib/phpthumb/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "james-heinrich/phpthumb",
+    "description": "The PHP thumbnail generator",
+    "type": "library",
+    "license": ["GPL-1.0-or-later", "LGPL-3.0-only", "MPL-2.0"],
+	"authors": [
+        {
+            "name": "James Heinrich",
+            "email": "info@silisoftware.com",
+            "homepage": "http://www.silisoftware.com/",
+            "role": "Developer"
+        }
+    ],
+    "keywords": ["thumbnail", "thumb", "GD", "ImageMagick", "image", "magic"],
+    "homepage": "http://phpthumb.sourceforge.net/",
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "suggest": {
+        "ext-gd": "PHP GD library",
+        "ext-imagick": "PHP ImageMagick"
+    },
+    "autoload": {
+        "files": [
+            "phpthumb.class.php"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/lib/phpthumb/fonts/readme.txt b/lib/phpthumb/fonts/readme.txt
new file mode 100644
index 00000000..2e5ef72d
--- /dev/null
+++ b/lib/phpthumb/fonts/readme.txt
@@ -0,0 +1,5 @@
+This is the default location for TTF fonts.
+
+You can safely delete or ignore this directory if you're not using
+TTF fonts for text watermarks. You can also specify an alternate
+directory in phpThumb.config.php
\ No newline at end of file
diff --git a/lib/phpthumb/images/readme.txt b/lib/phpthumb/images/readme.txt
new file mode 100644
index 00000000..26409657
--- /dev/null
+++ b/lib/phpthumb/images/readme.txt
@@ -0,0 +1,4 @@
+If you're looking for the demo images, they can be downloaded from
+the bottom of the phpThumb demo page on SourceForge:
+
+http://phpthumb.sourceforge.net/demo/demo/phpThumb.demo.demo.php
\ No newline at end of file
diff --git a/lib/phpthumb/index.php b/lib/phpthumb/index.php
new file mode 100644
index 00000000..8a666e02
--- /dev/null
+++ b/lib/phpthumb/index.php
@@ -0,0 +1,10 @@
+<?php
+if (!file_exists('phpThumb.config.php')) {
+	if (file_exists('phpThumb.config.php.default')) {
+		echo 'WARNING! "phpThumb.config.php.default" MUST be renamed to "phpThumb.config.php"';
+	} else {
+		echo 'WARNING! "phpThumb.config.php" should exist but does not';
+	}
+	exit;
+}
+header('Location: ./demo/');
diff --git a/lib/phpthumb/license.txt b/lib/phpthumb/license.txt
new file mode 100644
index 00000000..c2def251
--- /dev/null
+++ b/lib/phpthumb/license.txt
@@ -0,0 +1,29 @@
+//////////////////////////////////////////////////////////////
+//   phpThumb() by James Heinrich <info@silisoftware.com>   //
+//        available at http://phpthumb.sourceforge.net      //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
+//////////////////////////////////////////////////////////////
+
+*****************************************************************
+*****************************************************************
+
+   phpThumb is released under multiple licenses. You may choose
+   from the following licenses, and use getID3 according to the
+   terms of the license most suitable to your project.
+
+GNU GPL: https://gnu.org/licenses/gpl.html                   (v3)
+         https://gnu.org/licenses/old-licenses/gpl-2.0.html  (v2)
+         https://gnu.org/licenses/old-licenses/gpl-1.0.html  (v1)
+
+GNU LGPL: https://gnu.org/licenses/lgpl.html                 (v3)
+
+Mozilla MPL: https://www.mozilla.org/MPL/2.0/                (v2)
+
+phpThumb Commercial License (pTCL):
+http://phpthumb.sourceforge.net/#pTCL (payment required)
+
+*****************************************************************
+*****************************************************************
+
+Copies of each of the above licenses are included in the 'licenses'
+directory of the phpThumb distribution.
diff --git a/lib/phpthumb/licenses/license.gpl-10.txt b/lib/phpthumb/licenses/license.gpl-10.txt
new file mode 100644
index 00000000..8de98afa
--- /dev/null
+++ b/lib/phpthumb/licenses/license.gpl-10.txt
@@ -0,0 +1,251 @@
+
+                    GNU GENERAL PUBLIC LICENSE
+                     Version 1, February 1989
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+                    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The license agreements of most software companies try to keep users
+at the mercy of those companies.  By contrast, our General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  The
+General Public License applies to the Free Software Foundation's
+software and to any other program whose authors commit to using it.
+You can use it for your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Specifically, the General Public License is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of a such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must tell them their rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License.  The
+"Program", below, refers to any such program or work, and a "work based
+on the Program" means either the Program or any work containing the
+Program or a portion of it, either verbatim or with modifications.  Each
+licensee is addressed as "you".
+
+  1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this General Public License
+along with the Program.  You may charge a fee for the physical act of
+transferring a copy.
+
+  2. You may modify your copy or copies of the Program or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating that
+    you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish, that
+    in whole or in part contains the Program or any part thereof, either
+    with or without modifications, to be licensed at no charge to all
+    third parties under the terms of this General Public License (except
+    that you may choose to grant warranty protection to some or all
+    third parties, at your option).
+
+    c) If the modified program normally reads commands interactively when
+    run, you must cause it, when started running for such interactive use
+    in the simplest and most usual way, to print or display an
+    announcement including an appropriate copyright notice and a notice
+    that there is no warranty (or else, saying that you provide a
+    warranty) and that users may redistribute the program under these
+    conditions, and telling the user how to view a copy of this General
+    Public License.
+
+    d) You may charge a fee for the physical act of transferring a
+    copy, and you may at your option offer warranty protection in
+    exchange for a fee.
+
+Mere aggregation of another independent work with the Program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
+
+  3. You may copy and distribute the Program (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal charge
+    for the cost of distribution) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it.  For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+  4. You may not copy, modify, sublicense, distribute or transfer the
+Program except as expressly provided under this General Public License.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Program is void, and will automatically terminate your rights to use
+the Program under this License.  However, parties who have received
+copies, or rights to use copies, from you under this General Public
+License will not have their licenses terminated so long as such parties
+remain in full compliance.
+
+  5. By copying, distributing or modifying the Program (or any work based
+on the Program) you indicate your acceptance of this license to do so,
+and all its terms and conditions.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these
+terms and conditions.  You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
+
+  7. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of the license which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+the license, you may choose any version ever published by the Free Software
+Foundation.
+
+  8. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+        Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+  To do so, attach the following notices to the program.  It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19xx name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License.  Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  program `Gnomovision' (a program to direct compilers to make passes
+  at assemblers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/lib/phpthumb/licenses/license.gpl-20.txt b/lib/phpthumb/licenses/license.gpl-20.txt
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/lib/phpthumb/licenses/license.gpl-20.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/lib/phpthumb/licenses/license.gpl-30.txt b/lib/phpthumb/licenses/license.gpl-30.txt
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/lib/phpthumb/licenses/license.gpl-30.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/lib/phpthumb/licenses/license.lgpl-30.txt b/lib/phpthumb/licenses/license.lgpl-30.txt
new file mode 100644
index 00000000..65c5ca88
--- /dev/null
+++ b/lib/phpthumb/licenses/license.lgpl-30.txt
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/lib/phpthumb/licenses/license.mpl-20.txt b/lib/phpthumb/licenses/license.mpl-20.txt
new file mode 100644
index 00000000..14e2f777
--- /dev/null
+++ b/lib/phpthumb/licenses/license.mpl-20.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/lib/phpthumb/licenses/license.ptcl.txt b/lib/phpthumb/licenses/license.ptcl.txt
new file mode 100644
index 00000000..37c845d5
--- /dev/null
+++ b/lib/phpthumb/licenses/license.ptcl.txt
@@ -0,0 +1,27 @@
+                 phpThumb() Commercial License
+                 =============================
+
+phpThumb() is licensed under the "GNU Public License" (GPL) and/or the
+"phpThumb() Commercial License" (pTCL). This document describes the pTCL.
+
+---------------------------------------------------------------------
+
+The license is non-exclusively granted to a single person or company,
+per payment of the license fee, for the lifetime of that person or
+company. The license is non-transferrable.
+
+The pTCL grants the licensee the right to use phpThumb() in commercial
+closed-source projects. Modifications may be made to phpThumb() with no
+obligation to release the modified source code. phpThumb() (or pieces
+thereof) may be included in any number of projects authored (in whole
+or in part) by the licensee.
+
+The licensee may use any version of phpThumb(), past, present or future,
+as is most convenient. This license does not entitle the licensee to
+receive any technical support, updates or bugfixes, except as such are
+made publicly available to all phpThumb() users.
+
+The licensee may not sub-license phpThumb() itself, meaning that any
+commercially released product containing all or parts of phpThumb() must
+have added functionality beyond what is available in phpThumb();
+phpThumb() itself may not be re-licensed by the licensee.
diff --git a/lib/phpthumb/phpThumb.config.php.default b/lib/phpthumb/phpThumb.config.php.default
new file mode 100644
index 00000000..2f26aed3
--- /dev/null
+++ b/lib/phpthumb/phpThumb.config.php.default
@@ -0,0 +1,277 @@
+<?php
+//////////////////////////////////////////////////////////////
+//   phpThumb() by James Heinrich <info@silisoftware.com>   //
+//        available at http://phpthumb.sourceforge.net      //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
+//////////////////////////////////////////////////////////////
+///                                                         //
+// See: phpthumb.readme.txt for usage instructions          //
+//      NOTE: THIS FILE HAS NO EFFECT IN OBJECT MODE!       //
+//            THIS CONFIG FILE ONLY APPLIES TO phpThumb.php //
+//                                                         ///
+//////////////////////////////////////////////////////////////
+
+define('phpThumbConfigFileVersion', '1.7.16');
+ob_start();
+if (!class_exists('phpthumb_functions', false)) { // normally include_once should take care of this, but see https://github.com/JamesHeinrich/phpThumb/issues/94
+	if (!file_exists( __DIR__ .'/phpthumb.functions.php') || !include_once( __DIR__ .'/phpthumb.functions.php')) {
+		ob_end_flush();
+		die('failed to include_once(phpthumb.functions.php) - realpath="'.realpath( __DIR__ .'/phpthumb.functions.php').'"');
+	}
+}
+ob_end_clean();
+
+
+
+/****************************************************************************************/
+/* START USER CONFIGURATION SECTION: */
+global $PHPTHUMB_CONFIG;  // declare as global to prevent scope issues (when including phpThumb.config.php inside functions inside included files, etc)
+$PHPTHUMB_CONFIG = array();
+
+// * DocumentRoot configuration
+// phpThumb() depends on $_SERVER['DOCUMENT_ROOT'] to resolve path/filenames. This value is usually correct,
+// but has been known to be broken on some servers. This value allows you to override the default value.
+// Do not modify from the auto-detect default value unless you are having problems.
+//$PHPTHUMB_CONFIG['document_root'] = '/home/httpd/httpdocs';
+//$PHPTHUMB_CONFIG['document_root'] = 'c:\\webroot\\example.com\\www';
+//$PHPTHUMB_CONFIG['document_root'] = $_SERVER['DOCUMENT_ROOT'];
+//$PHPTHUMB_CONFIG['document_root'] = realpath((@$_SERVER['DOCUMENT_ROOT'] && file_exists(@$_SERVER['DOCUMENT_ROOT'].$_SERVER['PHP_SELF'])) ? $_SERVER['DOCUMENT_ROOT'] : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', realpath('.'))));
+$PHPTHUMB_CONFIG['document_root'] = realpath((getenv('DOCUMENT_ROOT') && preg_match('#^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))).'#', realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/',  __DIR__ )));
+
+
+// * Security configuration
+$PHPTHUMB_CONFIG['disable_debug']               = true;    // DO NOT DISABLE THIS ON ANY PUBLIC-ACCESSIBLE SERVER. Prevents phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled. If set to false (debug messages enabled) then debug mode will be FORCED -- ONLY debug output will be presented, no actual thumbnail (to avoid accidentally leaving debug mode enabled on a production server)
+$PHPTHUMB_CONFIG['high_security_enabled']       = true;    // DO NOT DISABLE THIS ON ANY PUBLIC-ACCESSIBLE SERVER. If disabled, your server is more vulnerable to hacking attempts, both on your server and via your server to other servers. When enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs
+$PHPTHUMB_CONFIG['high_security_password']      = '';      // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpthumb.functions.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password
+
+$PHPTHUMB_CONFIG['high_security_url_separator'] = '&';     // should almost always be left as '&'. Must be a single character. Do not change to '&amp;' -- htmlspecialchars wrapped around phpThumbURL() takes care of this without breaking the hash
+$PHPTHUMB_CONFIG['allow_src_above_docroot']     = false;   // if false (default) only allow src within document_root; if true, allow src to be anywhere in filesystem
+$PHPTHUMB_CONFIG['allow_src_above_phpthumb']    = true;    // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation
+$PHPTHUMB_CONFIG['auto_allow_symlinks']         = true;    // if true (default), allow symlink target directories without explicitly whitelisting them
+$PHPTHUMB_CONFIG['additional_allowed_dirs']     = array(); // array of additional directories to allow source images to be read from
+
+
+// * Cache directory configuration (choose only one of these - leave the other lines commented-out):
+// Note: this directory must be writable (usually chmod 777 is neccesary) for caching to work.
+// If the directory is not writable no error will be generated but caching will be disabled.
+$PHPTHUMB_CONFIG['cache_directory'] = __DIR__.DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR;                                                            // set the cache directory relative to the phpThumb() installation
+//$PHPTHUMB_CONFIG['cache_directory'] = $PHPTHUMB_CONFIG['document_root'].DIRECTORY_SEPARATOR.'phpthumb'.DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR; // set the cache directory to an absolute directory for all source images
+//$PHPTHUMB_CONFIG['cache_directory'] = '.'.DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR;                                                              // set the cache directory relative to the source image - must start with '.' (will not work to cache URL- or database-sourced images, please use an absolute directory name)
+//$PHPTHUMB_CONFIG['cache_directory'] = null;                                                                                                             // disable thumbnail caching (not recommended)
+//if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+//	$PHPTHUMB_CONFIG['cache_directory'] = __DIR__.DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR;                                                        // set the cache directory to an absolute directory for all source images
+//	$PHPTHUMB_CONFIG['cache_directory'] = '/tmp/persistent/phpthumb/cache/';
+//}
+
+$PHPTHUMB_CONFIG['cache_disable_warning'] = false; // If [cache_directory] is non-existant or not writable, and [cache_disable_warning] is false, an error image will be generated warning to either set the cache directory or disable the warning (to avoid people not knowing about the cache)
+$PHPTHUMB_CONFIG['cache_directory_depth'] = 2; // If this larger than zero, cache structure will be broken into a broad directory structure based on cache filename. For example "cache_src012345..." will be stored in "/0/01/012/0123/cache_src012345..." when (cache_directory_depth = 4). Caution: larger values can lead to an exponentially larger number of subdirectories which will also affect disk space due to (typically) 4kB used per directory entry: "2" gives a maximum of 16^2=256 subdirectories (up to 1MB wasted space), "3": 16^3=4096 subdirs (up to 16MB wasted), "4": 16^4=65536 subdirs (256MB wasted space), etc.
+
+// * Cache culling: phpThumb can automatically limit the contents of the cache directory
+//   based on last-access date and/or number of files and/or total filesize.
+
+//$PHPTHUMB_CONFIG['cache_maxage'] = null;            // never delete cached thumbnails based on last-access time
+$PHPTHUMB_CONFIG['cache_maxage'] = 86400 * 30;        // delete cached thumbnails that haven't been accessed in more than [30 days] (value is maximum time since last access in seconds to avoid deletion)
+
+//$PHPTHUMB_CONFIG['cache_maxsize'] = null;           // never delete cached thumbnails based on byte size of cache directory
+$PHPTHUMB_CONFIG['cache_maxsize'] = 10 * 1024 * 1024; // delete least-recently-accessed cached thumbnails when more than [10MB] of cached files are present (value is maximum bytesize of all cached files). Note: this only counts file size, does not count space "wasted" by directory entries in the cache structure -- see notes under $PHPTHUMB_CONFIG['cache_directory_depth']
+
+//$PHPTHUMB_CONFIG['cache_maxfiles'] = null;          // never delete cached thumbnails based on number of cached files
+$PHPTHUMB_CONFIG['cache_maxfiles'] = 200;             // delete least-recently-accessed cached thumbnails when more than [200] cached files are present (value is maximum number of cached files to keep)
+
+
+// * Source image cache configuration
+$PHPTHUMB_CONFIG['cache_source_enabled']   = false;                                                                                  // if true, source images obtained via HTTP are cached to $PHPTHUMB_CONFIG['cache_source_directory']
+$PHPTHUMB_CONFIG['cache_source_directory'] =  __DIR__.DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;  // set the cache directory for unprocessed source images
+
+// * cache source modification date configuration
+$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_local']  = false; // if true, local source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed
+$PHPTHUMB_CONFIG['cache_source_filemtime_ignore_remote'] = true;  // if true, remote source images will not be checked for modification date and cached image will be used if available, even if source image is changed or removed. WARNING: cached performance MUCH slower if this is set to false.
+
+
+// * Simplified cache filename configuration
+// Instead of creating unique cache filenames for all parameter combinations, create "simple" cache files (eg: "pic_thumb.jpg")
+// If cache_default_only_suffix is non-empty, GETstring parameters (except 'src') are ignored and only $PHPTHUMB_DEFAULTS
+// parameters (set at the bottom of phpThumb.config.php) are used for processing.
+// The '*' character MUST be used to represent the source image name
+$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '';           // cached in normal phpThumb manner
+//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb';  // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc)
+//$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*';  // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc)
+
+$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain
+//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache';                                                                                             // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server
+
+$PHPTHUMB_CONFIG['cache_force_passthru'] = true;  // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead
+
+
+
+// * Temp directory configuration
+// phpThumb() may need to create temp files. Usually the system temp dir is writable and can be used.
+// Leave this value as NULL in most cases. If you get errors about "failed to open <filename> for writing"
+// you should change this to a full pathname to a directory you do have write access to.
+//$PHPTHUMB_CONFIG['temp_directory'] = null;                               // attempt to auto-detect
+//$PHPTHUMB_CONFIG['temp_directory'] = '/tmp/persistent/phpthumb/cache/';  // set to absolute path
+$PHPTHUMB_CONFIG['temp_directory'] = $PHPTHUMB_CONFIG['cache_directory'];  // set to same as cache directory
+
+
+// ImageMagick configuration
+$PHPTHUMB_CONFIG['prefer_imagemagick']        = true;  // If true, use ImageMagick to resize thumbnails if possible, since it is usually faster than GD functions; if false only use ImageMagick if PHP memory limit is too low.
+$PHPTHUMB_CONFIG['imagemagick_use_thumbnail'] = true;  // If true, use ImageMagick's "-thumbnail" resizing parameter (if available) which removes extra non-image metadata (profiles, EXIF info, etc) resulting in much smaller filesize; if false, use "-resize" paramter which retains this info
+if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+	// Windows: set absolute pathname
+	$PHPTHUMB_CONFIG['imagemagick_path'] = 'C:/ImageMagick/convert.exe';
+} else {
+	// *nix: set absolute pathname to "convert", or leave as null if "convert" is in the path (location detected with `which`)
+	//$PHPTHUMB_CONFIG['imagemagick_path'] = '/usr/local/bin/convert';
+	$PHPTHUMB_CONFIG['imagemagick_path'] = null;
+}
+
+
+// NOTE: "max_source_pixels" only affects GD-resized thumbnails. If you have ImageMagick installed it will bypass most of these limits
+// maximum number of pixels in source image to attempt to process entire image in GD mode.
+// If this is zero then no limit on source image dimensions.
+// If this is nonzero then this is the maximum number of pixels the source image can have to be processed normally, otherwise the
+// embedded EXIF thumbnail will be used (if available) or an "image too large" notice will be displayed. This is to be used for large
+// source images (>2Mpx) and low PHP memory limits. If PHP runs out of memory the script will usually just die with no output.
+// To calculate this number, multiply the dimensions of the largest image you can process with your memory limitation (e.g. 1600 * 1200 = 1920000)
+// As a general guideline, this number will be about 20% of your PHP memory configuration, so 8M = 1,677,722; 16M = 3,355,443; 32M = 6,710,886; etc.
+if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=') && !defined('memory_get_usage') && !@ini_get('memory_limit')) {
+	// memory_get_usage() will only be defined if your PHP is compiled with the --enable-memory-limit configuration option.
+	$PHPTHUMB_CONFIG['max_source_pixels'] = 0;         // no memory limit
+} else {
+	// calculate default max_source_pixels as 1/6 of memory limit configuration
+	$PHPTHUMB_CONFIG['max_source_pixels'] = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 / 6);
+	//$PHPTHUMB_CONFIG['max_source_pixels'] = 0;       // no memory limit
+	//$PHPTHUMB_CONFIG['max_source_pixels'] = 1920000; // allow 1600x1200 images (2Mpx), no larger (about 12MB memory required)
+	//$PHPTHUMB_CONFIG['max_source_pixels'] = 2795000; // 16MB memory limit
+	//$PHPTHUMB_CONFIG['max_source_pixels'] = 3871488; // allow 2272x1704 images (4Mpx), no larger (about 24MB memory required)
+}
+
+
+// * Default output configuration:
+$PHPTHUMB_CONFIG['output_format']    = 'jpeg'; // default output format ('jpeg', 'png' or 'gif') - thumbnail will be output in this format (if available in your version of GD or ImageMagick). This is only used if the "f" parameter is not specified, and if the thumbnail can't be output in the input format.
+$PHPTHUMB_CONFIG['output_maxwidth']  = 0;      // default maximum thumbnail width.  If this is zero then default width  is the width  of the source image. This is always overridden by ?w=___ GETstring parameter
+$PHPTHUMB_CONFIG['output_maxheight'] = 0;      // default maximum thumbnail height. If this is zero then default height is the height of the source image. This is always overridden by ?h=___ GETstring parameter
+$PHPTHUMB_CONFIG['output_interlace'] = true;   // if true: interlaced output for GIF/PNG, progressive output for JPEG; if false: non-interlaced for GIF/PNG, baseline for JPEG.
+
+// * Error message configuration
+$PHPTHUMB_CONFIG['error_image_width']           = 400;      // default width for error images
+$PHPTHUMB_CONFIG['error_image_height']          = 100;      // default height for error images
+$PHPTHUMB_CONFIG['error_message_image_default'] = '';       // Set this to the name of a generic error image (e.g. '/images/error.png') that you want displayed in place of any error message that may occur. This setting is overridden by the 'err' parameter, which does the same thing.
+$PHPTHUMB_CONFIG['error_bgcolor']               = 'CCCCFF'; // background color of error message images
+$PHPTHUMB_CONFIG['error_textcolor']             = 'FF0000'; // color of text in error messages
+$PHPTHUMB_CONFIG['error_fontsize']              = 1;        // size of text in error messages, from 1 (smallest) to 5 (largest)
+$PHPTHUMB_CONFIG['error_die_on_error']          = true;     // die with error message on any fatal error (recommended with standalone phpThumb.php)
+$PHPTHUMB_CONFIG['error_silent_die_on_error']   = false;    // simply die with no output of any kind on fatal errors (not recommended)
+$PHPTHUMB_CONFIG['error_die_on_source_failure'] = true;     // die with error message if source image cannot be processed by phpThumb() (usually because source image is corrupt in some way). If false the source image will be passed through unprocessed, if true (default) an error message will be displayed.
+
+// * Off-server Thumbnailing Configuration:
+$PHPTHUMB_CONFIG['nohotlink_enabled']           = true;                                     // If false will allow thumbnailing from any source domain, if true then only domains in 'nohotlink_valid_domains' will be accepted
+$PHPTHUMB_CONFIG['nohotlink_valid_domains']     = array(@$_SERVER['HTTP_HOST']);            // This is the list of domains for which thumbnails are allowed to be created. Note: domain only, do not include port numbers. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format "www.example.com"
+$PHPTHUMB_CONFIG['nohotlink_erase_image']       = true;                                     // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
+$PHPTHUMB_CONFIG['nohotlink_text_message']      = 'Off-server thumbnailing is not allowed'; // text of error message
+
+// * Off-server Linking Configuration:
+$PHPTHUMB_CONFIG['nooffsitelink_enabled']       = true;                                       // If false will allow thumbnails to be linked to from any domain, if true only domains listed below in 'nooffsitelink_valid_domains' will be allowed.
+$PHPTHUMB_CONFIG['nooffsitelink_valid_domains'] = array(@$_SERVER['HTTP_HOST']);              // This is the list of domains for which thumbnails are allowed to be created. The default value of the current domain should be fine in most cases, but if neccesary you can add more domains in here, in the format 'www.example.com'
+$PHPTHUMB_CONFIG['nooffsitelink_require_refer'] = false;                                      // If false will allow standalone calls to phpThumb(). If true then only requests with a $_SERVER['HTTP_REFERER'] value in 'nooffsitelink_valid_domains' are allowed.
+$PHPTHUMB_CONFIG['nooffsitelink_erase_image']   = false;                                      // if true thumbnail is covered up with $PHPTHUMB_CONFIG['nohotlink_fill_color'] before text is applied, if false text is written over top of thumbnail
+$PHPTHUMB_CONFIG['nooffsitelink_watermark_src'] = '/demo/images/watermark.png';                // webroot-relative image to overlay on hotlinked images
+$PHPTHUMB_CONFIG['nooffsitelink_text_message']  = 'Image taken from '.@$_SERVER['HTTP_HOST']; // text of error message (used if [nooffsitelink_watermark_src] is not a valid image)
+
+
+// * Border & Background default colors
+$PHPTHUMB_CONFIG['border_hexcolor']     = '000000'; // Default border color - usual HTML-style hex color notation (overidden with 'bc' parameter)
+$PHPTHUMB_CONFIG['background_hexcolor'] = 'FFFFFF'; // Default background color when thumbnail aspect ratio does not match fixed-dimension box - usual HTML-style hex color notation (overridden with 'bg' parameter)
+
+// * Watermark configuration
+$PHPTHUMB_CONFIG['ttf_directory'] =  __DIR__ .DIRECTORY_SEPARATOR.'fonts'; // Base directory for TTF font files
+//$PHPTHUMB_CONFIG['ttf_directory'] = 'c:/windows/fonts';
+
+
+// * MySQL configuration
+// You may want to pull data from a database rather than a physical file
+// If so, modify the $PHPTHUMB_CONFIG['mysql_query'] line to suit your database structure
+// Note: the data retrieved must be the actual binary data of the image, not a URL or filename
+$PHPTHUMB_CONFIG['mysql_extension'] = 'mysqli'; // either "mysqli" or "mysql"
+
+$PHPTHUMB_CONFIG['mysql_query'] = '';
+//$PHPTHUMB_CONFIG['mysql_query'] = 'SELECT `picture` FROM `products` WHERE (`id` = \''.mysqli_real_escape_string(@$_GET['id']).'\')';
+
+// These 4 values must be modified if $PHPTHUMB_CONFIG['mysql_query'] is not empty, but may be ignored if $PHPTHUMB_CONFIG['mysql_query'] is blank.
+$PHPTHUMB_CONFIG['mysql_hostname'] = 'localhost';
+$PHPTHUMB_CONFIG['mysql_username'] = '';
+$PHPTHUMB_CONFIG['mysql_password'] = '';
+$PHPTHUMB_CONFIG['mysql_database'] = '';
+
+
+// * HTTP UserAgent configuration
+//$PHPTHUMB_CONFIG['http_user_agent'] = '';                                                                                        // PHP default: none
+//$PHPTHUMB_CONFIG['http_user_agent'] = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)';                                      // Windows XP, Internet Explorer
+//$PHPTHUMB_CONFIG['http_user_agent'] = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7'; // Windows XP, Firefox
+$PHPTHUMB_CONFIG['http_user_agent'] = @$_SERVER['HTTP_USER_AGENT'];                                                                // use client user-agent
+
+
+// * Compatability settings
+$PHPTHUMB_CONFIG['disable_pathinfo_parsing']        = true;   // if true, $_SERVER[PATH_INFO] is not parsed. May be needed on some server configurations to allow normal behavior.
+$PHPTHUMB_CONFIG['disable_imagecopyresampled']      = false;  // if true, imagecopyresampled is replaced with ImageCopyResampleBicubic. May be needed for buggy versions of PHP-GD.
+$PHPTHUMB_CONFIG['disable_onlycreateable_passthru'] = true;   // if true, any image that can be parsed by getimagesize() can be passed through; if false, only images that can be converted to GD by ImageCreateFrom(JPEG|GIF|PNG) functions are allowed
+$PHPTHUMB_CONFIG['disable_realpath']                = false;  // PHP realpath() function requires that "the running script must have executable permissions on all directories in the hierarchy, otherwise realpath() will return FALSE". Set config_disable_realpath=false to enable alternate filename-parsing that does not use realpath() function (but also does not resolve symbolic links)
+
+
+// * HTTP remote file opening settings
+$PHPTHUMB_CONFIG['http_fopen_timeout']              = 10;   // timeout (in seconds) for fopen / curl / fsockopen
+$PHPTHUMB_CONFIG['http_follow_redirect']            = true; // if true (default), follow "302 Found" redirects to new URL; if false, return error message
+
+
+// * Speed optimizations configuration
+$PHPTHUMB_CONFIG['allow_local_http_src']         = false; // If true, 'src' parameter can be "http://<thishostname>/path/image.ext" instead of just "/path/image.ext"; if false then display warning message to encourage more efficient local-filename calling.
+$PHPTHUMB_CONFIG['use_exif_thumbnail_for_speed'] = false; // If true, and EXIF thumbnail is available, and is larger or equal to output image dimensions, use EXIF thumbnail rather than actual source image for generating thumbnail. Benefit is only speed, avoiding resizing large image.
+
+/* END USER CONFIGURATION SECTION */
+
+
+
+
+/* START DEFAULT PARAMETERS SECTION */
+// If any parameters are constant across ALL images, you can set them here
+
+$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE = true;  // if true, any parameters in the URL will override the defaults set here; if false, any parameters set here cannot be overridden in the URL
+$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS  = false; // if true, GETstring parameters will be ignored (except for 'src') and only below default parameters will be used; if false, both default and GETstring parameters will be used (depending on $PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE). Will be auto-set true if !empty($PHPTHUMB_CONFIG['cache_default_only_suffix'])
+
+//$PHPTHUMB_DEFAULTS['w']    = 200;
+//$PHPTHUMB_DEFAULTS['fltr'] = array('blur|10');
+//$PHPTHUMB_DEFAULTS['q']    =  90;
+
+
+/* END DEFAULT PARAMETERS SECTION */
+
+
+
+//////////////////////////////////////////////////////////////////////////////
+// Function for generating hashed calls to phpThumb if 'high_security_enabled'
+// example:
+//   require_once('phpThumb/phpThumb.config.php');
+//   echo '<img src="'.htmlspecialchars(phpThumbURL('src=/images/pic.jpg&w=50', '/phpThumb/phpThumb.php')).'">';
+
+$GLOBALS['PHPTHUMB_CONFIG'] = $PHPTHUMB_CONFIG;
+function phpThumbURL($ParameterString, $path_to_phpThumb='phpThumb.php') {
+	global $PHPTHUMB_CONFIG;
+	if (is_array($ParameterString)) {
+		$ParameterStringArray = $ParameterString;
+	} else {
+		parse_str($ParameterString, $ParameterStringArray);
+	}
+	$ParamterStringEncodedArray = array();
+	foreach ($ParameterStringArray as $key => $value) {
+		if (is_array($value)) {
+			// e.g. fltr[] is passed as an array
+			foreach ($value as $subvalue) {
+				$ParamterStringEncodedArray[] = $key.'[]='.rawurlencode($subvalue);
+			}
+		} else {
+			$ParamterStringEncodedArray[] = $key.'='.rawurlencode($value);
+		}
+	}
+	$ParameterString = implode($PHPTHUMB_CONFIG['high_security_url_separator'], $ParamterStringEncodedArray);
+	return $path_to_phpThumb.'?'.$ParameterString.$PHPTHUMB_CONFIG['high_security_url_separator'].'hash='.md5($ParameterString.$PHPTHUMB_CONFIG['high_security_password']);
+}
diff --git a/lib/phpthumb/phpThumb.php b/lib/phpthumb/phpThumb.php
new file mode 100644
index 00000000..8e021995
--- /dev/null
+++ b/lib/phpthumb/phpThumb.php
@@ -0,0 +1,711 @@
+<?php
+//////////////////////////////////////////////////////////////
+//   phpThumb() by James Heinrich <info@silisoftware.com>   //
+//        available at http://phpthumb.sourceforge.net      //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
+//////////////////////////////////////////////////////////////
+///                                                         //
+// See: phpthumb.changelog.txt for recent changes           //
+// See: phpthumb.readme.txt for usage instructions          //
+//                                                         ///
+//////////////////////////////////////////////////////////////
+
+error_reporting(E_ALL);
+ini_set('display_errors', '1');
+
+// check for magic quotes in PHP < 7.4.0 (when these functions became deprecated)
+if (version_compare(PHP_VERSION, '7.4.0', '<')) {
+	ini_set('magic_quotes_runtime', '0');
+	if (ini_get('magic_quotes_runtime')) {
+		die('"magic_quotes_runtime" is set in php.ini, cannot run phpThumb with this enabled');
+	}
+}
+// Set a default timezone if web server has not done already in php.ini
+if (!ini_get('date.timezone') && function_exists('date_default_timezone_set')) { // PHP >= 5.1.0
+    date_default_timezone_set('UTC');
+}
+$starttime = array_sum(explode(' ', microtime())); // could be called as microtime(true) for PHP 5.0.0+
+
+// this script relies on the superglobal arrays, fake it here for old PHP versions
+if (PHP_VERSION < '4.1.0') {
+	$_SERVER = $HTTP_SERVER_VARS;
+	$_GET    = $HTTP_GET_VARS;
+}
+
+function SendSaveAsFileHeaderIfNeeded($getimagesize=false) {
+	if (headers_sent()) {
+		return false;
+	}
+	global $phpThumb;
+	$downloadfilename = phpthumb_functions::SanitizeFilename(!empty($_GET['sia']) ? $_GET['sia'] : (!empty($_GET['down']) ? $_GET['down'] : 'phpThumb_generated_thumbnail.'.(!empty($_GET['f']) ? $_GET['f'] : 'jpg')));
+	//if (empty($_GET['sia']) && empty($_GET['down']) && !empty($phpThumb->thumbnail_image_width) && !empty($phpThumb->thumbnail_image_height)) {
+	if (empty($_GET['sia']) && empty($_GET['down']) && !empty($getimagesize[0]) && !empty($getimagesize[1])) {
+		// if we know the output image dimensions we can generate a better default filename
+		$downloadfilename = phpthumb_functions::SanitizeFilename((!empty($phpThumb->src) ? basename($phpThumb->src) : md5($phpThumb->rawImageData)).'-'.intval($getimagesize[0]).'x'.intval($getimagesize[1]).'.'.(!empty($_GET['f']) ? $_GET['f'] : 'jpg'));
+	}
+	if (!empty($downloadfilename)) {
+		$phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
+		header('Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
+	}
+	return true;
+}
+
+function RedirectToCachedFile() {
+	global $phpThumb;
+
+	$nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename);
+	$nice_docroot   = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($phpThumb->config_document_root, '/\\'));
+
+	$parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
+
+	$nModified  = filemtime($phpThumb->cache_filename);
+
+	if ($phpThumb->config_nooffsitelink_enabled && !empty($_SERVER['HTTP_REFERER']) && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) {
+
+		$phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+
+	} elseif ($phpThumb->phpThumbDebug) {
+
+		$phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
+		$phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+		$phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
+		if ($getimagesize = @getimagesize($phpThumb->cache_filename)) {
+			$phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
+		}
+		if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+			$phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
+		} else {
+			$phpThumb->DebugMessage('* Would have sent data: file_get_contents('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
+		}
+
+	} else {
+
+		if (headers_sent()) {
+			$phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
+			exit;
+		}
+		$getimagesize = @getimagesize($phpThumb->cache_filename);
+		SendSaveAsFileHeaderIfNeeded($getimagesize);
+
+		header('Pragma: private');
+		header('Cache-Control: max-age='.$phpThumb->getParameter('config_cache_maxage'));
+		header('Expires: '.date(DATE_RFC1123,  time() + $phpThumb->getParameter('config_cache_maxage')));
+		if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && !empty($_SERVER['SERVER_PROTOCOL'])) {
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
+			header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
+			exit;
+		}
+		header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
+		header('ETag: "'.md5_file($phpThumb->cache_filename).'"');
+		if (!empty($getimagesize[2])) {
+			header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
+		} elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) {
+			header('Content-Type: image/x-icon');
+		}
+		header('Content-Length: '.filesize($phpThumb->cache_filename));
+		if (empty($phpThumb->config_cache_force_passthru) && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+			header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
+		} else {
+			echo file_get_contents($phpThumb->cache_filename);
+		}
+		exit;
+
+	}
+	return true;
+}
+
+
+
+// instantiate a new phpThumb() object
+ob_start();
+if (!include_once __DIR__ .'/phpthumb.class.php' ) {
+	ob_end_flush();
+	die('failed to include_once("'.realpath( __DIR__ .'/phpthumb.class.php').'")');
+}
+ob_end_clean();
+$phpThumb = new phpThumb();
+$phpThumb->DebugTimingMessage('phpThumb.php start', __FILE__, __LINE__, $starttime);
+$phpThumb->setParameter('config_error_die_on_error', true);
+
+if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
+	set_time_limit(60);  // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
+}
+
+// phpThumbDebug[0] used to be here, but may reveal too much
+// info when high_security_mode should be enabled (not set yet)
+
+if (file_exists( __DIR__ .'/phpThumb.config.php')) {
+	ob_start();
+	if (include_once __DIR__ .'/phpThumb.config.php' ) {
+		// great
+	} else {
+		ob_end_flush();
+		$phpThumb->config_disable_debug = false; // otherwise error message won't print
+		$phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
+	}
+	ob_end_clean();
+} elseif (file_exists( __DIR__ .'/phpThumb.config.php.default')) {
+	$phpThumb->config_disable_debug = false; // otherwise error message won't print
+	$phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
+} else {
+	$phpThumb->config_disable_debug = false; // otherwise error message won't print
+	$phpThumb->ErrorImage('failed to include_once('. __DIR__ .'/phpThumb.config.php) - realpath="'.realpath( __DIR__ .'/phpThumb.config.php').'"');
+}
+
+if (!empty($PHPTHUMB_CONFIG)) {
+	foreach ($PHPTHUMB_CONFIG as $key => $value) {
+		$keyname = 'config_'.$key;
+		$phpThumb->setParameter($keyname, $value);
+		if (!preg_match('#(password|mysql)#i', $key)) {
+			$phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
+		}
+	}
+	if (!$phpThumb->config_disable_debug) {
+		// if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
+		$_GET['phpThumbDebug'] = (!empty($_GET['phpThumbDebug']) ? max(1, (int) $_GET[ 'phpThumbDebug']) : 9);
+		$phpThumb->setParameter('phpThumbDebug', $_GET['phpThumbDebug']);
+	}
+} else {
+	$phpThumb->DebugMessage('$PHPTHUMB_CONFIG is empty', __FILE__, __LINE__);
+}
+
+if (empty($phpThumb->config_disable_pathinfo_parsing) && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) {
+	$_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']);
+
+	$args = explode(';', substr($_SERVER['PATH_INFO'], 1));
+	$phpThumb->DebugMessage('PATH_INFO.$args set to ('.implode(')(', $args).')', __FILE__, __LINE__);
+	if (!empty($args)) {
+		$_GET['src'] = @$args[count($args) - 1];
+		$phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__);
+		if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) {
+			unset($_GET['src']);
+			$_GET['new'] = $matches[1];
+		}
+	}
+	if (preg_match('#^([\d]*)x?([\d]*)$#i', @$args[count($args) - 2], $matches)) {
+		$_GET['w'] = $matches[1];
+		$_GET['h'] = $matches[2];
+		$phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__);
+	}
+	for ($i = 0; $i < count($args) - 2; $i++) {
+		@list($key, $value) = explode('=', @$args[$i]);
+		if (substr($key, -2) == '[]') {
+			$array_key_name = substr($key, 0, -2);
+			$_GET[$array_key_name][] = $value;
+			$phpThumb->DebugMessage('PATH_INFO."'.$array_key_name.'[]" = "'.$value.'"', __FILE__, __LINE__);
+		} else {
+			$_GET[$key] = $value;
+			$phpThumb->DebugMessage('PATH_INFO."'.$key.'" = "'.$value.'"', __FILE__, __LINE__);
+		}
+	}
+}
+
+if (!empty($phpThumb->config_high_security_enabled)) {
+	if (empty($_GET['hash'])) {
+		$phpThumb->config_disable_debug = false; // otherwise error message won't print
+		$phpThumb->ErrorImage('ERROR: missing hash');
+	} elseif (phpthumb_functions::PasswordStrength($phpThumb->config_high_security_password) < 20) {
+		$phpThumb->config_disable_debug = false; // otherwise error message won't print
+		$phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough');
+	} elseif ($_GET['hash'] != md5(str_replace($phpThumb->config_high_security_url_separator.'hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$phpThumb->config_high_security_password)) {
+		header('HTTP/1.0 403 Forbidden');
+		sleep(10); // deliberate delay to discourage password-guessing
+		$phpThumb->ErrorImage('ERROR: invalid hash');
+	}
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[0]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '0')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+// check for magic quotes in PHP < 7.4.0 (when these functions became deprecated)
+if (version_compare(PHP_VERSION, '7.4.0', '<')) {
+	// returned the fixed string if the evil "magic_quotes_gpc" setting is on
+	if (get_magic_quotes_gpc()) {
+		// deprecated: 'err', 'file', 'goto',
+		$RequestVarsToStripSlashes = array('src', 'wmf', 'down');
+		foreach ($RequestVarsToStripSlashes as $key) {
+			if (isset($_GET[$key])) {
+				if (is_string($_GET[$key])) {
+					$_GET[$key] = stripslashes($_GET[$key]);
+				} else {
+					unset($_GET[$key]);
+				}
+			}
+		}
+	}
+}
+
+if (empty($_SERVER['PATH_INFO']) && empty($_SERVER['QUERY_STRING'])) {
+	$phpThumb->config_disable_debug = false; // otherwise error message won't print
+	$phpThumb->ErrorImage('ERROR: no parameters specified');
+}
+
+if (!empty($_GET['src']) && isset($_GET['md5s']) && empty($_GET['md5s'])) {
+	$md5s = '';
+	if (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
+		if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
+			if ($rawImageData = phpthumb_functions::SafeURLread($_GET['src'], $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
+				$md5s = md5($rawImageData);
+			}
+		} else {
+			$phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+		}
+	} else {
+		$SourceFilename = $phpThumb->ResolveFilenameToAbsolute($_GET['src']);
+		if (is_readable($SourceFilename)) {
+			$md5s = phpthumb_functions::md5_file_safe($SourceFilename);
+		} else {
+			$phpThumb->ErrorImage('ERROR: "'.$SourceFilename.'" cannot be read');
+		}
+	}
+	if (!empty($_SERVER['HTTP_REFERER'])) {
+		$phpThumb->ErrorImage('&md5s='.$md5s);
+	} else {
+		die('&md5s='.$md5s);
+	}
+}
+
+if (!empty($_GET['src']) && empty($phpThumb->config_allow_local_http_src) && preg_match('#^http://'.@$_SERVER['HTTP_HOST'].'(.+)#i', $_GET['src'], $matches)) {
+	$phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[1]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '1')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+$parsed_url_referer = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
+if ($phpThumb->config_nooffsitelink_require_refer && !in_array(@$parsed_url_referer['host'], $phpThumb->config_nohotlink_valid_domains)) {
+	$phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists'));
+}
+$parsed_url_src = phpthumb_functions::ParseURLbetter(@$_GET['src']);
+if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image && preg_match('#^(f|ht)tps?://#i', @$_GET['src']) && !in_array(@$parsed_url_src['host'], $phpThumb->config_nohotlink_valid_domains)) {
+	$phpThumb->ErrorImage($phpThumb->config_nohotlink_text_message);
+}
+
+if ($phpThumb->config_mysql_query) {
+	if ($phpThumb->config_mysql_extension == 'mysqli') {
+
+		$found_missing_function = false;
+		foreach (array('mysqli_connect') as $required_mysqli_function) {
+			if (!function_exists($required_mysqli_function)) {
+				$found_missing_function = $required_mysqli_function;
+				break;
+			}
+		}
+		if ($found_missing_function) {
+			$phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
+		} else {
+			$mysqli = new mysqli($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password, $phpThumb->config_mysql_database);
+			if ($mysqli->connect_error) {
+				$phpThumb->ErrorImage('MySQLi connect error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
+			} else {
+				if ($result = $mysqli->query($phpThumb->config_mysql_query)) {
+					if ($row = $result->fetch_array()) {
+
+						$result->free();
+						$mysqli->close();
+						$phpThumb->setSourceData($row[0]);
+						unset($row);
+
+					} else {
+						$result->free();
+						$mysqli->close();
+						$phpThumb->ErrorImage('no matching data in database.');
+					}
+				} else {
+					$mysqli->close();
+					$phpThumb->ErrorImage('Error in MySQL query: "'.$mysqli->error.'"');
+				}
+			}
+			unset($_GET['id']);
+		}
+
+	} elseif ($phpThumb->config_mysql_extension == 'mysql') {
+
+		$found_missing_function = false;
+		//foreach (array('mysql_connect', 'mysql_select_db', 'mysql_query', 'mysql_fetch_array', 'mysql_free_result', 'mysql_close', 'mysql_error') as $required_mysql_function) {
+		foreach (array('mysql_connect') as $required_mysql_function) {
+			if (!function_exists($required_mysql_function)) {
+				$found_missing_function = $required_mysql_function;
+				break;
+			}
+		}
+		if ($found_missing_function) {
+			$phpThumb->ErrorImage('SQL function unavailable: '.$found_missing_function);
+		} else {
+			if ($cid = @mysql_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
+				if (@mysql_select_db($phpThumb->config_mysql_database, $cid)) {
+					if ($result = @mysql_query($phpThumb->config_mysql_query, $cid)) {
+						if ($row = @mysql_fetch_array($result)) {
+
+							mysql_free_result($result);
+							mysql_close($cid);
+							$phpThumb->setSourceData($row[0]);
+							unset($row);
+
+						} else {
+							mysql_free_result($result);
+							mysql_close($cid);
+							$phpThumb->ErrorImage('no matching data in database.');
+						}
+					} else {
+						mysql_close($cid);
+						$phpThumb->ErrorImage('Error in MySQL query: "'.mysql_error($cid).'"');
+					}
+				} else {
+					mysql_close($cid);
+					$phpThumb->ErrorImage('cannot select MySQL database: "'.mysql_error($cid).'"');
+				}
+			} else {
+				$phpThumb->ErrorImage('cannot connect to MySQL server');
+			}
+			unset($_GET['id']);
+		}
+
+	} else {
+		$phpThumb->ErrorImage('config_mysql_extension not supported');
+	}
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[2]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '2')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = (bool) ($phpThumb->config_cache_default_only_suffix && (strpos($phpThumb->config_cache_default_only_suffix, '*') !== false));
+
+// deprecated: 'err', 'file', 'goto',
+$allowedGETparameters = array('src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'ica', 'bc', 'bg', 'bgt', 'fltr', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down', 'phpThumbDebug', 'hash', 'md5s', 'sfn', 'dpi', 'sia', 'nocache');
+foreach ($_GET as $key => $value) {
+	if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ($key != 'src')) {
+		// disabled, do not set parameter
+		$phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
+	} elseif (in_array($key, $allowedGETparameters)) {
+		$phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
+		$phpThumb->setParameter($key, $value);
+	} else {
+		$phpThumb->ErrorImage('Forbidden parameter: '.$key);
+	}
+}
+
+if (!empty($PHPTHUMB_DEFAULTS) && is_array($PHPTHUMB_DEFAULTS)) {
+	$phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS['.implode(';', array_keys($PHPTHUMB_DEFAULTS)).']', __FILE__, __LINE__);
+	foreach ($PHPTHUMB_DEFAULTS as $key => $value) {
+		if (!$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE || !isset($_GET[$key])) { // set parameter to default value if config is set to allow _GET to override default, OR if no value is passed via _GET for this parameter
+			//$_GET[$key] = $value;
+			//$phpThumb->DebugMessage('PHPTHUMB_DEFAULTS assigning ('.(is_array($value) ? print_r($value, true) : $value).') to $_GET['.$key.']', __FILE__, __LINE__);
+			$phpThumb->setParameter($key, $value);
+			$phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).') from $PHPTHUMB_DEFAULTS', __FILE__, __LINE__);
+		}
+	}
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[3]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '3')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+//if (!@$_GET['phpThumbDebug'] && !is_file($phpThumb->sourceFilename) && !phpthumb_functions::gd_version()) {
+//	if (!headers_sent()) {
+//		// base64-encoded error image in GIF format
+//		$ERROR_NOGD = 'R0lGODlhIAAgALMAAAAAABQUFCQkJDY2NkZGRldXV2ZmZnJycoaGhpSUlKWlpbe3t8XFxdXV1eTk5P7+/iwAAAAAIAAgAAAE/vDJSau9WILtTAACUinDNijZtAHfCojS4W5H+qxD8xibIDE9h0OwWaRWDIljJSkUJYsN4bihMB8th3IToAKs1VtYM75cyV8sZ8vygtOE5yMKmGbO4jRdICQCjHdlZzwzNW4qZSQmKDaNjhUMBX4BBAlmMywFSRWEmAI6b5gAlhNxokGhooAIK5o/pi9vEw4Lfj4OLTAUpj6IabMtCwlSFw0DCKBoFqwAB04AjI54PyZ+yY3TD0ss2YcVmN/gvpcu4TOyFivWqYJlbAHPpOntvxNAACcmGHjZzAZqzSzcq5fNjxFmAFw9iFRunD1epU6tsIPmFCAJnWYE0FURk7wJDA0MTKpEzoWAAskiAAA7';
+//		header('Content-Type: image/gif');
+//		echo base64_decode($ERROR_NOGD);
+//	} else {
+//		echo '*** ERROR: No PHP-GD support available ***';
+//	}
+//	exit;
+//}
+
+// check to see if file can be output from source with no processing or caching
+$CanPassThroughDirectly = true;
+if ($phpThumb->rawImageData) {
+	// data from SQL, should be fine
+} elseif (preg_match('#^https?\\://[^\\?&]+\\.(jpe?g|gif|png|webp)$#i', $phpThumb->src)) {
+	// assume is ok to passthru if no other parameters specified
+} elseif (preg_match('#^(f|ht)tps?\\://#i', $phpThumb->src)) {
+	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tps?://#i", '.$phpThumb->src.')', __FILE__, __LINE__);
+	$CanPassThroughDirectly = false;
+} elseif (!@is_readable($phpThumb->sourceFilename)) {
+	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+	$CanPassThroughDirectly = false;
+} elseif (!@is_file($phpThumb->sourceFilename)) {
+	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+	$CanPassThroughDirectly = false;
+}
+foreach ($_GET as $key => $value) {
+	switch ($key) {
+		case 'src':
+			// allowed
+			break;
+
+		case 'w':
+		case 'h':
+			// might be OK if exactly matches original
+			if (preg_match('#^https?\\://[^\\?&]+\\.(jpe?g|gif|png|webp)$#i', $phpThumb->src)) {
+				// assume it is not ok for direct-passthru of remote image
+				$CanPassThroughDirectly = false;
+			}
+			break;
+
+		case 'phpThumbDebug':
+			// handled in direct-passthru code
+			break;
+
+		default:
+			// all other parameters will cause some processing,
+			// therefore cannot pass through original image unmodified
+			$CanPassThroughDirectly = false;
+			$UnAllowedGET[] = $key;
+			break;
+	}
+}
+if (!empty($UnAllowedGET)) {
+	$phpThumb->DebugMessage('$CanPassThroughDirectly=false because $_GET['.implode(';', array_unique($UnAllowedGET)).'] are set', __FILE__, __LINE__);
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[4]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '4')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+$phpThumb->DebugMessage('$CanPassThroughDirectly="'. (int) $CanPassThroughDirectly .'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__);
+while ($CanPassThroughDirectly && $phpThumb->src) {
+	// no parameters set, passthru
+
+	if (preg_match('#^https?\\://[^\\?&]+\.(jpe?g|gif|png|webp)$#i', $phpThumb->src)) {
+		$phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__);
+		header('Location: '.$phpThumb->src);
+		exit;
+	}
+
+	$SourceFilename = $phpThumb->ResolveFilenameToAbsolute($phpThumb->src);
+
+	// security and size checks
+	if ($phpThumb->getimagesizeinfo = @getimagesize($SourceFilename)) {
+		$phpThumb->DebugMessage('Direct passthru getimagesize() returned [w='.$phpThumb->getimagesizeinfo[0].';h='.$phpThumb->getimagesizeinfo[1].';t='.$phpThumb->getimagesizeinfo[2].']', __FILE__, __LINE__);
+
+		if (!@$_GET['w'] && !@$_GET['wp'] && !@$_GET['wl'] && !@$_GET['ws'] && !@$_GET['h'] && !@$_GET['hp'] && !@$_GET['hl'] && !@$_GET['hs']) {
+			// no resizing needed
+			$phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'")', __FILE__, __LINE__);
+		} elseif (($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) && ($phpThumb->getimagesizeinfo[1] <= @$_GET['h']) && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0]) || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
+			// image fits into 'w'x'h' box, and at least one dimension matches exactly, therefore no resizing needed
+			$phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" fits inside "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
+		} else {
+			$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because resizing required (from "'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" to "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
+			break;
+		}
+		switch ($phpThumb->getimagesizeinfo[2]) {
+			case  1: // GIF
+			case  2: // JPG
+			case  3: // PNG
+			case 18: // WEBP
+				// great, let it through
+				break;
+			default:
+				// browser probably can't handle format, remangle it to JPEG/PNG/GIF
+				$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because $phpThumb->getimagesizeinfo[2] = "'.$phpThumb->getimagesizeinfo[2].'"', __FILE__, __LINE__);
+				break 2;
+		}
+
+		$ImageCreateFunctions = array(1=>'imagecreatefromgif', 2=>'imagecreatefromjpeg', 3=>'imagecreatefrompng', 18=>'imagecreatefromwebp');
+		$theImageCreateFunction = @$ImageCreateFunctions[$phpThumb->getimagesizeinfo[2]];
+		$dummyImage = false;
+		if ($phpThumb->config_disable_onlycreateable_passthru || (function_exists($theImageCreateFunction) && ($dummyImage = @$theImageCreateFunction($SourceFilename)))) {
+
+			// great
+			if (@is_resource($dummyImage) || (@is_object($dummyImage) && $dummyImage instanceOf \GdImage)) {
+				unset($dummyImage);
+			}
+
+			if (headers_sent()) {
+				$phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
+				exit;
+			}
+			if (!empty($_GET['phpThumbDebug'])) {
+				$phpThumb->DebugTimingMessage('skipped direct $SourceFilename passthru', __FILE__, __LINE__);
+				$phpThumb->DebugMessage('Would have passed "'.$SourceFilename.'" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+				break;
+			}
+
+			SendSaveAsFileHeaderIfNeeded($phpThumb->getimagesizeinfo);
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s', @filemtime($SourceFilename)).' GMT');
+			if ($contentType = phpthumb_functions::ImageTypeToMIMEtype(@$phpThumb->getimagesizeinfo[2])) {
+				header('Content-Type: '.$contentType);
+			}
+			echo file_get_contents($SourceFilename);
+			exit;
+
+		} else {
+			$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because ($phpThumb->config_disable_onlycreateable_passthru = "'.$phpThumb->config_disable_onlycreateable_passthru.'") and '.$theImageCreateFunction.'() failed', __FILE__, __LINE__);
+			break;
+		}
+
+	} else {
+		$phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because getimagesize() failed', __FILE__, __LINE__);
+		break;
+	}
+	break;
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[5]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '5')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+// check to see if file already exists in cache, and output it with no processing if it does
+$phpThumb->SetCacheFilename();
+if (@is_readable($phpThumb->cache_filename)) {
+	RedirectToCachedFile();
+} else {
+	$phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__);
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[6]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '6')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+if ($phpThumb->rawImageData) {
+
+	// great
+
+} elseif (!empty($_GET['new'])) {
+
+	// generate a blank image resource of the specified size/background color/opacity
+	if (($phpThumb->w <= 0) || ($phpThumb->h <= 0)) {
+		$phpThumb->ErrorImage('"w" and "h" parameters required for "new"');
+	}
+	@list($bghexcolor, $opacity) = explode('|', $_GET['new']);
+	if (!phpthumb_functions::IsHexColor($bghexcolor)) {
+		$phpThumb->ErrorImage('BGcolor parameter for "new" is not valid');
+	}
+	$opacity = ('' !== $opacity ? $opacity : 100);
+	if ($phpThumb->gdimg_source = phpthumb_functions::ImageCreateFunction($phpThumb->w, $phpThumb->h)) {
+		$alpha = (100 - min(100, max(0, $opacity))) * 1.27;
+		if ($alpha) {
+			$phpThumb->setParameter('is_alpha', true);
+			imagealphablending($phpThumb->gdimg_source, false);
+			imagesavealpha($phpThumb->gdimg_source, true);
+		}
+		$new_background_color = phpthumb_functions::ImageHexColorAllocate($phpThumb->gdimg_source, $bghexcolor, false, $alpha);
+		imagefilledrectangle($phpThumb->gdimg_source, 0, 0, $phpThumb->w, $phpThumb->h, $new_background_color);
+	} else {
+		$phpThumb->ErrorImage('failed to create "new" image ('.$phpThumb->w.'x'.$phpThumb->h.')');
+	}
+
+} elseif (!$phpThumb->src) {
+
+	$phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details');
+
+} elseif (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
+
+	if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
+		$phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__);
+		if ($phpThumb->config_http_user_agent) {
+			$phpThumb->DebugMessage('Setting "user_agent" to "'.$phpThumb->config_http_user_agent.'"', __FILE__, __LINE__);
+			ini_set('user_agent', $phpThumb->config_http_user_agent);
+		}
+		$cleanedupurl = phpthumb_functions::CleanUpURLencoding($phpThumb->src);
+		$phpThumb->DebugMessage('CleanUpURLencoding('.$phpThumb->src.') returned "'.$cleanedupurl.'"', __FILE__, __LINE__);
+		$phpThumb->src = $cleanedupurl;
+		unset($cleanedupurl);
+		if ($rawImageData = phpthumb_functions::SafeURLread($phpThumb->src, $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
+			$phpThumb->DebugMessage('SafeURLread('.$phpThumb->src.') succeeded'.($error ? ' with messages: "'.$error.'"' : ''), __FILE__, __LINE__);
+			$phpThumb->DebugMessage('Setting source data from URL "'.$phpThumb->src.'"', __FILE__, __LINE__);
+			$phpThumb->setSourceData($rawImageData, urlencode($phpThumb->src));
+		} else {
+			$phpThumb->ErrorImage($error);
+		}
+	} else {
+		$phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+	}
+
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[7]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '7')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+$phpThumb->GenerateThumbnail();
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[8]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '8')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+if (!empty($phpThumb->config_high_security_enabled) && !empty($_GET['nocache'])) {
+
+	// cache disabled, don't write cachefile
+
+} else {
+
+	phpthumb_functions::EnsureDirectoryExists(dirname($phpThumb->cache_filename));
+	if (is_writable(dirname($phpThumb->cache_filename)) || (file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename))) {
+
+		$phpThumb->CleanUpCacheDirectory();
+		if ($phpThumb->RenderToFile($phpThumb->cache_filename) && is_readable($phpThumb->cache_filename)) {
+			chmod($phpThumb->cache_filename, 0644);
+			RedirectToCachedFile();
+		} else {
+			$phpThumb->DebugMessage('Failed: RenderToFile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
+		}
+
+	} else {
+
+		$phpThumb->DebugMessage('Cannot write to $phpThumb->cache_filename ('.$phpThumb->cache_filename.') because that directory ('.dirname($phpThumb->cache_filename).') is not writable', __FILE__, __LINE__);
+
+	}
+
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[9]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '9')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
+
+if (!$phpThumb->OutputThumbnail()) {
+	$phpThumb->ErrorImage('Error in OutputThumbnail():'."\n". $phpThumb->debugmessages[ count($phpThumb->debugmessages) - 1 ]);
+}
+
+////////////////////////////////////////////////////////////////
+// Debug output, to try and help me diagnose problems
+$phpThumb->DebugTimingMessage('phpThumbDebug[10]', __FILE__, __LINE__);
+if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '10')) {
+	$phpThumb->phpThumbDebug();
+}
+////////////////////////////////////////////////////////////////
diff --git a/lib/phpthumb/phpthumb.bmp.php b/lib/phpthumb/phpthumb.bmp.php
index 43c983c4..55a28a11 100644
--- a/lib/phpthumb/phpthumb.bmp.php
+++ b/lib/phpthumb/phpthumb.bmp.php
@@ -20,11 +20,7 @@
 
 class phpthumb_bmp {
 
-	function phpthumb_bmp() {
-		return true;
-	}
-
-	function phpthumb_bmp2gd(&$BMPdata, $truecolor=true) {
+	public function phpthumb_bmp2gd(&$BMPdata, $truecolor=true) {
 		$ThisFileInfo = array();
 		if ($this->getid3_bmp($BMPdata, $ThisFileInfo, true, true)) {
 			$gd = $this->PlotPixelsGD($ThisFileInfo['bmp'], $truecolor);
@@ -33,7 +29,7 @@ function phpthumb_bmp2gd(&$BMPdata, $truecolor=true) {
 		return false;
 	}
 
-	function phpthumb_bmpfile2gd($filename, $truecolor=true) {
+	public function phpthumb_bmpfile2gd($filename, $truecolor=true) {
 		if ($fp = @fopen($filename, 'rb')) {
 			$BMPdata = fread($fp, filesize($filename));
 			fclose($fp);
@@ -42,9 +38,9 @@ function phpthumb_bmpfile2gd($filename, $truecolor=true) {
 		return false;
 	}
 
-	function GD2BMPstring(&$gd_image) {
-		$imageX = ImageSX($gd_image);
-		$imageY = ImageSY($gd_image);
+	public function GD2BMPstring(&$gd_image) {
+		$imageX = imagesx($gd_image);
+		$imageY = imagesy($gd_image);
 
 		$BMP = '';
 		for ($y = ($imageY - 1); $y >= 0; $y--) {
@@ -83,13 +79,13 @@ function GD2BMPstring(&$gd_image) {
 		return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
 	}
 
-	function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractData=false) {
+	public function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractData=false) {
 
-	    // shortcuts
-	    $ThisFileInfo['bmp']['header']['raw'] = array();
-	    $thisfile_bmp                         = &$ThisFileInfo['bmp'];
-	    $thisfile_bmp_header                  = &$thisfile_bmp['header'];
-	    $thisfile_bmp_header_raw              = &$thisfile_bmp_header['raw'];
+		// shortcuts
+		$ThisFileInfo['bmp']['header']['raw'] = array();
+		$thisfile_bmp                         = &$ThisFileInfo['bmp'];
+		$thisfile_bmp_header                  = &$thisfile_bmp['header'];
+		$thisfile_bmp_header_raw              = &$thisfile_bmp_header['raw'];
 
 		// BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
 		// all versions
@@ -108,7 +104,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 		$offset += 2;
 
 		if ($thisfile_bmp_header_raw['identifier'] != 'BM') {
-			$ThisFileInfo['error'][] = 'Expecting "BM" at offset '.intval(@$ThisFileInfo['avdataoffset']).', found "'.$thisfile_bmp_header_raw['identifier'].'"';
+			$ThisFileInfo['error'][] = 'Expecting "BM" at offset '. (int) (@$ThisFileInfo[ 'avdataoffset']) .', found "'. $thisfile_bmp_header_raw[ 'identifier'].'"';
 			unset($ThisFileInfo['fileformat']);
 			unset($ThisFileInfo['bmp']);
 			return false;
@@ -252,9 +248,9 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 			// DWORD  biClrUsed;
 			// DWORD  biClrImportant;
 
-			$thisfile_bmp_header_raw['width']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4), true);
+			$thisfile_bmp_header_raw['width']            = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 			$offset += 4;
-			$thisfile_bmp_header_raw['height']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 4), true);
+			$thisfile_bmp_header_raw['height']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 			$offset += 4;
 			$thisfile_bmp_header_raw['planes']           = $this->LittleEndian2Int(substr($BMPheader, $offset, 2));
 			$offset += 2;
@@ -264,9 +260,9 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 			$offset += 4;
 			$thisfile_bmp_header_raw['bmp_data_size']    = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 			$offset += 4;
-			$thisfile_bmp_header_raw['resolution_h']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4), true);
+			$thisfile_bmp_header_raw['resolution_h']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 			$offset += 4;
-			$thisfile_bmp_header_raw['resolution_v']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4), true);
+			$thisfile_bmp_header_raw['resolution_v']     = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 			$offset += 4;
 			$thisfile_bmp_header_raw['colors_used']      = $this->LittleEndian2Int(substr($BMPheader, $offset, 4));
 			$offset += 4;
@@ -368,21 +364,21 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 					// BYTE    rgbGreen;
 					// BYTE    rgbRed;
 					// BYTE    rgbReserved;
-					$blue  = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
-					$green = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
-					$red   = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
+					$blue  = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
+					$green = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
+					$red   = $this->LittleEndian2Int($BMPpalette[ $paletteoffset++ ]);
 					if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) {
 						// no padding byte
 					} else {
 						$paletteoffset++; // padding byte
 					}
-					$thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | ($blue));
+					$thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | $blue);
 				}
 			}
 		}
 
 		if ($ExtractData) {
-			$RowByteLength = ceil(($thisfile_bmp_header_raw['width'] * ($thisfile_bmp_header_raw['bits_per_pixel'] / 8)) / 4) * 4; // round up to nearest DWORD boundry
+			$RowByteLength = ceil(($thisfile_bmp_header_raw['width'] * ($thisfile_bmp_header_raw['bits_per_pixel'] / 8)) / 4) * 4; // round up to nearest DWORD boundary
 
 			$BMPpixelData = substr($BMPdata, $thisfile_bmp_header_raw['data_offset'], $thisfile_bmp_header_raw['height'] * $RowByteLength);
 			$overalloffset = $thisfile_bmp_header_raw['data_offset'] + ($thisfile_bmp_header_raw['height'] * $RowByteLength);
@@ -395,7 +391,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 						case 1:
 							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
 								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-									$paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+									$paletteindexbyte = ord($BMPpixelData[$pixeldataoffset++]);
 									for ($i = 7; $i >= 0; $i--) {
 										$paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
 										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -412,7 +408,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 						case 4:
 							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
 								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-									$paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+									$paletteindexbyte = ord($BMPpixelData[$pixeldataoffset++]);
 									for ($i = 1; $i >= 0; $i--) {
 										$paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
 										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -429,7 +425,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 						case 8:
 							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
 								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$paletteindex = ord($BMPpixelData{$pixeldataoffset++});
+									$paletteindex = ord($BMPpixelData[$pixeldataoffset++]);
 									$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
 								}
 								while (($pixeldataoffset % 4) != 0) {
@@ -442,7 +438,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 						case 24:
 							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
 								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData[$pixeldataoffset+2]) << 16) | (ord($BMPpixelData[$pixeldataoffset+1]) << 8) | ord($BMPpixelData[$pixeldataoffset]);
 									$pixeldataoffset += 3;
 								}
 								while (($pixeldataoffset % 4) != 0) {
@@ -455,7 +451,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 						case 32:
 							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
 								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+3}) << 24) | (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData[$pixeldataoffset+3]) << 24) | (ord($BMPpixelData[$pixeldataoffset+2]) << 16) | (ord($BMPpixelData[$pixeldataoffset+1]) << 8) | ord($BMPpixelData[$pixeldataoffset]);
 									$pixeldataoffset += 4;
 								}
 								while (($pixeldataoffset % 4) != 0) {
@@ -481,8 +477,8 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 						case 8:
 							$pixelcounter = 0;
 							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-								$secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+								$secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
 								if ($firstbyte == 0) {
 
 									// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -503,8 +499,8 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 											// delta - The 2 bytes following the escape contain unsigned values
 											// indicating the horizontal and vertical offsets of the next pixel
 											// from the current position.
-											$colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-											$rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+											$colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+											$rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
 											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
 											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
 											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -516,7 +512,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 											// number of bytes that follow, each of which contains the color index
 											// of a single pixel. Each run must be aligned on a word boundary.
 											for ($i = 0; $i < $secondbyte; $i++) {
-												$paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+												$paletteindex = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
 												$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
 												$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
 												$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -557,8 +553,8 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 						case 4:
 							$pixelcounter = 0;
 							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-								$secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+								$firstbyte  = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+								$secondbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
 								if ($firstbyte == 0) {
 
 									// escaped/absolute mode - the first byte of the pair can be set to zero to
@@ -579,8 +575,8 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 											// delta - The 2 bytes following the escape contain unsigned values
 											// indicating the horizontal and vertical offsets of the next pixel
 											// from the current position.
-											$colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-											$rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+											$colincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
+											$rowincrement = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
 											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
 											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
 											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
@@ -591,9 +587,9 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 											// of color indexes that follow. Subsequent bytes contain color indexes in their
 											// high- and low-order 4 bits, one color index for each pixel. In absolute mode,
 											// each run must be aligned on a word boundary.
-											unset($paletteindexes);
-											for ($i = 0; $i < ceil($secondbyte / 2); $i++) {
-												$paletteindexbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+											$paletteindexes = array();
+											for ($i = 0, $iMax = ceil($secondbyte / 2); $i < $iMax; $i++) {
+												$paletteindexbyte = $this->LittleEndian2Int($BMPpixelData[ $pixeldataoffset++ ]);
 												$paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
 												$paletteindexes[] = ($paletteindexbyte & 0x0F);
 											}
@@ -625,7 +621,7 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 									for ($i = 0; $i < $firstbyte; $i++) {
 										$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
 										$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindexes[($i % 2)]];
+										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][ $paletteindexes[ $i % 2 ]];
 										$pixelcounter++;
 									}
 
@@ -665,10 +661,10 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 									$pixelvalue = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset, $thisfile_bmp_header_raw['bits_per_pixel'] / 8));
 									$pixeldataoffset += $thisfile_bmp_header_raw['bits_per_pixel'] / 8;
 
-									$red   = intval(round(((($pixelvalue & $thisfile_bmp_header_raw['red_mask'])   >> $redshift)   / ($thisfile_bmp_header_raw['red_mask']   >> $redshift))   * 255));
-									$green = intval(round(((($pixelvalue & $thisfile_bmp_header_raw['green_mask']) >> $greenshift) / ($thisfile_bmp_header_raw['green_mask'] >> $greenshift)) * 255));
-									$blue  = intval(round(((($pixelvalue & $thisfile_bmp_header_raw['blue_mask'])  >> $blueshift)  / ($thisfile_bmp_header_raw['blue_mask']  >> $blueshift))  * 255));
-									$thisfile_bmp['data'][$row][$col] = (($red << 16) | ($green << 8) | ($blue));
+									$red   = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'red_mask'])   >> $redshift)   / ($thisfile_bmp_header_raw[ 'red_mask']   >> $redshift))   * 255);
+									$green = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'green_mask']) >> $greenshift) / ($thisfile_bmp_header_raw[ 'green_mask'] >> $greenshift)) * 255);
+									$blue  = (int) round(((($pixelvalue & $thisfile_bmp_header_raw[ 'blue_mask'])  >> $blueshift)  / ($thisfile_bmp_header_raw[ 'blue_mask']  >> $blueshift))  * 255);
+									$thisfile_bmp['data'][$row][$col] = (($red << 16) | ($green << 8) | $blue);
 								}
 								while (($pixeldataoffset % 4) != 0) {
 									// lines are padded to nearest DWORD
@@ -693,43 +689,43 @@ function getid3_bmp(&$BMPdata, &$ThisFileInfo, $ExtractPalette=false, $ExtractDa
 		return true;
 	}
 
-	function IntColor2RGB($color) {
+	public function IntColor2RGB($color) {
 		$red   = ($color & 0x00FF0000) >> 16;
 		$green = ($color & 0x0000FF00) >> 8;
 		$blue  = ($color & 0x000000FF);
 		return array($red, $green, $blue);
 	}
 
-	function PlotPixelsGD(&$BMPdata, $truecolor=true) {
+	public function PlotPixelsGD(&$BMPdata, $truecolor=true) {
 		$imagewidth  = $BMPdata['header']['raw']['width'];
 		$imageheight = $BMPdata['header']['raw']['height'];
 
 		if ($truecolor) {
 
-			$gd = @ImageCreateTrueColor($imagewidth, $imageheight);
+			$gd = @imagecreatetruecolor($imagewidth, $imageheight);
 
 		} else {
 
-			$gd = @ImageCreate($imagewidth, $imageheight);
+			$gd = @imagecreate($imagewidth, $imageheight);
 			if (!empty($BMPdata['palette'])) {
 				// create GD palette from BMP palette
 				foreach ($BMPdata['palette'] as $dummy => $color) {
 					list($r, $g, $b) = $this->IntColor2RGB($color);
-					ImageColorAllocate($gd, $r, $g, $b);
+					imagecolorallocate($gd, $r, $g, $b);
 				}
 			} else {
 				// create 216-color websafe palette
 				for ($r = 0x00; $r <= 0xFF; $r += 0x33) {
 					for ($g = 0x00; $g <= 0xFF; $g += 0x33) {
 						for ($b = 0x00; $b <= 0xFF; $b += 0x33) {
-							ImageColorAllocate($gd, $r, $g, $b);
+							imagecolorallocate($gd, $r, $g, $b);
 						}
 					}
 				}
 			}
 
 		}
-		if (!is_resource($gd)) {
+		if (!is_resource($gd) && !(is_object($gd) && $gd instanceOf \GdImage)) {
 			return false;
 		}
 
@@ -740,40 +736,38 @@ function PlotPixelsGD(&$BMPdata, $truecolor=true) {
 			foreach ($colarray as $col => $color) {
 				list($red, $green, $blue) = $this->IntColor2RGB($color);
 				if ($truecolor) {
-					$pixelcolor = ImageColorAllocate($gd, $red, $green, $blue);
+					$pixelcolor = imagecolorallocate($gd, $red, $green, $blue);
 				} else {
-					$pixelcolor = ImageColorClosest($gd, $red, $green, $blue);
+					$pixelcolor = imagecolorclosest($gd, $red, $green, $blue);
 				}
-				ImageSetPixel($gd, $col, $row, $pixelcolor);
+				imagesetpixel($gd, $col, $row, $pixelcolor);
 			}
 		}
 		return $gd;
 	}
 
-	function PlotBMP(&$BMPinfo) {
+	public function PlotBMP(&$BMPinfo) {
 		$starttime = time();
 		if (!isset($BMPinfo['bmp']['data']) || !is_array($BMPinfo['bmp']['data'])) {
 			echo 'ERROR: no pixel data<BR>';
 			return false;
 		}
 		if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
-			set_time_limit(intval(round($BMPinfo['resolution_x'] * $BMPinfo['resolution_y'] / 10000)));
+			set_time_limit((int) round($BMPinfo[ 'resolution_x'] * $BMPinfo[ 'resolution_y'] / 10000));
 		}
 		$im = $this->PlotPixelsGD($BMPinfo['bmp']);
 		if (headers_sent()) {
 			echo 'plotted '.($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']).' pixels in '.(time() - $starttime).' seconds<BR>';
-			ImageDestroy($im);
+			imagedestroy($im);
 			exit;
-		} else {
-			header('Content-Type: image/png');
-			ImagePNG($im);
-			ImageDestroy($im);
-			return true;
 		}
-		return false;
+		header('Content-Type: image/png');
+		imagepng($im);
+		imagedestroy($im);
+		return true;
 	}
 
-	function BMPcompressionWindowsLookup($compressionid) {
+	public function BMPcompressionWindowsLookup($compressionid) {
 		static $BMPcompressionWindowsLookup = array(
 			0 => 'BI_RGB',
 			1 => 'BI_RLE8',
@@ -785,7 +779,7 @@ function BMPcompressionWindowsLookup($compressionid) {
 		return (isset($BMPcompressionWindowsLookup[$compressionid]) ? $BMPcompressionWindowsLookup[$compressionid] : 'invalid');
 	}
 
-	function BMPcompressionOS2Lookup($compressionid) {
+	public function BMPcompressionOS2Lookup($compressionid) {
 		static $BMPcompressionOS2Lookup = array(
 			0 => 'BI_RGB',
 			1 => 'BI_RLE8',
@@ -799,7 +793,7 @@ function BMPcompressionOS2Lookup($compressionid) {
 
 	// from getid3.lib.php
 
-	function trunc($floatnumber) {
+	public function trunc($floatnumber) {
 		// truncates a floating-point number at the decimal point
 		// returns int (if possible, otherwise float)
 		if ($floatnumber >= 1) {
@@ -815,50 +809,50 @@ function trunc($floatnumber) {
 		return $truncatednumber;
 	}
 
-	function LittleEndian2Int($byteword) {
+	public function LittleEndian2Int($byteword) {
 		$intvalue = 0;
 		$byteword = strrev($byteword);
 		$bytewordlen = strlen($byteword);
 		for ($i = 0; $i < $bytewordlen; $i++) {
-			$intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
+			$intvalue += ord($byteword[$i]) * pow(256, $bytewordlen - 1 - $i);
 		}
 		return $intvalue;
 	}
 
-	function BigEndian2Int($byteword) {
+	public function BigEndian2Int($byteword) {
 		return $this->LittleEndian2Int(strrev($byteword));
 	}
 
-	function BigEndian2Bin($byteword) {
+	public function BigEndian2Bin($byteword) {
 		$binvalue = '';
 		$bytewordlen = strlen($byteword);
 		for ($i = 0; $i < $bytewordlen; $i++) {
-			$binvalue .= str_pad(decbin(ord($byteword{$i})), 8, '0', STR_PAD_LEFT);
+			$binvalue .= str_pad(decbin(ord($byteword[$i])), 8, '0', STR_PAD_LEFT);
 		}
 		return $binvalue;
 	}
 
-	function FixedPoint2_30($rawdata) {
+	public function FixedPoint2_30($rawdata) {
 		$binarystring = $this->BigEndian2Bin($rawdata);
 		return $this->Bin2Dec(substr($binarystring, 0, 2)) + (float) ($this->Bin2Dec(substr($binarystring, 2, 30)) / 1073741824);
 	}
 
-	function Bin2Dec($binstring, $signed=false) {
+	public function Bin2Dec($binstring, $signed=false) {
 		$signmult = 1;
 		if ($signed) {
-			if ($binstring{0} == '1') {
+			if ($binstring[0] == '1') {
 				$signmult = -1;
 			}
 			$binstring = substr($binstring, 1);
 		}
 		$decvalue = 0;
-		for ($i = 0; $i < strlen($binstring); $i++) {
-			$decvalue += ((int) substr($binstring, strlen($binstring) - $i - 1, 1)) * pow(2, $i);
+		for ($i = 0, $iMax = strlen($binstring); $i < $iMax; $i++) {
+			$decvalue += ((int) $binstring[ strlen($binstring) - $i - 1 ]) * pow(2, $i);
 		}
 		return $this->CastAsInt($decvalue * $signmult);
 	}
 
-	function CastAsInt($floatnum) {
+	public function CastAsInt($floatnum) {
 		// convert to float if not already
 		$floatnum = (float) $floatnum;
 
@@ -874,5 +868,3 @@ function CastAsInt($floatnum) {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/phpthumb/phpthumb.class.php b/lib/phpthumb/phpthumb.class.php
index 076dd4d0..119d82d3 100644
--- a/lib/phpthumb/phpthumb.class.php
+++ b/lib/phpthumb/phpthumb.class.php
@@ -1,63 +1,69 @@
 <?php
 //////////////////////////////////////////////////////////////
-///  phpThumb() by James Heinrich <info@silisoftware.com>   //
-//        available at http://phpthumb.sourceforge.net     ///
+//   phpThumb() by James Heinrich <info@silisoftware.com>   //
+//        available at http://phpthumb.sourceforge.net      //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
 //////////////////////////////////////////////////////////////
 ///                                                         //
 // See: phpthumb.readme.txt for usage instructions          //
 //                                                         ///
 //////////////////////////////////////////////////////////////
 
-ob_start();
-if (!include_once(dirname(__FILE__).'/phpthumb.functions.php')) {
-	ob_end_flush();
-	die('failed to include_once("'.realpath(dirname(__FILE__).'/phpthumb.functions.php').'")');
+if (!class_exists('phpthumb_functions', false))
+{
+	ob_start();
+	if(!include_once __DIR__ . '/phpthumb.functions.php')
+	{
+		ob_end_flush();
+		die('failed to include_once("' . __DIR__ . '/phpthumb.functions.php")');
+	}
+	ob_end_clean();
 }
-ob_end_clean();
 
 class phpthumb {
 
 	// public:
 	// START PARAMETERS (for object mode and phpThumb.php)
 	// See phpthumb.readme.txt for descriptions of what each of these values are
-	var $src  = null;     // SouRCe filename
-	var $new  = null;     // NEW image (phpThumb.php only)
-	var $w    = null;     // Width
-	var $h    = null;     // Height
-	var $wp   = null;     // Width  (Portrait Images Only)
-	var $hp   = null;     // Height (Portrait Images Only)
-	var $wl   = null;     // Width  (Landscape Images Only)
-	var $hl   = null;     // Height (Landscape Images Only)
-	var $ws   = null;     // Width  (Square Images Only)
-	var $hs   = null;     // Height (Square Images Only)
-	var $f    = null;     // output image Format
-	var $q    = 75;       // jpeg output Quality
-	var $sx   = null;     // Source crop top-left X position
-	var $sy   = null;     // Source crop top-left Y position
-	var $sw   = null;     // Source crop Width
-	var $sh   = null;     // Source crop Height
-	var $zc   = null;     // Zoom Crop
-	var $bc   = null;     // Border Color
-	var $bg   = null;     // BackGround color
-	var $fltr = array();  // FiLTeRs
-	var $goto = null;     // GO TO url after processing
-	var $err  = null;     // default ERRor image filename
-	var $xto  = null;     // extract eXif Thumbnail Only
-	var $ra   = null;     // Rotate by Angle
-	var $ar   = null;     // Auto Rotate
-	var $aoe  = null;     // Allow Output Enlargement
-	var $far  = null;     // Fixed Aspect Ratio
-	var $iar  = null;     // Ignore Aspect Ratio
-	var $maxb = null;     // MAXimum Bytes
-	var $down = null;     // DOWNload thumbnail filename
-	var $md5s = null;     // MD5 hash of Source image
-	var $sfn  = 0;        // Source Frame Number
-	var $dpi  = 150;      // Dots Per Inch for vector source formats
-	var $sia  = null;     // Save Image As filename
-
-	var $file = null;     // >>>deprecated, DO NOT USE, will be removed in future versions<<<
-
-	var $phpThumbDebug = null;
+	public $src  = null;     // SouRCe filename
+	public $new  = null;     // NEW image (phpThumb.php only)
+	public $w    = null;     // Width
+	public $h    = null;     // Height
+	public $wp   = null;     // Width  (Portrait Images Only)
+	public $hp   = null;     // Height (Portrait Images Only)
+	public $wl   = null;     // Width  (Landscape Images Only)
+	public $hl   = null;     // Height (Landscape Images Only)
+	public $ws   = null;     // Width  (Square Images Only)
+	public $hs   = null;     // Height (Square Images Only)
+	public $f    = null;     // output image Format
+	public $q    = 75;       // jpeg output Quality
+	public $sx   = null;     // Source crop top-left X position
+	public $sy   = null;     // Source crop top-left Y position
+	public $sw   = null;     // Source crop Width
+	public $sh   = null;     // Source crop Height
+	public $zc   = null;     // Zoom Crop
+	public $ica  = null;     // Image Crop Auto
+	public $bc   = null;     // Border Color
+	public $bg   = null;     // BackGround color
+	public $fltr = array();  // FiLTeRs
+	public $goto = null;     // GO TO url after processing
+	public $err  = null;     // default ERRor image filename
+	public $xto  = null;     // extract eXif Thumbnail Only
+	public $ra   = null;     // Rotate by Angle
+	public $ar   = null;     // Auto Rotate
+	public $aoe  = null;     // Allow Output Enlargement
+	public $far  = null;     // Fixed Aspect Ratio
+	public $iar  = null;     // Ignore Aspect Ratio
+	public $maxb = null;     // MAXimum Bytes
+	public $down = null;     // DOWNload thumbnail filename
+	public $md5s = null;     // MD5 hash of Source image
+	public $sfn  = 0;        // Source Frame Number
+	public $dpi  = 150;      // Dots Per Inch for vector source formats
+	public $sia  = null;     // Save Image As filename
+
+	public $file = null;     // >>>deprecated, DO NOT USE, will be removed in future versions<<<
+
+	public $phpThumbDebug = null;
 	// END PARAMETERS
 
 
@@ -66,155 +72,181 @@ class phpthumb {
 	// See phpThumb.config.php for descriptions of what each of these settings do
 
 	// * Directory Configuration
-	var $config_cache_directory                      = null;
-	var $config_cache_directory_depth                = 0;
-	var $config_cache_disable_warning                = true;
-	var $config_cache_source_enabled                 = false;
-	var $config_cache_source_directory               = null;
-	var $config_temp_directory                       = null;
-	var $config_document_root                        = null;
+	public $config_cache_directory                      = null;
+	public $config_cache_directory_depth                = 0;
+	public $config_cache_disable_warning                = true;
+	public $config_cache_source_enabled                 = false;
+	public $config_cache_source_directory               = null;
+	public $config_temp_directory                       = null;
+	public $config_document_root                        = null;
 
 	// * Default output configuration:
-	var $config_output_format                        = 'jpeg';
-	var $config_output_maxwidth                      = 0;
-	var $config_output_maxheight                     = 0;
-	var $config_output_interlace                     = true;
+	public $config_output_format                        = 'jpeg';
+	public $config_output_maxwidth                      = 0;
+	public $config_output_maxheight                     = 0;
+	public $config_output_interlace                     = true;
 
 	// * Error message configuration
-	var $config_error_image_width                    = 400;
-	var $config_error_image_height                   = 100;
-	var $config_error_message_image_default          = '';
-	var $config_error_bgcolor                        = 'CCCCFF';
-	var $config_error_textcolor                      = 'FF0000';
-	var $config_error_fontsize                       = 1;
-	var $config_error_die_on_error                   = false;
-	var $config_error_silent_die_on_error            = false;
-	var $config_error_die_on_source_failure          = true;
+	public $config_error_image_width                    = 400;
+	public $config_error_image_height                   = 100;
+	public $config_error_message_image_default          = '';
+	public $config_error_bgcolor                        = 'CCCCFF';
+	public $config_error_textcolor                      = 'FF0000';
+	public $config_error_fontsize                       = 1;
+	public $config_error_die_on_error                   = false;
+	public $config_error_silent_die_on_error            = false;
+	public $config_error_die_on_source_failure          = true;
 
 	// * Anti-Hotlink Configuration:
-	var $config_nohotlink_enabled                    = true;
-	var $config_nohotlink_valid_domains              = array();
-	var $config_nohotlink_erase_image                = true;
-	var $config_nohotlink_text_message               = 'Off-server thumbnailing is not allowed';
+	public $config_nohotlink_enabled                    = true;
+	public $config_nohotlink_valid_domains              = array();
+	public $config_nohotlink_erase_image                = true;
+	public $config_nohotlink_text_message               = 'Off-server thumbnailing is not allowed';
 	// * Off-server Linking Configuration:
-	var $config_nooffsitelink_enabled                = false;
-	var $config_nooffsitelink_valid_domains          = array();
-	var $config_nooffsitelink_require_refer          = false;
-	var $config_nooffsitelink_erase_image            = true;
-	var $config_nooffsitelink_watermark_src          = '';
-	var $config_nooffsitelink_text_message           = 'Off-server linking is not allowed';
+	public $config_nooffsitelink_enabled                = false;
+	public $config_nooffsitelink_valid_domains          = array();
+	public $config_nooffsitelink_require_refer          = false;
+	public $config_nooffsitelink_erase_image            = true;
+	public $config_nooffsitelink_watermark_src          = '';
+	public $config_nooffsitelink_text_message           = 'Off-server linking is not allowed';
 
 	// * Border & Background default colors
-	var $config_border_hexcolor                      = '000000';
-	var $config_background_hexcolor                  = 'FFFFFF';
+	public $config_border_hexcolor                      = '000000';
+	public $config_background_hexcolor                  = 'FFFFFF';
 
 	// * TrueType Fonts
-	var $config_ttf_directory                        = './fonts';
+	public $config_ttf_directory                        = './fonts';
 
-	var $config_max_source_pixels                    = null;
-	var $config_use_exif_thumbnail_for_speed         = false;
-	var $allow_local_http_src                        = false;
+	public $config_max_source_pixels                    = null;
+	public $config_use_exif_thumbnail_for_speed         = false;
+	public $config_allow_local_http_src                 = false;
 
-	var $config_imagemagick_path                     = null;
-	var $config_prefer_imagemagick                   = true;
-	var $config_imagemagick_use_thumbnail            = true;
+	public $config_imagemagick_path                     = null;
+	public $config_prefer_imagemagick                   = true;
+	public $config_imagemagick_use_thumbnail            = true;
 
-	var $config_cache_maxage                         = null;
-	var $config_cache_maxsize                        = null;
-	var $config_cache_maxfiles                       = null;
-	var $config_cache_source_filemtime_ignore_local  = false;
-	var $config_cache_source_filemtime_ignore_remote = true;
-	var $config_cache_default_only_suffix            = false;
-	var $config_cache_force_passthru                 = true;
-	var $config_cache_prefix                         = '';    // default value set in the constructor below
+	public $config_cache_maxage                         = null;
+	public $config_cache_maxsize                        = null;
+	public $config_cache_maxfiles                       = null;
+	public $config_cache_source_filemtime_ignore_local  = false;
+	public $config_cache_source_filemtime_ignore_remote = true;
+	public $config_cache_default_only_suffix            = false;
+	public $config_cache_force_passthru                 = true;
+	public $config_cache_prefix                         = '';    // default value set in the constructor below
 
 	// * MySQL
-	var $config_mysql_query                          = null;
-	var $config_mysql_hostname                       = null;
-	var $config_mysql_username                       = null;
-	var $config_mysql_password                       = null;
-	var $config_mysql_database                       = null;
+	public $config_mysql_extension                      = null;
+	public $config_mysql_query                          = null;
+	public $config_mysql_hostname                       = null;
+	public $config_mysql_username                       = null;
+	public $config_mysql_password                       = null;
+	public $config_mysql_database                       = null;
 
 	// * Security
-	var $config_high_security_enabled                = false;
-	var $config_high_security_password               = null;
-	var $config_disable_debug                        = true;
-	var $config_allow_src_above_docroot              = false;
-	var $config_allow_src_above_phpthumb             = true;
+	public $config_high_security_enabled                = true;
+	public $config_high_security_password               = null;
+	public $config_high_security_url_separator          = '&';
+	public $config_disable_debug                        = true;
+	public $config_allow_src_above_docroot              = false;
+	public $config_allow_src_above_phpthumb             = true;
+	public $config_auto_allow_symlinks                  = true;    // allow symlink target directories without explicitly whitelisting them
+	public $config_additional_allowed_dirs              = array(); // additional directories to allow source images to be read from
+	public $config_file_create_mask                     = 0755;
+	public $config_dir_create_mask                      = 0755;
 
 	// * HTTP fopen
-	var $config_http_fopen_timeout                   = 10;
-	var $config_http_follow_redirect                 = true;
+	public $config_http_fopen_timeout                   = 10;
+	public $config_http_follow_redirect                 = true;
 
 	// * Compatability
-	var $config_disable_pathinfo_parsing             = false;
-	var $config_disable_imagecopyresampled           = false;
-	var $config_disable_onlycreateable_passthru      = false;
+	public $config_disable_pathinfo_parsing             = false;
+	public $config_disable_imagecopyresampled           = false;
+	public $config_disable_onlycreateable_passthru      = false;
+	public $config_disable_realpath                     = false;
 
-	var $config_http_user_agent                      = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7';
+	public $config_http_user_agent                      = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7';
 
 	// END CONFIGURATION OPTIONS
 
 
 	// public: error messages (read-only; persistant)
-	var $debugmessages = array();
-	var $debugtiming   = array();
-	var $fatalerror    = null;
+	public $debugmessages = array();
+	public $debugtiming   = array();
+	public $fatalerror    = null;
 
 
 	// private: (should not be modified directly)
-	var $thumbnailQuality = 75;
-	var $thumbnailFormat  = null;
+	public $thumbnailQuality = 75;
+	public $thumbnailFormat  = null;
 
-	var $sourceFilename   = null;
-	var $rawImageData     = null;
-	var $IMresizedData    = null;
-	var $outputImageData  = null;
+	public $sourceFilename   = null;
+	public $rawImageData     = null;
+	public $IMresizedData    = null;
+	public $outputImageData  = null;
 
-	var $useRawIMoutput   = false;
+	public $useRawIMoutput   = false;
 
-	var $gdimg_output     = null;
-	var $gdimg_source     = null;
+	public $gdimg_output     = null;
+	public $gdimg_source     = null;
 
-	var $getimagesizeinfo = null;
+	public $getimagesizeinfo = null;
 
-	var $source_width  = null;
-	var $source_height = null;
+	public $source_width  = null;
+	public $source_height = null;
 
-	var $thumbnailCropX = null;
-	var $thumbnailCropY = null;
-	var $thumbnailCropW = null;
-	var $thumbnailCropH = null;
+	public $thumbnailCropX = null;
+	public $thumbnailCropY = null;
+	public $thumbnailCropW = null;
+	public $thumbnailCropH = null;
 
-	var $exif_thumbnail_width  = null;
-	var $exif_thumbnail_height = null;
-	var $exif_thumbnail_type   = null;
-	var $exif_thumbnail_data   = null;
-	var $exif_raw_data         = null;
+	public $exif_thumbnail_width  = null;
+	public $exif_thumbnail_height = null;
+	public $exif_thumbnail_type   = null;
+	public $exif_thumbnail_data   = null;
+	public $exif_raw_data         = null;
 
-	var $thumbnail_width        = null;
-	var $thumbnail_height       = null;
-	var $thumbnail_image_width  = null;
-	var $thumbnail_image_height = null;
+	public $thumbnail_width        = null;
+	public $thumbnail_height       = null;
+	public $thumbnail_image_width  = null;
+	public $thumbnail_image_height = null;
 
-	var $tempFilesToDelete = array();
-	var $cache_filename    = null;
+	public $tempFilesToDelete = array();
+	public $cache_filename    = null;
 
-	var $AlphaCapableFormats = array('png', 'ico', 'gif');
-	var $is_alpha = false;
+	public $AlphaCapableFormats = array( 'png', 'ico', 'gif', 'webp');
+	public $is_alpha = false;
 
-	var $iswindows  = null;
-	var $issafemode = null;
+	public $iswindows        = null;
+	public $issafemode       = null;
+	public $php_memory_limit = null;
 
-	var $phpthumb_version = '1.7.11-201108081537';
+	public $phpthumb_version = '1.7.17-202109221111';
 
 	//////////////////////////////////////////////////////////////////////
 
 	// public: constructor
-	function phpThumb() {
+	public function __construct() {
+		$this->phpThumb();
+	}
+
+	public function phpThumb() {
 		$this->DebugTimingMessage('phpThumb() constructor', __FILE__, __LINE__);
 		$this->DebugMessage('phpThumb() v'.$this->phpthumb_version, __FILE__, __LINE__);
-		$this->config_max_source_pixels = round(max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576 * 0.20); // 20% of memory_limit
+
+		foreach (array(ini_get('memory_limit'), get_cfg_var('memory_limit')) as $php_config_memory_limit) {
+			if (!empty($php_config_memory_limit)) {
+				if (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'G') { // PHP memory limit expressed in Gigabytes
+					$php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1073741824;
+				} elseif (strtoupper($php_config_memory_limit[ strlen($php_config_memory_limit) - 1 ]) == 'M') { // PHP memory limit expressed in Megabytes
+					$php_config_memory_limit = (int) substr($php_config_memory_limit, 0, -1) * 1048576;
+				}
+				$this->php_memory_limit = max($this->php_memory_limit, $php_config_memory_limit);
+			}
+		}
+		if ($this->php_memory_limit > 0) { // could be "-1" for "no limit"
+			$this->config_max_source_pixels = round($this->php_memory_limit * 0.20); // 20% of memory_limit
+		}
+
 		$this->iswindows  = (bool) (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
 		$this->issafemode = (bool) preg_match('#(1|ON)#i', ini_get('safe_mode'));
 		$this->config_document_root = (!empty($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT']   : $this->config_document_root);
@@ -222,18 +254,23 @@ function phpThumb() {
 
 		$this->purgeTempFiles(); // purge existing temp files if re-initializing object
 
-		$php_sapi_name = strtolower(function_exists('php_sapi_name') ? php_sapi_name() : '');
+		$php_sapi_name = strtolower(function_exists('php_sapi_name') ? PHP_SAPI : '');
 		if ($php_sapi_name == 'cli') {
 			$this->config_allow_src_above_docroot = true;
 		}
+
+		if (!$this->config_disable_debug) {
+			// if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
+			$this->phpThumbDebug = (null === $this->phpThumbDebug ? 9 : max(1, (int) $this->phpThumbDebug));
+		}
 	}
 
-	function __destruct() {
+	public function __destruct() {
 		$this->purgeTempFiles();
 	}
 
 	// public:
-	function purgeTempFiles() {
+	public function purgeTempFiles() {
 		foreach ($this->tempFilesToDelete as $tempFileToDelete) {
 			if (file_exists($tempFileToDelete)) {
 				$this->DebugMessage('Deleting temp file "'.$tempFileToDelete.'"', __FILE__, __LINE__);
@@ -245,12 +282,12 @@ function purgeTempFiles() {
 	}
 
 	// public:
-	function setSourceFilename($sourceFilename) {
+	public function setSourceFilename($sourceFilename) {
 		//$this->resetObject();
 		//$this->rawImageData   = null;
 		$this->sourceFilename = $sourceFilename;
 		$this->src            = $sourceFilename;
-		if (is_null($this->config_output_format)) {
+		if (null === $this->config_output_format) {
 			$sourceFileExtension = strtolower(substr(strrchr($sourceFilename, '.'), 1));
 			if (preg_match('#^[a-z]{3,4}$#', $sourceFileExtension)) {
 				$this->config_output_format = $sourceFileExtension;
@@ -264,7 +301,7 @@ function setSourceFilename($sourceFilename) {
 	}
 
 	// public:
-	function setSourceData($rawImageData, $sourceFilename='') {
+	public function setSourceData($rawImageData, $sourceFilename='') {
 		//$this->resetObject();
 		//$this->sourceFilename = null;
 		$this->rawImageData   = $rawImageData;
@@ -288,14 +325,14 @@ function setSourceData($rawImageData, $sourceFilename='') {
 	}
 
 	// public:
-	function setSourceImageResource($gdimg) {
+	public function setSourceImageResource($gdimg) {
 		//$this->resetObject();
 		$this->gdimg_source = $gdimg;
 		return true;
 	}
 
 	// public:
-	function setParameter($param, $value) {
+	public function setParameter($param, $value) {
 		if ($param == 'src') {
 			$this->setSourceFilename($this->ResolveFilenameToAbsolute($value));
 		} elseif (@is_array($this->$param)) {
@@ -313,7 +350,7 @@ function setParameter($param, $value) {
 	}
 
 	// public:
-	function getParameter($param) {
+	public function getParameter($param) {
 		//if (property_exists('phpThumb', $param)) {
 			return $this->$param;
 		//}
@@ -323,7 +360,7 @@ function getParameter($param) {
 
 
 	// public:
-	function GenerateThumbnail() {
+	public function GenerateThumbnail() {
 
 		$this->setOutputFormat();
 			$this->phpThumbDebug('8a');
@@ -343,40 +380,27 @@ function GenerateThumbnail() {
 			return false;
 		}
 			$this->phpThumbDebug('8f');
+		$this->ImageCropAuto();
+			$this->phpThumbDebug('8h');
 		$this->Rotate();
-			$this->phpThumbDebug('8g');
-		$this->CreateGDoutput();
 			$this->phpThumbDebug('8h');
+		$this->CreateGDoutput();
+			$this->phpThumbDebug('8i');
 
-		switch ($this->far) {
-			case 'L':
-			case 'TL':
-			case 'BL':
-				$destination_offset_x = 0;
-				$destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2);
-				break;
-			case 'R':
-			case 'TR':
-			case 'BR':
-				$destination_offset_x =  round($this->thumbnail_width  - $this->thumbnail_image_width);
-				$destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2);
-				break;
-			case 'T':
-			case 'TL':
-			case 'TR':
-				$destination_offset_x = round(($this->thumbnail_width  - $this->thumbnail_image_width)  / 2);
-				$destination_offset_y = 0;
-				break;
-			case 'B':
-			case 'BL':
-			case 'BR':
-				$destination_offset_x = round(($this->thumbnail_width  - $this->thumbnail_image_width)  / 2);
-				$destination_offset_y =  round($this->thumbnail_height - $this->thumbnail_image_height);
-				break;
-			case 'C':
-			default:
-				$destination_offset_x = round(($this->thumbnail_width  - $this->thumbnail_image_width)  / 2);
-				$destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2);
+		// default values, also applicable for far="C"
+		$destination_offset_x = round(($this->thumbnail_width  - $this->thumbnail_image_width)  / 2);
+		$destination_offset_y = round(($this->thumbnail_height - $this->thumbnail_image_height) / 2);
+		if (($this->far == 'L') || ($this->far == 'TL') || ($this->far == 'BL')) {
+			$destination_offset_x = 0;
+		}
+		if (($this->far == 'R') || ($this->far == 'TR') || ($this->far == 'BR')) {
+			$destination_offset_x =  round($this->thumbnail_width  - $this->thumbnail_image_width);
+		}
+		if (($this->far == 'T') || ($this->far == 'TL') || ($this->far == 'TR')) {
+			$destination_offset_y = 0;
+		}
+		if (($this->far == 'B') || ($this->far == 'BL') || ($this->far == 'BR')) {
+			$destination_offset_y =  round($this->thumbnail_height - $this->thumbnail_image_height);
 		}
 
 //		// copy/resize image to appropriate dimensions
@@ -407,8 +431,8 @@ function GenerateThumbnail() {
 		);
 
 		$this->DebugMessage('memory_get_usage() after copy-resize = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
-		ImageDestroy($this->gdimg_source);
-		$this->DebugMessage('memory_get_usage() after ImageDestroy = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
+		imagedestroy($this->gdimg_source);
+		$this->DebugMessage('memory_get_usage() after imagedestroy = '.(function_exists('memory_get_usage') ? @memory_get_usage() : 'n/a'), __FILE__, __LINE__);
 
 			$this->phpThumbDebug('8i');
 		$this->AntiOffsiteLinking();
@@ -426,8 +450,8 @@ function GenerateThumbnail() {
 
 
 	// public:
-	function RenderOutput() {
-		if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) {
+	public function RenderOutput() {
+		if (!$this->useRawIMoutput && !(is_resource($this->gdimg_output) || (is_object($this->gdimg_source) && $this->gdimg_source instanceOf \GdImage))) {
 			$this->DebugMessage('RenderOutput() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__);
 			return false;
 		}
@@ -442,61 +466,106 @@ function RenderOutput() {
 		}
 
 		$builtin_formats = array();
-		if (function_exists('ImageTypes')) {
-			$imagetypes = ImageTypes();
+		if (function_exists('imagetypes')) {
+			$imagetypes = imagetypes();
 			$builtin_formats['wbmp'] = (bool) ($imagetypes & IMG_WBMP);
 			$builtin_formats['jpg']  = (bool) ($imagetypes & IMG_JPG);
 			$builtin_formats['gif']  = (bool) ($imagetypes & IMG_GIF);
 			$builtin_formats['png']  = (bool) ($imagetypes & IMG_PNG);
+			if (defined('IMG_WEBP')) {
+				$builtin_formats['webp'] = (bool) ($imagetypes & IMG_WEBP); // PHP 5.6.25, 7.0.10
+			}
+			if (defined('IMG_BMP')) {
+				$builtin_formats['bmp']  = (bool) ($imagetypes & IMG_BMP);  // PHP 7.2.0
+			}
 		}
-		$this->DebugMessage('RenderOutput() attempting Image'.strtoupper(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__);
+
+		$this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
+		imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
+
+		$this->DebugMessage('RenderOutput() attempting image'.strtolower(@$this->thumbnailFormat).'($this->gdimg_output)', __FILE__, __LINE__);
 		ob_start();
 		switch ($this->thumbnailFormat) {
 			case 'wbmp':
-				if (!@$builtin_formats['wbmp']) {
+				if (empty($builtin_formats['wbmp'])) {
 					$this->DebugMessage('GD does not have required built-in support for WBMP output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
-				ImageJPEG($this->gdimg_output, null, $this->thumbnailQuality);
+				imagewbmp($this->gdimg_output, null, $this->thumbnailQuality);
 				$this->outputImageData = ob_get_contents();
 				break;
 
 			case 'jpeg':
 			case 'jpg':  // should be "jpeg" not "jpg" but just in case...
-				if (!@$builtin_formats['jpg']) {
+				if (empty($builtin_formats['jpg'])) {
 					$this->DebugMessage('GD does not have required built-in support for JPEG output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
-				ImageJPEG($this->gdimg_output, null, $this->thumbnailQuality);
+				imagejpeg($this->gdimg_output, null, $this->thumbnailQuality);
 				$this->outputImageData = ob_get_contents();
 				break;
 
 			case 'png':
-				if (!@$builtin_formats['png']) {
+				if (empty($builtin_formats['png'])) {
 					$this->DebugMessage('GD does not have required built-in support for PNG output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
-				ImagePNG($this->gdimg_output);
+				if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.1.2', '>=')) {
+					// https://github.com/JamesHeinrich/phpThumb/issues/24
+
+					/* http://php.net/manual/en/function.imagepng.php:
+					from php source (gd.h):
+					2.0.12: Compression level: 0-9 or -1, where 0 is NO COMPRESSION at all,
+					:: 1 is FASTEST but produces larger files, 9 provides the best
+					:: compression (smallest files) but takes a long time to compress, and
+					:: -1 selects the default compiled into the zlib library.
+					Conclusion: Based on the Zlib manual (http://www.zlib.net/manual.html) the default compression level is set to 6.
+					*/
+					if (($this->thumbnailQuality >= -1) && ($this->thumbnailQuality <= 9)) {
+						$PNGquality = $this->thumbnailQuality;
+					} else {
+						$this->DebugMessage('Specified thumbnailQuality "'.$this->thumbnailQuality.'" is outside the accepted range (0-9, or -1). Using 6 as default value.', __FILE__, __LINE__);
+						$PNGquality = 6;
+					}
+					imagepng($this->gdimg_output, null, $PNGquality);
+				} else {
+					imagepng($this->gdimg_output);
+				}
 				$this->outputImageData = ob_get_contents();
 				break;
 
 			case 'gif':
-				if (!@$builtin_formats['gif']) {
+				if (empty($builtin_formats['gif'])) {
 					$this->DebugMessage('GD does not have required built-in support for GIF output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
-				ImageGIF($this->gdimg_output);
+				imagegif($this->gdimg_output);
+				$this->outputImageData = ob_get_contents();
+				break;
+
+			case 'webp':
+				if (empty($builtin_formats['webp'])) {
+					$this->DebugMessage('GD does not have required built-in support for WebP output', __FILE__, __LINE__);
+					ob_end_clean();
+					return false;
+				}
+				imagewebp($this->gdimg_output, null, $this->thumbnailQuality);
 				$this->outputImageData = ob_get_contents();
 				break;
 
 			case 'bmp':
-				$ImageOutFunction = '"builtin BMP output"';
-				if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) {
-					$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+				if (!empty($builtin_formats['bmp'])) {
+					imagebmp($this->gdimg_output);
+					$this->outputImageData = ob_get_contents();
+					break;
+				}
+				$this->DebugMessage('GD does not have required built-in support for BMP output', __FILE__, __LINE__);
+				if (!@include_once __DIR__ .'/phpthumb.bmp.php' ) {
+					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
@@ -506,9 +575,8 @@ function RenderOutput() {
 				break;
 
 			case 'ico':
-				$ImageOutFunction = '"builtin ICO output"';
-				if (!@include_once(dirname(__FILE__).'/phpthumb.ico.php')) {
-					$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+				if (!@include_once __DIR__ .'/phpthumb.ico.php' ) {
+					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
 					ob_end_clean();
 					return false;
 				}
@@ -535,15 +603,15 @@ function RenderOutput() {
 
 
 	// public:
-	function RenderToFile($filename) {
-		if (preg_match('#^(f|ht)tps?\://#i', $filename)) {
+	public function RenderToFile($filename) {
+		if (preg_match('#^[a-z0-9]+://#i', $filename)) {
 			$this->DebugMessage('RenderToFile() failed because $filename ('.$filename.') is a URL', __FILE__, __LINE__);
 			return false;
 		}
 		// render thumbnail to this file only, do not cache, do not output to browser
 		//$renderfilename = $this->ResolveFilenameToAbsolute(dirname($filename)).DIRECTORY_SEPARATOR.basename($filename);
 		$renderfilename = $filename;
-		if (($filename{0} != '/') && ($filename{0} != '\\') && ($filename{1} != ':')) {
+		if (($filename[0] != '/') && ($filename[0] != '\\') && ($filename[1] != ':')) {
 			$renderfilename = $this->ResolveFilenameToAbsolute($renderfilename);
 		}
 		if (!@is_writable(dirname($renderfilename))) {
@@ -557,6 +625,7 @@ function RenderToFile($filename) {
 
 		if ($this->RenderOutput()) {
 			if (file_put_contents($renderfilename, $this->outputImageData)) {
+				@chmod($renderfilename, $this->getParameter('config_file_create_mask'));
 				$this->DebugMessage('RenderToFile('.$renderfilename.') succeeded', __FILE__, __LINE__);
 				return true;
 			}
@@ -571,16 +640,15 @@ function RenderToFile($filename) {
 
 
 	// public:
-	function OutputThumbnail() {
+	public function OutputThumbnail() {
 		$this->purgeTempFiles();
 
-		if (!$this->useRawIMoutput && !is_resource($this->gdimg_output)) {
+		if (!$this->useRawIMoutput && !(is_resource($this->gdimg_output) || (is_object($this->gdimg_source) && $this->gdimg_source instanceOf \GdImage))) {
 			$this->DebugMessage('OutputThumbnail() failed because !is_resource($this->gdimg_output)', __FILE__, __LINE__);
 			return false;
 		}
 		if (headers_sent()) {
 			return $this->ErrorImage('OutputThumbnail() failed - headers already sent');
-			exit;
 		}
 
 		$downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($this->down ? $this->down : 'phpThumb_generated_thumbnail'.'.'.$this->thumbnailFormat));
@@ -598,25 +666,34 @@ function OutputThumbnail() {
 
 		} else {
 
-			$this->DebugMessage('ImageInterlace($this->gdimg_output, '.intval($this->config_output_interlace).')', __FILE__, __LINE__);
-			ImageInterlace($this->gdimg_output, intval($this->config_output_interlace));
+			$this->DebugMessage('imageinterlace($this->gdimg_output, '. (int) $this->config_output_interlace .')', __FILE__, __LINE__);
+			imageinterlace($this->gdimg_output, (int) $this->config_output_interlace);
 			switch ($this->thumbnailFormat) {
+				case 'gif':
 				case 'jpeg':
-					header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
-					$ImageOutFunction = 'image'.$this->thumbnailFormat;
-					@$ImageOutFunction($this->gdimg_output, '', $this->thumbnailQuality);
-					break;
-
 				case 'png':
-				case 'gif':
-					header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+				case 'webp':
 					$ImageOutFunction = 'image'.$this->thumbnailFormat;
-					@$ImageOutFunction($this->gdimg_output);
+					if (!function_exists($ImageOutFunction)) {
+						$this->DebugMessage($ImageOutFunction.' is not available', __FILE__, __LINE__);
+						return false;
+					}
+					header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+					if ($this->thumbnailFormat == 'gif') {
+						@$ImageOutFunction($this->gdimg_output);
+					} else {
+						@$ImageOutFunction($this->gdimg_output, null, $this->thumbnailQuality);
+					}
 					break;
 
 				case 'bmp':
-					if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) {
-						$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
+					if (function_exists('imagebmp')) {
+						header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($this->thumbnailFormat));
+						imagebmp($this->gdimg_output);
+						break;
+					}
+					if (!@include_once __DIR__ .'/phpthumb.bmp.php' ) {
+						$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.bmp.php" which is required for BMP format output', __FILE__, __LINE__);
 						return false;
 					}
 					$phpthumb_bmp = new phpthumb_bmp();
@@ -636,8 +713,8 @@ function OutputThumbnail() {
 					break;
 
 				case 'ico':
-					if (!@include_once(dirname(__FILE__).'/phpthumb.ico.php')) {
-						$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
+					if (!@include_once __DIR__ .'/phpthumb.ico.php' ) {
+						$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.ico.php" which is required for ICO format output', __FILE__, __LINE__);
 						return false;
 					}
 					$phpthumb_ico = new phpthumb_ico();
@@ -669,8 +746,8 @@ function OutputThumbnail() {
 
 
 	// public:
-	function CleanUpCacheDirectory() {
-		$this->DebugMessage('CleanUpCacheDirectory() set to purge ('.(is_null($this->config_cache_maxage) ? 'NULL' : number_format($this->config_cache_maxage / 86400, 1)).' days; '.(is_null($this->config_cache_maxsize) ? 'NULL' : number_format($this->config_cache_maxsize / 1048576, 2)).' MB; '.(is_null($this->config_cache_maxfiles) ? 'NULL' : number_format($this->config_cache_maxfiles)).' files)', __FILE__, __LINE__);
+	public function CleanUpCacheDirectory() {
+		$this->DebugMessage('CleanUpCacheDirectory() set to purge ('.(null === $this->config_cache_maxage ? 'NULL' : number_format($this->config_cache_maxage / 86400, 1)).' days; '.(null === $this->config_cache_maxsize ? 'NULL' : number_format($this->config_cache_maxsize / 1048576, 2)).' MB; '.(null === $this->config_cache_maxfiles ? 'NULL' : number_format($this->config_cache_maxfiles)).' files)', __FILE__, __LINE__);
 
 		if (!is_writable($this->config_cache_directory)) {
 			$this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$this->config_cache_directory.'" is not writable', __FILE__, __LINE__);
@@ -683,7 +760,9 @@ function CleanUpCacheDirectory() {
 			$this->DebugMessage('CleanUpCacheDirectory() skipped because "'.$phpThumbCacheStats_filename.'" is recently modified', __FILE__, __LINE__);
 			return true;
 		}
-		touch($phpThumbCacheStats_filename);
+		if (!@touch($phpThumbCacheStats_filename)) {
+			$this->DebugMessage('touch('.$phpThumbCacheStats_filename.') failed', __FILE__, __LINE__);
+		}
 
 		$DeletedKeys = array();
 		$AllFilesInCacheDirectory = array();
@@ -692,7 +771,7 @@ function CleanUpCacheDirectory() {
 			$CacheDirOldFilesSize = array();
 			$AllFilesInCacheDirectory = phpthumb_functions::GetAllFilesInSubfolders($this->config_cache_directory);
 			foreach ($AllFilesInCacheDirectory as $fullfilename) {
-				if (preg_match('#^'.preg_quote($this->config_cache_prefix).'#i', $fullfilename) && file_exists($fullfilename)) {
+				if (preg_match('#'.preg_quote($this->config_cache_prefix).'#i', $fullfilename) && file_exists($fullfilename)) {
 					$CacheDirOldFilesAge[$fullfilename] = @fileatime($fullfilename);
 					if ($CacheDirOldFilesAge[$fullfilename] == 0) {
 						$CacheDirOldFilesAge[$fullfilename] = @filemtime($fullfilename);
@@ -701,6 +780,7 @@ function CleanUpCacheDirectory() {
 				}
 			}
 			if (empty($CacheDirOldFilesSize)) {
+				$this->DebugMessage('CleanUpCacheDirectory() skipped because $CacheDirOldFilesSize is empty (phpthumb_functions::GetAllFilesInSubfolders('.$this->config_cache_directory.') found no files)', __FILE__, __LINE__);
 				return true;
 			}
 			$DeletedKeys['zerobyte'] = array();
@@ -798,9 +878,9 @@ function CleanUpCacheDirectory() {
 			$empty_dirs = array();
 			foreach ($AllFilesInCacheDirectory as $fullfilename) {
 				if (is_dir($fullfilename)) {
-					$empty_dirs[realpath($fullfilename)] = 1;
+					$empty_dirs[$this->realPathSafe($fullfilename)] = 1;
 				} else {
-					unset($empty_dirs[realpath(dirname($fullfilename))]);
+					unset($empty_dirs[$this->realPathSafe(dirname($fullfilename))]);
 				}
 			}
 			krsort($empty_dirs);
@@ -823,7 +903,7 @@ function CleanUpCacheDirectory() {
 	//////////////////////////////////////////////////////////////////////
 
 	// private: re-initializator (call between rendering multiple images with one object)
-	function resetObject() {
+	public function resetObject() {
 		$class_vars = get_class_vars(get_class($this));
 		foreach ($class_vars as $key => $value) {
 			// do not clobber debug or config info
@@ -837,8 +917,8 @@ function resetObject() {
 
 	//////////////////////////////////////////////////////////////////////
 
-	function ResolveSource() {
-		if (is_resource($this->gdimg_source)) {
+	public function ResolveSource() {
+		if (is_resource($this->gdimg_source) || (is_object($this->gdimg_source) && $this->gdimg_source instanceOf \GdImage)) {
 			$this->DebugMessage('ResolveSource() exiting because is_resource($this->gdimg_source)', __FILE__, __LINE__);
 			return true;
 		}
@@ -858,11 +938,15 @@ function ResolveSource() {
 		}
 		if ($this->iswindows && ((substr($this->sourceFilename, 0, 2) == '//') || (substr($this->sourceFilename, 0, 2) == '\\\\'))) {
 			// Windows \\share\filename.ext
-		} elseif (preg_match('#^(f|ht)tps?\://#i', $this->sourceFilename)) {
-			// URL
-			if ($this->config_http_user_agent) {
-				ini_set('user_agent', $this->config_http_user_agent);
-			}
+		} elseif (preg_match('#^[a-z0-9]+://#i', $this->sourceFilename, $protocol_matches)) {
+			if (preg_match('#^(f|ht)tps?\://#i', $this->sourceFilename)) {
+				// URL
+				if ($this->config_http_user_agent) {
+					ini_set('user_agent', $this->config_http_user_agent);
+				}
+			} else {
+				return $this->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+		}
 		} elseif (!@file_exists($this->sourceFilename)) {
 			return $this->ErrorImage('"'.$this->sourceFilename.'" does not exist');
 		} elseif (!@is_file($this->sourceFilename)) {
@@ -871,7 +955,8 @@ function ResolveSource() {
 		return true;
 	}
 
-	function setOutputFormat() {
+
+	public function setOutputFormat() {
 		static $alreadyCalled = false;
 		if ($this->thumbnailFormat && $alreadyCalled) {
 			return true;
@@ -880,18 +965,18 @@ function setOutputFormat() {
 
 		$AvailableImageOutputFormats = array();
 		$AvailableImageOutputFormats[] = 'text';
-		if (@is_readable(dirname(__FILE__).'/phpthumb.ico.php')) {
+		if (@is_readable( __DIR__ .'/phpthumb.ico.php')) {
 			$AvailableImageOutputFormats[] = 'ico';
 		}
-		if (@is_readable(dirname(__FILE__).'/phpthumb.bmp.php')) {
+		if (@is_readable( __DIR__ .'/phpthumb.bmp.php')) {
 			$AvailableImageOutputFormats[] = 'bmp';
 		}
 
 		$this->thumbnailFormat = 'ico';
 
 		// Set default output format based on what image types are available
-		if (function_exists('ImageTypes')) {
-			$imagetypes = ImageTypes();
+		if (function_exists('imagetypes')) {
+			$imagetypes = imagetypes();
 			if ($imagetypes & IMG_WBMP) {
 				$this->thumbnailFormat         = 'wbmp';
 				$AvailableImageOutputFormats[] = 'wbmp';
@@ -900,6 +985,10 @@ function setOutputFormat() {
 				$this->thumbnailFormat         = 'gif';
 				$AvailableImageOutputFormats[] = 'gif';
 			}
+			if ($imagetypes & IMG_WEBP) {
+				$this->thumbnailFormat         = 'webp';
+				$AvailableImageOutputFormats[] = 'webp';
+			}
 			if ($imagetypes & IMG_PNG) {
 				$this->thumbnailFormat         = 'png';
 				$AvailableImageOutputFormats[] = 'png';
@@ -909,11 +998,10 @@ function setOutputFormat() {
 				$AvailableImageOutputFormats[] = 'jpeg';
 			}
 		} else {
-			//return $this->ErrorImage('ImageTypes() does not exist - GD support might not be enabled?');
-			$this->DebugMessage('ImageTypes() does not exist - GD support might not be enabled?',  __FILE__, __LINE__);
+			$this->DebugMessage('imagetypes() does not exist - GD support might not be enabled?',  __FILE__, __LINE__);
 		}
 		if ($this->ImageMagickVersion()) {
-			$IMformats = array('jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp');
+			$IMformats = array('jpeg', 'png', 'gif', 'bmp', 'ico', 'wbmp', 'webp');
 			$this->DebugMessage('Addding ImageMagick formats to $AvailableImageOutputFormats ('.implode(';', $AvailableImageOutputFormats).')', __FILE__, __LINE__);
 			foreach ($IMformats as $key => $format) {
 				$AvailableImageOutputFormats[] = $format;
@@ -936,7 +1024,7 @@ function setOutputFormat() {
 		} elseif ($this->config_output_format) {
 			$this->DebugMessage('$this->thumbnailFormat staying as "'.$this->thumbnailFormat.'" because $this->config_output_format ('.strtolower($this->config_output_format).') is not in $AvailableImageOutputFormats', __FILE__, __LINE__);
 		}
-		if ($this->f && (phpthumb_functions::CaseInsensitiveInArray($this->f, $AvailableImageOutputFormats))) {
+		if ($this->f && phpthumb_functions::CaseInsensitiveInArray($this->f, $AvailableImageOutputFormats) ) {
 			// override output format if $this->f is set and that format is available
 			$this->DebugMessage('$this->thumbnailFormat set to $this->f "'.strtolower($this->f).'"', __FILE__, __LINE__);
 			$this->thumbnailFormat = strtolower($this->f);
@@ -947,16 +1035,17 @@ function setOutputFormat() {
 		// for JPEG images, quality 1 (worst) to 99 (best)
 		// quality < 25 is nasty, with not much size savings - not recommended
 		// problems with 100 - invalid JPEG?
-		$this->thumbnailQuality = max(1, min(99, ($this->q ? intval($this->q) : 75)));
+		$this->thumbnailQuality = max(1, min(99, ($this->q ? (int) $this->q : 75)));
 		$this->DebugMessage('$this->thumbnailQuality set to "'.$this->thumbnailQuality.'"', __FILE__, __LINE__);
 
 		return true;
 	}
 
-	function setCacheDirectory() {
+
+	public function setCacheDirectory() {
 		// resolve cache directory to absolute pathname
 		$this->DebugMessage('setCacheDirectory() starting with config_cache_directory = "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
-		if (substr($this->config_cache_directory, 0, 1) == '.') {
+		if ($this->config_cache_directory && ($this->config_cache_directory[0] == '.')) {
 			if (preg_match('#^(f|ht)tps?\://#i', $this->src)) {
 				if (!$this->config_cache_disable_warning) {
 					$this->ErrorImage('$this->config_cache_directory ('.$this->config_cache_directory.') cannot be used for remote images. Adjust "cache_directory" or "cache_disable_warning" in phpThumb.config.php');
@@ -975,15 +1064,15 @@ function setCacheDirectory() {
 			$this->config_cache_directory = str_replace('/', DIRECTORY_SEPARATOR, $this->config_cache_directory);
 		}
 		if ($this->config_cache_directory) {
-			$real_cache_path = realpath($this->config_cache_directory);
+			$real_cache_path = $this->realPathSafe($this->config_cache_directory);
 			if (!$real_cache_path) {
-				$this->DebugMessage('realpath($this->config_cache_directory) failed for "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
+				$this->DebugMessage('$this->realPathSafe($this->config_cache_directory) failed for "'.$this->config_cache_directory.'"', __FILE__, __LINE__);
 				if (!is_dir($this->config_cache_directory)) {
 					$this->DebugMessage('!is_dir('.$this->config_cache_directory.')', __FILE__, __LINE__);
 				}
 			}
 			if ($real_cache_path) {
-				$this->DebugMessage('setting config_cache_directory to realpath('.$this->config_cache_directory.') = "'.$real_cache_path.'"', __FILE__, __LINE__);
+				$this->DebugMessage('setting config_cache_directory to $this->realPathSafe('.$this->config_cache_directory.') = "'.$real_cache_path.'"', __FILE__, __LINE__);
 				$this->config_cache_directory = $real_cache_path;
 			}
 		}
@@ -1005,13 +1094,212 @@ function setCacheDirectory() {
 		return true;
 	}
 
+	/* Takes the array of path segments up to now, and the next segment (maybe a modifier: empty, . or ..)
+	   Applies it, adding or removing from $segments as a result. Returns nothing. */
+	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+	public function applyPathSegment(&$segments, $segment) {
+		if ($segment == '.') {
+			return; // always remove
+		}
+		if ($segment == '') {
+			$test = array_pop($segments);
+			if (null === $test) {
+				$segments[] = $segment; // keep the first empty block
+			} elseif ($test == '') {
+				$test = array_pop($segments);
+				if (null === $test) {
+					$segments[] = $test;
+					$segments[] = $segment; // keep the second one too
+				} else { // put both back and ignore segment
+					$segments[] = $test;
+					$segments[] = $test;
+				}
+			} else {
+				$segments[] = $test; // ignore empty blocks
+			}
+		} else {
+			if ($segment == '..') {
+				$test = array_pop($segments);
+				if (null === $test) {
+					$segments[] = $segment;
+				} elseif ($test == '..') {
+					$segments[] = $test;
+					$segments[] = $segment;
+				} else {
+					if ($test == '') {
+						$segments[] = $test;
+					} // else nothing, remove both
+				}
+			} else {
+				$segments[] = $segment;
+			}
+		}
+	}
+
+	/* Takes array of path components, normalizes it: removes empty slots and '.', collapses '..' and folder names.  Returns array. */
+	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+	public function normalizePath($segments) {
+		$parts = array();
+		foreach ($segments as $segment) {
+			$this->applyPathSegment($parts, $segment);
+		}
+		return $parts;
+	}
+
+	/* True if the provided path points (without resolving symbolic links) into one of the allowed directories. */
+	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+	public function matchPath($path, $allowed_dirs) {
+		if (!empty($allowed_dirs)) {
+			foreach ($allowed_dirs as $one_dir) {
+				if (preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($one_dir))).'#', $path)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/* True if the provided path points inside one of open_basedirs (or if open_basedirs are disabled) */
+	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+	public function isInOpenBasedir($path) {
+		static $open_basedirs = null;
+		if (null === $open_basedirs) {
+			$ini_text = ini_get('open_basedir');
+			$this->DebugMessage('open_basedir: "'.$ini_text.'"', __FILE__, __LINE__);
+			$open_basedirs = array();
+			if (strlen($ini_text) > 0) {
+				foreach (preg_split('#[;:]#', $ini_text) as $key => $value) {
+					$open_basedirs[$key] = $this->realPathSafe($value);
+				}
+			}
+		}
+		return (empty($open_basedirs) || $this->matchPath($path, $open_basedirs));
+	}
+
+	/* Resolves all symlinks in $path, checking that each continuous part ends in an allowed zone. Returns null, if any component leads outside of allowed zone. */
+	// http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
+	public function resolvePath($path, $allowed_dirs) {
+		$this->DebugMessage('resolvePath: '.$path.' (allowed_dirs: '.print_r($allowed_dirs, true).')', __FILE__, __LINE__);
+
+		// add base path to the top of the list
+		if (!$this->config_allow_src_above_docroot) {
+			array_unshift($allowed_dirs, $this->realPathSafe($this->config_document_root));
+		} else {
+			if (!$this->config_allow_src_above_phpthumb) {
+				array_unshift($allowed_dirs, $this->realPathSafe( __DIR__ ));
+			} else {
+				// no checks are needed, offload the work to realpath and forget about it
+				$this->DebugMessage('resolvePath: checks disabled, returning '.$this->realPathSafe($path), __FILE__, __LINE__);
+				return $this->realPathSafe($path);
+			}
+		}
+		if ($path == '') {
+			return null; // save us trouble
+		}
+
+		do {
+			$this->DebugMessage('resolvePath: iteration, path='.$path.', base path = '.$allowed_dirs[0], __FILE__, __LINE__);
+
+			$parts = array();
+			// do not use "cleaner" foreach version of this loop as later code relies on both $segments and $i
+			// http://support.silisoftware.com/phpBB3/viewtopic.php?t=964
+			$segments = explode(DIRECTORY_SEPARATOR, $path);
+			for ($i = 0, $iMax = count($segments); $i < $iMax; $i++) {
+				$this->applyPathSegment($parts, $segments[$i]);
+				$thispart = implode(DIRECTORY_SEPARATOR, $parts);
+				if ($this->isInOpenBasedir($thispart)) {
+					if (is_link($thispart)) {
+						break;
+					}
+				}
+			}
+
+			$this->DebugMessage('resolvePath: stop at component '.$i, __FILE__, __LINE__);
+			// test the part up to here
+			$path = implode(DIRECTORY_SEPARATOR, $parts);
+			$this->DebugMessage('resolvePath: stop at path='.$path, __FILE__, __LINE__);
+			if (!$this->matchPath($path, $allowed_dirs)) {
+				$this->DebugMessage('resolvePath: no match, returning null', __FILE__, __LINE__);
+				return null;
+			}
+			if ($i >= count($segments)) { // reached end
+				$this->DebugMessage('resolvePath: path parsed, over', __FILE__, __LINE__);
+				break;
+			}
+			// else it's symlink, rewrite path
+			$path = readlink($path);
+			$this->DebugMessage('resolvePath: symlink matched, target='.$path, __FILE__, __LINE__);
+
+			/*
+			Replace base path with symlink target.
+			Assuming:
+			  /www/img/external -> /external
+			This is allowed:
+			  GET /www/img/external/../external/test/pic.jpg
+			This isn't:
+			  GET /www/img/external/../www/img/pic.jpg
+			So there's only one base path which is the last symlink target, but any number of stable whitelisted paths.
+			*/
+			if ($this->config_auto_allow_symlinks) {
+				$allowed_dirs[0] = $path;
+			}
+			$path = $path.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, array_slice($segments,$i + 1));
+		} while (true);
+		return $path;
+	}
+
+
+	public function realPathSafe($filename) {
+		// http://php.net/manual/en/function.realpath.php -- "Note: The running script must have executable permissions on all directories in the hierarchy, otherwise realpath() will return FALSE"
+		// realPathSafe() provides a reasonable facsimile of realpath() but does not resolve symbolic links, nor does it check that the file/path actually exists
+		if (!$this->config_disable_realpath) {
+			return realpath($filename);
+		}
+
+		// http://stackoverflow.com/questions/21421569
+		$newfilename = preg_replace('#[\\/]+#', DIRECTORY_SEPARATOR, $filename);
+
+		if (phpthumb_functions::is_windows()) {
+			$isAlreadyAbsoluteFilename = preg_match('#^[A-Z]\\:#i', $newfilename);  // C:\path\filename.ext
+		} else {
+			$isAlreadyAbsoluteFilename = ($newfilename[0] == DIRECTORY_SEPARATOR);  // /path/filename.ext
+		}
+		if (!$isAlreadyAbsoluteFilename) {
+			// not already an absolute filename, prepend current directory
+			$newfilename =  __DIR__ .DIRECTORY_SEPARATOR.$newfilename;
+		}
+		do {
+			$beforeloop = $newfilename;
+
+			// Replace all sequences of more than one / with a single one [[ If you're working on a system that treats // at the start of a path as special, make sure you replace multiple / characters at the start with two of them. This is the only place where POSIX allows (but does not mandate) special handling for multiples, in all other cases, multiple / characters are equivalent to a single one.]]
+			$newfilename = preg_replace('#'.preg_quote(DIRECTORY_SEPARATOR).'+#', DIRECTORY_SEPARATOR, $newfilename);
+
+			// Replace all occurrences of /./ with /
+			$newfilename = preg_replace('#'.preg_quote(DIRECTORY_SEPARATOR).'\\.'.preg_quote(DIRECTORY_SEPARATOR).'#', DIRECTORY_SEPARATOR, $newfilename);
+
+			// Remove ./ if at the start
+			$newfilename = preg_replace('#^\\.'.preg_quote(DIRECTORY_SEPARATOR).'#', '', $newfilename);
+
+			// Remove /. if at the end
+			$newfilename = preg_replace('#'.preg_quote(DIRECTORY_SEPARATOR).'\\.$#', '', $newfilename);
+
+			// Replace /anything/../ with /
+			$newfilename = preg_replace('#'.preg_quote(DIRECTORY_SEPARATOR).'[^'.preg_quote(DIRECTORY_SEPARATOR).']+'.preg_quote(DIRECTORY_SEPARATOR).'\\.\\.'.preg_quote(DIRECTORY_SEPARATOR).'#', DIRECTORY_SEPARATOR, $newfilename);
+
+			// Remove /anything/.. if at the end
+			$newfilename = preg_replace('#'.preg_quote(DIRECTORY_SEPARATOR).'[^'.preg_quote(DIRECTORY_SEPARATOR).']+'.preg_quote(DIRECTORY_SEPARATOR).'\\.\\.$#', '', $newfilename);
+
+		} while ($newfilename != $beforeloop);
+		return $newfilename;
+	}
+
 
-	function ResolveFilenameToAbsolute($filename) {
+	public function ResolveFilenameToAbsolute($filename) {
 		if (empty($filename)) {
 			return false;
 		}
 
-		if (preg_match('#^[a-z0-9]+\:/{1,2}#i', $filename)) {
+		if (preg_match('#^[a-z0-9]+\\:/{1,2}#i', $filename)) {
 			// eg: http://host/path/file.jpg (HTTP URL)
 			// eg: ftp://host/path/file.jpg  (FTP URL)
 			// eg: data1:/path/file.jpg      (Netware path)
@@ -1019,7 +1307,7 @@ function ResolveFilenameToAbsolute($filename) {
 			//$AbsoluteFilename = $filename;
 			return $filename;
 
-		} elseif ($this->iswindows && isset($filename{1}) && ($filename{1} == ':')) {
+		} elseif ($this->iswindows && isset($filename[1]) && ($filename[1] == ':')) {
 
 			// absolute pathname (Windows)
 			$AbsoluteFilename = $filename;
@@ -1029,24 +1317,24 @@ function ResolveFilenameToAbsolute($filename) {
 			// absolute pathname (Windows)
 			$AbsoluteFilename = $filename;
 
-		} elseif ($filename{0} == '/') {
+		} elseif ($filename[0] == '/') {
 
 			if (@is_readable($filename) && !@is_readable($this->config_document_root.$filename)) {
 
 				// absolute filename (*nix)
 				$AbsoluteFilename = $filename;
 
-			} elseif (isset($filename{1}) && ($filename{1} == '~')) {
+			} elseif (isset($filename[1]) && ($filename[1] == '~')) {
 
 				// /~user/path
 				if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray($filename)) {
 					$AbsoluteFilename = $ApacheLookupURIarray['filename'];
 				} else {
-					$AbsoluteFilename = realpath($filename);
+					$AbsoluteFilename = $this->realPathSafe($filename);
 					if (@is_readable($AbsoluteFilename)) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with realpath($filename)', __FILE__, __LINE__);
+						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with $this->realPathSafe($filename)', __FILE__, __LINE__);
 					} elseif (is_dir(dirname($AbsoluteFilename))) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname($filename).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with realpath(.)', __FILE__, __LINE__);
+						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname($filename).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with $this->realPathSafe(.)', __FILE__, __LINE__);
 					} else {
 						return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.$filename.'". This has been known to fail on Apache2 - try using the absolute filename for the source image (ex: "/home/user/httpdocs/image.jpg" instead of "/~user/image.jpg")');
 					}
@@ -1068,22 +1356,17 @@ function ResolveFilenameToAbsolute($filename) {
 		} else {
 
 			// relative to current directory (any OS)
-			//$AbsoluteFilename = $this->config_document_root.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, dirname(@$_SERVER['PHP_SELF'])).DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
-			$AbsoluteFilename = dirname(__FILE__).DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
-
-			//if (!@file_exists($AbsoluteFilename) && @file_exists(realpath($this->DotPadRelativeDirectoryPath($filename)))) {
-			//	$AbsoluteFilename = realpath($this->DotPadRelativeDirectoryPath($filename));
-			//}
+			$AbsoluteFilename =  __DIR__ .DIRECTORY_SEPARATOR.preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $filename);
 
 			if (substr(dirname(@$_SERVER['PHP_SELF']), 0, 2) == '/~') {
 				if ($ApacheLookupURIarray = phpthumb_functions::ApacheLookupURIarray(dirname(@$_SERVER['PHP_SELF']))) {
 					$AbsoluteFilename = $ApacheLookupURIarray['filename'].DIRECTORY_SEPARATOR.$filename;
 				} else {
-					$AbsoluteFilename = realpath('.').DIRECTORY_SEPARATOR.$filename;
+					$AbsoluteFilename = $this->realPathSafe('.').DIRECTORY_SEPARATOR.$filename;
 					if (@is_readable($AbsoluteFilename)) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with realpath(.)/$filename', __FILE__, __LINE__);
+						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct filename ('.$AbsoluteFilename.') seems to have been resolved with $this->realPathSafe(.)/$filename', __FILE__, __LINE__);
 					} elseif (is_dir(dirname($AbsoluteFilename))) {
-						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with realpath(.)', __FILE__, __LINE__);
+						$this->DebugMessage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'", but the correct directory ('.dirname($AbsoluteFilename).') seems to have been resolved with $this->realPathSafe(.)', __FILE__, __LINE__);
 					} else {
 						return $this->ErrorImage('phpthumb_functions::ApacheLookupURIarray() failed for "'.dirname(@$_SERVER['PHP_SELF']).'". This has been known to fail on Apache2 - try using the absolute filename for the source image');
 					}
@@ -1091,147 +1374,189 @@ function ResolveFilenameToAbsolute($filename) {
 			}
 
 		}
+		/*
+		// removed 2014-May-30: http://support.silisoftware.com/phpBB3/viewtopic.php?t=961
 		if (is_link($AbsoluteFilename)) {
 			$this->DebugMessage('is_link()==true, changing "'.$AbsoluteFilename.'" to "'.readlink($AbsoluteFilename).'"', __FILE__, __LINE__);
 			$AbsoluteFilename = readlink($AbsoluteFilename);
 		}
-		if (realpath($AbsoluteFilename)) {
-			$AbsoluteFilename = realpath($AbsoluteFilename);
+		if ($this->realPathSafe($AbsoluteFilename)) {
+			$AbsoluteFilename = $this->realPathSafe($AbsoluteFilename);
 		}
+		*/
 		if ($this->iswindows) {
-			$AbsoluteFilename = preg_replace('#^'.preg_quote(realpath($this->config_document_root)).'#i', realpath($this->config_document_root), $AbsoluteFilename);
+			$AbsoluteFilename = preg_replace('#^'.preg_quote($this->realPathSafe($this->config_document_root)).'#i', str_replace('\\', '\\\\', $this->realPathSafe($this->config_document_root)), $AbsoluteFilename);
 			$AbsoluteFilename = str_replace(DIRECTORY_SEPARATOR, '/', $AbsoluteFilename);
 		}
-		if (!$this->config_allow_src_above_docroot && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', realpath($this->config_document_root))).'#', $AbsoluteFilename)) {
-			$this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.realpath($this->config_document_root).'") to null', __FILE__, __LINE__);
+		$resolvedAbsoluteFilename = $this->resolvePath($AbsoluteFilename, $this->config_additional_allowed_dirs);
+		if (!$this->config_allow_src_above_docroot && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', $this->realPathSafe($this->config_document_root))).'#', $resolvedAbsoluteFilename)) {
+			$this->DebugMessage('!$this->config_allow_src_above_docroot therefore setting "'.$AbsoluteFilename.'" (outside "'.$this->realPathSafe($this->config_document_root).'") to null', __FILE__, __LINE__);
 			return false;
 		}
-		if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))).'#', $AbsoluteFilename)) {
-			$this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'.dirname(__FILE__).'") to null', __FILE__, __LINE__);
+		if (!$this->config_allow_src_above_phpthumb && !preg_match('#^'.preg_quote(str_replace(DIRECTORY_SEPARATOR, '/',  __DIR__ )).'#', $resolvedAbsoluteFilename)) {
+			$this->DebugMessage('!$this->config_allow_src_above_phpthumb therefore setting "'.$AbsoluteFilename.'" (outside "'. __DIR__ .'") to null', __FILE__, __LINE__);
 			return false;
 		}
-		return $AbsoluteFilename;
+		return $resolvedAbsoluteFilename;
 	}
 
-	function file_exists_ignoreopenbasedir($filename, $cached=true) {
+
+	public function file_exists_ignoreopenbasedir($filename, $cached=true) {
 		static $open_basedirs = null;
 		static $file_exists_cache = array();
 		if (!$cached || !isset($file_exists_cache[$filename])) {
-			if (is_null($open_basedirs)) {
-				$open_basedirs = explode(';', ini_get('open_basedir'));
+			if (null === $open_basedirs) {
+				$open_basedirs = preg_split('#[;:]#', ini_get('open_basedir'));
 			}
 			if (empty($open_basedirs) || in_array(dirname($filename), $open_basedirs)) {
 				$file_exists_cache[$filename] = file_exists($filename);
 			} elseif ($this->iswindows) {
-				$ls_filename = trim(phpthumb_functions::SafeExec('dir '.escapeshellarg($filename)));
-				$file_exists_cache[$filename] = !preg_match('#File Not Found#i', $ls_filename);
+				$ls_filename = trim(phpthumb_functions::SafeExec('dir /b '.phpthumb_functions::escapeshellarg_replacement($filename)));
+				$file_exists_cache[$filename] = ($ls_filename == basename($filename));  // command dir /b return only filename without path
 			} else {
-				$ls_filename = trim(phpthumb_functions::SafeExec('ls '.escapeshellarg($filename)));
+				$ls_filename = trim(phpthumb_functions::SafeExec('ls '.phpthumb_functions::escapeshellarg_replacement($filename)));
 				$file_exists_cache[$filename] = ($ls_filename == $filename);
 			}
 		}
 		return $file_exists_cache[$filename];
 	}
 
-	function ImageMagickWhichConvert() {
+
+	public function ImageMagickWhichConvert() {
 		static $WhichConvert = null;
-		if (is_null($WhichConvert)) {
+		if (null === $WhichConvert) {
 			if ($this->iswindows) {
 				$WhichConvert = false;
 			} else {
-				$WhichConvert = trim(phpthumb_functions::SafeExec('which convert'));
+				$IMwhichConvertCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMwhichConvert.txt';
+				if (($cachedwhichconvertstring = @file_get_contents($IMwhichConvertCacheFilename)) !== false) {
+					$WhichConvert = $cachedwhichconvertstring;
+				} else {
+					$WhichConvert = trim(phpthumb_functions::SafeExec('which convert'));
+					@file_put_contents($IMwhichConvertCacheFilename, $WhichConvert);
+					@chmod($IMwhichConvertCacheFilename, $this->getParameter('config_file_create_mask'));
+				}
 			}
 		}
 		return $WhichConvert;
 	}
 
-	function ImageMagickCommandlineBase() {
+
+	public function ImageMagickCommandlineBase() {
 		static $commandline = null;
-		if (is_null($commandline)) {
+		if (null === $commandline) {
 			if ($this->issafemode) {
 				$commandline = '';
 				return $commandline;
 			}
-			$commandline = (!is_null($this->config_imagemagick_path) ? $this->config_imagemagick_path : '');
 
-			if ($this->config_imagemagick_path && ($this->config_imagemagick_path != realpath($this->config_imagemagick_path))) {
-				if (@is_executable(realpath($this->config_imagemagick_path))) {
-					$this->DebugMessage('Changing $this->config_imagemagick_path ('.$this->config_imagemagick_path.') to realpath($this->config_imagemagick_path) ('.realpath($this->config_imagemagick_path).')', __FILE__, __LINE__);
-					$this->config_imagemagick_path = realpath($this->config_imagemagick_path);
+			$IMcommandlineBaseCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMcommandlineBase.txt';
+			if (($commandline = @file_get_contents($IMcommandlineBaseCacheFilename)) !== false) {
+				return $commandline;
+			}
+
+			$commandline = (null !== $this->config_imagemagick_path ? $this->config_imagemagick_path : '');
+
+			if ($this->config_imagemagick_path && ($this->config_imagemagick_path != $this->realPathSafe($this->config_imagemagick_path))) {
+				if (@is_executable($this->realPathSafe($this->config_imagemagick_path))) {
+					$this->DebugMessage('Changing $this->config_imagemagick_path ('.$this->config_imagemagick_path.') to $this->realPathSafe($this->config_imagemagick_path) ('.$this->realPathSafe($this->config_imagemagick_path).')', __FILE__, __LINE__);
+					$this->config_imagemagick_path = $this->realPathSafe($this->config_imagemagick_path);
 				} else {
-					$this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable(realpath($this->config_imagemagick_path)) ('.realpath($this->config_imagemagick_path).')', __FILE__, __LINE__);
+					$this->DebugMessage('Leaving $this->config_imagemagick_path as ('.$this->config_imagemagick_path.') because !is_execuatable($this->realPathSafe($this->config_imagemagick_path)) ('.$this->realPathSafe($this->config_imagemagick_path).')', __FILE__, __LINE__);
 				}
 			}
-			$this->DebugMessage('                  file_exists('.$this->config_imagemagick_path.') = '.intval(                        @file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
-			$this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '.intval($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)), __FILE__, __LINE__);
-			$this->DebugMessage('                      is_file('.$this->config_imagemagick_path.') = '.intval(                            @is_file($this->config_imagemagick_path)), __FILE__, __LINE__);
-			$this->DebugMessage('                is_executable('.$this->config_imagemagick_path.') = '.intval(                      @is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
+			$this->DebugMessage('                  file_exists('.$this->config_imagemagick_path.') = '. (int) (@file_exists($this->config_imagemagick_path)), __FILE__, __LINE__);
+			$this->DebugMessage('file_exists_ignoreopenbasedir('.$this->config_imagemagick_path.') = '. (int) $this->file_exists_ignoreopenbasedir($this->config_imagemagick_path), __FILE__, __LINE__);
+			$this->DebugMessage('                      is_file('.$this->config_imagemagick_path.') = '. (int) (@is_file($this->config_imagemagick_path)), __FILE__, __LINE__);
+			$this->DebugMessage('                is_executable('.$this->config_imagemagick_path.') = '. (int) (@is_executable($this->config_imagemagick_path)), __FILE__, __LINE__);
 
 			if ($this->file_exists_ignoreopenbasedir($this->config_imagemagick_path)) {
+
 				$this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path ('.$this->config_imagemagick_path.')', __FILE__, __LINE__);
 				if ($this->iswindows) {
-					$commandline = substr($this->config_imagemagick_path, 0, 2).' && cd '.escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2))).' && '.escapeshellarg(basename($this->config_imagemagick_path));
+					$commandline = substr($this->config_imagemagick_path, 0, 2).' && cd '.phpthumb_functions::escapeshellarg_replacement(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2))).' && '.phpthumb_functions::escapeshellarg_replacement(basename($this->config_imagemagick_path));
 				} else {
-					$commandline = escapeshellarg($this->config_imagemagick_path);
+					$commandline = phpthumb_functions::escapeshellarg_replacement($this->config_imagemagick_path);
 				}
-				return $commandline;
-			}
 
-			$which_convert = $this->ImageMagickWhichConvert();
-			$IMversion     = $this->ImageMagickVersion();
+			} else {
 
-			if ($which_convert && ($which_convert{0} == '/') && $this->file_exists_ignoreopenbasedir($which_convert)) {
+				$which_convert = $this->ImageMagickWhichConvert();
+				$IMversion     = $this->ImageMagickVersion();
 
-				// `which convert` *should* return the path if "convert" exist, or nothing if it doesn't
-				// other things *may* get returned, like "sh: convert: not found" or "no convert in /usr/local/bin /usr/sbin /usr/bin /usr/ccs/bin"
-				// so only do this if the value returned exists as a file
-				$this->DebugMessage('using ImageMagick path from `which convert` ('.$which_convert.')', __FILE__, __LINE__);
-				$commandline = 'convert';
+				if ($which_convert && ($which_convert[0] == '/') && $this->file_exists_ignoreopenbasedir($which_convert)) {
 
-			} elseif ($IMversion) {
+					// `which convert` *should* return the path if "convert" exist, or nothing if it doesn't
+					// other things *may* get returned, like "sh: convert: not found" or "no convert in /usr/local/bin /usr/sbin /usr/bin /usr/ccs/bin"
+					// so only do this if the value returned exists as a file
+					$this->DebugMessage('using ImageMagick path from `which convert` ('.$which_convert.')', __FILE__, __LINE__);
+					$commandline = 'convert';
 
-				$this->DebugMessage('setting ImageMagick path to $this->config_imagemagick_path ('.$this->config_imagemagick_path.') ['.$IMversion.']', __FILE__, __LINE__);
-				$commandline = $this->config_imagemagick_path;
+				} elseif ($IMversion) {
 
-			} else {
+					$this->DebugMessage('setting ImageMagick path to $this->config_imagemagick_path ('.$this->config_imagemagick_path.') ['.$IMversion.']', __FILE__, __LINE__);
+					$commandline = $this->config_imagemagick_path;
 
-				$this->DebugMessage('ImageMagickThumbnailToGD() aborting because cannot find convert in $this->config_imagemagick_path ('.$this->config_imagemagick_path.'), and `which convert` returned ('.$which_convert.')', __FILE__, __LINE__);
-				$commandline = '';
+				} else {
+
+					$this->DebugMessage('ImageMagickThumbnailToGD() aborting because cannot find convert in $this->config_imagemagick_path ('.$this->config_imagemagick_path.'), and `which convert` returned ('.$which_convert.')', __FILE__, __LINE__);
+					$commandline = '';
+
+				}
 
 			}
+
+			@file_put_contents($IMcommandlineBaseCacheFilename, $commandline);
+			@chmod($IMcommandlineBaseCacheFilename, $this->getParameter('config_file_create_mask'));
 		}
 		return $commandline;
 	}
 
-	function ImageMagickVersion($returnRAW=false) {
+
+	public function ImageMagickVersion($returnRAW=false) {
 		static $versionstring = null;
-		if (is_null($versionstring)) {
+		if (null === $versionstring) {
 			$versionstring = array(0=>false, 1=>false);
-			$commandline = $this->ImageMagickCommandlineBase();
-			$commandline = (!is_null($commandline) ? $commandline : '');
-
-			if ($commandline) {
-				$commandline .= ' --version';
-				$this->DebugMessage('ImageMagick version checked with "'.$commandline.'"', __FILE__, __LINE__);
-				$versionstring[1] = trim(phpthumb_functions::SafeExec($commandline));
-				if (preg_match('#^Version: [^0-9]*([ 0-9\\.\\:Q/\\-]+) (http|file)\:#i', $versionstring[1], $matches)) {
-					$versionstring[0] = $matches[1];
-				} else {
-					$versionstring[0] = false;
-					$this->DebugMessage('ImageMagick did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__);
+
+			$IMversionCacheFilename = $this->config_cache_directory.DIRECTORY_SEPARATOR.'phpThumbCacheIMversion.txt';
+			if ($cachedversionstring = @file_get_contents($IMversionCacheFilename)) {
+
+				$versionstring = explode("\n", $cachedversionstring, 2);
+				$versionstring[0] = ($versionstring[0] ? $versionstring[0] : false); // "false" is stored as an empty string in the cache file
+				$versionstring[1] = ($versionstring[1] ? $versionstring[1] : false); // "false" is stored as an empty string in the cache file
+
+			} else {
+
+				$commandline = $this->ImageMagickCommandlineBase();
+				$commandline = (null !== $commandline ? $commandline : '');
+				if ($commandline) {
+					$commandline .= ' --version';
+					$this->DebugMessage('ImageMagick version checked with "'.$commandline.'"', __FILE__, __LINE__);
+					$versionstring[1] = trim(phpthumb_functions::SafeExec($commandline));
+					if (preg_match('#^Version: [^\d]*([ 0-9\\.\\:Q/\\-]+)#i', $versionstring[1], $matches)) {
+						$versionstring[0] = trim($matches[1]);
+					} else {
+						$versionstring[0] = false;
+						$this->DebugMessage('ImageMagick did not return recognized version string ('.$versionstring[1].')', __FILE__, __LINE__);
+					}
+					$this->DebugMessage('ImageMagick convert --version says "'.@$matches[0].'"', __FILE__, __LINE__);
 				}
-				$this->DebugMessage('ImageMagick convert --version says "'.@$matches[0].'"', __FILE__, __LINE__);
+
+				@file_put_contents($IMversionCacheFilename, $versionstring[0]."\n".$versionstring[1]);
+				@chmod($IMversionCacheFilename, $this->getParameter('config_file_create_mask'));
+
 			}
 		}
-		return $versionstring[intval($returnRAW)];
+		return $versionstring[ (int) $returnRAW ];
 	}
 
-	function ImageMagickSwitchAvailable($switchname) {
+
+	public function ImageMagickSwitchAvailable($switchname) {
 		static $IMoptions = null;
-		if (is_null($IMoptions)) {
+		if (null === $IMoptions) {
 			$IMoptions = array();
 			$commandline = $this->ImageMagickCommandlineBase();
-			if (!is_null($commandline)) {
+			if (null !== $commandline) {
 				$commandline .= ' -help';
 				$IMhelp_lines = explode("\n", phpthumb_functions::SafeExec($commandline));
 				foreach ($IMhelp_lines as $line) {
@@ -1249,20 +1574,21 @@ function ImageMagickSwitchAvailable($switchname) {
 					break;
 				}
 			}
-			$this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '.intval($allOK).'', __FILE__, __LINE__);
+			$this->DebugMessage('ImageMagickSwitchAvailable('.implode(';', $switchname).') = '. (int) $allOK .'', __FILE__, __LINE__);
 		} else {
 			$allOK = isset($IMoptions[$switchname]);
-			$this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '.intval($allOK).'', __FILE__, __LINE__);
+			$this->DebugMessage('ImageMagickSwitchAvailable('.$switchname.') = '. (int) $allOK .'', __FILE__, __LINE__);
 		}
 		return $allOK;
 	}
 
-	function ImageMagickFormatsList() {
+
+	public function ImageMagickFormatsList() {
 		static $IMformatsList = null;
-		if (is_null($IMformatsList)) {
+		if (null === $IMformatsList) {
 			$IMformatsList = '';
 			$commandline = $this->ImageMagickCommandlineBase();
-			if (!is_null($commandline)) {
+			if (null !== $commandline) {
 				$commandline = dirname($commandline).DIRECTORY_SEPARATOR.str_replace('convert', 'identify', basename($commandline));
 				$commandline .= ' -list format';
 				$IMformatsList = phpthumb_functions::SafeExec($commandline);
@@ -1271,9 +1597,10 @@ function ImageMagickFormatsList() {
 		return $IMformatsList;
 	}
 
-	function SourceDataToTempFile() {
+
+	public function SourceDataToTempFile() {
 		if ($IMtempSourceFilename = $this->phpThumb_tempnam()) {
-			$IMtempSourceFilename = realpath($IMtempSourceFilename);
+			$IMtempSourceFilename = $this->realPathSafe($IMtempSourceFilename);
 			ob_start();
 			$fp_tempfile = fopen($IMtempSourceFilename, 'wb');
 			$tempfile_open_error  = ob_get_contents();
@@ -1281,6 +1608,7 @@ function SourceDataToTempFile() {
 			if ($fp_tempfile) {
 				fwrite($fp_tempfile, $this->rawImageData);
 				fclose($fp_tempfile);
+				@chmod($IMtempSourceFilename, $this->getParameter('config_file_create_mask'));
 				$this->sourceFilename = $IMtempSourceFilename;
 				$this->DebugMessage('ImageMagickThumbnailToGD() setting $this->sourceFilename to "'.$IMtempSourceFilename.'" from $this->rawImageData ('.strlen($this->rawImageData).' bytes)', __FILE__, __LINE__);
 			} else {
@@ -1293,17 +1621,28 @@ function SourceDataToTempFile() {
 		return false;
 	}
 
-	function ImageMagickThumbnailToGD() {
+
+	public function ImageMagickThumbnailToGD() {
 		// http://www.imagemagick.org/script/command-line-options.php
 
 		$this->useRawIMoutput = true;
 		if (phpthumb_functions::gd_version()) {
 			// if GD is not available, must use whatever ImageMagick can output
 
+			// $CannotMagickParameters contains options that cannot be used with ImageMagick
+			$CannotMagickParameters = array('ica');
+			foreach ($CannotMagickParameters as $parameter) {
+				if (isset($this->$parameter)) {
+					$this->DebugMessage('cannot process with ImageMagick because "'.$parameter.'" is set', __FILE__, __LINE__);
+					$this->useRawIMoutput = false;
+					return false;
+				}
+			}
+
 			// $UnAllowedParameters contains options that can only be processed in GD, not ImageMagick
 			// note: 'fltr' *may* need to be processed by GD, but we'll check that in more detail below
 			$UnAllowedParameters = array('xto', 'ar', 'bg', 'bc');
-			// 'ra' may be part of this list, if not a multiple of 90�
+			// 'ra' may be part of this list, if not a multiple of 90 degrees
 			foreach ($UnAllowedParameters as $parameter) {
 				if (isset($this->$parameter)) {
 					$this->DebugMessage('$this->useRawIMoutput=false because "'.$parameter.'" is set', __FILE__, __LINE__);
@@ -1313,39 +1652,44 @@ function ImageMagickThumbnailToGD() {
 			}
 		}
 		$this->DebugMessage('$this->useRawIMoutput='.($this->useRawIMoutput ? 'true' : 'false').' after checking $UnAllowedParameters', __FILE__, __LINE__);
+		$ImageCreateFunction = '';
 		$outputFormat = $this->thumbnailFormat;
 		if (phpthumb_functions::gd_version()) {
 			if ($this->useRawIMoutput) {
 				switch ($this->thumbnailFormat) {
 					case 'gif':
-						$ImageCreateFunction = 'ImageCreateFromGIF';
+						$ImageCreateFunction = 'imagecreatefromgif';
 						$this->is_alpha = true;
 						break;
 					case 'png':
-						$ImageCreateFunction = 'ImageCreateFromPNG';
+						$ImageCreateFunction = 'imagecreatefrompng';
 						$this->is_alpha = true;
 						break;
 					case 'jpg':
 					case 'jpeg':
-						$ImageCreateFunction = 'ImageCreateFromJPEG';
+						$ImageCreateFunction = 'imagecreatefromjpeg';
+						break;
+					case 'webp':
+						$ImageCreateFunction = 'imagecreatefromwebp';
+						$this->is_alpha = true;
 						break;
 					default:
 						$this->DebugMessage('Forcing output to PNG because $this->thumbnailFormat ('.$this->thumbnailFormat.' is not a GD-supported format)', __FILE__, __LINE__);
 						$outputFormat = 'png';
-						$ImageCreateFunction = 'ImageCreateFromPNG';
+						$ImageCreateFunction = 'imagecreatefrompng';
 						$this->is_alpha = true;
 						$this->useRawIMoutput = false;
 						break;
 				}
-				if (!function_exists(@$ImageCreateFunction)) {
-					// ImageMagickThumbnailToGD() depends on ImageCreateFromPNG/ImageCreateFromGIF
+				if (!function_exists($ImageCreateFunction)) {
+					// ImageMagickThumbnailToGD() depends on imagecreatefrompng/imagecreatefromgif
 					//$this->DebugMessage('ImageMagickThumbnailToGD() aborting because '.@$ImageCreateFunction.'() is not available', __FILE__, __LINE__);
 					$this->useRawIMoutput = true;
 					//return false;
 				}
 			} else {
 				$outputFormat = 'png';
-				$ImageCreateFunction = 'ImageCreateFromPNG';
+				$ImageCreateFunction = 'imagecreatefrompng';
 				$this->is_alpha = true;
 				$this->useRawIMoutput = false;
 			}
@@ -1374,8 +1718,9 @@ function ImageMagickThumbnailToGD() {
 
 		$commandline = $this->ImageMagickCommandlineBase();
 		if ($commandline) {
+			$commandline .= ' '.phpthumb_functions::escapeshellarg_replacement(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['. (int) $this->sfn .']')); // [0] means first frame of (GIF) animation, can be ignored
 			if ($IMtempfilename = $this->phpThumb_tempnam()) {
-				$IMtempfilename = realpath($IMtempfilename);
+				$IMtempfilename = $this->realPathSafe($IMtempfilename);
 
 				$IMuseExplicitImageOutputDimensions = false;
 				if ($this->ImageMagickSwitchAvailable('thumbnail') && $this->config_imagemagick_use_thumbnail) {
@@ -1384,32 +1729,39 @@ function ImageMagickThumbnailToGD() {
 					$IMresizeParameter = 'resize';
 
 					// some (older? around 2002) versions of IM won't accept "-resize 100x" but require "-resize 100x100"
-					$commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x '.escapeshellarg($IMtempfilename).' 2>&1';
+					$commandline_test = $this->ImageMagickCommandlineBase().' logo: -resize 1x '.phpthumb_functions::escapeshellarg_replacement($IMtempfilename).' 2>&1';
 					$IMresult_test = phpthumb_functions::SafeExec($commandline_test);
 					$IMuseExplicitImageOutputDimensions = preg_match('#image dimensions are zero#i', $IMresult_test);
-					$this->DebugMessage('IMuseExplicitImageOutputDimensions = '.intval($IMuseExplicitImageOutputDimensions), __FILE__, __LINE__);
+					$this->DebugMessage('IMuseExplicitImageOutputDimensions = '. (int) $IMuseExplicitImageOutputDimensions, __FILE__, __LINE__);
 					if ($fp_im_temp = @fopen($IMtempfilename, 'wb')) {
 						// erase temp image so ImageMagick logo doesn't get output if other processing fails
 						fclose($fp_im_temp);
+						@chmod($IMtempfilename, $this->getParameter('config_file_create_mask'));
 					}
 				}
 
 
-				if (!is_null($this->dpi) && $this->ImageMagickSwitchAvailable('density')) {
-					// for raster source formats only (WMF, PDF, etc)
-					$commandline .= ' -density '.escapeshellarg($this->dpi);
-				}
 				ob_start();
-				$getimagesize = GetImageSize($this->sourceFilename);
+				$getimagesize = getimagesize($this->sourceFilename);
 				$GetImageSizeError = ob_get_contents();
 				ob_end_clean();
 				if (is_array($getimagesize)) {
-					$this->DebugMessage('GetImageSize('.$this->sourceFilename.') SUCCEEDED: '.print_r($getimagesize, true), __FILE__, __LINE__);
+					$this->DebugMessage('getimagesize('.$this->sourceFilename.') SUCCEEDED: '.print_r($getimagesize, true), __FILE__, __LINE__);
 				} else {
-					$this->DebugMessage('GetImageSize('.$this->sourceFilename.') FAILED with error "'.$GetImageSizeError.'"', __FILE__, __LINE__);
+					$this->DebugMessage('getimagesize('.$this->sourceFilename.') FAILED with error "'.$GetImageSizeError.'"', __FILE__, __LINE__);
+				}
+				if (null !== $this->dpi && $this->ImageMagickSwitchAvailable('density')) {
+					// for vector source formats only (WMF, PDF, etc)
+					if (is_array($getimagesize) && isset($getimagesize[2]) && ($getimagesize[2] == IMAGETYPE_PNG)) {
+						// explicitly exclude PNG from "-flatten" to make sure transparency is preserved
+						// https://github.com/JamesHeinrich/phpThumb/issues/65
+					} else {
+						$commandline .= ' -flatten';
+						$commandline .= ' -density '.phpthumb_functions::escapeshellarg_replacement($this->dpi);
+					}
 				}
 				if (is_array($getimagesize)) {
-					$this->DebugMessage('GetImageSize('.$this->sourceFilename.') returned [w='.$getimagesize[0].';h='.$getimagesize[1].';f='.$getimagesize[2].']', __FILE__, __LINE__);
+					$this->DebugMessage('getimagesize('.$this->sourceFilename.') returned [w='.$getimagesize[0].';h='.$getimagesize[1].';f='.$getimagesize[2].']', __FILE__, __LINE__);
 					$this->source_width  = $getimagesize[0];
 					$this->source_height = $getimagesize[1];
 					$this->DebugMessage('source dimensions set to '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
@@ -1417,10 +1769,14 @@ function ImageMagickThumbnailToGD() {
 
 					if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
 						// not a transparency-capable format
-						$commandline .= ' -background '.escapeshellarg('#'.($this->bg ? $this->bg : 'FFFFFF'));
-						if ($getimagesize[2] == IMAGETYPE_GIF) {
+						$commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ? $this->bg : 'FFFFFF'));
+						if (!stristr($commandline, ' -flatten')) {
 							$commandline .= ' -flatten';
 						}
+					} else {
+						if ($getimagesize[2] == IMAGETYPE_PNG && !$this->bg) {
+							$commandline .= ' -background none';
+						}
 					}
 					if ($getimagesize[2] == IMAGETYPE_GIF) {
 						$commandline .= ' -coalesce'; // may be needed for animated GIFs
@@ -1431,14 +1787,14 @@ function ImageMagickThumbnailToGD() {
 							$borderThickness = 0;
 							if (!empty($this->fltr)) {
 								foreach ($this->fltr as $key => $value) {
-									if (preg_match('#^bord\|([0-9]+)#', $value, $matches)) {
+									if (preg_match('#^bord\|([\d]+)#', $value, $matches)) {
 										$borderThickness = $matches[1];
 										break;
 									}
 								}
 							}
-							$wAll = intval(max($this->w, $this->wp, $this->wl, $this->ws)) - (2 * $borderThickness);
-							$hAll = intval(max($this->h, $this->hp, $this->hl, $this->hs)) - (2 * $borderThickness);
+							$wAll = (int) max($this->w, $this->wp, $this->wl, $this->ws) - (2 * $borderThickness);
+							$hAll = (int) max($this->h, $this->hp, $this->hl, $this->hs) - (2 * $borderThickness);
 							$imAR = $this->source_width / $this->source_height;
 							$zcAR = (($wAll && $hAll) ? $wAll / $hAll : 1);
 							$side  = phpthumb_functions::nonempty_min($this->source_width, $this->source_height, max($wAll, $hAll));
@@ -1446,7 +1802,11 @@ function ImageMagickThumbnailToGD() {
 							$sideY = phpthumb_functions::nonempty_min(                     $this->source_height, $hAll, round($wAll / $zcAR));
 
 							$thumbnailH = round(max($sideY, ($sideY * $zcAR) / $imAR));
-							$commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '').'x'.$thumbnailH);
+							if ($this->aoe == 1) {
+								$commandline .= ' -'.$IMresizeParameter.' "'.$wAll.'x'.$hAll.'^"';
+							} else {
+								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($IMuseExplicitImageOutputDimensions ? $thumbnailH : '').'x'.$thumbnailH);
+							}
 
 							switch (strtoupper($this->zc)) {
 								case 'T':
@@ -1481,9 +1841,9 @@ function ImageMagickThumbnailToGD() {
 							}
 
 							if (($wAll > 0) && ($hAll > 0)) {
-								$commandline .= ' -crop '.escapeshellarg($wAll.'x'.$hAll.'+0+0');
+								$commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($wAll.'x'.$hAll.'+0+0');
 							} else {
-								$commandline .= ' -crop '.escapeshellarg($side.'x'.$side.'+0+0');
+								$commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($side.'x'.$side.'+0+0');
 							}
 							if ($this->ImageMagickSwitchAvailable('repage')) {
 								$commandline .= ' +repage';
@@ -1502,7 +1862,7 @@ function ImageMagickThumbnailToGD() {
 // makes 1x1 output
 // http://trainspotted.com/phpThumb/phpThumb.php?src=/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg&w=100&h=100&far=1&f=png&fltr[]=lvl&sx=0.05&sy=0.25&sw=0.92&sh=0.42
 // '/usr/bin/convert' -density 150 -thumbnail 100x100 -contrast-stretch '0.1%' '/var/www/vhosts/trainspotted.com/httpdocs/content/CNR/47/CNR-4728-LD-L-20110723-898.jpg[0]' png:'/var/www/vhosts/trainspotted.com/httpdocs/phpThumb/_cache/pThumbIIUlvj'
-//							$commandline .= ' -crop '.escapeshellarg($crop_param);
+							$commandline .= ' -crop '.phpthumb_functions::escapeshellarg_replacement($crop_param);
 
 							// this is broken for aoe=1, but unsure how to fix. Send advice to info@silisoftware.com
 							if ($this->w || $this->h) {
@@ -1521,19 +1881,33 @@ function ImageMagickThumbnailToGD() {
 										$this->w = ceil($this->h * ($this->source_width / $this->source_height));
 									}
 								}
-								$commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($this->w.'x'.$this->h);
+								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h);
 							}
 
 						} else {
 
-							if ($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) {
+							if ($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) {
+
 								list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
 								$nw = ((round($nw) != 0) ? round($nw) : '');
 								$nh = ((round($nh) != 0) ? round($nh) : '');
-								$commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($nw.'x'.$nh.'!');
+								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh.'!');
+
+							} elseif ($this->far && ((int) $this->w > 0) && ((int) $this->h > 0)) {
+
+								$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(phpthumb_functions::nonempty_min($this->w, $getimagesize[0]).'x'.phpthumb_functions::nonempty_min($this->h, $getimagesize[1]));
+								$commandline .= ' -gravity center';
+								if ($this->bg) {
+									$commandline .= ' -background ' . phpthumb_functions::escapeshellarg_replacement('#' . $this->bg);
+								} else {
+									$commandline .= ' -background none';
+								}
+								$commandline .= ' -extent '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h);
+
 							} else {
-								$this->w = ((($this->aoe || $this->far) && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : ''));
-								$this->h = ((($this->aoe || $this->far) && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : ''));
+
+								$this->w = (($this->aoe && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : null));
+								$this->h = (($this->aoe && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : null));
 								if ($this->w || $this->h) {
 									if ($IMuseExplicitImageOutputDimensions) {
 										if ($this->w && !$this->h) {
@@ -1545,39 +1919,40 @@ function ImageMagickThumbnailToGD() {
 									list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra);
 									$nw = ((round($nw) != 0) ? round($nw) : '');
 									$nh = ((round($nh) != 0) ? round($nh) : '');
-									$commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($nw.'x'.$nh);
+									$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($nw.'x'.$nh);
 								}
+
 							}
 						}
 					}
 
 				} else {
 
-					$this->DebugMessage('GetImageSize('.$this->sourceFilename.') failed', __FILE__, __LINE__);
+					$this->DebugMessage('getimagesize('.$this->sourceFilename.') failed', __FILE__, __LINE__);
 					if ($this->w || $this->h) {
-						$exactDimensionsBang = (($this->iar && (intval($this->w) > 0) && (intval($this->h) > 0)) ? '!' : '');
+						$exactDimensionsBang = (($this->iar && ((int) $this->w > 0) && ((int) $this->h > 0)) ? '!' : '');
 						if ($IMuseExplicitImageOutputDimensions) {
 							// unknown source aspect ratio, just put large number and hope IM figures it out
-							$commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg(($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999').$exactDimensionsBang);
+							$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($this->w ? $this->w : '9999').'x'.($this->h ? $this->h : '9999').$exactDimensionsBang);
 						} else {
-							$commandline .= ' -'.$IMresizeParameter.' '.escapeshellarg($this->w.'x'.$this->h.$exactDimensionsBang);
+							$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h.$exactDimensionsBang);
 						}
 					}
 
 				}
 
 				if ($this->ra) {
-					$this->ra = intval($this->ra);
+					$this->ra = (int) $this->ra;
 					if ($this->ImageMagickSwitchAvailable('rotate')) {
 						if (!preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat) || phpthumb_functions::version_compare_replacement($this->ImageMagickVersion(), '6.3.7', '>=')) {
 							$this->DebugMessage('Using ImageMagick rotate', __FILE__, __LINE__);
-							$commandline .= ' -rotate '.escapeshellarg($this->ra);
+							$commandline .= ' -rotate '.phpthumb_functions::escapeshellarg_replacement($this->ra);
 							if (($this->ra % 90) != 0) {
 								if (preg_match('#('.implode('|', $this->AlphaCapableFormats).')#i', $outputFormat)) {
 									// alpha-capable format
 									$commandline .= ' -background rgba(255,255,255,0)';
 								} else {
-									$commandline .= ' -background '.escapeshellarg('#'.($this->bg ? $this->bg : 'FFFFFF'));
+									$commandline .= ' -background '.phpthumb_functions::escapeshellarg_replacement('#'.($this->bg ? $this->bg : 'FFFFFF'));
 								}
 							}
 							$this->ra = 0;
@@ -1595,14 +1970,14 @@ function ImageMagickThumbnailToGD() {
 					switch ($command) {
 						case 'brit':
 							if ($this->ImageMagickSwitchAvailable('modulate')) {
-								$commandline .= ' -modulate '.escapeshellarg((100 + intval($parameter)).',100,100');
+								$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement((100 + (int) $parameter).',100,100');
 								$successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
 
 						case 'cont':
 							if ($this->ImageMagickSwitchAvailable('contrast')) {
-								$contDiv10 = round(intval($parameter) / 10);
+								$contDiv10 = round((int) $parameter / 10);
 								if ($contDiv10 > 0) {
 									$contDiv10 = min($contDiv10, 100);
 									for ($i = 0; $i < $contDiv10; $i++) {
@@ -1626,7 +2001,7 @@ function ImageMagickThumbnailToGD() {
 									$commandline .= ' -colorspace GRAY';
 									$commandline .= ' -modulate 100,0,100';
 								} else {
-									$commandline .= ' -modulate '.escapeshellarg('100,'.(100 - intval($parameter)).',100');
+									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 - (int) $parameter).',100');
 								}
 								$successfullyProcessedFilters[] = $filterkey;
 							}
@@ -1638,7 +2013,7 @@ function ImageMagickThumbnailToGD() {
 									$commandline .= ' -colorspace GRAY';
 									$commandline .= ' -modulate 100,0,100';
 								} else {
-									$commandline .= ' -modulate '.escapeshellarg('100,'.(100 + intval($parameter)).',100');
+									$commandline .= ' -modulate '.phpthumb_functions::escapeshellarg_replacement('100,'.(100 + (int) $parameter).',100');
 								}
 								$successfullyProcessedFilters[] = $filterkey;
 							}
@@ -1655,8 +2030,9 @@ function ImageMagickThumbnailToGD() {
 						case 'clr':
 							if ($this->ImageMagickSwitchAvailable(array('fill', 'colorize'))) {
 								@list($amount, $color) = explode('|', $parameter);
-								$commandline .= ' -fill '.escapeshellarg('#'.preg_replace('#[^0-9A-F]#i', '', $color));
-								$commandline .= ' -colorize '.escapeshellarg(min(max(intval($amount), 0), 100));
+								$commandline .= ' -fill '.phpthumb_functions::escapeshellarg_replacement('#'.preg_replace('#[^0-9A-F]#i', '', $color));
+								$commandline .= ' -colorize '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100));
+                                $successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
 
@@ -1665,7 +2041,7 @@ function ImageMagickThumbnailToGD() {
 								@list($amount, $color) = explode('|', $parameter);
 								$amount = ($amount ? $amount : 80);
 								if (!$color) {
-									$commandline .= ' -sepia-tone '.escapeshellarg(min(max(intval($amount), 0), 100).'%');
+									$commandline .= ' -sepia-tone '.phpthumb_functions::escapeshellarg_replacement(min(max((int) $amount, 0), 100).'%');
 									$successfullyProcessedFilters[] = $filterkey;
 								}
 							}
@@ -1673,10 +2049,10 @@ function ImageMagickThumbnailToGD() {
 
 						case 'gam':
 							@list($amount) = explode('|', $parameter);
-							$amount = min(max(floatval($amount), 0.001), 10);
+							$amount = min(max((float) $amount, 0.001), 10);
 							if (number_format($amount, 3) != '1.000') {
 								if ($this->ImageMagickSwitchAvailable('gamma')) {
-									$commandline .= ' -gamma '.escapeshellarg($amount);
+									$commandline .= ' -gamma '.phpthumb_functions::escapeshellarg_replacement($amount);
 									$successfullyProcessedFilters[] = $filterkey;
 								}
 							}
@@ -1692,7 +2068,7 @@ function ImageMagickThumbnailToGD() {
 						case 'th':
 							@list($amount) = explode('|', $parameter);
 							if ($this->ImageMagickSwitchAvailable(array('threshold', 'dither', 'monochrome'))) {
-								$commandline .= ' -threshold '.escapeshellarg(round(min(max(intval($amount), 0), 255) / 2.55).'%');
+								$commandline .= ' -threshold '.phpthumb_functions::escapeshellarg_replacement(round(min(max((int) $amount, 0), 255) / 2.55).'%');
 								$commandline .= ' -dither';
 								$commandline .= ' -monochrome';
 								$successfullyProcessedFilters[] = $filterkey;
@@ -1704,7 +2080,7 @@ function ImageMagickThumbnailToGD() {
 								@list($colors, $dither) = explode('|', $parameter);
 								$colors = ($colors                ?  (int) $colors : 256);
 								$dither  = ((strlen($dither) > 0) ? (bool) $dither : true);
-								$commandline .= ' -colors '.escapeshellarg(max($colors, 8)); // ImageMagick will otherwise fail with "cannot quantize to fewer than 8 colors"
+								$commandline .= ' -colors '.phpthumb_functions::escapeshellarg_replacement(max($colors, 8)); // ImageMagick will otherwise fail with "cannot quantize to fewer than 8 colors"
 								$commandline .= ($dither ? ' -dither' : ' +dither');
 								$successfullyProcessedFilters[] = $filterkey;
 							}
@@ -1725,7 +2101,7 @@ function ImageMagickThumbnailToGD() {
 						case 'edge':
 							if ($this->ImageMagickSwitchAvailable('edge')) {
 								$parameter = (!empty($parameter) ? $parameter : 2);
-								$commandline .= ' -edge '.escapeshellarg(!empty($parameter) ? intval($parameter) : 1);
+								$commandline .= ' -edge '.phpthumb_functions::escapeshellarg_replacement(!empty($parameter) ? (int) $parameter : 1);
 								$successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
@@ -1733,7 +2109,7 @@ function ImageMagickThumbnailToGD() {
 						case 'emb':
 							if ($this->ImageMagickSwitchAvailable(array('emboss', 'negate'))) {
 								$parameter = (!empty($parameter) ? $parameter : 2);
-								$commandline .= ' -emboss '.escapeshellarg(intval($parameter));
+								$commandline .= ' -emboss '.phpthumb_functions::escapeshellarg_replacement((int) $parameter);
 								if ($parameter < 2) {
 									$commandline .= ' -negate'; // ImageMagick negates the image for some reason with '-emboss 1';
 								}
@@ -1744,8 +2120,8 @@ function ImageMagickThumbnailToGD() {
 						case 'lvl':
 							@list($band, $method, $threshold) = explode('|', $parameter);
 							$band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band))       : '*');
-							$method    = ((strlen($method) > 0)    ? intval($method)                        :   2);
-							$threshold = ((strlen($threshold) > 0) ? min(max(floatval($threshold), 0), 100) : 0.1);
+							$method    = ((strlen($method) > 0)    ? (int) $method :   2);
+							$threshold = ((strlen($threshold) > 0) ? min(max((float) $threshold, 0), 100) : 0.1);
 
 							$band = preg_replace('#[^RGBA\\*]#', '', strtoupper($band));
 
@@ -1770,10 +2146,10 @@ function ImageMagickThumbnailToGD() {
 								case 2: // ImageMagick "contrast-stretch"
 									if ($this->ImageMagickSwitchAvailable('contrast-stretch')) {
 										if ($band != '*') {
-											$commandline .= ' -channel '.escapeshellarg(strtoupper($band));
+											$commandline .= ' -channel '.phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
 										}
 										$threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure
-										//$commandline .= ' -contrast-stretch '.escapeshellarg($threshold.'%');
+										//$commandline .= ' -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%');
 										$commandline .= ' -contrast-stretch \''.$threshold.'%\'';
 										if ($band != '*') {
 											$commandline .= ' +channel';
@@ -1784,7 +2160,7 @@ function ImageMagickThumbnailToGD() {
 								case 3: // ImageMagick "normalize"
 									if ($this->ImageMagickSwitchAvailable('normalize')) {
 										if ($band != '*') {
-											$commandline .= ' -channel '.escapeshellarg(strtoupper($band));
+											$commandline .= ' -channel '.phpthumb_functions::escapeshellarg_replacement(strtoupper($band));
 										}
 										$commandline .= ' -normalize';
 										if ($band != '*') {
@@ -1806,11 +2182,11 @@ function ImageMagickThumbnailToGD() {
 						case 'wb':
 							if ($this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) {
 								@list($threshold) = explode('|', $parameter);
-								$threshold = (!empty($threshold) ? min(max(floatval($threshold), 0), 100) : 0.1);
+								$threshold = (!empty($threshold) ? min(max((float) $threshold, 0), 100) : 0.1);
 								$threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure
-								//$commandline .= ' -channel R -contrast-stretch '.escapeshellarg($threshold.'%'); // doesn't work on Windows because most versions of PHP do not properly
-								//$commandline .= ' -channel G -contrast-stretch '.escapeshellarg($threshold.'%'); // escape special characters (such as %) and just replace them with spaces
-								//$commandline .= ' -channel B -contrast-stretch '.escapeshellarg($threshold.'%'); // https://bugs.php.net/bug.php?id=43261
+								//$commandline .= ' -channel R -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // doesn't work on Windows because most versions of PHP do not properly
+								//$commandline .= ' -channel G -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // escape special characters (such as %) and just replace them with spaces
+								//$commandline .= ' -channel B -contrast-stretch '.phpthumb_functions::escapeshellarg_replacement($threshold.'%'); // https://bugs.php.net/bug.php?id=43261
 								$commandline .= ' -channel R -contrast-stretch \''.$threshold.'%\'';
 								$commandline .= ' -channel G -contrast-stretch \''.$threshold.'%\'';
 								$commandline .= ' -channel B -contrast-stretch \''.$threshold.'%\'';
@@ -1822,21 +2198,21 @@ function ImageMagickThumbnailToGD() {
 						case 'blur':
 							if ($this->ImageMagickSwitchAvailable('blur')) {
 								@list($radius) = explode('|', $parameter);
-								$radius = (!empty($radius) ? min(max(intval($radius), 0), 25) : 1);
-								$commandline .= ' -blur '.escapeshellarg($radius);
+								$radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
+								$commandline .= ' -blur '.phpthumb_functions::escapeshellarg_replacement($radius);
 								$successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
 
 						case 'gblr':
 							@list($radius) = explode('|', $parameter);
-							$radius = (!empty($radius) ? min(max(intval($radius), 0), 25) : 1);
+							$radius = (!empty($radius) ? min(max((int) $radius, 0), 25) : 1);
 							// "-gaussian" changed to "-gaussian-blur" sometime around 2009
 							if ($this->ImageMagickSwitchAvailable('gaussian-blur')) {
-								$commandline .= ' -gaussian-blur '.escapeshellarg($radius);
+								$commandline .= ' -gaussian-blur '.phpthumb_functions::escapeshellarg_replacement($radius);
 								$successfullyProcessedFilters[] = $filterkey;
 							} elseif ($this->ImageMagickSwitchAvailable('gaussian')) {
-								$commandline .= ' -gaussian '.escapeshellarg($radius);
+								$commandline .= ' -gaussian '.phpthumb_functions::escapeshellarg_replacement($radius);
 								$successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
@@ -1844,10 +2220,10 @@ function ImageMagickThumbnailToGD() {
 						case 'usm':
 							if ($this->ImageMagickSwitchAvailable('unsharp')) {
 								@list($amount, $radius, $threshold) = explode('|', $parameter);
-								$amount    = ($amount            ? min(max(intval($radius), 0), 255) : 80);
-								$radius    = ($radius            ? min(max(intval($radius), 0), 10)  : 0.5);
-								$threshold = (strlen($threshold) ? min(max(intval($radius), 0), 50)  : 3);
-								$commandline .= ' -unsharp '.escapeshellarg(number_format(($radius * 2) - 1, 2, '.', '').'x1+'.number_format($amount / 100, 2, '.', '').'+'.number_format($threshold / 100, 2, '.', ''));
+								$amount    = ($amount            ? min(max((int) $amount,    0), 255) : 80);
+								$radius    = ($radius            ? min(max((int) $radius,    0),  10) : 0.5);
+								$threshold = ('' !== $threshold ? min(max((int) $threshold, 0),  50) : 3);
+								$commandline .= ' -unsharp '.phpthumb_functions::escapeshellarg_replacement(number_format(($radius * 2) - 1, 2, '.', '').'x1+'.number_format($amount / 100, 2, '.', '').'+'.number_format($threshold / 100, 2, '.', ''));
 								$successfullyProcessedFilters[] = $filterkey;
 							}
 							break;
@@ -1856,20 +2232,20 @@ function ImageMagickThumbnailToGD() {
 							if ($this->ImageMagickSwitchAvailable(array('border', 'bordercolor', 'thumbnail', 'crop'))) {
 								if (!$this->zc) {
 									@list($width, $rX, $rY, $color) = explode('|', $parameter);
-									$width = intval($width);
-									$rX    = intval($rX);
-									$rY    = intval($rY);
+									$width = (int) $width;
+									$rX    = (int) $rX;
+									$rY    = (int) $rY;
 									if ($width && !$rX && !$rY) {
 										if (!phpthumb_functions::IsHexColor($color)) {
 											$color = ((!empty($this->bc) && phpthumb_functions::IsHexColor($this->bc)) ? $this->bc : '000000');
 										}
-										$commandline .= ' -border '.escapeshellarg(intval($width));
-										$commandline .= ' -bordercolor '.escapeshellarg('#'.$color);
+										$commandline .= ' -border '.phpthumb_functions::escapeshellarg_replacement((int) $width);
+										$commandline .= ' -bordercolor '.phpthumb_functions::escapeshellarg_replacement('#'.$color);
 
-										if (preg_match('# \\-crop "([0-9]+)x([0-9]+)\\+0\\+0" #', $commandline, $matches)) {
-											$commandline = str_replace(' -crop "'.$matches[1].'x'.$matches[2].'+0+0" ', ' -crop '.escapeshellarg(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width)).'+0+0').' ', $commandline);
+										if (preg_match('# \\-crop "([\d]+)x([\d]+)\\+0\\+0" #', $commandline, $matches)) {
+											$commandline = str_replace(' -crop "'.$matches[1].'x'.$matches[2].'+0+0" ', ' -crop '.phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width)).'+0+0').' ', $commandline);
 										} elseif (preg_match('# \\-'.$IMresizeParameter.' "([0-9]+)x([0-9]+)" #', $commandline, $matches)) {
-											$commandline = str_replace(' -'.$IMresizeParameter.' "'.$matches[1].'x'.$matches[2].'" ', ' -'.$IMresizeParameter.' '.escapeshellarg(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width))).' ', $commandline);
+											$commandline = str_replace(' -'.$IMresizeParameter.' "'.$matches[1].'x'.$matches[2].'" ', ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)).'x'.($matches[2] - (2 * $width))).' ', $commandline);
 										}
 										$successfullyProcessedFilters[] = $filterkey;
 									}
@@ -1943,15 +2319,14 @@ function ImageMagickThumbnailToGD() {
 
 				if (preg_match('#jpe?g#i', $outputFormat) && $this->q) {
 					if ($this->ImageMagickSwitchAvailable(array('quality', 'interlace'))) {
-						$commandline .= ' -quality '.escapeshellarg($this->thumbnailQuality);
+						$commandline .= ' -quality '.phpthumb_functions::escapeshellarg_replacement($this->thumbnailQuality);
 						if ($this->config_output_interlace) {
 							// causes weird things with animated GIF... leave for JPEG only
 							$commandline .= ' -interlace line '; // Use Line or Plane to create an interlaced PNG or GIF or progressive JPEG image
 						}
 					}
 				}
-				$commandline .= ' '.escapeshellarg(preg_replace('#[/\\\\]#', DIRECTORY_SEPARATOR, $this->sourceFilename).(($outputFormat == 'gif') ? '' : '['.intval($this->sfn).']')); // [0] means first frame of (GIF) animation, can be ignored
-				$commandline .= ' '.$outputFormat.':'.escapeshellarg($IMtempfilename);
+				$commandline .= ' '.$outputFormat.':'.phpthumb_functions::escapeshellarg_replacement($IMtempfilename);
 				if (!$this->iswindows) {
 					$commandline .= ' 2>&1';
 				}
@@ -1971,19 +2346,23 @@ function ImageMagickThumbnailToGD() {
 						unset($this->fltr[$filterkey]);
 					}
 					$this->IMresizedData = file_get_contents($IMtempfilename);
-					$getimagesize_imresized = @GetImageSize($IMtempfilename);
-					$this->DebugMessage('GetImageSize('.$IMtempfilename.') returned [w='.$getimagesize_imresized[0].';h='.$getimagesize_imresized[1].';f='.$getimagesize_imresized[2].']', __FILE__, __LINE__);
+					$getimagesize_imresized = @getimagesize($IMtempfilename);
+					$this->DebugMessage('getimagesize('.$IMtempfilename.') returned [w='.$getimagesize_imresized[0].';h='.$getimagesize_imresized[1].';f='.$getimagesize_imresized[2].']', __FILE__, __LINE__);
 					if (($this->config_max_source_pixels > 0) && (($getimagesize_imresized[0] * $getimagesize_imresized[1]) > $this->config_max_source_pixels)) {
 						$this->DebugMessage('skipping ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() because IM output is too large ('.$getimagesize_imresized[0].'x'.$getimagesize_imresized[0].' = '.($getimagesize_imresized[0] * $getimagesize_imresized[1]).' > '.$this->config_max_source_pixels.')', __FILE__, __LINE__);
 					} elseif (function_exists(@$ImageCreateFunction) && ($this->gdimg_source = @$ImageCreateFunction($IMtempfilename))) {
-						$this->source_width  = ImageSX($this->gdimg_source);
-						$this->source_height = ImageSY($this->gdimg_source);
+						$this->source_width  = imagesx($this->gdimg_source);
+						$this->source_height = imagesy($this->gdimg_source);
 						$this->DebugMessage('ImageMagickThumbnailToGD::'.$ImageCreateFunction.'() succeeded, $this->gdimg_source is now ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__);
 						$this->DebugMessage('ImageMagickThumbnailToGD() returning $this->IMresizedData ('.strlen($this->IMresizedData).' bytes)', __FILE__, __LINE__);
 					} else {
 						$this->useRawIMoutput = true;
 						$this->DebugMessage('$this->useRawIMoutput set to TRUE because '.@$ImageCreateFunction.'('.$IMtempfilename.') failed', __FILE__, __LINE__);
 					}
+					if (file_exists($IMtempfilename)) {
+						$this->DebugMessage('deleting "'.$IMtempfilename.'"', __FILE__, __LINE__);
+						@unlink($IMtempfilename);
+					}
 					return true;
 
 				}
@@ -2010,14 +2389,14 @@ function ImageMagickThumbnailToGD() {
 	}
 
 
-	function Rotate() {
+	public function Rotate() {
 		if ($this->ra || $this->ar) {
-			if (!function_exists('ImageRotate')) {
-				$this->DebugMessage('!function_exists(ImageRotate)', __FILE__, __LINE__);
+			if (!function_exists('imagerotate')) {
+				$this->DebugMessage('!function_exists(imagerotate)', __FILE__, __LINE__);
 				return false;
 			}
-			if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) {
-				$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
+			if (!include_once __DIR__ .'/phpthumb.filters.php' ) {
+				$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
 				return false;
 			}
 
@@ -2029,12 +2408,12 @@ function Rotate() {
 			$rotate_angle = 0;
 			if ($this->ra) {
 
-				$rotate_angle = floatval($this->ra);
+				$rotate_angle = (float) $this->ra;
 
 			} else {
 
 				if ($this->ar == 'x') {
-					if (phpthumb_functions::version_compare_replacement(phpversion(), '4.2.0', '>=')) {
+					if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.2.0', '>=')) {
 						if ($this->sourceFilename) {
 							if (function_exists('exif_read_data')) {
 								if ($exif_data = @exif_read_data($this->sourceFilename, 'IFD0')) {
@@ -2072,7 +2451,7 @@ function Rotate() {
 							return false;
 						}
 					} else {
-						$this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('.phpversion().')', __FILE__, __LINE__);
+						$this->DebugMessage('Cannot auto-rotate from EXIF data because PHP is less than v4.2.0 ('. PHP_VERSION .')', __FILE__, __LINE__);
 						return false;
 					}
 				} elseif (($this->ar == 'l') && ($this->source_height > $this->source_width)) {
@@ -2089,15 +2468,15 @@ function Rotate() {
 			if ($rotate_angle % 90) {
 				$this->is_alpha = true;
 			}
-			phpthumb_filters::ImprovedImageRotate($this->gdimg_source, $rotate_angle, $this->config_background_hexcolor, $this->bg);
-			$this->source_width  = ImageSX($this->gdimg_source);
-			$this->source_height = ImageSY($this->gdimg_source);
+			phpthumb_filters::ImprovedImageRotate($this->gdimg_source, $rotate_angle, $this->config_background_hexcolor, $this->bg, $this);
+			$this->source_width  = imagesx($this->gdimg_source);
+			$this->source_height = imagesy($this->gdimg_source);
 		}
 		return true;
 	}
 
 
-	function FixedAspectRatio() {
+	public function FixedAspectRatio() {
 		// optional fixed-dimension images (regardless of aspect ratio)
 
 		if (!$this->far) {
@@ -2113,8 +2492,8 @@ function FixedAspectRatio() {
 		$this->is_alpha = true;
 		if ($this->thumbnail_image_width >= $this->thumbnail_width) {
 
+			$aspectratio = $this->thumbnail_image_height / $this->thumbnail_image_width;
 			if ($this->w) {
-				$aspectratio = $this->thumbnail_image_height / $this->thumbnail_image_width;
 				$this->thumbnail_image_height = round($this->thumbnail_image_width * $aspectratio);
 				$this->thumbnail_height = ($this->h ? $this->h : $this->thumbnail_image_height);
 			} elseif ($this->thumbnail_image_height < $this->thumbnail_height) {
@@ -2123,8 +2502,9 @@ function FixedAspectRatio() {
 			}
 
 		} else {
+
+			$aspectratio = $this->thumbnail_image_width / $this->thumbnail_image_height;
 			if ($this->h) {
-				$aspectratio = $this->thumbnail_image_width / $this->thumbnail_image_height;
 				$this->thumbnail_image_width = round($this->thumbnail_image_height * $aspectratio);
 			} elseif ($this->thumbnail_image_width < $this->thumbnail_width) {
 				$this->thumbnail_image_width = $this->thumbnail_width;
@@ -2136,7 +2516,7 @@ function FixedAspectRatio() {
 	}
 
 
-	function OffsiteDomainIsAllowed($hostname, $allowed_domains) {
+	public function OffsiteDomainIsAllowed($hostname, $allowed_domains) {
 		static $domain_is_allowed = array();
 		$hostname = strtolower($hostname);
 		if (!isset($domain_is_allowed[$hostname])) {
@@ -2161,9 +2541,9 @@ function OffsiteDomainIsAllowed($hostname, $allowed_domains) {
 	}
 
 
-	function AntiOffsiteLinking() {
+	public function AntiOffsiteLinking() {
 		// Optional anti-offsite hijacking of the thumbnail script
-		$allow = true;
+		$allow   = true;
 		if ($allow && $this->config_nooffsitelink_enabled && (@$_SERVER['HTTP_REFERER'] || $this->config_nooffsitelink_require_refer)) {
 			$this->DebugMessage('AntiOffsiteLinking() checking $_SERVER[HTTP_REFERER] "'.@$_SERVER['HTTP_REFERER'].'"', __FILE__, __LINE__);
 			foreach ($this->config_nooffsitelink_valid_domains as $key => $valid_domain) {
@@ -2173,12 +2553,9 @@ function AntiOffsiteLinking() {
 			}
 			$parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
 			if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nooffsitelink_valid_domains)) {
-				$allow = false;
-				$erase   = $this->config_nooffsitelink_erase_image;
-				$message = $this->config_nooffsitelink_text_message;
-$this->ErrorImage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')');
-exit;
-				$this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+				$allow   = false;
+				//$this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+				$this->ErrorImage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is NOT in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')');
 			} else {
 				$this->DebugMessage('AntiOffsiteLinking() - "'.@$parsed_url['host'].'" is in $this->config_nooffsitelink_valid_domains ('.implode(';', $this->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
 			}
@@ -2187,11 +2564,9 @@ function AntiOffsiteLinking() {
 		if ($allow && $this->config_nohotlink_enabled && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
 			$parsed_url = phpthumb_functions::ParseURLbetter($this->src);
 			//if (!phpthumb_functions::CaseInsensitiveInArray(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) {
-			if ($this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) {
+			if (!$this->OffsiteDomainIsAllowed(@$parsed_url['host'], $this->config_nohotlink_valid_domains)) {
 				// This domain is not allowed
 				$allow = false;
-				$erase   = $this->config_nohotlink_erase_image;
-				$message = $this->config_nohotlink_text_message;
 				$this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is NOT in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__);
 			} else {
 				$this->DebugMessage('AntiOffsiteLinking() - "'.$parsed_url['host'].'" is in $this->config_nohotlink_valid_domains ('.implode(';', $this->config_nohotlink_valid_domains).')', __FILE__, __LINE__);
@@ -2209,17 +2584,17 @@ function AntiOffsiteLinking() {
 		if (!phpthumb_functions::IsHexColor($this->config_error_textcolor)) {
 			return $this->ErrorImage('Invalid hex color string "'.$this->config_error_textcolor.'" for $this->config_error_textcolor');
 		}
-		if ($erase) {
+		if ($this->config_nooffsitelink_erase_image) {
 
-			return $this->ErrorImage($message, $this->thumbnail_width, $this->thumbnail_height, $this->config_error_bgcolor, $this->config_error_textcolor, $this->config_error_fontsize);
+			return $this->ErrorImage($this->config_nooffsitelink_text_message, $this->thumbnail_width, $this->thumbnail_height);
 
 		} else {
 
 			$this->config_nooffsitelink_watermark_src = $this->ResolveFilenameToAbsolute($this->config_nooffsitelink_watermark_src);
 			if (is_file($this->config_nooffsitelink_watermark_src)) {
 
-				if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) {
-					$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__);
+				if (!include_once __DIR__ .'/phpthumb.filters.php' ) {
+					$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying watermark', __FILE__, __LINE__);
 					return false;
 				}
 				$watermark_img = $this->ImageCreateFromStringReplacement(file_get_contents($this->config_nooffsitelink_watermark_src));
@@ -2228,21 +2603,21 @@ function AntiOffsiteLinking() {
 				$opacity = 50;
 				$margin  = 5;
 				$phpthumbFilters->WatermarkOverlay($this->gdimg_output, $watermark_img, '*', $opacity, $margin);
-				ImageDestroy($watermark_img);
+				imagedestroy($watermark_img);
 				unset($phpthumbFilters);
 
 			} else {
 
-				$nohotlink_text_array = explode("\n", wordwrap($message, floor($this->thumbnail_width / ImageFontWidth($this->config_error_fontsize)), "\n"));
+				$nohotlink_text_array = explode("\n", wordwrap($this->config_nooffsitelink_text_message, floor($this->thumbnail_width / imagefontwidth($this->config_error_fontsize)), "\n"));
 				$nohotlink_text_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_error_textcolor);
 
-				$topoffset = round(($this->thumbnail_height - (count($nohotlink_text_array) * ImageFontHeight($this->config_error_fontsize))) / 2);
+				$topoffset = round(($this->thumbnail_height - (count($nohotlink_text_array) * imagefontheight($this->config_error_fontsize))) / 2);
 
 				$rowcounter = 0;
-				$this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__);
+				$this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$this->config_nooffsitelink_text_message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__);
 				foreach ($nohotlink_text_array as $textline) {
-					$leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * ImageFontWidth($this->config_error_fontsize))) / 2));
-					ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
+					$leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * imagefontwidth($this->config_error_fontsize))) / 2));
+					imagestring($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * imagefontheight($this->config_error_fontsize)), $textline, $nohotlink_text_color);
 				}
 
 			}
@@ -2252,7 +2627,7 @@ function AntiOffsiteLinking() {
 	}
 
 
-	function AlphaChannelFlatten() {
+	public function AlphaChannelFlatten() {
 		if (!$this->is_alpha) {
 			// image doesn't have alpha transparency, no need to flatten
 			$this->DebugMessage('skipping AlphaChannelFlatten() because !$this->is_alpha', __FILE__, __LINE__);
@@ -2260,15 +2635,16 @@ function AlphaChannelFlatten() {
 		}
 		switch ($this->thumbnailFormat) {
 			case 'png':
+			case 'webp':
 			case 'ico':
-				// image has alpha transparency, but output as PNG or ICO which can handle it
+				// image has alpha transparency, but output as PNG, WEBP or ICO which can handle it
 				$this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'")', __FILE__, __LINE__);
 				return false;
 				break;
 
 			case 'gif':
 				// image has alpha transparency, but output as GIF which can handle only single-color transparency
-				$CurrentImageColorTransparent = ImageColorTransparent($this->gdimg_output);
+				$CurrentImageColorTransparent = imagecolortransparent($this->gdimg_output);
 				if ($CurrentImageColorTransparent == -1) {
 					// no transparent color defined
 
@@ -2277,53 +2653,53 @@ function AlphaChannelFlatten() {
 						return false;
 					}
 
-					if ($img_alpha_mixdown_dither = @ImageCreateTrueColor(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) {
+					if ($img_alpha_mixdown_dither = @imagecreatetruecolor(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
 
+						$dither_color = array();
 						for ($i = 0; $i <= 255; $i++) {
-							$dither_color[$i] = ImageColorAllocate($img_alpha_mixdown_dither, $i, $i, $i);
+							$dither_color[$i] = imagecolorallocate($img_alpha_mixdown_dither, $i, $i, $i);
 						}
 
 						// scan through current truecolor image copy alpha channel to temp image as grayscale
 						for ($x = 0; $x < $this->thumbnail_width; $x++) {
 							for ($y = 0; $y < $this->thumbnail_height; $y++) {
 								$PixelColor = phpthumb_functions::GetPixelColor($this->gdimg_output, $x, $y);
-								ImageSetPixel($img_alpha_mixdown_dither, $x, $y, $dither_color[($PixelColor['alpha'] * 2)]);
+								imagesetpixel($img_alpha_mixdown_dither, $x, $y, $dither_color[ $PixelColor[ 'alpha'] * 2 ]);
 							}
 						}
 
 						// dither alpha channel grayscale version down to 2 colors
-						ImageTrueColorToPalette($img_alpha_mixdown_dither, true, 2);
+						imagetruecolortopalette($img_alpha_mixdown_dither, true, 2);
 
 						// reduce color palette to 256-1 colors (leave one palette position for transparent color)
-						ImageTrueColorToPalette($this->gdimg_output, true, 255);
+						imagetruecolortopalette($this->gdimg_output, true, 255);
 
 						// allocate a new color for transparent color index
-						$TransparentColor = ImageColorAllocate($this->gdimg_output, 1, 254, 253);
-						ImageColorTransparent($this->gdimg_output, $TransparentColor);
+						$TransparentColor = imagecolorallocate($this->gdimg_output, 1, 254, 253);
+						imagecolortransparent($this->gdimg_output, $TransparentColor);
 
 						// scan through alpha channel image and note pixels with >50% transparency
-						$TransparentPixels = array();
 						for ($x = 0; $x < $this->thumbnail_width; $x++) {
 							for ($y = 0; $y < $this->thumbnail_height; $y++) {
 								$AlphaChannelPixel = phpthumb_functions::GetPixelColor($img_alpha_mixdown_dither, $x, $y);
 								if ($AlphaChannelPixel['red'] > 127) {
-									ImageSetPixel($this->gdimg_output, $x, $y, $TransparentColor);
+									imagesetpixel($this->gdimg_output, $x, $y, $TransparentColor);
 								}
 							}
 						}
-						ImageDestroy($img_alpha_mixdown_dither);
+						imagedestroy($img_alpha_mixdown_dither);
 
 						$this->DebugMessage('AlphaChannelFlatten() set image to 255+1 colors with transparency for GIF output', __FILE__, __LINE__);
 						return true;
 
 					} else {
-						$this->DebugMessage('AlphaChannelFlatten() failed ImageCreate('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).')', __FILE__, __LINE__);
+						$this->DebugMessage('AlphaChannelFlatten() failed imagecreate('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).')', __FILE__, __LINE__);
 						return false;
 					}
 
 				} else {
 					// a single transparent color already defined, leave as-is
-					$this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'") and ImageColorTransparent returned "'.$CurrentImageColorTransparent.'"', __FILE__, __LINE__);
+					$this->DebugMessage('skipping AlphaChannelFlatten() because ($this->thumbnailFormat == "'.$this->thumbnailFormat.'") and imagecolortransparent() returned "'.$CurrentImageColorTransparent.'"', __FILE__, __LINE__);
 					return true;
 				}
 				break;
@@ -2337,15 +2713,15 @@ function AlphaChannelFlatten() {
 				return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
 			}
 			$background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor);
-			ImageFilledRectangle($gdimg_flatten_temp, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
-			ImageCopy($gdimg_flatten_temp, $this->gdimg_output, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
+			imagefilledrectangle($gdimg_flatten_temp, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
+			imagecopy($gdimg_flatten_temp, $this->gdimg_output, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
 
-			ImageAlphaBlending($this->gdimg_output, true);
-			ImageSaveAlpha($this->gdimg_output, false);
-			ImageColorTransparent($this->gdimg_output, -1);
-			ImageCopy($this->gdimg_output, $gdimg_flatten_temp, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
+			imagealphablending($this->gdimg_output, true);
+			imagesavealpha($this->gdimg_output, false);
+			imagecolortransparent($this->gdimg_output, -1);
+			imagecopy($this->gdimg_output, $gdimg_flatten_temp, 0, 0, 0, 0, $this->thumbnail_width, $this->thumbnail_height);
 
-			ImageDestroy($gdimg_flatten_temp);
+			imagedestroy($gdimg_flatten_temp);
 			return true;
 
 		} else {
@@ -2355,10 +2731,10 @@ function AlphaChannelFlatten() {
 	}
 
 
-	function ApplyFilters() {
+	public function ApplyFilters() {
 		if ($this->fltr && is_array($this->fltr)) {
-			if (!include_once(dirname(__FILE__).'/phpthumb.filters.php')) {
-				$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
+			if (!include_once __DIR__ .'/phpthumb.filters.php' ) {
+				$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.filters.php" which is required for applying filters ('.implode(';', $this->fltr).')', __FILE__, __LINE__);
 				return false;
 			}
 			$phpthumbFilters = new phpthumb_filters();
@@ -2429,7 +2805,7 @@ function ApplyFilters() {
 						break;
 
 					case 'flip': // Flip
-						$phpthumbFilters->Flip($this->gdimg_output, (strpos(strtolower($parameter), 'x') !== false), (strpos(strtolower($parameter), 'y') !== false));
+						$phpthumbFilters->Flip($this->gdimg_output, strpos(strtolower($parameter), 'x') !== false, strpos(strtolower($parameter), 'y') !== false);
 						break;
 
 					case 'edge': // EdgeDetect
@@ -2448,8 +2824,8 @@ function ApplyFilters() {
 					case 'lvl': // autoLevels
 						@list($band, $method, $threshold) = explode('|', $parameter, 3);
 						$band      = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*');
-						$method    = ((strlen($method) > 0)    ? intval($method)                  :   2);
-						$threshold = ((strlen($threshold) > 0) ? floatval($threshold)             : 0.1);
+						$method    = ((strlen($method) > 0)    ? (int) $method :   2);
+						$threshold = ((strlen($threshold) > 0) ? (float) $threshold : 0.1);
 
 						$phpthumbFilters->HistogramStretch($this->gdimg_output, $band, $method, $threshold);
 						break;
@@ -2471,7 +2847,7 @@ function ApplyFilters() {
 						$alignment = ($alignment ? $alignment : 'BR');
 						$opacity   = ($opacity   ? $opacity   :   50);
 						$margin_x  = ($margin_x  ? $margin_x  :    5);
-						$margin_y  = $margin_y; // just to note it wasn't forgotten, but let the value always pass unchanged
+						// $margin_y -- it wasn't forgotten, let the value always pass unchanged
 						$phpthumbFilters->HistogramOverlay($this->gdimg_output, $bands, $colors, $width, $height, $alignment, $opacity, $margin_x, $margin_y);
 						break;
 
@@ -2495,7 +2871,8 @@ function ApplyFilters() {
 							$this->DebugMessage('Skipping Mask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 							return false;
 						}
-						$mask_filename = $this->ResolveFilenameToAbsolute($parameter);
+						@list($mask_filename, $invert) = explode('|', $parameter, 2);
+						$mask_filename = $this->ResolveFilenameToAbsolute($mask_filename);
 						if (@is_readable($mask_filename) && ($fp_mask = @fopen($mask_filename, 'rb'))) {
 							$MaskImageData = '';
 							do {
@@ -2504,9 +2881,12 @@ function ApplyFilters() {
 							} while (strlen($buffer) > 0);
 							fclose($fp_mask);
 							if ($gdimg_mask = $this->ImageCreateFromStringReplacement($MaskImageData)) {
+								if ($invert && phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+									imagefilter($gdimg_mask, IMG_FILTER_NEGATE);
+								}
 								$this->is_alpha = true;
 								$phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
-								ImageDestroy($gdimg_mask);
+								imagedestroy($gdimg_mask);
 							} else {
 								$this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$mask_filename.'"', __FILE__, __LINE__);
 							}
@@ -2515,13 +2895,13 @@ function ApplyFilters() {
 						}
 						break;
 
-					case 'elip': // Elipse cropping
+					case 'elip': // Ellipse cropping
 						if (phpthumb_functions::gd_version() < 2) {
-							$this->DebugMessage('Skipping Elipse() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
+							$this->DebugMessage('Skipping Ellipse() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 							return false;
 						}
 						$this->is_alpha = true;
-						$phpthumbFilters->Elipse($this->gdimg_output);
+						$phpthumbFilters->Ellipse($this->gdimg_output);
 						break;
 
 					case 'ric': // RoundedImageCorners
@@ -2569,48 +2949,48 @@ function ApplyFilters() {
 							} while (strlen($buffer) > 0);
 							fclose($fp_watermark);
 							if ($img_watermark = $this->ImageCreateFromStringReplacement($WatermarkImageData)) {
-								if ($margin < 1) {
-									$resized_x = max(1, ImageSX($this->gdimg_output) - round(2 * (ImageSX($this->gdimg_output) * $margin)));
-									$resized_y = max(1, ImageSY($this->gdimg_output) - round(2 * (ImageSY($this->gdimg_output) * $margin)));
+								if (($margin > 0) && ($margin < 1)) {
+									$resized_x = max(1, imagesx($this->gdimg_output) - round(2 * (imagesx($this->gdimg_output) * $margin)));
+									$resized_y = max(1, imagesy($this->gdimg_output) - round(2 * (imagesy($this->gdimg_output) * $margin)));
 								} else {
-									$resized_x = max(1, ImageSX($this->gdimg_output) - round(2 * $margin));
-									$resized_y = max(1, ImageSY($this->gdimg_output) - round(2 * $margin));
+									$resized_x = max(1, imagesx($this->gdimg_output) - round(2 * $margin));
+									$resized_y = max(1, imagesy($this->gdimg_output) - round(2 * $margin));
 								}
 
 								if ($underlay) {
 
-									if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) {
-										ImageAlphaBlending($img_watermark_resized, false);
-										ImageSaveAlpha($img_watermark_resized, true);
-										$this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark_resized), ImageSY($img_watermark_resized), ImageSX($img_watermark), ImageSY($img_watermark));
+									if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
+										imagealphablending($img_watermark_resized, false);
+										imagesavealpha($img_watermark_resized, true);
+										$this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark_resized), imagesy($img_watermark_resized), imagesx($img_watermark), imagesy($img_watermark));
 										if ($img_source_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) {
-											ImageAlphaBlending($img_source_resized, false);
-											ImageSaveAlpha($img_source_resized, true);
-											$this->ImageResizeFunction($img_source_resized, $this->gdimg_output, 0, 0, 0, 0, ImageSX($img_source_resized), ImageSY($img_source_resized), ImageSX($this->gdimg_output), ImageSY($this->gdimg_output));
+											imagealphablending($img_source_resized, false);
+											imagesavealpha($img_source_resized, true);
+											$this->ImageResizeFunction($img_source_resized, $this->gdimg_output, 0, 0, 0, 0, imagesx($img_source_resized), imagesy($img_source_resized), imagesx($this->gdimg_output), imagesy($this->gdimg_output));
 											$phpthumbFilters->WatermarkOverlay($img_watermark_resized, $img_source_resized, 'C', $opacity, $margin);
-											ImageCopy($this->gdimg_output, $img_watermark_resized, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output));
+											imagecopy($this->gdimg_output, $img_watermark_resized, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
 										} else {
 											$this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__);
 										}
-										ImageDestroy($img_watermark_resized);
+										imagedestroy($img_watermark_resized);
 									} else {
-										$this->DebugMessage('phpthumb_functions::ImageCreateFunction('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).')', __FILE__, __LINE__);
+										$this->DebugMessage('phpthumb_functions::ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).')', __FILE__, __LINE__);
 									}
 
 								} else { // overlay
 
 									if ($img_watermark_resized = phpthumb_functions::ImageCreateFunction($resized_x, $resized_y)) {
-										ImageAlphaBlending($img_watermark_resized, false);
-										ImageSaveAlpha($img_watermark_resized, true);
-										$this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark_resized), ImageSY($img_watermark_resized), ImageSX($img_watermark), ImageSY($img_watermark));
+										imagealphablending($img_watermark_resized, false);
+										imagesavealpha($img_watermark_resized, true);
+										$this->ImageResizeFunction($img_watermark_resized, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark_resized), imagesy($img_watermark_resized), imagesx($img_watermark), imagesy($img_watermark));
 										$phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark_resized, 'C', $opacity, $margin);
-										ImageDestroy($img_watermark_resized);
+										imagedestroy($img_watermark_resized);
 									} else {
 										$this->DebugMessage('phpthumb_functions::ImageCreateFunction('.$resized_x.', '.$resized_y.')', __FILE__, __LINE__);
 									}
 
 								}
-								ImageDestroy($img_watermark);
+								imagedestroy($img_watermark);
 
 							} else {
 								$this->DebugMessage('ImageCreateFromStringReplacement() failed for "'.$filename.'"', __FILE__, __LINE__);
@@ -2624,12 +3004,12 @@ function ApplyFilters() {
 						@list($filename, $alignment, $opacity, $margin['x'], $margin['y'], $rotate_angle) = explode('|', $parameter, 6);
 						// $margin can be pixel margin or percent margin if $alignment is text, or max width/height if $alignment is position like "50x75"
 						$alignment    = ($alignment            ? $alignment            : 'BR');
-						$opacity      = (strlen($opacity)      ? intval($opacity)      : 50);
-						$rotate_angle = (strlen($rotate_angle) ? intval($rotate_angle) : 0);
+						$opacity      = ('' != $opacity ? (int) $opacity : 50);
+						$rotate_angle = ('' != $rotate_angle ? (int) $rotate_angle : 0);
 						if (!preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
 							$margins = array('x', 'y');
 							foreach ($margins as $xy) {
-								$margin[$xy] = (strlen($margin[$xy]) ? $margin[$xy] : 5);
+								$margin[$xy] = ('' !== $margin[ $xy ] ? $margin[ $xy] : 5);
 								if (($margin[$xy] > 0) && ($margin[$xy] < 1)) {
 									$margin[$xy] = min(0.499, $margin[$xy]);
 								} elseif (($margin[$xy] > -1) && ($margin[$xy] < 0)) {
@@ -2642,31 +3022,31 @@ function ApplyFilters() {
 						if (@is_readable($filename)) {
 							if ($img_watermark = $this->ImageCreateFromFilename($filename)) {
 								if ($rotate_angle !== 0) {
-									$phpthumbFilters->ImprovedImageRotate($img_watermark, $rotate_angle);
+									$phpthumbFilters->ImprovedImageRotate($img_watermark, $rotate_angle, 'FFFFFF', null, $this);
 								}
 								if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
-									$watermark_max_width  = intval($margin['x'] ? $margin['x'] : ImageSX($img_watermark));
-									$watermark_max_height = intval($margin['y'] ? $margin['y'] : ImageSY($img_watermark));
-									$scale = phpthumb_functions::ScaleToFitInBox(ImageSX($img_watermark), ImageSY($img_watermark), $watermark_max_width, $watermark_max_height, true, true);
+									$watermark_max_width  = (int) ($margin[ 'x'] ? $margin[ 'x'] : imagesx($img_watermark));
+									$watermark_max_height = (int) ($margin[ 'y'] ? $margin[ 'y'] : imagesy($img_watermark));
+									$scale = phpthumb_functions::ScaleToFitInBox(imagesx($img_watermark), imagesy($img_watermark), $watermark_max_width, $watermark_max_height, true, true);
 									$this->DebugMessage('Scaling watermark by a factor of '.number_format($scale, 4), __FILE__, __LINE__);
 									if (($scale > 1) || ($scale < 1)) {
-										if ($img_watermark2 = phpthumb_functions::ImageCreateFunction($scale * ImageSX($img_watermark), $scale * ImageSY($img_watermark))) {
-											ImageAlphaBlending($img_watermark2, false);
-											ImageSaveAlpha($img_watermark2, true);
-											$this->ImageResizeFunction($img_watermark2, $img_watermark, 0, 0, 0, 0, ImageSX($img_watermark2), ImageSY($img_watermark2), ImageSX($img_watermark), ImageSY($img_watermark));
+										if ($img_watermark2 = phpthumb_functions::ImageCreateFunction($scale * imagesx($img_watermark), $scale * imagesy($img_watermark))) {
+											imagealphablending($img_watermark2, false);
+											imagesavealpha($img_watermark2, true);
+											$this->ImageResizeFunction($img_watermark2, $img_watermark, 0, 0, 0, 0, imagesx($img_watermark2), imagesy($img_watermark2), imagesx($img_watermark), imagesy($img_watermark));
 											$img_watermark = $img_watermark2;
 										} else {
-											$this->DebugMessage('ImageCreateFunction('.($scale * ImageSX($img_watermark)).', '.($scale * ImageSX($img_watermark)).') failed', __FILE__, __LINE__);
+											$this->DebugMessage('ImageCreateFunction('.($scale * imagesx($img_watermark)).', '.($scale * imagesx($img_watermark)).') failed', __FILE__, __LINE__);
 										}
 									}
-									$watermark_dest_x = round($matches[1] - (ImageSX($img_watermark) / 2));
-									$watermark_dest_y = round($matches[2] - (ImageSY($img_watermark) / 2));
+									$watermark_dest_x = round($matches[1] - (imagesx($img_watermark) / 2));
+									$watermark_dest_y = round($matches[2] - (imagesy($img_watermark) / 2));
 									$alignment = $watermark_dest_x.'x'.$watermark_dest_y;
 								}
 								$phpthumbFilters->WatermarkOverlay($this->gdimg_output, $img_watermark, $alignment, $opacity, $margin['x'], $margin['y']);
-								ImageDestroy($img_watermark);
-								if (isset($img_watermark2) && is_resource($img_watermark2)) {
-									ImageDestroy($img_watermark2);
+								imagedestroy($img_watermark);
+								if (isset($img_watermark2) && (is_resource($img_watermark2) || (is_object($img_watermark2) && $img_watermark2 instanceOf \GdImage))) {
+									imagedestroy($img_watermark2);
 								}
 							} else {
 								$this->DebugMessage('ImageCreateFromFilename() failed for "'.$filename.'"', __FILE__, __LINE__);
@@ -2677,25 +3057,26 @@ function ApplyFilters() {
 						break;
 
 					case 'wmt': // WaterMarkText
-						@list($text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend) = explode('|', $parameter, 11);
+						@list($text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend, $lineheight) = explode('|', $parameter, 12);
 						$text       = ($text            ? $text       : '');
 						$size       = ($size            ? $size       : 3);
 						$alignment  = ($alignment       ? $alignment  : 'BR');
 						$hex_color  = ($hex_color       ? $hex_color  : '000000');
 						$ttffont    = ($ttffont         ? $ttffont    : '');
-						$opacity    = (strlen($opacity) ? $opacity    : 50);
-						$margin     = (strlen($margin)  ? $margin     : 5);
-						$angle      = (strlen($angle)   ? $angle      : 0);
+						$opacity    = ('' != $opacity ? $opacity    : 50);
+						$margin     = ('' != $margin ? $margin     : 5);
+						$angle      = ('' != $angle ? $angle      : 0);
 						$bg_color   = ($bg_color        ? $bg_color   : false);
 						$bg_opacity = ($bg_opacity      ? $bg_opacity : 0);
 						$fillextend = ($fillextend      ? $fillextend : '');
+						$lineheight = ($lineheight      ? $lineheight : 1.0);
 
 						if (basename($ttffont) == $ttffont) {
-							$ttffont = realpath($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont);
+							$ttffont = $this->realPathSafe($this->config_ttf_directory.DIRECTORY_SEPARATOR.$ttffont);
 						} else {
 							$ttffont = $this->ResolveFilenameToAbsolute($ttffont);
 						}
-						$phpthumbFilters->WatermarkText($this->gdimg_output, $text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend);
+						$phpthumbFilters->WatermarkText($this->gdimg_output, $text, $size, $alignment, $hex_color, $ttffont, $opacity, $margin, $angle, $bg_color, $bg_opacity, $fillextend, $lineheight);
 						break;
 
 					case 'blur': // Blur
@@ -2728,15 +3109,15 @@ function ApplyFilters() {
 						@list($amount, $radius, $threshold) = explode('|', $parameter, 3);
 						$amount    = ($amount            ? $amount    : 80);
 						$radius    = ($radius            ? $radius    : 0.5);
-						$threshold = (strlen($threshold) ? $threshold : 3);
+						$threshold = ('' !== $threshold ? $threshold : 3);
 						if (phpthumb_functions::gd_version() >= 2.0) {
 							ob_start();
-							if (!@include_once(dirname(__FILE__).'/phpthumb.unsharp.php')) {
+							if (!@include_once __DIR__ .'/phpthumb.unsharp.php' ) {
 								$include_error = ob_get_contents();
 								if ($include_error) {
-									$this->DebugMessage('include_once("'.dirname(__FILE__).'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__);
+									$this->DebugMessage('include_once("'. __DIR__ .'/phpthumb.unsharp.php") generated message: "'.$include_error.'"', __FILE__, __LINE__);
 								}
-								$this->DebugMessage('Error including "'.dirname(__FILE__).'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__);
+								$this->DebugMessage('Error including "'. __DIR__ .'/phpthumb.unsharp.php" which is required for unsharp masking', __FILE__, __LINE__);
 								ob_end_clean();
 								return false;
 							}
@@ -2750,38 +3131,37 @@ function ApplyFilters() {
 
 					case 'size': // Resize
 						@list($newwidth, $newheight, $stretch) = explode('|', $parameter);
-						$newwidth  = (!$newwidth  ? ImageSX($this->gdimg_output) : ((($newwidth  > 0) && ($newwidth  < 1)) ? round($newwidth  * ImageSX($this->gdimg_output)) : round($newwidth)));
-						$newheight = (!$newheight ? ImageSY($this->gdimg_output) : ((($newheight > 0) && ($newheight < 1)) ? round($newheight * ImageSY($this->gdimg_output)) : round($newheight)));
+						$newwidth  = (!$newwidth  ? imagesx($this->gdimg_output) : ((($newwidth  > 0) && ($newwidth  < 1)) ? round($newwidth  * imagesx($this->gdimg_output)) : round($newwidth)));
+						$newheight = (!$newheight ? imagesy($this->gdimg_output) : ((($newheight > 0) && ($newheight < 1)) ? round($newheight * imagesy($this->gdimg_output)) : round($newheight)));
 						$stretch   = ($stretch ? true : false);
 						if ($stretch) {
-							$scale_x = phpthumb_functions::ScaleToFitInBox(ImageSX($this->gdimg_output), ImageSX($this->gdimg_output), $newwidth,  $newwidth,  true, true);
-							$scale_y = phpthumb_functions::ScaleToFitInBox(ImageSY($this->gdimg_output), ImageSY($this->gdimg_output), $newheight, $newheight, true, true);
+							$scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesx($this->gdimg_output), $newwidth,  $newwidth,  true, true);
+							$scale_y = phpthumb_functions::ScaleToFitInBox(imagesy($this->gdimg_output), imagesy($this->gdimg_output), $newheight, $newheight, true, true);
 						} else {
-							$scale_x = phpthumb_functions::ScaleToFitInBox(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output), $newwidth, $newheight, true, true);
+							$scale_x = phpthumb_functions::ScaleToFitInBox(imagesx($this->gdimg_output), imagesy($this->gdimg_output), $newwidth, $newheight, true, true);
 							$scale_y = $scale_x;
 						}
 						$this->DebugMessage('Scaling watermark ('.($stretch ? 'with' : 'without').' stretch) by a factor of "'.number_format($scale_x, 4).' x '.number_format($scale_y, 4).'"', __FILE__, __LINE__);
 						if (($scale_x > 1) || ($scale_x < 1) || ($scale_y > 1) || ($scale_y < 1)) {
-							if ($img_temp = phpthumb_functions::ImageCreateFunction(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output))) {
-								ImageCopy($img_temp, $this->gdimg_output, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output));
-								//ImageDestroy($this->gdimg_output);
-								if ($this->gdimg_output = phpthumb_functions::ImageCreateFunction($scale_x * ImageSX($img_temp), $scale_y * ImageSY($img_temp))) {
-									ImageAlphaBlending($this->gdimg_output, false);
-									ImageSaveAlpha($this->gdimg_output, true);
-									$this->ImageResizeFunction($this->gdimg_output, $img_temp, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output), ImageSX($img_temp), ImageSY($img_temp));
+							if ($img_temp = phpthumb_functions::ImageCreateFunction(imagesx($this->gdimg_output), imagesy($this->gdimg_output))) {
+								imagecopy($img_temp, $this->gdimg_output, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+								if ($this->gdimg_output = phpthumb_functions::ImageCreateFunction($scale_x * imagesx($img_temp), $scale_y * imagesy($img_temp))) {
+									imagealphablending($this->gdimg_output, false);
+									imagesavealpha($this->gdimg_output, true);
+									$this->ImageResizeFunction($this->gdimg_output, $img_temp, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output), imagesx($img_temp), imagesy($img_temp));
 								} else {
-									$this->DebugMessage('ImageCreateFunction('.($scale_x * ImageSX($img_temp)).', '.($scale_y * ImageSY($img_temp)).') failed', __FILE__, __LINE__);
+									$this->DebugMessage('ImageCreateFunction('.($scale_x * imagesx($img_temp)).', '.($scale_y * imagesy($img_temp)).') failed', __FILE__, __LINE__);
 								}
-								ImageDestroy($img_temp);
+								imagedestroy($img_temp);
 							} else {
-								$this->DebugMessage('ImageCreateFunction('.ImageSX($this->gdimg_output).', '.ImageSY($this->gdimg_output).') failed', __FILE__, __LINE__);
+								$this->DebugMessage('ImageCreateFunction('.imagesx($this->gdimg_output).', '.imagesy($this->gdimg_output).') failed', __FILE__, __LINE__);
 							}
 						}
 						break;
 
 					case 'rot': // ROTate
 						@list($angle, $bgcolor) = explode('|', $parameter, 2);
-						$phpthumbFilters->ImprovedImageRotate($this->gdimg_output, $angle, $bgcolor);
+						$phpthumbFilters->ImprovedImageRotate($this->gdimg_output, $angle, $bgcolor, null, $this);
 						break;
 
 					case 'stc': // Source Transparent Color
@@ -2790,14 +3170,14 @@ function ApplyFilters() {
 							$this->DebugMessage('Skipping SourceTransparentColor hex color is invalid ('.$hexcolor.')', __FILE__, __LINE__);
 							return false;
 						}
-						$min_limit = (strlen($min_limit) ? $min_limit :  5);
-						$max_limit = (strlen($max_limit) ? $max_limit : 10);
+						$min_limit = ('' !== $min_limit ? $min_limit :  5);
+						$max_limit = ('' !== $max_limit ? $max_limit : 10);
 						if ($gdimg_mask = $phpthumbFilters->SourceTransparentColorMask($this->gdimg_output, $hexcolor, $min_limit, $max_limit)) {
 							$this->is_alpha = true;
 							$phpthumbFilters->ApplyMask($gdimg_mask, $this->gdimg_output);
-							ImageDestroy($gdimg_mask);
+							imagedestroy($gdimg_mask);
 						} else {
-							$this->DebugMessage('SourceTransparentColorMask() failed for "'.$mask_filename.'"', __FILE__, __LINE__);
+							$this->DebugMessage('SourceTransparentColorMask() failed for "'.$hexcolor.','.$min_limit.','.$max_limit.'"', __FILE__, __LINE__);
 						}
 						break;
 				}
@@ -2808,7 +3188,7 @@ function ApplyFilters() {
 	}
 
 
-	function MaxFileSize() {
+	public function MaxFileSize() {
 		if (phpthumb_functions::gd_version() < 2) {
 			$this->DebugMessage('Skipping MaxFileSize() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 			return false;
@@ -2826,38 +3206,33 @@ function MaxFileSize() {
 
 					if (strlen($imgdata) > $this->maxb) {
 						for ($i = 8; $i >= 1; $i--) {
-							$tempIMG = ImageCreateTrueColor(ImageSX($this->gdimg_output), ImageSY($this->gdimg_output));
-							ImageCopy($tempIMG, $this->gdimg_output, 0, 0, 0, 0, ImageSX($this->gdimg_output), ImageSY($this->gdimg_output));
-							ImageTrueColorToPalette($tempIMG, true, pow(2, $i));
+							$tempIMG = imagecreatetruecolor(imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+							imagecopy($tempIMG, $this->gdimg_output, 0, 0, 0, 0, imagesx($this->gdimg_output), imagesy($this->gdimg_output));
+							imagetruecolortopalette($tempIMG, true, pow(2, $i));
 							ob_start();
 							$imgRenderFunction($tempIMG);
 							$imgdata = ob_get_contents();
 							ob_end_clean();
 
 							if (strlen($imgdata) <= $this->maxb) {
-								ImageTrueColorToPalette($this->gdimg_output, true, pow(2, $i));
+								imagetruecolortopalette($this->gdimg_output, true, pow(2, $i));
 								break;
 							}
 						}
 					}
-					if (strlen($imgdata) > $this->maxb) {
-						ImageTrueColorToPalette($this->gdimg_output, true, pow(2, $i));
-						return false;
-					}
 					break;
 
 				case 'jpeg':
 					ob_start();
-					ImageJPEG($this->gdimg_output);
+					imagejpeg($this->gdimg_output);
 					$imgdata = ob_get_contents();
 					ob_end_clean();
 
-					$OriginalJPEGquality = $this->thumbnailQuality;
 					if (strlen($imgdata) > $this->maxb) {
 						for ($i = 3; $i < 20; $i++) {
 							$q = round(100 * (1 - log10($i / 2)));
 							ob_start();
-							ImageJPEG($this->gdimg_output, '', $q);
+							imagejpeg($this->gdimg_output, null, $q);
 							$imgdata = ob_get_contents();
 							ob_end_clean();
 
@@ -2874,14 +3249,13 @@ function MaxFileSize() {
 
 				default:
 					return false;
-					break;
 			}
 		}
 		return true;
 	}
 
 
-	function CalculateThumbnailDimensions() {
+	public function CalculateThumbnailDimensions() {
 		$this->DebugMessage('CalculateThumbnailDimensions() starting with [W,H,sx,sy,sw,sh] initially set to ['.$this->source_width.','.$this->source_height.','.$this->sx.','.$this->sy.','.$this->sw.','.$this->sh.']', __FILE__, __LINE__);
 //echo $this->source_width.'x'.$this->source_height.'<hr>';
 		$this->thumbnailCropX = ($this->sx ? (($this->sx >= 2) ? $this->sx : round($this->sx * $this->source_width))  : 0);
@@ -2976,24 +3350,23 @@ function CalculateThumbnailDimensions() {
 	}
 
 
-	function CreateGDoutput() {
+	public function CreateGDoutput() {
 		$this->CalculateThumbnailDimensions();
 
-		// Create the GD image (either true-color or 256-color, depending on GD version)
+		// create the GD image (either true-color or 256-color, depending on GD version)
 		$this->gdimg_output = phpthumb_functions::ImageCreateFunction($this->thumbnail_width, $this->thumbnail_height);
 
-		// Images that have transparency must have the background filled with the configured 'bg' color
-		// otherwise the transparent color will appear as black
-		ImageSaveAlpha($this->gdimg_output, true);
+		// images that have transparency must have the background filled with the configured 'bg' color otherwise the transparent color will appear as black
+		imagesavealpha($this->gdimg_output, true);
 		if ($this->is_alpha && phpthumb_functions::gd_version() >= 2) {
 
-			ImageAlphaBlending($this->gdimg_output, false);
+			imagealphablending($this->gdimg_output, false);
 			$output_full_alpha = phpthumb_functions::ImageColorAllocateAlphaSafe($this->gdimg_output, 255, 255, 255, 127);
-			ImageFilledRectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $output_full_alpha);
+			imagefilledrectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $output_full_alpha);
 
 		} else {
 
-			$current_transparent_color = ImageColorTransparent($this->gdimg_source);
+			$current_transparent_color = imagecolortransparent($this->gdimg_source);
 			if ($this->bg || (@$current_transparent_color >= 0)) {
 
 				$this->config_background_hexcolor = ($this->bg ? $this->bg : $this->config_background_hexcolor);
@@ -3001,7 +3374,7 @@ function CreateGDoutput() {
 					return $this->ErrorImage('Invalid hex color string "'.$this->config_background_hexcolor.'" for parameter "bg"');
 				}
 				$background_color = phpthumb_functions::ImageHexColorAllocate($this->gdimg_output, $this->config_background_hexcolor);
-				ImageFilledRectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
+				imagefilledrectangle($this->gdimg_output, 0, 0, $this->thumbnail_width, $this->thumbnail_height, $background_color);
 
 			}
 
@@ -3010,7 +3383,7 @@ function CreateGDoutput() {
 		return true;
 	}
 
-	function SetOrientationDependantWidthHeight() {
+	public function SetOrientationDependantWidthHeight() {
 		$this->DebugMessage('SetOrientationDependantWidthHeight() starting with "'.$this->source_width.'"x"'.$this->source_height.'"', __FILE__, __LINE__);
 		if ($this->source_height > $this->source_width) {
 			// portrait
@@ -3027,55 +3400,54 @@ function SetOrientationDependantWidthHeight() {
 		}
 		//$this->w = round($this->w ? $this->w : (($this->h && $this->source_height) ? $this->h * $this->source_width  / $this->source_height : $this->w));
 		//$this->h = round($this->h ? $this->h : (($this->w && $this->source_width)  ? $this->w * $this->source_height / $this->source_width  : $this->h));
-		$this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'.intval($this->w).'", h="'.intval($this->h).'"', __FILE__, __LINE__);
+		$this->DebugMessage('SetOrientationDependantWidthHeight() setting w="'. (int) $this->w .'", h="'. (int) $this->h .'"', __FILE__, __LINE__);
 		return true;
 	}
 
-	function ExtractEXIFgetImageSize() {
+	public function ExtractEXIFgetImageSize() {
 		$this->DebugMessage('starting ExtractEXIFgetImageSize()', __FILE__, __LINE__);
 
 		if (preg_match('#^http:#i', $this->src) && !$this->sourceFilename && $this->rawImageData) {
-			!$this->SourceDataToTempFile();
+			$this->SourceDataToTempFile();
 		}
-		if (is_null($this->getimagesizeinfo)) {
+		if (null === $this->getimagesizeinfo) {
 			if ($this->sourceFilename) {
-				$this->getimagesizeinfo = @GetImageSize($this->sourceFilename);
+				if ($this->getimagesizeinfo = @getimagesize($this->sourceFilename)) {
 				$this->source_width  = $this->getimagesizeinfo[0];
 				$this->source_height = $this->getimagesizeinfo[1];
-				$this->DebugMessage('GetImageSize('.$this->sourceFilename.') says image is '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
+				$this->DebugMessage('getimagesize('.$this->sourceFilename.') says image is '.$this->source_width.'x'.$this->source_height, __FILE__, __LINE__);
+				} else {
+					$this->DebugMessage('getimagesize('.$this->sourceFilename.') failed', __FILE__, __LINE__);
+				}
 			} else {
-				$this->DebugMessage('skipping GetImageSize() because $this->sourceFilename is empty', __FILE__, __LINE__);
+				$this->DebugMessage('skipping getimagesize() because $this->sourceFilename is empty', __FILE__, __LINE__);
 			}
 		} else {
-			$this->DebugMessage('skipping GetImageSize() because !is_null($this->getimagesizeinfo)', __FILE__, __LINE__);
+			$this->DebugMessage('skipping getimagesize() because !is_null($this->getimagesizeinfo)', __FILE__, __LINE__);
 		}
 
-		if (is_resource($this->gdimg_source)) {
+		if (is_resource($this->gdimg_source) || (is_object($this->gdimg_source) && $this->gdimg_source instanceOf \GdImage)) {
 
-			$this->source_width  = ImageSX($this->gdimg_source);
-			$this->source_height = ImageSY($this->gdimg_source);
+			$this->source_width  = imagesx($this->gdimg_source);
+			$this->source_height = imagesy($this->gdimg_source);
 
 			$this->SetOrientationDependantWidthHeight();
 
 		} elseif ($this->rawImageData && !$this->sourceFilename) {
 
 			if ($this->SourceImageIsTooLarge($this->source_width, $this->source_height)) {
-				$this->DebugMessage('NOT bypassing EXIF and GetImageSize sections because source image is too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
+				$this->DebugMessage('NOT bypassing EXIF and getimagesize sections because source image is too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
 			} else {
-				$this->DebugMessage('bypassing EXIF and GetImageSize sections because $this->rawImageData is set, and $this->sourceFilename is not set, and source image is not too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
+				$this->DebugMessage('bypassing EXIF and getimagesize sections because $this->rawImageData is set, and $this->sourceFilename is not set, and source image is not too large for GD ('.$this->source_width.'x'.$this->source_width.'='.($this->source_width * $this->source_height * 5).'MB)', __FILE__, __LINE__);
 			}
 
 		}
 
-		if (is_null($this->getimagesizeinfo)) {
-			$this->getimagesizeinfo = @GetImageSize($this->sourceFilename);
-		}
-
 		if (!empty($this->getimagesizeinfo)) {
 			// great
 			$this->getimagesizeinfo['filesize'] = @filesize($this->sourceFilename);
 		} elseif (!$this->rawImageData) {
-			$this->DebugMessage('GetImageSize("'.$this->sourceFilename.'") failed', __FILE__, __LINE__);
+			$this->DebugMessage('getimagesize("'.$this->sourceFilename.'") failed', __FILE__, __LINE__);
 		}
 
 		if ($this->config_prefer_imagemagick) {
@@ -3085,13 +3457,15 @@ function ExtractEXIFgetImageSize() {
 			$this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
 		}
 
+		if (isset($this->getimagesizeinfo[1])) {
 		$this->source_width  = $this->getimagesizeinfo[0];
 		$this->source_height = $this->getimagesizeinfo[1];
+		}
 
 		$this->SetOrientationDependantWidthHeight();
 
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '4.2.0', '>=') && function_exists('exif_read_data')) {
-			switch ($this->getimagesizeinfo[2]) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.2.0', '>=') && function_exists('exif_read_data')) {
+			switch (@$this->getimagesizeinfo[2]) {
 				case IMAGETYPE_JPEG:
 				case IMAGETYPE_TIFF_II:
 				case IMAGETYPE_TIFF_MM:
@@ -3099,7 +3473,7 @@ function ExtractEXIFgetImageSize() {
 					break;
 			}
 		}
-		if (function_exists('exif_thumbnail') && ($this->getimagesizeinfo[2] == IMAGETYPE_JPEG)) {
+		if (function_exists('exif_thumbnail') && (@$this->getimagesizeinfo[2] == IMAGETYPE_JPEG)) {
 			// Extract EXIF info from JPEGs
 
 			$this->exif_thumbnail_width  = '';
@@ -3107,7 +3481,7 @@ function ExtractEXIFgetImageSize() {
 			$this->exif_thumbnail_type   = '';
 
 			// The parameters width, height and imagetype are available since PHP v4.3.0
-			if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=')) {
+			if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
 
 				$this->exif_thumbnail_data = @exif_thumbnail($this->sourceFilename, $this->exif_thumbnail_width, $this->exif_thumbnail_height, $this->exif_thumbnail_type);
 
@@ -3121,8 +3495,8 @@ function ExtractEXIFgetImageSize() {
 				if (!$exit_thumbnail_error && $this->exif_thumbnail_data) {
 
 					if ($gdimg_exif_temp = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data, false)) {
-						$this->exif_thumbnail_width  = ImageSX($gdimg_exif_temp);
-						$this->exif_thumbnail_height = ImageSY($gdimg_exif_temp);
+						$this->exif_thumbnail_width  = imagesx($gdimg_exif_temp);
+						$this->exif_thumbnail_height = imagesy($gdimg_exif_temp);
 						$this->exif_thumbnail_type   = 2; // (2 == JPEG) before PHP v4.3.0 only JPEG format EXIF thumbnails are returned
 						unset($gdimg_exif_temp);
 					} else {
@@ -3139,7 +3513,7 @@ function ExtractEXIFgetImageSize() {
 
 		}
 
-		$this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '.intval($this->exif_thumbnail_width).'x'.intval($this->exif_thumbnail_height).')', __FILE__, __LINE__);
+		$this->DebugMessage('EXIF thumbnail extraction: (size='.strlen($this->exif_thumbnail_data).'; type="'.$this->exif_thumbnail_type.'"; '. (int) $this->exif_thumbnail_width .'x'. (int) $this->exif_thumbnail_height .')', __FILE__, __LINE__);
 
 		// see if EXIF thumbnail can be used directly with no processing
 		if ($this->config_use_exif_thumbnail_for_speed && $this->exif_thumbnail_data) {
@@ -3169,8 +3543,8 @@ function ExtractEXIFgetImageSize() {
 
 				$this->DebugMessage('setting $this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data)', __FILE__, __LINE__);
 				$this->gdimg_source = $this->ImageCreateFromStringReplacement($this->exif_thumbnail_data);
-				$this->source_width  = ImageSX($this->gdimg_source);
-				$this->source_height = ImageSY($this->gdimg_source);
+				$this->source_width  = imagesx($this->gdimg_source);
+				$this->source_height = imagesy($this->gdimg_source);
 				return true;
 			}
 		}
@@ -3192,17 +3566,19 @@ function ExtractEXIFgetImageSize() {
 	}
 
 
-	function SetCacheFilename() {
-		if (!is_null($this->cache_filename)) {
+	public function SetCacheFilename() {
+		if (null !== $this->cache_filename) {
 			$this->DebugMessage('$this->cache_filename already set, skipping SetCacheFilename()', __FILE__, __LINE__);
 			return true;
 		}
-		$this->setOutputFormat();
-		$this->setCacheDirectory();
-		if (!$this->config_cache_directory) {
-			$this->DebugMessage('SetCacheFilename() failed because $this->config_cache_directory is empty', __FILE__, __LINE__);
-			return false;
+		if (null === $this->config_cache_directory) {
+			$this->setCacheDirectory();
+			if (!$this->config_cache_directory) {
+				$this->DebugMessage('SetCacheFilename() failed because $this->config_cache_directory is empty', __FILE__, __LINE__);
+				return false;
+			}
 		}
+		$this->setOutputFormat();
 
 		if (!$this->sourceFilename && !$this->rawImageData && $this->src) {
 			$this->sourceFilename = $this->ResolveFilenameToAbsolute($this->src);
@@ -3223,7 +3599,6 @@ function SetCacheFilename() {
 		}
 
 		$this->cache_filename = '';
-		$broad_directory_name = '';
 		if ($this->new) {
 			$broad_directory_name = strtolower(md5($this->new));
 			$this->cache_filename .= '_new'.$broad_directory_name;
@@ -3241,7 +3616,7 @@ function SetCacheFilename() {
 			$broad_directory_name = strtolower(md5($this->sourceFilename));
 			$this->cache_filename .= '_src'.$broad_directory_name;
 		}
-		if (@$_SERVER['HTTP_REFERER'] && $this->config_nooffsitelink_enabled) {
+		if (!empty($_SERVER['HTTP_REFERER']) && $this->config_nooffsitelink_enabled) {
 			$parsed_url1 = @phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
 			$parsed_url2 = @phpthumb_functions::ParseURLbetter('http://'.@$_SERVER['HTTP_HOST']);
 			if (@$parsed_url1['host'] && @$parsed_url2['host'] && ($parsed_url1['host'] != $parsed_url2['host'])) {
@@ -3263,12 +3638,18 @@ function SetCacheFilename() {
 		$FilenameParameters2 = array('h', 'w', 'wl', 'wp', 'ws', 'hp', 'hs', 'xto', 'ra', 'iar', 'aoe', 'maxb', 'sfn', 'dpi');
 		foreach ($FilenameParameters2 as $key) {
 			if ($this->$key) {
-				$ParametersString .= '_'.$key.intval($this->$key);
+				$ParametersString .= '_'.$key. (int) $this->$key;
+			}
+		}
+		$FilenameParameters3 = array('ica');
+		foreach ($FilenameParameters3 as $key) {
+			if ($this->$key) {
+				$ParametersString .= '_'.$key.substr(md5($this->$key), 0, 4);
 			}
 		}
 		if ($this->thumbnailFormat == 'jpeg') {
 			// only JPEG output has variable quality option
-			$ParametersString .= '_q'.intval($this->thumbnailQuality);
+			$ParametersString .= '_q'. (int) $this->thumbnailQuality;
 		}
 		$this->DebugMessage('SetCacheFilename() _par set from md5('.$ParametersString.')', __FILE__, __LINE__);
 		$this->cache_filename .= '_par'.strtolower(md5($ParametersString));
@@ -3278,9 +3659,9 @@ function SetCacheFilename() {
 			// do not source image modification date --
 			// cached image will be used even if file was modified or removed
 		} elseif (!$this->config_cache_source_filemtime_ignore_remote && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
-			$this->cache_filename .= '_dat'.intval(phpthumb_functions::filedate_remote($this->src));
+			$this->cache_filename .= '_dat'. (int) phpthumb_functions::filedate_remote($this->src);
 		} elseif (!$this->config_cache_source_filemtime_ignore_local && $this->src && !$this->rawImageData) {
-			$this->cache_filename .= '_dat'.intval(@filemtime($this->sourceFilename));
+			$this->cache_filename .= '_dat'. (int) (@filemtime($this->sourceFilename));
 		}
 
 		$this->cache_filename .= '.'.strtolower($this->thumbnailFormat);
@@ -3294,32 +3675,32 @@ function SetCacheFilename() {
 	}
 
 
-	function SourceImageIsTooLarge($width, $height) {
+	public function SourceImageIsTooLarge($width, $height) {
 		if (!$this->config_max_source_pixels) {
 			return false;
 		}
-		if (function_exists('memory_get_usage')) {
-			$available_memory = max(intval(ini_get('memory_limit')), intval(get_cfg_var('memory_limit'))) * 1048576;
-			$available_memory -= memory_get_usage();
+		if ($this->php_memory_limit && function_exists('memory_get_usage')) {
+			$available_memory = $this->php_memory_limit - memory_get_usage();
 			return (bool) (($width * $height * 5) > $available_memory);
 		}
 		return (bool) (($width * $height) > $this->config_max_source_pixels);
 	}
 
-	function ImageCreateFromFilename($filename) {
+	public function ImageCreateFromFilename($filename) {
 		// try to create GD image source directly via GD, if possible,
-		// rather than buffering to memory and creating with ImageCreateFromString
+		// rather than buffering to memory and creating with imagecreatefromstring
 		$ImageCreateWasAttempted = false;
 		$gd_image = false;
 
 		$this->DebugMessage('starting ImageCreateFromFilename('.$filename.')', __FILE__, __LINE__);
-		if ($filename && ($getimagesizeinfo = @GetImageSize($filename))) {
+		if ($filename && ($getimagesizeinfo = @getimagesize($filename))) {
 			if (!$this->SourceImageIsTooLarge($getimagesizeinfo[0], $getimagesizeinfo[1])) {
 				$ImageCreateFromFunction = array(
-					1  => 'ImageCreateFromGIF',
-					2  => 'ImageCreateFromJPEG',
-					3  => 'ImageCreateFromPNG',
-					15 => 'ImageCreateFromWBMP',
+					1  => 'imagecreatefromgif',
+					2  => 'imagecreatefromjpeg',
+					3  => 'imagecreatefrompng',
+					15 => 'imagecreatefromwbmp',
+					18 => 'imagecreatefromwebp',
 				);
 				$this->DebugMessage('ImageCreateFromFilename found ($getimagesizeinfo[2]=='.@$getimagesizeinfo[2].')', __FILE__, __LINE__);
 				switch (@$getimagesizeinfo[2]) {
@@ -3327,6 +3708,7 @@ function ImageCreateFromFilename($filename) {
 					case 2:  // JPEG
 					case 3:  // PNG
 					case 15: // WBMP
+					case 18: // WEBP
 						$ImageCreateFromFunctionName = $ImageCreateFromFunction[$getimagesizeinfo[2]];
 						if (function_exists($ImageCreateFromFunctionName)) {
 							$this->DebugMessage('Calling '.$ImageCreateFromFunctionName.'('.$filename.')', __FILE__, __LINE__);
@@ -3361,13 +3743,13 @@ function ImageCreateFromFilename($filename) {
 				return false;
 			}
 		} else {
-			$this->DebugMessage('empty $filename or GetImageSize('.$filename.') failed', __FILE__, __LINE__);
+			$this->DebugMessage('empty $filename or getimagesize('.$filename.') failed', __FILE__, __LINE__);
 		}
 
 		if (!$gd_image) {
-			// cannot create from filename, attempt to create source image with ImageCreateFromString, if possible
+			// cannot create from filename, attempt to create source image with imagecreatefromstring, if possible
 			if ($ImageCreateWasAttempted) {
-				$this->DebugMessage(@$ImageCreateFromFunctionName.'() was attempted but FAILED', __FILE__, __LINE__);
+				$this->DebugMessage($ImageCreateFromFunctionName.'() was attempted but FAILED', __FILE__, __LINE__);
 			}
 			$this->DebugMessage('Populating $rawimagedata', __FILE__, __LINE__);
 			$rawimagedata = '';
@@ -3390,10 +3772,10 @@ function ImageCreateFromFilename($filename) {
 		return $gd_image;
 	}
 
-	function SourceImageToGD() {
-		if (is_resource($this->gdimg_source)) {
-			$this->source_width  = ImageSX($this->gdimg_source);
-			$this->source_height = ImageSY($this->gdimg_source);
+	public function SourceImageToGD() {
+		if (is_resource($this->gdimg_source) || (is_object($this->gdimg_source) && $this->gdimg_source instanceOf \GdImage)) {
+			$this->source_width  = imagesx($this->gdimg_source);
+			$this->source_height = imagesy($this->gdimg_source);
 			$this->DebugMessage('skipping SourceImageToGD() because $this->gdimg_source is already a resource ('.$this->source_width.'x'.$this->source_height.')', __FILE__, __LINE__);
 			return true;
 		}
@@ -3403,7 +3785,7 @@ function SourceImageToGD() {
 			if (empty($this->sourceFilename) && !empty($this->rawImageData)) {
 				$this->DebugMessage('Copying raw image data to temp file and trying again with ImageMagick', __FILE__, __LINE__);
 				if ($tempnam = $this->phpThumb_tempnam()) {
-					if (file_put_contents($tempname, $this->rawImageData)) {
+					if (file_put_contents($tempnam, $this->rawImageData)) {
 						$this->sourceFilename = $tempnam;
 						if ($this->ImageMagickThumbnailToGD()) {
 							// excellent, we have a thumbnailed source image
@@ -3411,6 +3793,7 @@ function SourceImageToGD() {
 						} else {
 							$this->DebugMessage('ImageMagickThumbnailToGD() failed', __FILE__, __LINE__);
 						}
+						@chmod($tempnam, $this->getParameter('config_file_create_mask'));
 					} else {
 						$this->DebugMessage('failed to put $this->rawImageData into temp file "'.$tempnam.'"', __FILE__, __LINE__);
 					}
@@ -3542,7 +3925,7 @@ function SourceImageToGD() {
 					break;
 			}
 			if ($imageHeader) {
-				// cannot create image for whatever reason (maybe ImageCreateFromJPEG et al are not available?)
+				// cannot create image for whatever reason (maybe imagecreatefromjpeg et al are not available?)
 				// and ImageMagick is not available either, no choice but to output original (not resized/modified) data and exit
 				if ($this->config_error_die_on_source_failure) {
 					$errormessages = array();
@@ -3582,9 +3965,9 @@ function SourceImageToGD() {
 			switch (@$this->getimagesizeinfo[2]) {
 				case 6:
 					ob_start();
-					if (!@include_once(dirname(__FILE__).'/phpthumb.bmp.php')) {
+					if (!@include_once __DIR__ .'/phpthumb.bmp.php' ) {
 						ob_end_clean();
-						return $this->ErrorImage('include_once('.dirname(__FILE__).'/phpthumb.bmp.php) failed');
+						return $this->ErrorImage('include_once('. __DIR__ .'/phpthumb.bmp.php) failed');
 					}
 					ob_end_clean();
 					if ($fp = @fopen($this->sourceFilename, 'rb')) {
@@ -3595,7 +3978,7 @@ function SourceImageToGD() {
 						fclose($fp);
 					}
 					$phpthumb_bmp = new phpthumb_bmp();
-					$this->gdimg_source = $phpthumb_bmp->phpthumb_bmp2gd($this->rawImageData, (phpthumb_functions::gd_version() >= 2.0));
+					$this->gdimg_source = $phpthumb_bmp->phpthumb_bmp2gd($this->rawImageData, phpthumb_functions::gd_version() >= 2.0);
 					unset($phpthumb_bmp);
 					if ($this->gdimg_source) {
 						$this->DebugMessage('$phpthumb_bmp->phpthumb_bmp2gd() succeeded', __FILE__, __LINE__);
@@ -3618,7 +4001,6 @@ function SourceImageToGD() {
 			}
 
 			if (!$this->gdimg_source) {
-				$HeaderFourBytes = '';
 				if ($this->rawImageData) {
 					$HeaderFourBytes = substr($this->rawImageData, 0, 4);
 				} elseif ($this->sourceFilename) {
@@ -3660,14 +4042,55 @@ function SourceImageToGD() {
 			return false;
 		}
 
-		$this->source_width  = ImageSX($this->gdimg_source);
-		$this->source_height = ImageSY($this->gdimg_source);
+		$this->source_width  = imagesx($this->gdimg_source);
+		$this->source_height = imagesy($this->gdimg_source);
 		return true;
 	}
 
+	private function ImageCropAuto() {
+		// ImageCropAuto
+		if (!is_null($this->ica)) {
+			$this->DebugMessage('ImageCropAuto('.$this->ica.') starting', __FILE__, __LINE__);
+			if (function_exists('imagecropauto')) { // (PHP 5 >= 5.5.0, PHP 7)
+				// https://www.php.net/manual/en/function.imagecropauto.php
+				// 0 = IMG_CROP_DEFAULT
+				// 1 = IMG_CROP_TRANSPARENT
+				// 2 = IMG_CROP_BLACK
+				// 3 = IMG_CROP_WHITE
+				// 4 = IMG_CROP_SIDES
+				// 5 = IMG_CROP_THRESHOLD
+				if (preg_match('#^(([0-4])|(5)\\|(0?\\.?[0-9]+)\\|([0-9A-F]{6}))$#i', $this->ica, $matches)) {
+					@list($dummy, $dummy, $ica_mode1, $ica_mode2, $ica_threshold, $ica_color) = $matches;
+					if ($ica_mode2) {
+						$param_color = hexdec($ica_color);
+						if (!imageistruecolor($this->gdimg_source)) {
+							$param_color = imagecolorclosest($this->gdimg_source, hexdec(substr($ica_color, 0, 2)), hexdec(substr($ica_color, 2, 2)), hexdec(substr($ica_color, 4, 2)));
+						}
+						$cropped = imagecropauto($this->gdimg_source, intval($ica_mode2), floatval($ica_threshold), $param_color);
+					} else {
+						$cropped = imagecropauto($this->gdimg_source, intval($ica_mode1));
+					}
+					if ($cropped !== false) {                 // in case a new image resource was returned
+						$this->DebugMessage('ImageCropAuto changing source image size from '.imagesx($this->gdimg_source).'x'.imagesy($this->gdimg_source).' to '.imagesx($cropped).'x'.imagesy($cropped), __FILE__, __LINE__);
+						imagedestroy($this->gdimg_source);    // we destroy the original image
+						$this->gdimg_source = $cropped;       // and assign the cropped image to $im
+						$this->source_width  = imagesx($this->gdimg_source);
+						$this->source_height = imagesy($this->gdimg_source);
+					} else {
+						$this->DebugMessage('imagecropauto failed', __FILE__, __LINE__);
+					}
+				} else {
+					$this->DebugMessage('invalid "ica" parameter syntax, ignoring', __FILE__, __LINE__);
+				}
+			} else {
+				$this->DebugMessage('!function_exists(imagecropauto), ignoring "ica" parameter', __FILE__, __LINE__);
+			}
+		}
+		return true;
+	}
 
-	function phpThumbDebugVarDump($var) {
-		if (is_null($var)) {
+	public function phpThumbDebugVarDump($var) {
+		if (null === $var) {
 			return 'NULL';
 		} elseif (is_bool($var)) {
 			return ($var ? 'TRUE' : 'FALSE');
@@ -3687,7 +4110,7 @@ function phpThumbDebugVarDump($var) {
 		return gettype($var);
 	}
 
-	function phpThumbDebug($level='') {
+	public function phpThumbDebug($level='') {
 		if ($level && ($this->phpThumbDebug !== $level)) {
 			return true;
 		}
@@ -3695,14 +4118,14 @@ function phpThumbDebug($level='') {
 			return $this->ErrorImage('phpThumbDebug disabled');
 		}
 
-		$FunctionsExistance  = array('exif_thumbnail', 'gd_info', 'image_type_to_mime_type', 'GetImageSize', 'ImageCopyResampled', 'ImageCopyResized', 'ImageCreate', 'ImageCreateFromString', 'ImageCreateTrueColor', 'ImageIsTrueColor', 'ImageRotate', 'ImageTypes', 'version_compare', 'ImageCreateFromGIF', 'ImageCreateFromJPEG', 'ImageCreateFromPNG', 'ImageCreateFromWBMP', 'ImageCreateFromXBM', 'ImageCreateFromXPM', 'ImageCreateFromString', 'ImageCreateFromGD', 'ImageCreateFromGD2', 'ImageCreateFromGD2Part', 'ImageJPEG', 'ImageGIF', 'ImagePNG', 'ImageWBMP');
-		$ParameterNames      = array('src', 'new', 'w', 'h', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'far', 'bg', 'bc', 'file', 'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'iar', 'maxb');
+		$FunctionsExistance  = array('exif_thumbnail', 'gd_info', 'image_type_to_mime_type', 'getimagesize', 'imagecopyresampled', 'imagecopyresized', 'imagecreate', 'imagecreatefromstring', 'imagecreatetruecolor', 'imageistruecolor', 'imagerotate', 'imagetypes', 'version_compare', 'imagecreatefromgif', 'imagecreatefromjpeg', 'imagecreatefrompng', 'imagecreatefromwbmp', 'imagecreatefromxbm', 'imagecreatefromxpm', 'imagecreatefromstring', 'imagecreatefromgd', 'imagecreatefromgd2', 'imagecreatefromgd2part', 'imagejpeg', 'imagegif', 'imagepng', 'imagewbmp');
+		$ParameterNames      = array('src', 'new', 'w', 'h', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'far', 'bg', 'bc', 'zc', 'ica', 'file', 'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'iar', 'maxb');
 		$ConfigVariableNames = array('document_root', 'temp_directory', 'output_format', 'output_maxwidth', 'output_maxheight', 'error_message_image_default', 'error_bgcolor', 'error_textcolor', 'error_fontsize', 'error_die_on_error', 'error_silent_die_on_error', 'error_die_on_source_failure', 'nohotlink_enabled', 'nohotlink_valid_domains', 'nohotlink_erase_image', 'nohotlink_text_message', 'nooffsitelink_enabled', 'nooffsitelink_valid_domains', 'nooffsitelink_require_refer', 'nooffsitelink_erase_image', 'nooffsitelink_text_message', 'high_security_enabled', 'allow_src_above_docroot', 'allow_src_above_phpthumb', 'max_source_pixels', 'use_exif_thumbnail_for_speed', 'border_hexcolor', 'background_hexcolor', 'ttf_directory', 'disable_pathinfo_parsing', 'disable_imagecopyresampled');
 		$OtherVariableNames  = array('phpThumbDebug', 'thumbnailQuality', 'thumbnailFormat', 'gdimg_output', 'gdimg_source', 'sourceFilename', 'source_width', 'source_height', 'thumbnailCropX', 'thumbnailCropY', 'thumbnailCropW', 'thumbnailCropH', 'exif_thumbnail_width', 'exif_thumbnail_height', 'exif_thumbnail_type', 'thumbnail_width', 'thumbnail_height', 'thumbnail_image_width', 'thumbnail_image_height');
 
 		$DebugOutput = array();
 		$DebugOutput[] = 'phpThumb() version          = '.$this->phpthumb_version;
-		$DebugOutput[] = 'phpversion()                = '.@phpversion();
+		$DebugOutput[] = 'phpversion()                = '.@PHP_VERSION;
 		$DebugOutput[] = 'PHP_OS                      = '.PHP_OS;
 		$DebugOutput[] = '$_SERVER[SERVER_SOFTWARE]   = '.@$_SERVER['SERVER_SOFTWARE'];
 		$DebugOutput[] = '__FILE__                    = '.__FILE__;
@@ -3830,31 +4253,31 @@ function phpThumbDebug($level='') {
 		return $this->ErrorImage(implode("\n", $DebugOutput), 700, 500, true);
 	}
 
-	function FatalError($text) {
-		if (is_null($this->fatalerror)) {
+	public function FatalError($text) {
+		if (null === $this->fatalerror) {
 			$this->fatalerror = $text;
 		}
 		return true;
 	}
 
-	function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
+	public function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
 		$width  = ($width  ? $width  : $this->config_error_image_width);
 		$height = ($height ? $height : $this->config_error_image_height);
 
-		$text = 'phpThumb() v'.$this->phpthumb_version."\n".'http://phpthumb.sourceforge.net'."\n\n".($this->config_disable_debug ? 'Error messages disabled' : $text);
+		$text = 'phpThumb() v'.$this->phpthumb_version."\n".'http://phpthumb.sourceforge.net'."\n\n".($this->config_disable_debug ? 'Error messages disabled.'."\n\n".'edit phpThumb.config.php and (temporarily) set'."\n".'$PHPTHUMB_CONFIG[\'disable_debug\'] = false;'."\n".'to view the details of this error' : $text);
 
 		$this->FatalError($text);
 		$this->DebugMessage($text, __FILE__, __LINE__);
 		$this->purgeTempFiles();
+		if ($this->config_error_silent_die_on_error) {
+			exit;
+		}
 		if ($this->phpThumbDebug && !$forcedisplay) {
 			return false;
 		}
 		if (!$this->config_error_die_on_error && !$forcedisplay) {
 			return false;
 		}
-		if ($this->config_error_silent_die_on_error) {
-			exit;
-		}
 		if ($this->err || $this->config_error_message_image_default) {
 			// Show generic custom error image instead of error message
 			// for use on production sites where you don't want debug messages
@@ -3866,7 +4289,7 @@ function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
 			}
 		}
 		$this->setOutputFormat();
-		if (!$this->thumbnailFormat || (phpthumb_functions::gd_version() < 1)) {
+		if (!$this->thumbnailFormat || !$this->config_disable_debug || (phpthumb_functions::gd_version() < 1)) {
 			$this->thumbnailFormat = 'text';
 		}
 		if (@$this->thumbnailFormat == 'text') {
@@ -3880,15 +4303,15 @@ function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
 			exit;
 		}
 
-		$FontWidth  = ImageFontWidth($this->config_error_fontsize);
-		$FontHeight = ImageFontHeight($this->config_error_fontsize);
+		$FontWidth  = imagefontwidth($this->config_error_fontsize);
+		$FontHeight = imagefontheight($this->config_error_fontsize);
 
 		$LinesOfText = explode("\n", @wordwrap($text, floor($width / $FontWidth), "\n", true));
 		$height = max($height, count($LinesOfText) * $FontHeight);
 
 		$headers_file = '';
 		$headers_line = '';
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=') && headers_sent($headers_file, $headers_line)) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.0', '>=') && headers_sent($headers_file, $headers_line)) {
 
 			echo "\n".'**Headers already sent in file "'.$headers_file.'" on line "'.$headers_line.'", dumping error message as text:**<br><pre>'."\n\n".$text."\n".'</pre>';
 
@@ -3896,45 +4319,44 @@ function ErrorImage($text, $width=0, $height=0, $forcedisplay=false) {
 
 			echo "\n".'**Headers already sent, dumping error message as text:**<br><pre>'."\n\n".$text."\n".'</pre>';
 
-		} elseif ($gdimg_error = ImageCreate($width, $height)) {
+		} elseif ($gdimg_error = imagecreate($width, $height)) {
 
 			$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_bgcolor,   true);
 			$text_color       = phpthumb_functions::ImageHexColorAllocate($gdimg_error, $this->config_error_textcolor, true);
-			ImageFilledRectangle($gdimg_error, 0, 0, $width, $height, $background_color);
+			imagefilledrectangle($gdimg_error, 0, 0, $width, $height, $background_color);
 			$lineYoffset = 0;
 			foreach ($LinesOfText as $line) {
-				ImageString($gdimg_error, $this->config_error_fontsize, 2, $lineYoffset, $line, $text_color);
+				imagestring($gdimg_error, $this->config_error_fontsize, 2, $lineYoffset, $line, $text_color);
 				$lineYoffset += $FontHeight;
 			}
-			if (function_exists('ImageTypes')) {
-				$imagetypes = ImageTypes();
+			if (function_exists('imagetypes')) {
+				$imagetypes = imagetypes();
 				if ($imagetypes & IMG_PNG) {
 					header('Content-Type: image/png');
-					ImagePNG($gdimg_error);
+					imagepng($gdimg_error);
 				} elseif ($imagetypes & IMG_GIF) {
 					header('Content-Type: image/gif');
-					ImageGIF($gdimg_error);
+					imagegif($gdimg_error);
 				} elseif ($imagetypes & IMG_JPG) {
 					header('Content-Type: image/jpeg');
-					ImageJPEG($gdimg_error);
+					imagejpeg($gdimg_error);
 				} elseif ($imagetypes & IMG_WBMP) {
 					header('Content-Type: image/vnd.wap.wbmp');
-					ImageWBMP($gdimg_error);
+					imagewbmp($gdimg_error);
 				}
 			}
-			ImageDestroy($gdimg_error);
+			imagedestroy($gdimg_error);
 
 		}
 		if (!headers_sent()) {
 			echo "\n".'**Failed to send graphical error image, dumping error message as text:**<br>'."\n\n".$text;
 		}
 		exit;
-		return true;
 	}
 
-	function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
+	public function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
 		// there are serious bugs in the non-bundled versions of GD which may cause
-		// PHP to segfault when calling ImageCreateFromString() - avoid if at all possible
+		// PHP to segfault when calling imagecreatefromstring() - avoid if at all possible
 		// when not using a bundled version of GD2
 		if (!phpthumb_functions::gd_version()) {
 			if ($DieOnErrors) {
@@ -3953,8 +4375,8 @@ function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
 			}
 		}
 		if (phpthumb_functions::gd_is_bundled()) {
-			$this->DebugMessage('ImageCreateFromStringReplacement() calling built-in ImageCreateFromString()', __FILE__, __LINE__);
-			return @ImageCreateFromString($RawImageData);
+			$this->DebugMessage('ImageCreateFromStringReplacement() calling built-in imagecreatefromstring()', __FILE__, __LINE__);
+			return @imagecreatefromstring($RawImageData);
 		}
 		if ($this->issafemode) {
 			$this->DebugMessage('ImageCreateFromStringReplacement() failed: cannot create temp file in SAFE_MODE', __FILE__, __LINE__);
@@ -3963,29 +4385,31 @@ function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
 
 		switch (substr($RawImageData, 0, 3)) {
 			case 'GIF':
-				$ICFSreplacementFunctionName = 'ImageCreateFromGIF';
+				$ICFSreplacementFunctionName = 'imagecreatefromgif';
 				break;
 			case "\xFF\xD8\xFF":
-				$ICFSreplacementFunctionName = 'ImageCreateFromJPEG';
+				$ICFSreplacementFunctionName = 'imagecreatefromjpeg';
 				break;
 			case "\x89".'PN':
-				$ICFSreplacementFunctionName = 'ImageCreateFromPNG';
+				$ICFSreplacementFunctionName = 'imagecreatefrompng';
 				break;
 			default:
 				$this->DebugMessage('ImageCreateFromStringReplacement() failed: unknown fileformat signature "'.phpthumb_functions::HexCharDisplay(substr($RawImageData, 0, 3)).'"', __FILE__, __LINE__);
 				return false;
 				break;
 		}
+		$ErrorMessage = '';
 		if ($tempnam = $this->phpThumb_tempnam()) {
 			if ($fp_tempnam = @fopen($tempnam, 'wb')) {
 				fwrite($fp_tempnam, $RawImageData);
 				fclose($fp_tempnam);
-				if (($ICFSreplacementFunctionName == 'ImageCreateFromGIF') && !function_exists($ICFSreplacementFunctionName)) {
+				@chmod($tempnam, $this->getParameter('config_file_create_mask'));
+				if (($ICFSreplacementFunctionName == 'imagecreatefromgif') && !function_exists($ICFSreplacementFunctionName)) {
 
-					// Need to create from GIF file, but ImageCreateFromGIF does not exist
+					// Need to create from GIF file, but imagecreatefromgif does not exist
 					ob_start();
-					if (!@include_once(dirname(__FILE__).'/phpthumb.gif.php')) {
-						$ErrorMessage = 'Failed to include required file "'.dirname(__FILE__).'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__;
+					if (!@include_once __DIR__ .'/phpthumb.gif.php' ) {
+						$ErrorMessage = 'Failed to include required file "'. __DIR__ .'/phpthumb.gif.php" in '.__FILE__.' on line '.__LINE__;
 						$this->DebugMessage($ErrorMessage, __FILE__, __LINE__);
 					}
 					ob_end_clean();
@@ -4046,39 +4470,42 @@ function ImageCreateFromStringReplacement(&$RawImageData, $DieOnErrors=false) {
 		return false;
 	}
 
-	function ImageResizeFunction(&$dst_im, &$src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH) {
+	public function ImageResizeFunction(&$dst_im, &$src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH) {
 		$this->DebugMessage('ImageResizeFunction($o, $s, '.$dstX.', '.$dstY.', '.$srcX.', '.$srcY.', '.$dstW.', '.$dstH.', '.$srcW.', '.$srcH.')', __FILE__, __LINE__);
 		if (($dstW == $srcW) && ($dstH == $srcH)) {
-			return ImageCopy($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $srcW, $srcH);
+			return imagecopy($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $srcW, $srcH);
 		}
 		if (phpthumb_functions::gd_version() >= 2.0) {
 			if ($this->config_disable_imagecopyresampled) {
 				return phpthumb_functions::ImageCopyResampleBicubic($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
 			}
-			return ImageCopyResampled($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
+			return imagecopyresampled($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
 		}
-		return ImageCopyResized($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
+		return imagecopyresized($dst_im, $src_im, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
 	}
 
-	function InitializeTempDirSetting() {
-		$this->config_temp_directory = realpath($this->config_temp_directory ? $this->config_temp_directory : (getenv('TMPDIR') ? getenv('TMPDIR') : getenv('TMP')));
+	public function InitializeTempDirSetting() {
+		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe((function_exists('sys_get_temp_dir') ? sys_get_temp_dir() : ''))); // sys_get_temp_dir added in PHP v5.2.1
+		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(ini_get('upload_tmp_dir')));
+		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(getenv('TMPDIR')));
+		$this->config_temp_directory = ($this->config_temp_directory ? $this->config_temp_directory : $this->realPathSafe(getenv('TMP')));
 		return true;
 	}
 
-	function phpThumb_tempnam() {
+	public function phpThumb_tempnam() {
 		$this->InitializeTempDirSetting();
-		$tempnam = realpath(tempnam($this->config_temp_directory, 'pThumb'));
+		$tempnam = $this->realPathSafe(tempnam($this->config_temp_directory, 'pThumb'));
 		$this->tempFilesToDelete[$tempnam] = $tempnam;
 		$this->DebugMessage('phpThumb_tempnam() returning "'.$tempnam.'"', __FILE__, __LINE__);
 		return $tempnam;
 	}
 
-	function DebugMessage($message, $file='', $line='') {
+	public function DebugMessage($message, $file='', $line='') {
 		$this->debugmessages[] = $message.($file ? ' in file "'.(basename($file) ? basename($file) : $file).'"' : '').($line ? ' on line '.$line : '');
 		return true;
 	}
 
-	function DebugTimingMessage($message, $file='', $line='', $timestamp=0) {
+	public function DebugTimingMessage($message, $file='', $line='', $timestamp=0) {
 		if (!$timestamp) {
 			$timestamp = array_sum(explode(' ', microtime()));
 		}
@@ -4087,5 +4514,3 @@ function DebugTimingMessage($message, $file='', $line='', $timestamp=0) {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/phpthumb/phpthumb.filters.php b/lib/phpthumb/phpthumb.filters.php
index e118b6fc..b8e2131a 100644
--- a/lib/phpthumb/phpthumb.filters.php
+++ b/lib/phpthumb/phpthumb.filters.php
@@ -1,7 +1,8 @@
 <?php
 //////////////////////////////////////////////////////////////
-///  phpThumb() by James Heinrich <info@silisoftware.com>   //
-//        available at http://phpthumb.sourceforge.net     ///
+//   phpThumb() by James Heinrich <info@silisoftware.com>   //
+//        available at http://phpthumb.sourceforge.net      //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
 //////////////////////////////////////////////////////////////
 ///                                                         //
 // phpthumb.filters.php - image processing filter functions //
@@ -10,48 +11,57 @@
 
 class phpthumb_filters {
 
-	var $phpThumbObject = null;
+	/**
+	* @var phpthumb
+	*/
 
-	function phpthumb_filters() {
-		return true;
+	public $phpThumbObject = null;
+
+
+	public function DebugMessage($message, $file='', $line='') {
+		if (is_object($this->phpThumbObject)) {
+			return $this->phpThumbObject->DebugMessage($message, $file, $line);
+		}
+		return false;
 	}
 
-	function ApplyMask(&$gdimg_mask, &$gdimg_image) {
+
+	public function ApplyMask(&$gdimg_mask, &$gdimg_image) {
 		if (phpthumb_functions::gd_version() < 2) {
 			$this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
 			return false;
 		}
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=')) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '4.3.2', '>=')) {
 
 			$this->DebugMessage('Using alpha ApplyMask() technique', __FILE__, __LINE__);
-			if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
+			if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_image), imagesy($gdimg_image))) {
 
-				ImageCopyResampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, ImageSX($gdimg_image), ImageSY($gdimg_image), ImageSX($gdimg_mask), ImageSY($gdimg_mask));
-				if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
+				imagecopyresampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, imagesx($gdimg_image), imagesy($gdimg_image), imagesx($gdimg_mask), imagesy($gdimg_mask));
+				if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_image), imagesy($gdimg_image))) {
 
-					$color_background = ImageColorAllocate($gdimg_mask_blendtemp, 0, 0, 0);
-					ImageFilledRectangle($gdimg_mask_blendtemp, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp), $color_background);
-					ImageAlphaBlending($gdimg_mask_blendtemp, false);
-					ImageSaveAlpha($gdimg_mask_blendtemp, true);
-					for ($x = 0; $x < ImageSX($gdimg_image); $x++) {
-						for ($y = 0; $y < ImageSY($gdimg_image); $y++) {
+					$color_background = imagecolorallocate($gdimg_mask_blendtemp, 0, 0, 0);
+					imagefilledrectangle($gdimg_mask_blendtemp, 0, 0, imagesx($gdimg_mask_blendtemp), imagesy($gdimg_mask_blendtemp), $color_background);
+					imagealphablending($gdimg_mask_blendtemp, false);
+					imagesavealpha($gdimg_mask_blendtemp, true);
+					for ($x = 0, $xMax = imagesx($gdimg_image); $x < $xMax; $x++) {
+						for ($y = 0, $yMax = imagesy($gdimg_image); $y < $yMax; $y++) {
 							//$RealPixel = phpthumb_functions::GetPixelColor($gdimg_mask_blendtemp, $x, $y);
 							$RealPixel = phpthumb_functions::GetPixelColor($gdimg_image, $x, $y);
 							$MaskPixel = phpthumb_functions::GrayscalePixel(phpthumb_functions::GetPixelColor($gdimg_mask_resized, $x, $y));
 							$MaskAlpha = 127 - (floor($MaskPixel['red'] / 2) * (1 - ($RealPixel['alpha'] / 127)));
 							$newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_mask_blendtemp, $RealPixel['red'], $RealPixel['green'], $RealPixel['blue'], $MaskAlpha);
-							ImageSetPixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
+							imagesetpixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
 						}
 					}
-					ImageAlphaBlending($gdimg_image, false);
-					ImageSaveAlpha($gdimg_image, true);
-					ImageCopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp));
-					ImageDestroy($gdimg_mask_blendtemp);
+					imagealphablending($gdimg_image, false);
+					imagesavealpha($gdimg_image, true);
+					imagecopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, imagesx($gdimg_mask_blendtemp), imagesy($gdimg_mask_blendtemp));
+					imagedestroy($gdimg_mask_blendtemp);
 
 				} else {
 					$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
 				}
-				ImageDestroy($gdimg_mask_resized);
+				imagedestroy($gdimg_mask_resized);
 
 			} else {
 				$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
@@ -59,43 +69,43 @@ function ApplyMask(&$gdimg_mask, &$gdimg_image) {
 
 		} else {
 			// alpha merging requires PHP v4.3.2+
-			$this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'.phpversion().'"', __FILE__, __LINE__);
+			$this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'. PHP_VERSION .'"', __FILE__, __LINE__);
 		}
 		return true;
 	}
 
 
-    function Bevel(&$gdimg, $width, $hexcolor1, $hexcolor2) {
+    public function Bevel(&$gdimg, $width, $hexcolor1, $hexcolor2) {
         $width     = ($width     ? $width     : 5);
         $hexcolor1 = ($hexcolor1 ? $hexcolor1 : 'FFFFFF');
         $hexcolor2 = ($hexcolor2 ? $hexcolor2 : '000000');
 
-        ImageAlphaBlending($gdimg, true);
+        imagealphablending($gdimg, true);
         for ($i = 0; $i < $width; $i++) {
             $alpha = round(($i / $width) * 127);
             $color1 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1, false, $alpha);
             $color2 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2, false, $alpha);
 
-            ImageLine($gdimg,                   $i,                   $i + 1,                   $i, ImageSY($gdimg) - $i - 1, $color1); // left
-            ImageLine($gdimg,                   $i,                   $i    , ImageSX($gdimg) - $i,                   $i    , $color1); // top
-            ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i - 1, ImageSX($gdimg) - $i,                   $i + 1, $color2); // right
-            ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i    ,                   $i, ImageSY($gdimg) - $i    , $color2); // bottom
+            imageline($gdimg,                   $i,                   $i + 1,                   $i, imagesy($gdimg) - $i - 1, $color1); // left
+            imageline($gdimg,                   $i,                   $i    , imagesx($gdimg) - $i,                   $i    , $color1); // top
+            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i - 1, imagesx($gdimg) - $i,                   $i + 1, $color2); // right
+            imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i    ,                   $i, imagesy($gdimg) - $i    , $color2); // bottom
         }
         return true;
     }
 
 
-	function Blur(&$gdimg, $radius=0.5) {
-		// Taken from Torstein Hønsi's phpUnsharpMask (see phpthumb.unsharp.php)
+	public function Blur(&$gdimg, $radius=0.5) {
+		// Taken from Torstein Hønsi's phpUnsharpMask (see phpthumb.unsharp.php)
 
 		$radius = round(max(0, min($radius, 50)) * 2);
 		if (!$radius) {
 			return false;
 		}
 
-		$w = ImageSX($gdimg);
-		$h = ImageSY($gdimg);
-		if ($imgBlur = ImageCreateTrueColor($w, $h)) {
+		$w = imagesx($gdimg);
+		$h = imagesy($gdimg);
+		if ($imgBlur = imagecreatetruecolor($w, $h)) {
 			// Gaussian blur matrix:
 			//	1	2	1
 			//	2	4	2
@@ -104,16 +114,16 @@ function Blur(&$gdimg, $radius=0.5) {
 			// Move copies of the image around one pixel at the time and merge them with weight
 			// according to the matrix. The same matrix is simply repeated for higher radii.
 			for ($i = 0; $i < $radius; $i++)	{
-				ImageCopy     ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1);            // up left
-				ImageCopyMerge($imgBlur, $gdimg, 1, 1, 0, 0, $w,     $h,     50.00000);  // down right
-				ImageCopyMerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h,     33.33333);  // down left
-				ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 1, $w,     $h - 1, 25.00000);  // up right
-				ImageCopyMerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h,     33.33333);  // left
-				ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 0, $w,     $h,     25.00000);  // right
-				ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 1, $w,     $h - 1, 20.00000);  // up
-				ImageCopyMerge($imgBlur, $gdimg, 0, 1, 0, 0, $w,     $h,     16.666667); // down
-				ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 0, $w,     $h,     50.000000); // center
-				ImageCopy     ($gdimg, $imgBlur, 0, 0, 0, 0, $w,     $h);
+				imagecopy     ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1);            // up left
+				imagecopymerge($imgBlur, $gdimg, 1, 1, 0, 0, $w,     $h,     50.00000);  // down right
+				imagecopymerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h,     33.33333);  // down left
+				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 1, $w,     $h - 1, 25.00000);  // up right
+				imagecopymerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h,     33.33333);  // left
+				imagecopymerge($imgBlur, $gdimg, 1, 0, 0, 0, $w,     $h,     25.00000);  // right
+				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 1, $w,     $h - 1, 20.00000);  // up
+				imagecopymerge($imgBlur, $gdimg, 0, 1, 0, 0, $w,     $h,     16.666667); // down
+				imagecopymerge($imgBlur, $gdimg, 0, 0, 0, 0, $w,     $h,     50.000000); // center
+				imagecopy     ($gdimg, $imgBlur, 0, 0, 0, 0, $w,     $h);
 			}
 			return true;
 		}
@@ -121,25 +131,25 @@ function Blur(&$gdimg, $radius=0.5) {
 	}
 
 
-	function BlurGaussian(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
+	public function BlurGaussian(&$gdimg) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 		$this->DebugMessage('FAILED: phpthumb_filters::BlurGaussian($gdimg) [using phpthumb_filters::Blur() instead]', __FILE__, __LINE__);
-		return phpthumb_filters::Blur($gdimg, 0.5);
+		return $this->Blur($gdimg, 0.5);
 	}
 
 
-	function BlurSelective(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
+	public function BlurSelective(&$gdimg) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 		// currently not implemented "the hard way"
@@ -148,49 +158,50 @@ function BlurSelective(&$gdimg) {
 	}
 
 
-	function Brightness(&$gdimg, $amount=0) {
+	public function Brightness(&$gdimg, $amount=0) {
 		if ($amount == 0) {
 			return true;
 		}
 		$amount = max(-255, min(255, $amount));
 
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 
 		$scaling = (255 - abs($amount)) / 255;
 		$baseamount = (($amount > 0) ? $amount : 0);
-		for ($x = 0; $x < ImageSX($gdimg); $x++) {
-			for ($y = 0; $y < ImageSY($gdimg); $y++) {
+		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
 				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+				$NewPixel = array();
 				foreach ($OriginalPixel as $key => $value) {
 					$NewPixel[$key] = round($baseamount + ($OriginalPixel[$key] * $scaling));
 				}
-				$newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				$newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
 		return true;
 	}
 
 
-	function Contrast(&$gdimg, $amount=0) {
+	public function Contrast(&$gdimg, $amount=0) {
 		if ($amount == 0) {
 			return true;
 		}
 		$amount = max(-255, min(255, $amount));
 
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			// ImageFilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			// imagefilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
 			$amount = ($amount / 255) * -100;
-			if (ImageFilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
+			if (imagefilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 
@@ -199,20 +210,22 @@ function Contrast(&$gdimg, $amount=0) {
 		} else {
 			$scaling = (255 - abs($amount)) / 255;
 		}
-		for ($x = 0; $x < ImageSX($gdimg); $x++) {
-			for ($y = 0; $y < ImageSY($gdimg); $y++) {
+		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
 				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+				$NewPixel = array();
 				foreach ($OriginalPixel as $key => $value) {
 					$NewPixel[$key] = min(255, max(0, round($OriginalPixel[$key] * $scaling)));
 				}
-				$newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				$newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
+		return true;
 	}
 
 
-	function Colorize(&$gdimg, $amount, $targetColor) {
+	public function Colorize(&$gdimg, $amount, $targetColor) {
 		$amount      = (is_numeric($amount)                          ? $amount      : 25);
 		$amountPct   = $amount / 100;
 		$targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
@@ -221,51 +234,53 @@ function Colorize(&$gdimg, $amount, $targetColor) {
 			return true;
 		}
 
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
 			if ($targetColor == 'gray') {
 				$targetColor = '808080';
 			}
 			$r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
 			$g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
 			$b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
-			if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
+			if (imagefilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 
 		// overridden below for grayscale
+		$TargetPixel = array();
 		if ($targetColor != 'gray') {
 			$TargetPixel['red']   = hexdec(substr($targetColor, 0, 2));
 			$TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
 			$TargetPixel['blue']  = hexdec(substr($targetColor, 4, 2));
 		}
 
-		for ($x = 0; $x < ImageSX($gdimg); $x++) {
-			for ($y = 0; $y < ImageSY($gdimg); $y++) {
+		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
 				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
 				if ($targetColor == 'gray') {
 					$TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
 				}
+				$NewPixel = array();
 				foreach ($TargetPixel as $key => $value) {
 					$NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct))));
 				}
 				//$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
-				$newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				$newColor = imagecolorallocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
 		return true;
 	}
 
 
-	function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
+	public function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
 		if (!$left && !$right && !$top && !$bottom) {
 			return true;
 		}
-		$oldW = ImageSX($gdimg);
-		$oldH = ImageSY($gdimg);
+		$oldW = imagesx($gdimg);
+		$oldH = imagesy($gdimg);
 		if (($left   > 0) && ($left   < 1)) { $left   = round($left   * $oldW); }
 		if (($right  > 0) && ($right  < 1)) { $right  = round($right  * $oldW); }
 		if (($top    > 0) && ($top    < 1)) { $top    = round($top    * $oldH); }
@@ -275,28 +290,28 @@ function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
 		$newW = $oldW - $left - $right;
 		$newH = $oldH - $top  - $bottom;
 
-		if ($imgCropped = ImageCreateTrueColor($newW, $newH)) {
-			ImageCopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
-			if ($gdimg = ImageCreateTrueColor($newW, $newH)) {
-				ImageCopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
-				ImageDestroy($imgCropped);
+		if ($imgCropped = imagecreatetruecolor($newW, $newH)) {
+			imagecopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
+			if ($gdimg = imagecreatetruecolor($newW, $newH)) {
+				imagecopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
+				imagedestroy($imgCropped);
 				return true;
 			}
-			ImageDestroy($imgCropped);
+			imagedestroy($imgCropped);
 		}
 		return false;
 	}
 
 
-	function Desaturate(&$gdimg, $amount, $color='') {
+	public function Desaturate(&$gdimg, $amount, $color='') {
 		if ($amount == 0) {
 			return true;
 		}
-		return phpthumb_filters::Colorize($gdimg, $amount, (phpthumb_functions::IsHexColor($color) ? $color : 'gray'));
+		return $this->Colorize($gdimg, $amount, (phpthumb_functions::IsHexColor($color) ? $color : 'gray'));
 	}
 
 
-	function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
+	public function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
 		if (phpthumb_functions::gd_version() < 2) {
 			return false;
 		}
@@ -315,29 +330,30 @@ function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
 			return true;
 		}
 
-		$width_shadow  = cos(deg2rad($angle)) * ($distance + $width);
-		$height_shadow = sin(deg2rad($angle)) * ($distance + $width);
-
-		$scaling = min(ImageSX($gdimg) / (ImageSX($gdimg) + abs($width_shadow)), ImageSY($gdimg) / (ImageSY($gdimg) + abs($height_shadow)));
+		//$width_shadow  = cos(deg2rad($angle)) * ($distance + $width);
+		//$height_shadow = sin(deg2rad($angle)) * ($distance + $width);
+		//$scaling = min(imagesx($gdimg) / (imagesx($gdimg) + abs($width_shadow)), imagesy($gdimg) / (imagesy($gdimg) + abs($height_shadow)));
 
+		$Offset = array();
 		for ($i = 0; $i < $width; $i++) {
 			$WidthAlpha[$i] = (abs(($width / 2) - $i) / $width);
 			$Offset['x'] = cos(deg2rad($angle)) * ($distance + $i);
 			$Offset['y'] = sin(deg2rad($angle)) * ($distance + $i);
 		}
 
-		$tempImageWidth  = ImageSX($gdimg)  + abs($Offset['x']);
-		$tempImageHeight = ImageSY($gdimg) + abs($Offset['y']);
+		$tempImageWidth  = imagesx($gdimg)  + abs($Offset['x']);
+		$tempImageHeight = imagesy($gdimg) + abs($Offset['y']);
 
 		if ($gdimg_dropshadow_temp = phpthumb_functions::ImageCreateFunction($tempImageWidth, $tempImageHeight)) {
 
-			ImageAlphaBlending($gdimg_dropshadow_temp, false);
-			ImageSaveAlpha($gdimg_dropshadow_temp, true);
+			imagealphablending($gdimg_dropshadow_temp, false);
+			imagesavealpha($gdimg_dropshadow_temp, true);
 			$transparent1 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, 0, 0, 0, 127);
-			ImageFill($gdimg_dropshadow_temp, 0, 0, $transparent1);
+			imagefill($gdimg_dropshadow_temp, 0, 0, $transparent1);
 
-			for ($x = 0; $x < ImageSX($gdimg); $x++) {
-				for ($y = 0; $y < ImageSY($gdimg); $y++) {
+			$PixelMap = array();
+			for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+				for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
 					$PixelMap[$x][$y] = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
 				}
 			}
@@ -348,42 +364,42 @@ function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
 						if (!isset($PixelMap[$x][$y]['alpha']) || ($PixelMap[$x][$y]['alpha'] > 0)) {
 							if (isset($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']) && ($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha'] < 127)) {
 								$thisColor = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor, false, $PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']);
-								ImageSetPixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
+								imagesetpixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
 							}
 						}
 					}
 				}
 			}
 
-			ImageAlphaBlending($gdimg_dropshadow_temp, true);
-			for ($x = 0; $x < ImageSX($gdimg); $x++) {
-				for ($y = 0; $y < ImageSY($gdimg); $y++) {
+			imagealphablending($gdimg_dropshadow_temp, true);
+			for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+				for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
 					if ($PixelMap[$x][$y]['alpha'] < 127) {
 						$thisColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, $PixelMap[$x][$y]['red'], $PixelMap[$x][$y]['green'], $PixelMap[$x][$y]['blue'], $PixelMap[$x][$y]['alpha']);
-						ImageSetPixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
+						imagesetpixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
 					}
 				}
 			}
 
-			ImageSaveAlpha($gdimg, true);
-			ImageAlphaBlending($gdimg, false);
+			imagesavealpha($gdimg, true);
+			imagealphablending($gdimg, false);
 			//$this->is_alpha = true;
 			$transparent2 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0, 0, 0, 127);
-			ImageFilledRectangle($gdimg, 0, 0, ImageSX($gdimg), ImageSY($gdimg), $transparent2);
-			ImageCopyResampled($gdimg, $gdimg_dropshadow_temp, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg), ImageSX($gdimg_dropshadow_temp), ImageSY($gdimg_dropshadow_temp));
+			imagefilledrectangle($gdimg, 0, 0, imagesx($gdimg), imagesy($gdimg), $transparent2);
+			imagecopyresampled($gdimg, $gdimg_dropshadow_temp, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg), imagesx($gdimg_dropshadow_temp), imagesy($gdimg_dropshadow_temp));
 
-			ImageDestroy($gdimg_dropshadow_temp);
+			imagedestroy($gdimg_dropshadow_temp);
 		}
 		return true;
 	}
 
 
-	function EdgeDetect(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_EDGEDETECT)) {
+	public function EdgeDetect(&$gdimg) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_EDGEDETECT)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_EDGEDETECT)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_EDGEDETECT)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 		// currently not implemented "the hard way"
@@ -392,39 +408,39 @@ function EdgeDetect(&$gdimg) {
 	}
 
 
-	function Elipse($gdimg) {
+	public function Ellipse($gdimg) {
 		if (phpthumb_functions::gd_version() < 2) {
 			return false;
 		}
 		// generate mask at twice desired resolution and downsample afterwards for easy antialiasing
-		if ($gdimg_elipsemask_double = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg) * 2, ImageSY($gdimg) * 2)) {
-			if ($gdimg_elipsemask = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg), ImageSY($gdimg))) {
+		if ($gdimg_ellipsemask_double = phpthumb_functions::ImageCreateFunction(imagesx($gdimg) * 2, imagesy($gdimg) * 2)) {
+			if ($gdimg_ellipsemask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
 
-				$color_transparent = ImageColorAllocate($gdimg_elipsemask_double, 255, 255, 255);
-				ImageFilledEllipse($gdimg_elipsemask_double, ImageSX($gdimg), ImageSY($gdimg), (ImageSX($gdimg) - 1) * 2, (ImageSY($gdimg) - 1) * 2, $color_transparent);
-				ImageCopyResampled($gdimg_elipsemask, $gdimg_elipsemask_double, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg), ImageSX($gdimg) * 2, ImageSY($gdimg) * 2);
+				$color_transparent = imagecolorallocate($gdimg_ellipsemask_double, 255, 255, 255);
+				imagefilledellipse($gdimg_ellipsemask_double, imagesx($gdimg), imagesy($gdimg), (imagesx($gdimg) - 1) * 2, (imagesy($gdimg) - 1) * 2, $color_transparent);
+				imagecopyresampled($gdimg_ellipsemask, $gdimg_ellipsemask_double, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg), imagesx($gdimg) * 2, imagesy($gdimg) * 2);
 
-				phpthumb_filters::ApplyMask($gdimg_elipsemask, $gdimg);
-				ImageDestroy($gdimg_elipsemask);
+				$this->ApplyMask($gdimg_ellipsemask, $gdimg);
+				imagedestroy($gdimg_ellipsemask);
 				return true;
 
 			} else {
-				$this->DebugMessage('$gdimg_elipsemask = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
+				$this->DebugMessage('$gdimg_ellipsemask = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
 			}
-			ImageDestroy($gdimg_elipsemask_double);
+			imagedestroy($gdimg_ellipsemask_double);
 		} else {
-			$this->DebugMessage('$gdimg_elipsemask_double = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
+			$this->DebugMessage('$gdimg_ellipsemask_double = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
 		}
 		return false;
 	}
 
 
-	function Emboss(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_EMBOSS)) {
+	public function Emboss(&$gdimg) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_EMBOSS)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_EMBOSS)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_EMBOSS)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 		// currently not implemented "the hard way"
@@ -433,30 +449,30 @@ function Emboss(&$gdimg) {
 	}
 
 
-	function Flip(&$gdimg, $x=false, $y=false) {
+	public function Flip(&$gdimg, $x=false, $y=false) {
 		if (!$x && !$y) {
 			return false;
 		}
-		if ($tempImage = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg), ImageSY($gdimg))) {
+		if ($tempImage = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
 			if ($x) {
-				ImageCopy($tempImage, $gdimg, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg));
-				for ($x = 0; $x < ImageSX($gdimg); $x++) {
-					ImageCopy($gdimg, $tempImage, ImageSX($gdimg) - 1 - $x, 0, $x, 0, 1, ImageSY($gdimg));
+				imagecopy($tempImage, $gdimg, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg));
+				for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+					imagecopy($gdimg, $tempImage, imagesx($gdimg) - 1 - $x, 0, $x, 0, 1, imagesy($gdimg));
 				}
 			}
 			if ($y) {
-				ImageCopy($tempImage, $gdimg, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg));
-				for ($y = 0; $y < ImageSY($gdimg); $y++) {
-					ImageCopy($gdimg, $tempImage, 0, ImageSY($gdimg) - 1 - $y, 0, $y, ImageSX($gdimg), 1);
+				imagecopy($tempImage, $gdimg, 0, 0, 0, 0, imagesx($gdimg), imagesy($gdimg));
+				for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
+					imagecopy($gdimg, $tempImage, 0, imagesy($gdimg) - 1 - $y, 0, $y, imagesx($gdimg), 1);
 				}
 			}
-			ImageDestroy($tempImage);
+			imagedestroy($tempImage);
 		}
 		return true;
 	}
 
 
-	function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1, $hexcolor2) {
+	public function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1, $hexcolor2) {
 		$frame_width    = ($frame_width    ? $frame_width    : 5);
 		$edge_width     = ($edge_width     ? $edge_width     : 1);
 		$hexcolor_frame = ($hexcolor_frame ? $hexcolor_frame : 'CCCCCC');
@@ -468,49 +484,50 @@ function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1,
 		$color2      = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2);
 		for ($i = 0; $i < $edge_width; $i++) {
 			// outer bevel
-			ImageLine($gdimg,                   $i,                   $i,                   $i, ImageSY($gdimg) - $i, $color1); // left
-			ImageLine($gdimg,                   $i,                   $i, ImageSX($gdimg) - $i,                   $i, $color1); // top
-			ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i, ImageSX($gdimg) - $i,                   $i, $color2); // right
-			ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i,                   $i, ImageSY($gdimg) - $i, $color2); // bottom
+			imageline($gdimg,                   $i,                   $i,                   $i, imagesy($gdimg) - $i, $color1); // left
+			imageline($gdimg,                   $i,                   $i, imagesx($gdimg) - $i,                   $i, $color1); // top
+			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i, imagesx($gdimg) - $i,                   $i, $color2); // right
+			imageline($gdimg, imagesx($gdimg) - $i, imagesy($gdimg) - $i,                   $i, imagesy($gdimg) - $i, $color2); // bottom
 		}
 		for ($i = 0; $i < $frame_width; $i++) {
 			// actual frame
-			ImageRectangle($gdimg, $edge_width + $i, $edge_width + $i, ImageSX($gdimg) - $edge_width - $i, ImageSY($gdimg) - $edge_width - $i, $color_frame);
+			imagerectangle($gdimg, $edge_width + $i, $edge_width + $i, imagesx($gdimg) - $edge_width - $i, imagesy($gdimg) - $edge_width - $i, $color_frame);
 		}
 		for ($i = 0; $i < $edge_width; $i++) {
 			// inner bevel
-			ImageLine($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $color2); // left
-			ImageLine($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, ImageSX($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color2); // top
-			ImageLine($gdimg, ImageSX($gdimg) - $frame_width - $edge_width - $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, ImageSX($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color1); // right
-			ImageLine($gdimg, ImageSX($gdimg) - $frame_width - $edge_width - $i, ImageSY($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
+			imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color2); // left
+			imageline($gdimg,                   $frame_width + $edge_width + $i,                   $frame_width + $edge_width + $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color2); // top
+			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i, imagesx($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, $color1); // right
+			imageline($gdimg, imagesx($gdimg) - $frame_width - $edge_width - $i, imagesy($gdimg) - $frame_width - $edge_width - $i,                   $frame_width + $edge_width + $i, imagesy($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
 		}
 		return true;
 	}
 
 
-	function Gamma(&$gdimg, $amount) {
+	public function Gamma(&$gdimg, $amount) {
 		if (number_format($amount, 4) == '1.0000') {
 			return true;
 		}
-		return ImageGammaCorrect($gdimg, 1.0, $amount);
+		return imagegammacorrect($gdimg, 1.0, $amount);
 	}
 
 
-	function Grayscale(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)) {
+	public function Grayscale(&$gdimg) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_GRAYSCALE)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
-		return phpthumb_filters::Colorize($gdimg, 100, 'gray');
+		return $this->Colorize($gdimg, 100, 'gray');
 	}
 
 
-	function HistogramAnalysis(&$gdimg, $calculateGray=false) {
-		$ImageSX = ImageSX($gdimg);
-		$ImageSY = ImageSY($gdimg);
+	public function HistogramAnalysis(&$gdimg, $calculateGray=false) {
+		$ImageSX = imagesx($gdimg);
+		$ImageSY = imagesy($gdimg);
+		$Analysis = array();
 		for ($x = 0; $x < $ImageSX; $x++) {
 			for ($y = 0; $y < $ImageSY; $y++) {
 				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
@@ -535,13 +552,13 @@ function HistogramAnalysis(&$gdimg, $calculateGray=false) {
 	}
 
 
-	function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
+	public function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
 		// equivalent of "Auto Contrast" in Adobe Photoshop
 		// method 0 stretches according to RGB colors. Gives a more conservative stretch.
 		// method 1 band stretches according to grayscale which is color-biased (59% green, 30% red, 11% blue). May give a punchier / more aggressive stretch, possibly appearing over-saturated
-		$Analysis = phpthumb_filters::HistogramAnalysis($gdimg, true);
-		$keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>(($method == 0) ? 'all' : 'gray'));
-		$band = substr($band, 0, 1);
+		$Analysis = $this->HistogramAnalysis($gdimg, true);
+		$keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=> ($method == 0) ? 'all' : 'gray' );
+		$band = $band[ 0 ];
 		if (!isset($keys[$band])) {
 			return false;
 		}
@@ -551,50 +568,47 @@ function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
 		// pixel in the image could throw off the whole system. Instead, count up/down
 		// from the limit and allow <threshold> (default = 0.1%) of brightest/darkest
 		// pixels to be clipped to min/max
-		$threshold = floatval($threshold) / 100;
-		$clip_threshold = ImageSX($gdimg) * ImageSX($gdimg) * $threshold;
-		//if ($min >= 0) {
-		//	$range_min = min($min, 255);
-		//} else {
-			$countsum = 0;
-			for ($i = 0; $i <= 255; $i++) {
-				if ($method == 0) {
-					$countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
-				} else {
-					$countsum += @$Analysis[$key][$i];
-				}
-				if ($countsum >= $clip_threshold) {
-					$range_min = $i - 1;
-					break;
-				}
+		$threshold = (float) $threshold / 100;
+		$clip_threshold = imagesx($gdimg) * imagesx($gdimg) * $threshold;
+
+		$countsum  = 0;
+		$range_min = 0;
+		for ($i = 0; $i <= 255; $i++) {
+			if ($method == 0) {
+				$countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
+			} else {
+				$countsum += @$Analysis[$key][$i];
 			}
-			$range_min = max($range_min, 0);
-		//}
-		//if ($max > 0) {
-		//	$range_max = max($max, 255);
-		//} else {
-			$countsum = 0;
-			for ($i = 255; $i >= 0; $i--) {
-				if ($method == 0) {
-					$countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
-				} else {
-					$countsum += @$Analysis[$key][$i];
-				}
-				if ($countsum >= $clip_threshold) {
-					$range_max = $i + 1;
-					break;
-				}
+			if ($countsum >= $clip_threshold) {
+				$range_min = $i - 1;
+				break;
 			}
-			$range_max = min($range_max, 255);
-		//}
+		}
+		$range_min = max($range_min, 0);
+
+		$countsum  =   0;
+		$range_max = 255;
+		for ($i = 255; $i >= 0; $i--) {
+			if ($method == 0) {
+				$countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
+			} else {
+				$countsum += @$Analysis[$key][$i];
+			}
+			if ($countsum >= $clip_threshold) {
+				$range_max = $i + 1;
+				break;
+			}
+		}
+		$range_max = min($range_max, 255);
+
 		$range_scale = (($range_max == $range_min) ? 1 : (255 / ($range_max - $range_min)));
 		if (($range_min == 0) && ($range_max == 255)) {
-			// no adjustment neccesary - don't waste CPU time!
+			// no adjustment necessary - don't waste CPU time!
 			return true;
 		}
 
-		$ImageSX = ImageSX($gdimg);
-		$ImageSY = ImageSY($gdimg);
+		$ImageSX = imagesx($gdimg);
+		$ImageSY = imagesy($gdimg);
 		for ($x = 0; $x < $ImageSX; $x++) {
 			for ($y = 0; $y < $ImageSY; $y++) {
 				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
@@ -608,7 +622,7 @@ function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
 					$new[$key] = min(255, max(0, ($OriginalPixel[$key] - $range_min) * $range_scale));
 				}
 				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $new['red'], $new['green'], $new['blue'], $new['alpha']);
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
 
@@ -616,25 +630,25 @@ function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
 	}
 
 
-	function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height=0.25, $alignment='BR', $opacity=50, $margin_x=5, $margin_y=null) {
-		$margin_y = (is_null($margin_y) ? $margin_x : $margin_y);
+	public function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height=0.25, $alignment='BR', $opacity=50, $margin_x=5, $margin_y=null) {
+		$margin_y = (null === $margin_y ? $margin_x : $margin_y);
 
-		$Analysis = phpthumb_filters::HistogramAnalysis($gdimg, true);
-		$histW = round(($width > 1) ? min($width, ImageSX($gdimg)) : ImageSX($gdimg) * $width);
-		$histH = round(($width > 1) ? min($width, ImageSX($gdimg)) : ImageSX($gdimg) * $width);
-		if ($gdHist = ImageCreateTrueColor($histW, $histH)) {
+		$Analysis = $this->HistogramAnalysis($gdimg, true);
+		$histW = round(($width > 1) ? min($width, imagesx($gdimg)) : imagesx($gdimg) * $width);
+		$histH = round(($width > 1) ? min($width, imagesx($gdimg)) : imagesx($gdimg) * $width);
+		if ($gdHist = imagecreatetruecolor($histW, $histH)) {
 			$color_back = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHist, 0, 0, 0, 127);
-			ImageFilledRectangle($gdHist, 0, 0, $histW, $histH, $color_back);
-			ImageAlphaBlending($gdHist, false);
-			ImageSaveAlpha($gdHist, true);
+			imagefilledrectangle($gdHist, 0, 0, $histW, $histH, $color_back);
+			imagealphablending($gdHist, false);
+			imagesavealpha($gdHist, true);
 
 			$HistogramTempWidth  = 256;
 			$HistogramTempHeight = 100;
-			if ($gdHistTemp = ImageCreateTrueColor($HistogramTempWidth, $HistogramTempHeight)) {
+			if ($gdHistTemp = imagecreatetruecolor($HistogramTempWidth, $HistogramTempHeight)) {
 				$color_back_temp = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHistTemp, 255, 0, 255, 127);
-				ImageAlphaBlending($gdHistTemp, false);
-				ImageSaveAlpha($gdHistTemp, true);
-				ImageFilledRectangle($gdHistTemp, 0, 0, ImageSX($gdHistTemp), ImageSY($gdHistTemp), $color_back_temp);
+				imagealphablending($gdHistTemp, false);
+				imagesavealpha($gdHistTemp, true);
+				imagefilledrectangle($gdHistTemp, 0, 0, imagesx($gdHistTemp), imagesy($gdHistTemp), $color_back_temp);
 
 				$DefaultColors = array('r'=>'FF0000', 'g'=>'00FF00', 'b'=>'0000FF', 'a'=>'999999', '*'=>'FFFFFF');
 				$Colors = explode(';', $colors);
@@ -647,92 +661,87 @@ function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height=
 					$PeakValue = max($Analysis[$keys[$band]]);
 					$thisColor = phpthumb_functions::ImageHexColorAllocate($gdHistTemp, phpthumb_functions::IsHexColor(@$Colors[$key]) ? $Colors[$key] : $DefaultColors[$band]);
 					for ($x = 0; $x < $HistogramTempWidth; $x++) {
-						ImageLine($gdHistTemp, $x, $HistogramTempHeight - 1, $x, $HistogramTempHeight - 1 - round(@$Analysis[$keys[$band]][$x] / $PeakValue * $HistogramTempHeight), $thisColor);
+						imageline($gdHistTemp, $x, $HistogramTempHeight - 1, $x, $HistogramTempHeight - 1 - round(@$Analysis[$keys[$band]][$x] / $PeakValue * $HistogramTempHeight), $thisColor);
 					}
-					ImageLine($gdHistTemp, 0, $HistogramTempHeight - 1, $HistogramTempWidth - 1, $HistogramTempHeight - 1, $thisColor);
-					ImageLine($gdHistTemp, 0, $HistogramTempHeight - 2, $HistogramTempWidth - 1, $HistogramTempHeight - 2, $thisColor);
+					imageline($gdHistTemp, 0, $HistogramTempHeight - 1, $HistogramTempWidth - 1, $HistogramTempHeight - 1, $thisColor);
+					imageline($gdHistTemp, 0, $HistogramTempHeight - 2, $HistogramTempWidth - 1, $HistogramTempHeight - 2, $thisColor);
 				}
-				ImageCopyResampled($gdHist, $gdHistTemp, 0, 0, 0, 0, ImageSX($gdHist), ImageSY($gdHist), ImageSX($gdHistTemp), ImageSY($gdHistTemp));
-				ImageDestroy($gdHistTemp);
+				imagecopyresampled($gdHist, $gdHistTemp, 0, 0, 0, 0, imagesx($gdHist), imagesy($gdHist), imagesx($gdHistTemp), imagesy($gdHistTemp));
+				imagedestroy($gdHistTemp);
 			} else {
 				return false;
 			}
 
-			phpthumb_filters::WatermarkOverlay($gdimg, $gdHist, $alignment, $opacity, $margin_x, $margin_y);
-			ImageDestroy($gdHist);
+			$this->WatermarkOverlay($gdimg, $gdHist, $alignment, $opacity, $margin_x, $margin_y);
+			imagedestroy($gdHist);
 			return true;
 		}
 		return false;
 	}
 
 
-	function ImageBorder(&$gdimg, $border_width, $radius_x, $radius_y, $hexcolor_border) {
+	public function ImageBorder(&$gdimg, $border_width, $radius_x, $radius_y, $hexcolor_border) {
 		$border_width = ($border_width ? $border_width : 1);
 		$radius_x     = ($radius_x     ? $radius_x     : 0);
 		$radius_y     = ($radius_y     ? $radius_y     : 0);
 
-		$output_width  = ImageSX($gdimg);
-		$output_height = ImageSY($gdimg);
+		$output_width  = imagesx($gdimg);
+		$output_height = imagesy($gdimg);
 
 		list($new_width, $new_height) = phpthumb_functions::ProportionalResize($output_width, $output_height, $output_width - max($border_width * 2, $radius_x), $output_height - max($border_width * 2, $radius_y));
 		$offset_x = ($radius_x ? $output_width  - $new_width  - $radius_x : 0);
-		$offset_y = ($radius_y ? $output_height - $new_height - $radius_y : 0);
 
-//header('Content-Type: image/png');
-//ImagePNG($gdimg);
-//exit;
 		if ($gd_border_canvas = phpthumb_functions::ImageCreateFunction($output_width, $output_height)) {
 
-			ImageSaveAlpha($gd_border_canvas, true);
-			ImageAlphaBlending($gd_border_canvas, false);
+			imagesavealpha($gd_border_canvas, true);
+			imagealphablending($gd_border_canvas, false);
 			$color_background = phpthumb_functions::ImageColorAllocateAlphaSafe($gd_border_canvas, 255, 255, 255, 127);
-			ImageFilledRectangle($gd_border_canvas, 0, 0, $output_width, $output_height, $color_background);
+			imagefilledrectangle($gd_border_canvas, 0, 0, $output_width, $output_height, $color_background);
 
 			$color_border = phpthumb_functions::ImageHexColorAllocate($gd_border_canvas, (phpthumb_functions::IsHexColor($hexcolor_border) ? $hexcolor_border : '000000'));
 
 			for ($i = 0; $i < $border_width; $i++) {
-				ImageLine($gd_border_canvas,             floor($offset_x / 2) + $radius_x,                      $i, $output_width - $radius_x - ceil($offset_x / 2),                         $i, $color_border); // top
-				ImageLine($gd_border_canvas,             floor($offset_x / 2) + $radius_x, $output_height - 1 - $i, $output_width - $radius_x - ceil($offset_x / 2),    $output_height - 1 - $i, $color_border); // bottom
-				ImageLine($gd_border_canvas,                    floor($offset_x / 2) + $i,               $radius_y,                      floor($offset_x / 2) +  $i, $output_height - $radius_y, $color_border); // left
-				ImageLine($gd_border_canvas, $output_width - 1 - $i - ceil($offset_x / 2),               $radius_y,    $output_width - 1 - $i - ceil($offset_x / 2), $output_height - $radius_y, $color_border); // right
+				imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x,                      $i, $output_width - $radius_x - ceil($offset_x / 2),                         $i, $color_border); // top
+				imageline($gd_border_canvas,             floor($offset_x / 2) + $radius_x, $output_height - 1 - $i, $output_width - $radius_x - ceil($offset_x / 2),    $output_height - 1 - $i, $color_border); // bottom
+				imageline($gd_border_canvas,                    floor($offset_x / 2) + $i,               $radius_y,                      floor($offset_x / 2) +  $i, $output_height - $radius_y, $color_border); // left
+				imageline($gd_border_canvas, $output_width - 1 - $i - ceil($offset_x / 2),               $radius_y,    $output_width - 1 - $i - ceil($offset_x / 2), $output_height - $radius_y, $color_border); // right
 			}
 
 			if ($radius_x && $radius_y) {
 
-				// PHP bug: ImageArc() with thicknesses > 1 give bad/undesirable/unpredicatable results
+				// PHP bug: imagearc() with thicknesses > 1 give bad/undesirable/unpredicatable results
 				// Solution: Draw multiple 1px arcs side-by-side.
 
 				// Problem: parallel arcs give strange/ugly antialiasing problems
 				// Solution: draw non-parallel arcs, from one side of the line thickness at the start angle
 				//   to the opposite edge of the line thickness at the terminating angle
 				for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
-					ImageArc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x,              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
-					ImageArc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2),              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
-					ImageArc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2), $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
-					ImageArc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x, $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
+					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x,              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
+					imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2),              $thickness_offset - 1 + $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
+					imagearc($gd_border_canvas,                     $output_width - $radius_x - 1 - ceil($offset_x / 2), $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
+					imagearc($gd_border_canvas, floor($offset_x / 2) + 1 +                 $radius_x, $output_height - $thickness_offset - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
 				}
 				if ($border_width > 1) {
 					for ($thickness_offset = 0; $thickness_offset < $border_width; $thickness_offset++) {
-						ImageArc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                                      $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
-						ImageArc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                                      $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
-						ImageArc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
-						ImageArc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
+						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                                      $radius_y, $radius_x * 2, $radius_y * 2, 180, 270, $color_border); // top-left
+						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                                      $radius_y, $radius_x * 2, $radius_y * 2, 270, 360, $color_border); // top-right
+						imagearc($gd_border_canvas, $output_width - $thickness_offset - $radius_x - 1 - ceil($offset_x / 2),                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,   0,  90, $color_border); // bottom-right
+						imagearc($gd_border_canvas, floor($offset_x / 2) + $thickness_offset + $radius_x,                     $output_height - $radius_y, $radius_x * 2, $radius_y * 2,  90, 180, $color_border); // bottom-left
 					}
 				}
 
 			}
 			$this->phpThumbObject->ImageResizeFunction($gd_border_canvas, $gdimg, floor(($output_width - $new_width) / 2), round(($output_height - $new_height) / 2), 0, 0, $new_width, $new_height, $output_width, $output_height);
 
-			ImageDestroy($gdimg);
+			imagedestroy($gdimg);
 			$gdimg = phpthumb_functions::ImageCreateFunction($output_width, $output_height);
-			ImageSaveAlpha($gdimg, true);
-			ImageAlphaBlending($gdimg, false);
+			imagesavealpha($gdimg, true);
+			imagealphablending($gdimg, false);
 			$gdimg_color_background = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 255, 255, 255, 127);
-			ImageFilledRectangle($gdimg, 0, 0, $output_width, $output_height, $gdimg_color_background);
+			imagefilledrectangle($gdimg, 0, 0, $output_width, $output_height, $gdimg_color_background);
 
-			ImageCopy($gdimg, $gd_border_canvas, 0, 0, 0, 0, $output_width, $output_height);
-			//$gdimg = $gd_border_canvas;
-			ImageDestroy($gd_border_canvas);
+			imagecopy($gdimg, $gd_border_canvas, 0, 0, 0, 0, $output_width, $output_height);
+			imagedestroy($gd_border_canvas);
 			return true;
 
 
@@ -743,11 +752,11 @@ function ImageBorder(&$gdimg, $border_width, $radius_x, $radius_y, $hexcolor_bor
 	}
 
 
-	function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background_hexcolor='FFFFFF', $bg=null) {
+	public static function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background_hexcolor='FFFFFF', $bg=null, &$phpThumbObject) {
 		while ($rotate_angle < 0) {
 			$rotate_angle += 360;
 		}
-		$rotate_angle = $rotate_angle % 360;
+		$rotate_angle %= 360;
 		if ($rotate_angle != 0) {
 
 			$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_source, $config_background_hexcolor);
@@ -755,31 +764,33 @@ function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background
 			if ((phpthumb_functions::gd_version() >= 2) && !$bg && ($rotate_angle % 90)) {
 
 				//$this->DebugMessage('Using alpha rotate', __FILE__, __LINE__);
-				if ($gdimg_rotate_mask = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_source), ImageSY($gdimg_source))) {
+				if ($gdimg_rotate_mask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_source), imagesy($gdimg_source))) {
 
+					$color_mask = array();
 					for ($i = 0; $i <= 255; $i++) {
-						$color_mask[$i] = ImageColorAllocate($gdimg_rotate_mask, $i, $i, $i);
+						$color_mask[$i] = imagecolorallocate($gdimg_rotate_mask, $i, $i, $i);
 					}
-					ImageFilledRectangle($gdimg_rotate_mask, 0, 0, ImageSX($gdimg_rotate_mask), ImageSY($gdimg_rotate_mask), $color_mask[255]);
-					$imageX = ImageSX($gdimg_source);
-					$imageY = ImageSY($gdimg_source);
+					imagefilledrectangle($gdimg_rotate_mask, 0, 0, imagesx($gdimg_rotate_mask), imagesy($gdimg_rotate_mask), $color_mask[255]);
+					$imageX = imagesx($gdimg_source);
+					$imageY = imagesy($gdimg_source);
 					for ($x = 0; $x < $imageX; $x++) {
 						for ($y = 0; $y < $imageY; $y++) {
 							$pixelcolor = phpthumb_functions::GetPixelColor($gdimg_source, $x, $y);
-							ImageSetPixel($gdimg_rotate_mask, $x, $y, $color_mask[255 - round($pixelcolor['alpha'] * 255 / 127)]);
+							imagesetpixel($gdimg_rotate_mask, $x, $y, $color_mask[255 - round($pixelcolor['alpha'] * 255 / 127)]);
 						}
 					}
-					$gdimg_rotate_mask  = ImageRotate($gdimg_rotate_mask,  $rotate_angle, $color_mask[0]);
-					$gdimg_source = ImageRotate($gdimg_source, $rotate_angle, $background_color);
+					$gdimg_rotate_mask = imagerotate($gdimg_rotate_mask, $rotate_angle, $color_mask[0]);
+					$gdimg_source      = imagerotate($gdimg_source,      $rotate_angle, $background_color);
 
-					ImageAlphaBlending($gdimg_source, false);
-					ImageSaveAlpha($gdimg_source, true);
+					imagealphablending($gdimg_source, false);
+					imagesavealpha($gdimg_source, true);
 					//$this->is_alpha = true;
-					$phpThumbFilters = new phpthumb_filters();
-					$phpThumbFilters->phpThumbObject = $this;
+					$phpThumbFilters = new self();
+					//$phpThumbFilters->phpThumbObject = $this;
+					$phpThumbFilters->phpThumbObject = $phpThumbObject;
 					$phpThumbFilters->ApplyMask($gdimg_rotate_mask, $gdimg_source);
 
-					ImageDestroy($gdimg_rotate_mask);
+					imagedestroy($gdimg_rotate_mask);
 
 				} else {
 					//$this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
@@ -797,40 +808,40 @@ function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background
 					//$this->DebugMessage('Using non-alpha rotate because $this->thumbnailFormat is "'.$this->thumbnailFormat.'"', __FILE__, __LINE__);
 				}
 
-				if (ImageColorTransparent($gdimg_source) >= 0) {
-					// ImageRotate() forgets all about an image's transparency and sets the transparent color to black
+				if (imagecolortransparent($gdimg_source) >= 0) {
+					// imagerotate() forgets all about an image's transparency and sets the transparent color to black
 					// To compensate, flood-fill the transparent color of the source image with the specified background color first
 					// then rotate and the colors should match
 
-					if (!function_exists('ImageIsTrueColor') || !ImageIsTrueColor($gdimg_source)) {
+					if (!function_exists('imageistruecolor') || !imageistruecolor($gdimg_source)) {
 						// convert paletted image to true-color before rotating to prevent nasty aliasing artifacts
 
-						//$this->source_width  = ImageSX($gdimg_source);
-						//$this->source_height = ImageSY($gdimg_source);
-						$gdimg_newsrc = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_source), ImageSY($gdimg_source));
+						//$this->source_width  = imagesx($gdimg_source);
+						//$this->source_height = imagesy($gdimg_source);
+						$gdimg_newsrc = phpthumb_functions::ImageCreateFunction(imagesx($gdimg_source), imagesy($gdimg_source));
 						$background_color = phpthumb_functions::ImageHexColorAllocate($gdimg_newsrc, $config_background_hexcolor);
-						ImageFilledRectangle($gdimg_newsrc, 0, 0, ImageSX($gdimg_source), ImageSY($gdimg_source), phpthumb_functions::ImageHexColorAllocate($gdimg_newsrc, $config_background_hexcolor));
-						ImageCopy($gdimg_newsrc, $gdimg_source, 0, 0, 0, 0, ImageSX($gdimg_source), ImageSY($gdimg_source));
-						ImageDestroy($gdimg_source);
+						imagefilledrectangle($gdimg_newsrc, 0, 0, imagesx($gdimg_source), imagesy($gdimg_source), phpthumb_functions::ImageHexColorAllocate($gdimg_newsrc, $config_background_hexcolor));
+						imagecopy($gdimg_newsrc, $gdimg_source, 0, 0, 0, 0, imagesx($gdimg_source), imagesy($gdimg_source));
+						imagedestroy($gdimg_source);
 						unset($gdimg_source);
 						$gdimg_source = $gdimg_newsrc;
 						unset($gdimg_newsrc);
 
 					} else {
 
-						ImageColorSet(
+						imagecolorset(
 							$gdimg_source,
-							ImageColorTransparent($gdimg_source),
+							imagecolortransparent($gdimg_source),
 							hexdec(substr($config_background_hexcolor, 0, 2)),
 							hexdec(substr($config_background_hexcolor, 2, 2)),
 							hexdec(substr($config_background_hexcolor, 4, 2)));
 
-						ImageColorTransparent($gdimg_source, -1);
+						imagecolortransparent($gdimg_source, -1);
 
 					}
 				}
 
-				$gdimg_source = ImageRotate($gdimg_source, $rotate_angle, $background_color);
+				$gdimg_source = imagerotate($gdimg_source, $rotate_angle, $background_color);
 
 			}
 		}
@@ -838,12 +849,12 @@ function ImprovedImageRotate(&$gdimg_source, $rotate_angle=0, $config_background
 	}
 
 
-	function MeanRemoval(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_MEAN_REMOVAL)) {
+	public function MeanRemoval(&$gdimg) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_MEAN_REMOVAL)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_MEAN_REMOVAL)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_MEAN_REMOVAL)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 		// currently not implemented "the hard way"
@@ -852,53 +863,53 @@ function MeanRemoval(&$gdimg) {
 	}
 
 
-	function Negative(&$gdimg) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_NEGATE)) {
+	public function Negative(&$gdimg) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_NEGATE)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_NEGATE)', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_NEGATE)', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
-		$ImageSX = ImageSX($gdimg);
-		$ImageSY = ImageSY($gdimg);
+		$ImageSX = imagesx($gdimg);
+		$ImageSY = imagesy($gdimg);
 		for ($x = 0; $x < $ImageSX; $x++) {
 			for ($y = 0; $y < $ImageSY; $y++) {
 				$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
-				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, (~$currentPixel['red'] & 0xFF), (~$currentPixel['green'] & 0xFF), (~$currentPixel['blue'] & 0xFF), $currentPixel['alpha']);
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, ~$currentPixel[ 'red'] & 0xFF, ~$currentPixel[ 'green'] & 0xFF, ~$currentPixel[ 'blue'] & 0xFF, $currentPixel[ 'alpha']);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
 		return true;
 	}
 
 
-	function RoundedImageCorners(&$gdimg, $radius_x, $radius_y) {
+	public function RoundedImageCorners(&$gdimg, $radius_x, $radius_y) {
 		// generate mask at twice desired resolution and downsample afterwards for easy antialiasing
-		// mask is generated as a white double-size elipse on a triple-size black background and copy-paste-resampled
+		// mask is generated as a white double-size ellipse on a triple-size black background and copy-paste-resampled
 		// onto a correct-size mask image as 4 corners due to errors when the entire mask is resampled at once (gray edges)
 		if ($gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction($radius_x * 6, $radius_y * 6)) {
-			if ($gdimg_cornermask = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg), ImageSY($gdimg))) {
+			if ($gdimg_cornermask = phpthumb_functions::ImageCreateFunction(imagesx($gdimg), imagesy($gdimg))) {
 
-				$color_transparent = ImageColorAllocate($gdimg_cornermask_triple, 255, 255, 255);
-				ImageFilledEllipse($gdimg_cornermask_triple, $radius_x * 3, $radius_y * 3, $radius_x * 4, $radius_y * 4, $color_transparent);
+				$color_transparent = imagecolorallocate($gdimg_cornermask_triple, 255, 255, 255);
+				imagefilledellipse($gdimg_cornermask_triple, $radius_x * 3, $radius_y * 3, $radius_x * 4, $radius_y * 4, $color_transparent);
 
-				ImageFilledRectangle($gdimg_cornermask, 0, 0, ImageSX($gdimg), ImageSY($gdimg), $color_transparent);
+				imagefilledrectangle($gdimg_cornermask, 0, 0, imagesx($gdimg), imagesy($gdimg), $color_transparent);
 
-				ImageCopyResampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0,                           0,     $radius_x,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				ImageCopyResampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0, ImageSY($gdimg) - $radius_y,     $radius_x, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				ImageCopyResampled($gdimg_cornermask, $gdimg_cornermask_triple, ImageSX($gdimg) - $radius_x, ImageSY($gdimg) - $radius_y, $radius_x * 3, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
-				ImageCopyResampled($gdimg_cornermask, $gdimg_cornermask_triple, ImageSX($gdimg) - $radius_x,                           0, $radius_x * 3,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0,                           0,     $radius_x,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple,                           0, imagesy($gdimg) - $radius_y,     $radius_x, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x, imagesy($gdimg) - $radius_y, $radius_x * 3, $radius_y * 3, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
+				imagecopyresampled($gdimg_cornermask, $gdimg_cornermask_triple, imagesx($gdimg) - $radius_x,                           0, $radius_x * 3,     $radius_y, $radius_x, $radius_y, $radius_x * 2, $radius_y * 2);
 
-				phpthumb_filters::ApplyMask($gdimg_cornermask, $gdimg);
-				ImageDestroy($gdimg_cornermask);
+				$this->ApplyMask($gdimg_cornermask, $gdimg);
+				imagedestroy($gdimg_cornermask);
 				$this->DebugMessage('RoundedImageCorners('.$radius_x.', '.$radius_y.') succeeded', __FILE__, __LINE__);
 				return true;
 
 			} else {
-				$this->DebugMessage('FAILED: $gdimg_cornermask = phpthumb_functions::ImageCreateFunction('.ImageSX($gdimg).', '.ImageSY($gdimg).')', __FILE__, __LINE__);
+				$this->DebugMessage('FAILED: $gdimg_cornermask = phpthumb_functions::ImageCreateFunction('.imagesx($gdimg).', '.imagesy($gdimg).')', __FILE__, __LINE__);
 			}
-			ImageDestroy($gdimg_cornermask_triple);
+			imagedestroy($gdimg_cornermask_triple);
 
 		} else {
 			$this->DebugMessage('FAILED: $gdimg_cornermask_triple = phpthumb_functions::ImageCreateFunction('.($radius_x * 6).', '.($radius_y * 6).')', __FILE__, __LINE__);
@@ -907,7 +918,7 @@ function RoundedImageCorners(&$gdimg, $radius_x, $radius_y) {
 	}
 
 
-	function Saturation(&$gdimg, $amount, $color='') {
+	public function Saturation(&$gdimg, $amount, $color='') {
 		if ($amount == 0) {
 			return true;
 		} elseif ($amount > 0) {
@@ -915,11 +926,11 @@ function Saturation(&$gdimg, $amount, $color='') {
 		} else {
 			$amount = abs($amount);
 		}
-		return phpthumb_filters::Desaturate($gdimg, $amount, $color);
+		return $this->Desaturate($gdimg, $amount, $color);
 	}
 
 
-	function Sepia(&$gdimg, $amount, $targetColor) {
+	public function Sepia(&$gdimg, $amount, $targetColor) {
 		$amount      = (is_numeric($amount) ? max(0, min(100, $amount)) : 50);
 		$amountPct   = $amount / 100;
 		$targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'A28065');
@@ -928,21 +939,21 @@ function Sepia(&$gdimg, $amount, $targetColor) {
 			return true;
 		}
 
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_GRAYSCALE)) {
 
 				$r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
 				$g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
 				$b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
-				if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
+				if (imagefilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
 					return true;
 				}
-				$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
+				$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
 				// fall through and try it the hard way
 
 			} else {
 
-				$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
+				$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
 				// fall through and try it the hard way
 
 			}
@@ -952,8 +963,8 @@ function Sepia(&$gdimg, $amount, $targetColor) {
 		$TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
 		$TargetPixel['blue']  = hexdec(substr($targetColor, 4, 2));
 
-		$ImageSX = ImageSX($gdimg);
-		$ImageSY = ImageSY($gdimg);
+		$ImageSX = imagesx($gdimg);
+		$ImageSY = imagesy($gdimg);
 		for ($x = 0; $x < $ImageSX; $x++) {
 			for ($y = 0; $y < $ImageSY; $y++) {
 				$OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
@@ -964,27 +975,28 @@ function Sepia(&$gdimg, $amount, $targetColor) {
 				// the mid-tones: the lighter and darker areas appear to be closer to B&W."
 				$SepiaAmount = ((128 - abs($GrayPixel['red'] - 128)) / 128) * $amountPct;
 
+				$NewPixel = array();
 				foreach ($TargetPixel as $key => $value) {
 					$NewPixel[$key] = round(max(0, min(255, $GrayPixel[$key] * (1 - $SepiaAmount) + ($TargetPixel[$key] * $SepiaAmount))));
 				}
 				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
 		return true;
 	}
 
 
-	function Smooth(&$gdimg, $amount=6) {
+	public function Smooth(&$gdimg, $amount=6) {
 		$amount = min(25, max(0, $amount));
 		if ($amount == 0) {
 			return true;
 		}
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
-			if (ImageFilter($gdimg, IMG_FILTER_SMOOTH, $amount)) {
+		if (phpthumb_functions::version_compare_replacement(PHP_VERSION, '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+			if (imagefilter($gdimg, IMG_FILTER_SMOOTH, $amount)) {
 				return true;
 			}
-			$this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_SMOOTH, '.$amount.')', __FILE__, __LINE__);
+			$this->DebugMessage('FAILED: imagefilter($gdimg, IMG_FILTER_SMOOTH, '.$amount.')', __FILE__, __LINE__);
 			// fall through and try it the hard way
 		}
 		// currently not implemented "the hard way"
@@ -993,10 +1005,10 @@ function Smooth(&$gdimg, $amount=6) {
 	}
 
 
-	function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit=10) {
-		$width  = ImageSX($gdimg);
-		$height = ImageSY($gdimg);
-		if ($gdimg_mask = ImageCreateTrueColor($width, $height)) {
+	public function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit=10) {
+		$width  = imagesx($gdimg);
+		$height = imagesy($gdimg);
+		if ($gdimg_mask = imagecreatetruecolor($width, $height)) {
 			$R = hexdec(substr($hexcolor, 0, 2));
 			$G = hexdec(substr($hexcolor, 2, 2));
 			$B = hexdec(substr($hexcolor, 4, 2));
@@ -1006,9 +1018,9 @@ function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit
 				for ($y = 0; $y < $height; $y++) {
 					$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
 					$colorDiff = phpthumb_functions::PixelColorDifferencePercent($currentPixel, $targetPixel);
-					$grayLevel = min($cutoffRange, MAX(0, -$min_limit + $colorDiff)) * (255 / MAX(1, $cutoffRange));
-					$newColor = ImageColorAllocate($gdimg_mask, $grayLevel, $grayLevel, $grayLevel);
-					ImageSetPixel($gdimg_mask, $x, $y, $newColor);
+					$grayLevel = min($cutoffRange, max(0, -$min_limit + $colorDiff)) * (255 / max(1, $cutoffRange));
+					$newColor = imagecolorallocate($gdimg_mask, $grayLevel, $grayLevel, $grayLevel);
+					imagesetpixel($gdimg_mask, $x, $y, $newColor);
 				}
 			}
 			return $gdimg_mask;
@@ -1017,9 +1029,9 @@ function SourceTransparentColorMask(&$gdimg, $hexcolor, $min_limit=5, $max_limit
 	}
 
 
-	function Threshold(&$gdimg, $cutoff) {
-		$width  = ImageSX($gdimg);
-		$height = ImageSY($gdimg);
+	public function Threshold(&$gdimg, $cutoff) {
+		$width  = imagesx($gdimg);
+		$height = imagesy($gdimg);
 		$cutoff = min(255, max(0, ($cutoff ? $cutoff : 128)));
 		for ($x = 0; $x < $width; $x++) {
 			for ($y = 0; $y < $height; $y++) {
@@ -1030,37 +1042,37 @@ function Threshold(&$gdimg, $cutoff) {
 				} else {
 					$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0xFF, 0xFF, 0xFF, $currentPixel['alpha']);
 				}
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
 		return true;
 	}
 
 
-	function ImageTrueColorToPalette2(&$image, $dither, $ncolors) {
+	public function ImageTrueColorToPalette2(&$image, $dither, $ncolors) {
 		// http://www.php.net/manual/en/function.imagetruecolortopalette.php
 		// zmorris at zsculpt dot com (17-Aug-2004 06:58)
-		$width  = ImageSX($image);
-		$height = ImageSY($image);
-		$image_copy = ImageCreateTrueColor($width, $height);
-		//ImageCopyMerge($image_copy, $image, 0, 0, 0, 0, $width, $height, 100);
-		ImageCopy($image_copy, $image, 0, 0, 0, 0, $width, $height);
-		ImageTrueColorToPalette($image, $dither, $ncolors);
-		ImageColorMatch($image_copy, $image);
-		ImageDestroy($image_copy);
+		$width  = imagesx($image);
+		$height = imagesy($image);
+		$image_copy = imagecreatetruecolor($width, $height);
+		//imagecopymerge($image_copy, $image, 0, 0, 0, 0, $width, $height, 100);
+		imagecopy($image_copy, $image, 0, 0, 0, 0, $width, $height);
+		imagetruecolortopalette($image, $dither, $ncolors);
+		imagecolormatch($image_copy, $image);
+		imagedestroy($image_copy);
 		return true;
 	}
 
-	function ReduceColorDepth(&$gdimg, $colors=256, $dither=true) {
+	public function ReduceColorDepth(&$gdimg, $colors=256, $dither=true) {
 		$colors = max(min($colors, 256), 2);
-		// ImageTrueColorToPalette usually makes ugly colors, the replacement is a bit better
-		//ImageTrueColorToPalette($gdimg, $dither, $colors);
-		phpthumb_filters::ImageTrueColorToPalette2($gdimg, $dither, $colors);
+		// imagetruecolortopalette usually makes ugly colors, the replacement is a bit better
+		//imagetruecolortopalette($gdimg, $dither, $colors);
+		$this->ImageTrueColorToPalette2($gdimg, $dither, $colors);
 		return true;
 	}
 
 
-	function WhiteBalance(&$gdimg, $targetColor='') {
+	public function WhiteBalance(&$gdimg, $targetColor='') {
 		if (phpthumb_functions::IsHexColor($targetColor)) {
 			$targetPixel = array(
 				'red'   => hexdec(substr($targetColor, 0, 2)),
@@ -1068,7 +1080,7 @@ function WhiteBalance(&$gdimg, $targetColor='') {
 				'blue'  => hexdec(substr($targetColor, 4, 2))
 			);
 		} else {
-			$Analysis = phpthumb_filters::HistogramAnalysis($gdimg, false);
+			$Analysis = $this->HistogramAnalysis($gdimg, false);
 			$targetPixel = array(
 				'red'   => max(array_keys($Analysis['red'])),
 				'green' => max(array_keys($Analysis['green'])),
@@ -1080,8 +1092,8 @@ function WhiteBalance(&$gdimg, $targetColor='') {
 		$scaleG = $grayValue / $targetPixel['green'];
 		$scaleB = $grayValue / $targetPixel['blue'];
 
-		for ($x = 0; $x < ImageSX($gdimg); $x++) {
-			for ($y = 0; $y < ImageSY($gdimg); $y++) {
+		for ($x = 0, $xMax = imagesx($gdimg); $x < $xMax; $x++) {
+			for ($y = 0, $yMax = imagesy($gdimg); $y < $yMax; $y++) {
 				$currentPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
 				$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe(
 					$gdimg,
@@ -1090,29 +1102,30 @@ function WhiteBalance(&$gdimg, $targetColor='') {
 					max(0, min(255, round($currentPixel['blue']  * $scaleB))),
 					$currentPixel['alpha']
 				);
-				ImageSetPixel($gdimg, $x, $y, $newColor);
+				imagesetpixel($gdimg, $x, $y, $newColor);
 			}
 		}
 		return true;
 	}
 
 
-	function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ttffont='', $opacity=100, $margin=5, $angle=0, $bg_color=false, $bg_opacity=0, $fillextend='') {
+	public function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $ttffont='', $opacity=100, $margin=5, $angle=0, $bg_color=false, $bg_opacity=0, $fillextend='', $lineheight=1.0) {
 		// text watermark requested
 		if (!$text) {
 			return false;
 		}
-		ImageAlphaBlending($gdimg, true);
+		imagealphablending($gdimg, true);
 
 		if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)(@[LCR])?$#i', $alignment, $matches)) {
-			$originOffsetX = intval($matches[1]);
-			$originOffsetY = intval($matches[2]);
+			$originOffsetX = (int) $matches[ 1];
+			$originOffsetY = (int) $matches[ 2];
 			$alignment = (@$matches[4] ? $matches[4] : 'L');
 			$margin = 0;
 		} else {
 			$originOffsetX = 0;
 			$originOffsetY = 0;
 		}
+		$lineheight = min(100.0, max(0.01, (float) $lineheight));
 
 		$metaTextArray = array(
 			'^Fb' =>       $this->phpThumbObject->getimagesizeinfo['filesize'],
@@ -1120,25 +1133,27 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 			'^Fm' => round($this->phpThumbObject->getimagesizeinfo['filesize'] / 1048576),
 			'^X'  => $this->phpThumbObject->getimagesizeinfo[0],
 			'^Y'  => $this->phpThumbObject->getimagesizeinfo[1],
-			'^x'  => ImageSX($gdimg),
-			'^y'  => ImageSY($gdimg),
+			'^x'  => imagesx($gdimg),
+			'^y'  => imagesy($gdimg),
 			'^^'  => '^',
 		);
 		$text = strtr($text, $metaTextArray);
 
-		$text = str_replace("\r\n", "\n", $text);
-		$text = str_replace("\r",   "\n", $text);
+		$text = str_replace(array(
+			"\r\n",
+			"\r"
+		), "\n", $text);
 		$textlines = explode("\n", $text);
 		$this->DebugMessage('Processing '.count($textlines).' lines of text', __FILE__, __LINE__);
 
 		if (@is_readable($ttffont) && is_file($ttffont)) {
 
-			$opacity = 100 - intval(max(min($opacity, 100), 0));
+			$opacity = 100 - (int) max(min($opacity, 100), 0);
 			$letter_color_text = phpthumb_functions::ImageHexColorAllocate($gdimg, $hex_color, false, $opacity * 1.27);
 
 			$this->DebugMessage('Using TTF font "'.$ttffont.'"', __FILE__, __LINE__);
 
-			$TTFbox = ImageTTFbBox($size, $angle, $ttffont, $text);
+			$TTFbox = imagettfbbox($size, $angle, $ttffont, $text);
 
 			$min_x = min($TTFbox[0], $TTFbox[2], $TTFbox[4], $TTFbox[6]);
 			$max_x = max($TTFbox[0], $TTFbox[2], $TTFbox[4], $TTFbox[6]);
@@ -1150,7 +1165,7 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 			//$text_height = round($max_y - $min_y + ($size * 0.5));
 			$text_height = round($max_y - $min_y);
 
-			$TTFboxChar = ImageTTFbBox($size, $angle, $ttffont, 'jH');
+			$TTFboxChar = imagettfbbox($size, $angle, $ttffont, 'jH');
 			$char_min_y = min($TTFboxChar[1], $TTFboxChar[3], $TTFboxChar[5], $TTFboxChar[7]);
 			$char_max_y = max($TTFboxChar[1], $TTFboxChar[3], $TTFboxChar[5], $TTFboxChar[7]);
 			$char_height = round($char_max_y - $char_min_y);
@@ -1158,47 +1173,49 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 			if ($alignment == '*') {
 
 				$text_origin_y = $char_height + $margin;
-				while (($text_origin_y - $text_height) < ImageSY($gdimg)) {
+				while (($text_origin_y - $text_height) < imagesy($gdimg)) {
 					$text_origin_x = $margin;
-					while ($text_origin_x < ImageSX($gdimg)) {
-						ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
+					while ($text_origin_x < imagesx($gdimg)) {
+						imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
 						$text_origin_x += ($text_width + $margin);
 					}
-					$text_origin_y += ($text_height + $margin);
+					$text_origin_y += ($text_height + $margin) * $lineheight;
 				}
 
 			} else {
 
 				// this block for background color only
 
+				$text_origin_x = 0;
+				$text_origin_y = 0;
 				switch ($alignment) {
 					case '*':
 						// handled separately
 						break;
 
 					case 'T':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((ImageSX($gdimg) - $text_width) / 2));
+						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
 						$text_origin_y = $char_height + $margin + $originOffsetY;
 						break;
 
 					case 'B':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((ImageSX($gdimg) - $text_width) / 2));
-						$text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
+						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
+						$text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
 						break;
 
 					case 'L':
 						$text_origin_x = $margin + $originOffsetX;
-						$text_origin_y = ($originOffsetY ? $originOffsetY : round((ImageSY($gdimg) - $text_height) / 2) + $char_height);
+						$text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
 						break;
 
 					case 'R':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : ImageSX($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
-						$text_origin_y = ($originOffsetY ? $originOffsetY : round((ImageSY($gdimg) - $text_height) / 2) + $char_height);
+						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+						$text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
 						break;
 
 					case 'C':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((ImageSX($gdimg) - $text_width) / 2));
-						$text_origin_y = ($originOffsetY ? $originOffsetY : round((ImageSY($gdimg) - $text_height) / 2) + $char_height);
+						$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width / 2) : round((imagesx($gdimg) - $text_width) / 2));
+						$text_origin_y = ($originOffsetY ? $originOffsetY : round((imagesy($gdimg) - $text_height) / 2) + $char_height);
 						break;
 
 					case 'TL':
@@ -1207,23 +1224,22 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 						break;
 
 					case 'TR':
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : ImageSX($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
 						$text_origin_y = $char_height + $margin + $originOffsetY;
 						break;
 
 					case 'BL':
 						$text_origin_x = $margin + $originOffsetX;
-						$text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
+						$text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
 						break;
 
 					case 'BR':
 					default:
-						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : ImageSX($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
-						$text_origin_y = ImageSY($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
+						$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width : imagesx($gdimg) - $text_width  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+						$text_origin_y = imagesy($gdimg) + $TTFbox[1] - $margin + $originOffsetY;
 						break;
 				}
 
-				//ImageRectangle($gdimg, $text_origin_x + $min_x, $text_origin_y + $TTFbox[1], $text_origin_x + $min_x + $text_width, $text_origin_y + $TTFbox[1] - $text_height, $letter_color_text);
 				if (phpthumb_functions::IsHexColor($bg_color)) {
 					$text_background_alpha = round(127 * ((100 - min(max(0, $bg_opacity), 100)) / 100));
 					$text_color_background = phpthumb_functions::ImageHexColorAllocate($gdimg, $bg_color, false, $text_background_alpha);
@@ -1234,17 +1250,12 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 				$y1 = $text_origin_y + $TTFbox[1];
 				$x2 = $text_origin_x + $min_x + $text_width;
 				$y2 = $text_origin_y + $TTFbox[1] - $text_height;
-				$x_TL = preg_match('#x#i', $fillextend) ?               0 : min($x1, $x2);
-				$y_TL = preg_match('#y#i', $fillextend) ?               0 : min($y1, $y2);
-				$x_BR = preg_match('#x#i', $fillextend) ? ImageSX($gdimg) : max($x1, $x2);
-				$y_BR = preg_match('#y#i', $fillextend) ? ImageSY($gdimg) : max($y1, $y2);
-				//while ($y_BR > ImageSY($gdimg)) {
-				//	$y_TL--;
-				//	$y_BR--;
-				//	$text_origin_y--;
-				//}
-				$this->DebugMessage('WatermarkText() calling ImageFilledRectangle($gdimg, '.$x_TL.', '.$y_TL.', '.$x_BR.', '.$y_BR.', $text_color_background)', __FILE__, __LINE__);
-				ImageFilledRectangle($gdimg, $x_TL, $y_TL, $x_BR, $y_BR, $text_color_background);
+				$x_TL = false !== stripos($fillextend, 'x') ?               0 : min($x1, $x2);
+				$y_TL = false !== stripos($fillextend, 'y') ?               0 : min($y1, $y2);
+				$x_BR = false !== stripos($fillextend, 'x') ? imagesx($gdimg) : max($x1, $x2);
+				$y_BR = false !== stripos($fillextend, 'y') ? imagesy($gdimg) : max($y1, $y2);
+				$this->DebugMessage('WatermarkText() calling imagefilledrectangle($gdimg, '.$x_TL.', '.$y_TL.', '.$x_BR.', '.$y_BR.', $text_color_background)', __FILE__, __LINE__);
+				imagefilledrectangle($gdimg, $x_TL, $y_TL, $x_BR, $y_BR, $text_color_background);
 
 				// end block for background color only
 
@@ -1252,44 +1263,38 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 				$y_offset = 0;
 				foreach ($textlines as $dummy => $line) {
 
-					$TTFboxLine = ImageTTFbBox($size, $angle, $ttffont, $line);
+					$TTFboxLine = imagettfbbox($size, $angle, $ttffont, $line);
 					$min_x_line = min($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]);
 					$max_x_line = max($TTFboxLine[0], $TTFboxLine[2], $TTFboxLine[4], $TTFboxLine[6]);
-					//$text_width = round($max_x - $min_x + ($size * 0.5));
 					$text_width_line = round($max_x_line - $min_x_line);
 
-					$min_y_line = min($TTFboxLine[1], $TTFboxLine[3], $TTFboxLine[5], $TTFboxLine[7]);
-					$max_y_line = max($TTFboxLine[1], $TTFboxLine[3], $TTFboxLine[5], $TTFboxLine[7]);
-					//$text_height = round($max_y - $min_y + ($size * 0.5));
-					$text_height_line = round($max_y_line - $min_y_line);
-
 					switch ($alignment) {
 						// $text_origin_y set above, just re-set $text_origin_x here as needed
 
 						case 'L':
 						case 'TL':
 						case 'BL':
-							// no change neccesary
+							// no change necessary
 							break;
 
 						case 'C':
 						case 'T':
 						case 'B':
-							$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width_line / 2) : round((ImageSX($gdimg) - $text_width_line) / 2));
+							$text_origin_x = ($originOffsetX ? $originOffsetX - round($text_width_line / 2) : round((imagesx($gdimg) - $text_width_line) / 2));
 							break;
 
 						case 'R':
 						case 'TR':
 						case 'BR':
-							$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width_line : ImageSX($gdimg) - $text_width_line  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
+							$text_origin_x = ($originOffsetX ? $originOffsetX - $text_width_line : imagesx($gdimg) - $text_width_line  + $TTFbox[0] - $min_x + round($size * 0.25) - $margin);
 							break;
 					}
 
-					//ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
-					$this->DebugMessage('WatermarkText() calling ImageTTFtext($gdimg, '.$size.', '.$angle.', '.$text_origin_x.', '.($text_origin_y + $y_offset).', $letter_color_text, '.$ttffont.', '.$line.')', __FILE__, __LINE__);
-					ImageTTFtext($gdimg, $size, $angle, $text_origin_x, $text_origin_y + $y_offset, $letter_color_text, $ttffont, $line);
+					//imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y, $letter_color_text, $ttffont, $text);
+					$this->DebugMessage('WatermarkText() calling imagettftext($gdimg, '.$size.', '.$angle.', '.$text_origin_x.', '.($text_origin_y + $y_offset).', $letter_color_text, '.$ttffont.', '.$line.')', __FILE__, __LINE__);
+					imagettftext($gdimg, $size, $angle, $text_origin_x, $text_origin_y + $y_offset, $letter_color_text, $ttffont, $line);
 
-					$y_offset += $char_height;
+					$y_offset += $char_height * $lineheight;
 				}
 
 			}
@@ -1303,55 +1308,59 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 			$text_width  = 0;
 			$text_height = 0;
 			foreach ($textlines as $dummy => $line) {
-				$text_width   = max($text_width, ImageFontWidth($size) * strlen($line));
-				$text_height += ImageFontHeight($size);
+				$text_width   = max($text_width, imagefontwidth($size) * strlen($line));
+				$text_height += imagefontheight($size);
 			}
 			if ($img_watermark = phpthumb_functions::ImageCreateFunction($text_width, $text_height)) {
-				ImageAlphaBlending($img_watermark, false);
+				imagealphablending($img_watermark, false);
 				if (phpthumb_functions::IsHexColor($bg_color)) {
 					$text_background_alpha = round(127 * ((100 - min(max(0, $bg_opacity), 100)) / 100));
 					$text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, $bg_color, false, $text_background_alpha);
 				} else {
 					$text_color_background = phpthumb_functions::ImageHexColorAllocate($img_watermark, 'FFFFFF', false, 127);
 				}
-				$this->DebugMessage('WatermarkText() calling ImageFilledRectangle($img_watermark, 0, 0, '.ImageSX($img_watermark).', '.ImageSY($img_watermark).', $text_color_background)', __FILE__, __LINE__);
-				ImageFilledRectangle($img_watermark, 0, 0, ImageSX($img_watermark), ImageSY($img_watermark), $text_color_background);
-
-				if ($angle && function_exists('ImageRotate')) {
-					// using $img_watermark_mask is pointless if ImageRotate function isn't available
+				$this->DebugMessage('WatermarkText() calling imagefilledrectangle($img_watermark, 0, 0, '.imagesx($img_watermark).', '.imagesy($img_watermark).', $text_color_background)', __FILE__, __LINE__);
+				imagefilledrectangle($img_watermark, 0, 0, imagesx($img_watermark), imagesy($img_watermark), $text_color_background);
+
+				$img_watermark_mask    = false;
+				$mask_color_background = false;
+				$mask_color_watermark  = false;
+				if ($angle && function_exists('imagerotate')) {
+					// using $img_watermark_mask is pointless if imagerotate function isn't available
 					if ($img_watermark_mask = phpthumb_functions::ImageCreateFunction($text_width, $text_height)) {
-						$mask_color_background = ImageColorAllocate($img_watermark_mask, 0, 0, 0);
-						ImageAlphaBlending($img_watermark_mask, false);
-						ImageFilledRectangle($img_watermark_mask, 0, 0, ImageSX($img_watermark_mask), ImageSY($img_watermark_mask), $mask_color_background);
-						$mask_color_watermark = ImageColorAllocate($img_watermark_mask, 255, 255, 255);
+						$mask_color_background = imagecolorallocate($img_watermark_mask, 0, 0, 0);
+						imagealphablending($img_watermark_mask, false);
+						imagefilledrectangle($img_watermark_mask, 0, 0, imagesx($img_watermark_mask), imagesy($img_watermark_mask), $mask_color_background);
+						$mask_color_watermark = imagecolorallocate($img_watermark_mask, 255, 255, 255);
 					}
 				}
 
 				$text_color_watermark = phpthumb_functions::ImageHexColorAllocate($img_watermark, $hex_color);
+				$x_offset = 0;
 				foreach ($textlines as $key => $line) {
 					switch ($alignment) {
 						case 'C':
-							$x_offset = round(($text_width - (ImageFontWidth($size) * strlen($line))) / 2);
-							$originOffsetX = (ImageSX($gdimg) - ImageSX($img_watermark)) / 2;
-							$originOffsetY = (ImageSY($gdimg) - ImageSY($img_watermark)) / 2;
+							$x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
+							$originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
+							$originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
 							break;
 
 						case 'T':
-							$x_offset = round(($text_width - (ImageFontWidth($size) * strlen($line))) / 2);
-							$originOffsetX = (ImageSX($gdimg) - ImageSX($img_watermark)) / 2;
+							$x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
+							$originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
 							$originOffsetY = $margin;
 							break;
 
 						case 'B':
-							$x_offset = round(($text_width - (ImageFontWidth($size) * strlen($line))) / 2);
-							$originOffsetX = (ImageSX($gdimg) - ImageSX($img_watermark)) / 2;
-							$originOffsetY = ImageSY($gdimg) - ImageSY($img_watermark) - $margin;
+							$x_offset = round(($text_width - (imagefontwidth($size) * strlen($line))) / 2);
+							$originOffsetX = (imagesx($gdimg) - imagesx($img_watermark)) / 2;
+							$originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
 							break;
 
 						case 'L':
 							$x_offset = 0;
 							$originOffsetX = $margin;
-							$originOffsetY = (ImageSY($gdimg) - ImageSY($img_watermark)) / 2;
+							$originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
 							break;
 
 						case 'TL':
@@ -1363,44 +1372,48 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 						case 'BL':
 							$x_offset = 0;
 							$originOffsetX = $margin;
-							$originOffsetY = ImageSY($gdimg) - ImageSY($img_watermark) - $margin;
+							$originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
 							break;
 
 						case 'R':
-							$x_offset = $text_width - (ImageFontWidth($size) * strlen($line));
-							$originOffsetX = ImageSX($gdimg) - ImageSX($img_watermark) - $margin;
-							$originOffsetY = (ImageSY($gdimg) - ImageSY($img_watermark)) / 2;
+							$x_offset = $text_width - (imagefontwidth($size) * strlen($line));
+							$originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
+							$originOffsetY = (imagesy($gdimg) - imagesy($img_watermark)) / 2;
 							break;
 
 						case 'TR':
-							$x_offset = $text_width - (ImageFontWidth($size) * strlen($line));
-							$originOffsetX = ImageSX($gdimg) - ImageSX($img_watermark) - $margin;
+							$x_offset = $text_width - (imagefontwidth($size) * strlen($line));
+							$originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
 							$originOffsetY = $margin;
 							break;
 
 						case 'BR':
 						default:
-							$x_offset = $text_width - (ImageFontWidth($size) * strlen($line));
-							$originOffsetX = ImageSX($gdimg) - ImageSX($img_watermark) - $margin;
-							$originOffsetY = ImageSY($gdimg) - ImageSY($img_watermark) - $margin;
+							if (!empty($originOffsetX) || !empty($originOffsetY)) {
+								// absolute pixel positioning
+							} else {
+								$x_offset = $text_width - (imagefontwidth($size) * strlen($line));
+								$originOffsetX = imagesx($gdimg) - imagesx($img_watermark) - $margin;
+								$originOffsetY = imagesy($gdimg) - imagesy($img_watermark) - $margin;
+							}
 							break;
 					}
-					$this->DebugMessage('WatermarkText() calling ImageString($img_watermark, '.$size.', '.$x_offset.', '.($key * ImageFontHeight($size)).', '.$line.', $text_color_watermark)', __FILE__, __LINE__);
-					ImageString($img_watermark, $size, $x_offset, $key * ImageFontHeight($size), $line, $text_color_watermark);
+					$this->DebugMessage('WatermarkText() calling imagestring($img_watermark, '.$size.', '.$x_offset.', '.($key * imagefontheight($size)).', '.$line.', $text_color_watermark)', __FILE__, __LINE__);
+					imagestring($img_watermark, $size, $x_offset, $key * imagefontheight($size), $line, $text_color_watermark);
 					if ($angle && $img_watermark_mask) {
-						$this->DebugMessage('WatermarkText() calling ImageString($img_watermark_mask, '.$size.', '.$x_offset.', '.($key * ImageFontHeight($size)).', '.$text.', $mask_color_watermark)', __FILE__, __LINE__);
-						ImageString($img_watermark_mask, $size, $x_offset, $key * ImageFontHeight($size), $text, $mask_color_watermark);
+						$this->DebugMessage('WatermarkText() calling imagestring($img_watermark_mask, '.$size.', '.$x_offset.', '.($key * imagefontheight($size) * $lineheight).', '.$text.', $mask_color_watermark)', __FILE__, __LINE__);
+						imagestring($img_watermark_mask, $size, $x_offset, $key * imagefontheight($size) * $lineheight, $text, $mask_color_watermark);
 					}
 				}
 				if ($angle && $img_watermark_mask) {
-					$img_watermark      = ImageRotate($img_watermark,      $angle, $text_color_background);
-					$img_watermark_mask = ImageRotate($img_watermark_mask, $angle, $mask_color_background);
-					phpthumb_filters::ApplyMask($img_watermark_mask, $img_watermark);
+					$img_watermark      = imagerotate($img_watermark,      $angle, $text_color_background);
+					$img_watermark_mask = imagerotate($img_watermark_mask, $angle, $mask_color_background);
+					$this->ApplyMask($img_watermark_mask, $img_watermark);
 				}
 				//phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $alignment, $opacity, $margin);
 				$this->DebugMessage('WatermarkText() calling phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, '.($originOffsetX.'x'.$originOffsetY).', '.$opacity.', 0)', __FILE__, __LINE__);
-				phpthumb_filters::WatermarkOverlay($gdimg, $img_watermark, $originOffsetX.'x'.$originOffsetY, $opacity, 0);
-				ImageDestroy($img_watermark);
+				$this->WatermarkOverlay($gdimg, $img_watermark, $originOffsetX.'x'.$originOffsetY, $opacity, 0);
+				imagedestroy($img_watermark);
 				return true;
 			}
 
@@ -1409,45 +1422,45 @@ function WatermarkText(&$gdimg, $text, $size, $alignment, $hex_color='000000', $
 	}
 
 
-	function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacity=50, $margin_x=5, $margin_y=null) {
+	public function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacity=50, $margin_x=5, $margin_y=null) {
 
-		if (is_resource($gdimg_dest) && is_resource($img_watermark)) {
-			$watermark_source_x        = 0;
-			$watermark_source_y        = 0;
-			$img_source_width          = ImageSX($gdimg_dest);
-			$img_source_height         = ImageSY($gdimg_dest);
-			$watermark_source_width    = ImageSX($img_watermark);
-			$watermark_source_height   = ImageSY($img_watermark);
+		if ((is_resource($gdimg_dest) || (is_object($gdimg_dest) && $gdimg_dest instanceOf \GdImage)) && (is_resource($img_watermark) || (is_object($img_watermark) && $img_watermark instanceOf \GdImage))) {
+			$img_source_width          = imagesx($gdimg_dest);
+			$img_source_height         = imagesy($gdimg_dest);
+			$watermark_source_width    = imagesx($img_watermark);
+			$watermark_source_height   = imagesy($img_watermark);
 			$watermark_opacity_percent = max(0, min(100, $opacity));
-			$margin_y = (is_null($margin_y) ? $margin_x : $margin_y);
+			$margin_y = (null === $margin_y ? $margin_x : $margin_y);
 			$watermark_margin_x = ((($margin_x > 0) && ($margin_x < 1)) ? round((1 - $margin_x) * $img_source_width)  : $margin_x);
 			$watermark_margin_y = ((($margin_y > 0) && ($margin_y < 1)) ? round((1 - $margin_y) * $img_source_height) : $margin_y);
+			$watermark_destination_x = 0;
+			$watermark_destination_y = 0;
 			if (preg_match('#^([0-9\\.\\-]*)x([0-9\\.\\-]*)$#i', $alignment, $matches)) {
-				$watermark_destination_x = intval($matches[1]);
-				$watermark_destination_y = intval($matches[2]);
+				$watermark_destination_x = (int) $matches[ 1];
+				$watermark_destination_y = (int) $matches[ 2];
 			} else {
 				switch ($alignment) {
 					case '*':
 						if ($gdimg_tiledwatermark = phpthumb_functions::ImageCreateFunction($img_source_width, $img_source_height)) {
 
-							ImageAlphaBlending($gdimg_tiledwatermark, false);
-							ImageSaveAlpha($gdimg_tiledwatermark, true);
+							imagealphablending($gdimg_tiledwatermark, false);
+							imagesavealpha($gdimg_tiledwatermark, true);
 							$text_color_transparent = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_tiledwatermark, 255, 0, 255, 127);
-							ImageFill($gdimg_tiledwatermark, 0, 0, $text_color_transparent);
+							imagefill($gdimg_tiledwatermark, 0, 0, $text_color_transparent);
 
 							// set the tiled image transparent color to whatever the untiled image transparency index is
-	//						ImageColorTransparent($gdimg_tiledwatermark, ImageColorTransparent($img_watermark));
+	//						imagecolortransparent($gdimg_tiledwatermark, imagecolortransparent($img_watermark));
 
 							// a "cleaner" way of doing it, but can't handle the margin feature :(
-	//						ImageSetTile($gdimg_tiledwatermark, $img_watermark);
-	//						ImageFill($gdimg_tiledwatermark, 0, 0, IMG_COLOR_TILED);
+	//						imagesettile($gdimg_tiledwatermark, $img_watermark);
+	//						imagefill($gdimg_tiledwatermark, 0, 0, IMG_COLOR_TILED);
 	//						break;
 
-	//						ImageFill($gdimg_tiledwatermark, 0, 0, ImageColorTransparent($gdimg_tiledwatermark));
+	//						imagefill($gdimg_tiledwatermark, 0, 0, imagecolortransparent($gdimg_tiledwatermark));
 							// tile the image as many times as can fit
 							for ($x = $watermark_margin_x; $x < ($img_source_width + $watermark_source_width); $x += ($watermark_source_width + $watermark_margin_x)) {
 								for ($y = $watermark_margin_y; $y < ($img_source_height + $watermark_source_height); $y += ($watermark_source_height + $watermark_margin_y)) {
-									ImageCopy(
+									imagecopy(
 										$gdimg_tiledwatermark,
 										$img_watermark,
 										$x,
@@ -1460,12 +1473,12 @@ function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacit
 								}
 							}
 
-							$watermark_source_width  = ImageSX($gdimg_tiledwatermark);
-							$watermark_source_height = ImageSY($gdimg_tiledwatermark);
+							$watermark_source_width  = imagesx($gdimg_tiledwatermark);
+							$watermark_source_height = imagesy($gdimg_tiledwatermark);
 							$watermark_destination_x = 0;
 							$watermark_destination_y = 0;
 
-							ImageDestroy($img_watermark);
+							imagedestroy($img_watermark);
 							$img_watermark = $gdimg_tiledwatermark;
 						}
 						break;
@@ -1506,13 +1519,6 @@ function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacit
 						break;
 
 					case 'BL':
-	//echo '<pre>';
-	////var_dump($watermark_destination_x);
-	////var_dump($watermark_destination_y);
-	//var_dump($watermark_margin_x);
-	//var_dump($img_source_height);
-	//var_dump($watermark_source_height);
-	//var_dump($watermark_margin_y);
 						$watermark_destination_x = $watermark_margin_x;
 						$watermark_destination_y = $img_source_height - $watermark_source_height - $watermark_margin_y;
 						break;
@@ -1524,9 +1530,9 @@ function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacit
 						break;
 				}
 			}
-			ImageAlphaBlending($gdimg_dest, false);
-			ImageSaveAlpha($gdimg_dest, true);
-			ImageSaveAlpha($img_watermark, true);
+			imagealphablending($gdimg_dest, false);
+			imagesavealpha($gdimg_dest, true);
+			imagesavealpha($img_watermark, true);
 			phpthumb_functions::ImageCopyRespectAlpha($gdimg_dest, $img_watermark, $watermark_destination_x, $watermark_destination_y, 0, 0, $watermark_source_width, $watermark_source_height, $watermark_opacity_percent);
 
 			return true;
@@ -1534,13 +1540,4 @@ function WatermarkOverlay(&$gdimg_dest, &$img_watermark, $alignment='*', $opacit
 		return false;
 	}
 
-
-	function DebugMessage($message, $file='', $line='') {
-		if (is_object($this->phpThumbObject)) {
-			return $this->phpThumbObject->DebugMessage($message, $file, $line);
-		}
-		return false;
-	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/phpthumb/phpthumb.functions.php b/lib/phpthumb/phpthumb.functions.php
index 42b91f5a..75a73654 100644
--- a/lib/phpthumb/phpthumb.functions.php
+++ b/lib/phpthumb/phpthumb.functions.php
@@ -1,7 +1,8 @@
 <?php
 //////////////////////////////////////////////////////////////
-///  phpThumb() by James Heinrich <info@silisoftware.com>   //
-//        available at http://phpthumb.sourceforge.net     ///
+//   phpThumb() by James Heinrich <info@silisoftware.com>   //
+//        available at http://phpthumb.sourceforge.net      //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
 //////////////////////////////////////////////////////////////
 ///                                                         //
 // phpthumb.functions.php - general support functions       //
@@ -10,7 +11,11 @@
 
 class phpthumb_functions {
 
-	static function user_function_exists($functionname) {
+	public static function is_windows() {
+		return (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN');
+	}
+
+	public static function user_function_exists($functionname) {
 		if (function_exists('get_defined_functions')) {
 			static $get_defined_functions = array();
 			if (empty($get_defined_functions)) {
@@ -22,7 +27,7 @@ static function user_function_exists($functionname) {
 	}
 
 
-	static function builtin_function_exists($functionname) {
+	public static function builtin_function_exists($functionname) {
 		if (function_exists('get_defined_functions')) {
 			static $get_defined_functions = array();
 			if (empty($get_defined_functions)) {
@@ -34,7 +39,7 @@ static function builtin_function_exists($functionname) {
 	}
 
 
-	static function version_compare_replacement_sub($version1, $version2, $operator='') {
+	public static function version_compare_replacement_sub($version1, $version2, $operator='') {
 		// If you specify the third optional operator argument, you can test for a particular relationship.
 		// The possible operators are: <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne respectively.
 		// Using this argument, the function will return 1 if the relationship is the one specified by the operator, 0 otherwise.
@@ -60,29 +65,29 @@ static function version_compare_replacement_sub($version1, $version2, $operator=
 		switch ($operator) {
 			case '<':
 			case 'lt':
-				return intval($version1 < $version2);
+				return (int) ($version1 < $version2);
 				break;
 			case '<=':
 			case 'le':
-				return intval($version1 <= $version2);
+				return (int) ($version1 <= $version2);
 				break;
 			case '>':
 			case 'gt':
-				return intval($version1 > $version2);
+				return (int) ($version1 > $version2);
 				break;
 			case '>=':
 			case 'ge':
-				return intval($version1 >= $version2);
+				return (int) ($version1 >= $version2);
 				break;
 			case '==':
 			case '=':
 			case 'eq':
-				return intval($version1 == $version2);
+				return (int) ($version1 == $version2);
 				break;
 			case '!=':
 			case '<>':
 			case 'ne':
-				return intval($version1 != $version2);
+				return (int) ($version1 != $version2);
 				break;
 		}
 		if ($version1 == $version2) {
@@ -94,7 +99,7 @@ static function version_compare_replacement_sub($version1, $version2, $operator=
 	}
 
 
-	static function version_compare_replacement($version1, $version2, $operator='') {
+	public static function version_compare_replacement($version1, $version2, $operator='') {
 		if (function_exists('version_compare')) {
 			// built into PHP v4.1.0+
 			return version_compare($version1, $version2, $operator);
@@ -106,14 +111,14 @@ static function version_compare_replacement($version1, $version2, $operator='')
 
 		// and also inserts dots . before and after any non number so that for example '4.3.2RC1' becomes '4.3.2.RC.1'.
 		// Then it splits the results like if you were using explode('.',$ver). Then it compares the parts starting from left to right.
-		$version1 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version1);
-		$version2 = preg_replace('#([0-9]+)([A-Z]+)([0-9]+)#i', "$1.$2.$3", $version2);
+		$version1 = preg_replace('#([\d]+)([A-Z]+)([\d]+)#i', '$1.$2.$3', $version1);
+		$version2 = preg_replace('#([\d]+)([A-Z]+)([\d]+)#i', '$1.$2.$3', $version2);
 
 		$parts1 = explode('.', $version1);
 		$parts2 = explode('.', $version1);
 		$parts_count = max(count($parts1), count($parts2));
 		for ($i = 0; $i < $parts_count; $i++) {
-			$comparison = phpthumb_functions::version_compare_replacement_sub($version1, $version2, $operator);
+			$comparison = self::version_compare_replacement_sub($version1, $version2, $operator);
 			if ($comparison != 0) {
 				return $comparison;
 			}
@@ -121,8 +126,14 @@ static function version_compare_replacement($version1, $version2, $operator='')
 		return 0;
 	}
 
+	public static function escapeshellarg_replacement($arg) {
+		if (function_exists('escapeshellarg') && !self::FunctionIsDisabled('escapeshellarg')) {
+			return escapeshellarg($arg);
+		}
+		return '\''.str_replace('\'', '\\\'', $arg).'\'';
+	}
 
-	static function phpinfo_array() {
+	public static function phpinfo_array() {
 		static $phpinfo_array = array();
 		if (empty($phpinfo_array)) {
 			ob_start();
@@ -135,7 +146,7 @@ static function phpinfo_array() {
 	}
 
 
-	static function exif_info() {
+	public static function exif_info() {
 		static $exif_info = array();
 		if (empty($exif_info)) {
 			// based on code by johnschaefer at gmx dot de
@@ -146,7 +157,7 @@ static function exif_info() {
 				'Supported EXIF Version' => '',
 				'Supported filetypes'    => ''
 			);
-			$phpinfo_array = phpthumb_functions::phpinfo_array();
+			$phpinfo_array = self::phpinfo_array();
 			foreach ($phpinfo_array as $line) {
 				$line = trim(strip_tags($line));
 				foreach ($exif_info as $key => $value) {
@@ -161,8 +172,8 @@ static function exif_info() {
 	}
 
 
-	static function ImageTypeToMIMEtype($imagetype) {
-		if (function_exists('image_type_to_mime_type') && ($imagetype >= 1) && ($imagetype <= 16)) {
+	public static function ImageTypeToMIMEtype($imagetype) {
+		if (function_exists('image_type_to_mime_type') && ($imagetype >= 1) && ($imagetype <= 18)) {
 			// PHP v4.3.0+
 			return image_type_to_mime_type($imagetype);
 		}
@@ -183,20 +194,23 @@ static function ImageTypeToMIMEtype($imagetype) {
 			14 => 'image/iff',                     // IMAGETYPE_IFF
 			15 => 'image/vnd.wap.wbmp',            // IMAGETYPE_WBMP
 			16 => 'image/xbm',                     // IMAGETYPE_XBM
+			17 => 'image/x-icon',                  // IMAGETYPE_ICO
+			18 => 'image/webp',                    // IMAGETYPE_WEBP
 
 			'gif'  => 'image/gif',                 // IMAGETYPE_GIF
 			'jpg'  => 'image/jpeg',                // IMAGETYPE_JPEG
 			'jpeg' => 'image/jpeg',                // IMAGETYPE_JPEG
 			'png'  => 'image/png',                 // IMAGETYPE_PNG
 			'bmp'  => 'image/bmp',                 // IMAGETYPE_BMP
-			'ico'  => 'image/x-icon',
+			'ico'  => 'image/x-icon',              // IMAGETYPE_ICO
+			'webp' => 'image/webp',                // IMAGETYPE_WEBP
 		);
 
 		return (isset($image_type_to_mime_type[$imagetype]) ? $image_type_to_mime_type[$imagetype] : false);
 	}
 
 
-	static function TranslateWHbyAngle($width, $height, $angle) {
+	public static function TranslateWHbyAngle($width, $height, $angle) {
 		if (($angle % 180) == 0) {
 			return array($width, $height);
 		}
@@ -205,60 +219,60 @@ static function TranslateWHbyAngle($width, $height, $angle) {
 		return array($newwidth, $newheight);
 	}
 
-	static function HexCharDisplay($string) {
+	public static function HexCharDisplay($string) {
 		$len = strlen($string);
 		$output = '';
 		for ($i = 0; $i < $len; $i++) {
-			$output .= ' 0x'.str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
+			$output .= ' 0x'.str_pad(dechex(ord($string[$i])), 2, '0', STR_PAD_LEFT);
 		}
 		return $output;
 	}
 
 
-	static function IsHexColor($HexColorString) {
+	public static function IsHexColor($HexColorString) {
 		return preg_match('#^[0-9A-F]{6}$#i', $HexColorString);
 	}
 
 
-	static function ImageColorAllocateAlphaSafe(&$gdimg_hexcolorallocate, $R, $G, $B, $alpha=false) {
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=') && ($alpha !== false)) {
-			return ImageColorAllocateAlpha($gdimg_hexcolorallocate, $R, $G, $B, intval($alpha));
+	public static function ImageColorAllocateAlphaSafe(&$gdimg_hexcolorallocate, $R, $G, $B, $alpha=false) {
+		if (self::version_compare_replacement(PHP_VERSION, '4.3.2', '>=') && ($alpha !== false)) {
+			return imagecolorallocatealpha($gdimg_hexcolorallocate, $R, $G, $B, (int) $alpha);
 		} else {
-			return ImageColorAllocate($gdimg_hexcolorallocate, $R, $G, $B);
+			return imagecolorallocate($gdimg_hexcolorallocate, $R, $G, $B);
 		}
 	}
 
-	static function ImageHexColorAllocate(&$gdimg_hexcolorallocate, $HexColorString, $dieOnInvalid=false, $alpha=false) {
-		if (!is_resource($gdimg_hexcolorallocate)) {
+	public static function ImageHexColorAllocate(&$gdimg_hexcolorallocate, $HexColorString, $dieOnInvalid=false, $alpha=false) {
+		if (!is_resource($gdimg_hexcolorallocate) && !(is_object($gdimg_hexcolorallocate) && $gdimg_hexcolorallocate instanceOf \GdImage)) {
 			die('$gdimg_hexcolorallocate is not a GD resource in ImageHexColorAllocate()');
 		}
-		if (phpthumb_functions::IsHexColor($HexColorString)) {
+		if (self::IsHexColor($HexColorString)) {
 			$R = hexdec(substr($HexColorString, 0, 2));
 			$G = hexdec(substr($HexColorString, 2, 2));
 			$B = hexdec(substr($HexColorString, 4, 2));
-			return phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_hexcolorallocate, $R, $G, $B, $alpha);
+			return self::ImageColorAllocateAlphaSafe($gdimg_hexcolorallocate, $R, $G, $B, $alpha);
 		}
 		if ($dieOnInvalid) {
 			die('Invalid hex color string: "'.$HexColorString.'"');
 		}
-		return ImageColorAllocate($gdimg_hexcolorallocate, 0x00, 0x00, 0x00);
+		return imagecolorallocate($gdimg_hexcolorallocate, 0x00, 0x00, 0x00);
 	}
 
 
-	static function HexColorXOR($hexcolor) {
+	public static function HexColorXOR($hexcolor) {
 		return strtoupper(str_pad(dechex(~hexdec($hexcolor) & 0xFFFFFF), 6, '0', STR_PAD_LEFT));
 	}
 
 
-	static function GetPixelColor(&$img, $x, $y) {
-		if (!is_resource($img)) {
+	public static function GetPixelColor(&$img, $x, $y) {
+		if (!is_resource($img) && !(is_object($img) && $img instanceOf \GdImage)) {
 			return false;
 		}
-		return @ImageColorsForIndex($img, @ImageColorAt($img, $x, $y));
+		return @imagecolorsforindex($img, @imagecolorat($img, $x, $y));
 	}
 
 
-	static function PixelColorDifferencePercent($currentPixel, $targetPixel) {
+	public static function PixelColorDifferencePercent($currentPixel, $targetPixel) {
 		$diff = 0;
 		foreach ($targetPixel as $channel => $currentvalue) {
 			$diff = max($diff, (max($currentPixel[$channel], $targetPixel[$channel]) - min($currentPixel[$channel], $targetPixel[$channel])) / 255);
@@ -266,18 +280,18 @@ static function PixelColorDifferencePercent($currentPixel, $targetPixel) {
 		return $diff * 100;
 	}
 
-	static function GrayscaleValue($r, $g, $b) {
+	public static function GrayscaleValue($r, $g, $b) {
 		return round(($r * 0.30) + ($g * 0.59) + ($b * 0.11));
 	}
 
 
-	static function GrayscalePixel($OriginalPixel) {
-		$gray = phpthumb_functions::GrayscaleValue($OriginalPixel['red'], $OriginalPixel['green'], $OriginalPixel['blue']);
+	public static function GrayscalePixel($OriginalPixel) {
+		$gray = self::GrayscaleValue($OriginalPixel[ 'red'], $OriginalPixel[ 'green'], $OriginalPixel[ 'blue']);
 		return array('red'=>$gray, 'green'=>$gray, 'blue'=>$gray);
 	}
 
 
-	static function GrayscalePixelRGB($rgb) {
+	public static function GrayscalePixelRGB($rgb) {
 		$r = ($rgb >> 16) & 0xFF;
 		$g = ($rgb >>  8) & 0xFF;
 		$b =  $rgb        & 0xFF;
@@ -285,9 +299,9 @@ static function GrayscalePixelRGB($rgb) {
 	}
 
 
-	static function ScaleToFitInBox($width, $height, $maxwidth=null, $maxheight=null, $allow_enlarge=true, $allow_reduce=true) {
-		$maxwidth  = (is_null($maxwidth)  ? $width  : $maxwidth);
-		$maxheight = (is_null($maxheight) ? $height : $maxheight);
+	public static function ScaleToFitInBox($width, $height, $maxwidth=null, $maxheight=null, $allow_enlarge=true, $allow_reduce=true) {
+		$maxwidth  = (null === $maxwidth  ? $width  : $maxwidth);
+		$maxheight = (null === $maxheight ? $height : $maxheight);
 		$scale_x = 1;
 		$scale_y = 1;
 		if (($width > $maxwidth) || ($width < $maxwidth)) {
@@ -306,7 +320,7 @@ static function ScaleToFitInBox($width, $height, $maxwidth=null, $maxheight=null
 		return $scale;
 	}
 
-	static function ImageCopyResampleBicubic($dst_img, $src_img, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) {
+	public static function ImageCopyResampleBicubic($dst_img, $src_img, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) {
 		// ron at korving dot demon dot nl
 		// http://www.php.net/imagecopyresampled
 
@@ -316,7 +330,7 @@ static function ImageCopyResampleBicubic($dst_img, $src_img, $dst_x, $dst_y, $sr
 		$scaleX2 = $scaleX / 2.0;
 		$scaleY2 = $scaleY / 2.0;
 
-		$isTrueColor = ImageIsTrueColor($src_img);
+		$isTrueColor = imageistruecolor($src_img);
 
 		for ($y = $src_y; $y < $src_y + $dst_h; $y++) {
 			$sY   = $y * $scaleY;
@@ -330,10 +344,10 @@ static function ImageCopyResampleBicubic($dst_img, $src_img, $dst_x, $dst_y, $sr
 
 				if ($isTrueColor) {
 
-					$c1 = ImageColorAt($src_img, $siX, $siY2);
-					$c2 = ImageColorAt($src_img, $siX, $siY);
-					$c3 = ImageColorAt($src_img, $siX2, $siY2);
-					$c4 = ImageColorAt($src_img, $siX2, $siY);
+					$c1 = imagecolorat($src_img, $siX, $siY2);
+					$c2 = imagecolorat($src_img, $siX, $siY);
+					$c3 = imagecolorat($src_img, $siX2, $siY2);
+					$c4 = imagecolorat($src_img, $siX2, $siY);
 
 					$r = (( $c1             +  $c2             +  $c3             +  $c4            ) >> 2) & 0xFF0000;
 					$g = ((($c1 & 0x00FF00) + ($c2 & 0x00FF00) + ($c3 & 0x00FF00) + ($c4 & 0x00FF00)) >> 2) & 0x00FF00;
@@ -341,27 +355,27 @@ static function ImageCopyResampleBicubic($dst_img, $src_img, $dst_x, $dst_y, $sr
 
 				} else {
 
-					$c1 = ImageColorsForIndex($src_img, ImageColorAt($src_img, $siX, $siY2));
-					$c2 = ImageColorsForIndex($src_img, ImageColorAt($src_img, $siX, $siY));
-					$c3 = ImageColorsForIndex($src_img, ImageColorAt($src_img, $siX2, $siY2));
-					$c4 = ImageColorsForIndex($src_img, ImageColorAt($src_img, $siX2, $siY));
+					$c1 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX, $siY2));
+					$c2 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX, $siY));
+					$c3 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY2));
+					$c4 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY));
 
 					$r = ($c1['red']   + $c2['red']   + $c3['red']   + $c4['red'] )  << 14;
 					$g = ($c1['green'] + $c2['green'] + $c3['green'] + $c4['green']) <<  6;
 					$b = ($c1['blue']  + $c2['blue']  + $c3['blue']  + $c4['blue'] ) >>  2;
 
 				}
-				ImageSetPixel($dst_img, $dst_x + $x - $src_x, $dst_y + $y - $src_y, $r+$g+$b);
+				imagesetpixel($dst_img, $dst_x + $x - $src_x, $dst_y + $y - $src_y, $r+$g+$b);
 			}
 		}
 		return true;
 	}
 
 
-	static function ImageCreateFunction($x_size, $y_size) {
-		$ImageCreateFunction = 'ImageCreate';
-		if (phpthumb_functions::gd_version() >= 2.0) {
-			$ImageCreateFunction = 'ImageCreateTrueColor';
+	public static function ImageCreateFunction($x_size, $y_size) {
+		$ImageCreateFunction = 'imagecreate';
+		if (self::gd_version() >= 2.0) {
+			$ImageCreateFunction = 'imagecreatetruecolor';
 		}
 		if (!function_exists($ImageCreateFunction)) {
 			return phpthumb::ErrorImage($ImageCreateFunction.'() does not exist - no GD support?');
@@ -373,31 +387,32 @@ static function ImageCreateFunction($x_size, $y_size) {
 	}
 
 
-	static function ImageCopyRespectAlpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $opacity_pct=100) {
+	public static function ImageCopyRespectAlpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $opacity_pct=100) {
 		$opacipct = $opacity_pct / 100;
 		for ($x = $src_x; $x < $src_w; $x++) {
 			for ($y = $src_y; $y < $src_h; $y++) {
-				$RealPixel    = phpthumb_functions::GetPixelColor($dst_im, $dst_x + $x, $dst_y + $y);
-				$OverlayPixel = phpthumb_functions::GetPixelColor($src_im, $x, $y);
+				$RealPixel    = self::GetPixelColor($dst_im, $dst_x + $x, $dst_y + $y);
+				$OverlayPixel = self::GetPixelColor($src_im, $x, $y);
 				$alphapct = $OverlayPixel['alpha'] / 127;
 				$overlaypct = (1 - $alphapct) * $opacipct;
 
-				$newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe(
+				$newcolor = self::ImageColorAllocateAlphaSafe(
 					$dst_im,
-					round($RealPixel['red']   * (1 - $overlaypct)) + ($OverlayPixel['red']   * $overlaypct),
-					round($RealPixel['green'] * (1 - $overlaypct)) + ($OverlayPixel['green'] * $overlaypct),
-					round($RealPixel['blue']  * (1 - $overlaypct)) + ($OverlayPixel['blue']  * $overlaypct),
-					//$RealPixel['alpha']);
-					0);
-
-				ImageSetPixel($dst_im, $dst_x + $x, $dst_y + $y, $newcolor);
+					$RealPixel['alpha'] == 127 ? $OverlayPixel['red'] : ($OverlayPixel['alpha'] == 127 ? $RealPixel['red'] : (round($RealPixel['red'] * (1 - $overlaypct)) + ($OverlayPixel['red'] * $overlaypct))),
+					$RealPixel['alpha'] == 127 ? $OverlayPixel['green'] : ($OverlayPixel['alpha'] == 127 ? $RealPixel['green'] : (round($RealPixel['green'] * (1 - $overlaypct)) + ($OverlayPixel['green'] * $overlaypct))),
+					$RealPixel['alpha'] == 127 ? $OverlayPixel['blue'] : ($OverlayPixel['alpha'] == 127 ? $RealPixel['blue'] : (round($RealPixel['blue'] * (1 - $overlaypct)) + ($OverlayPixel['blue'] * $overlaypct))),
+//					0);
+					min([$RealPixel['alpha'], floor($OverlayPixel['alpha'] * $opacipct)])
+				);
+
+				imagesetpixel($dst_im, $dst_x + $x, $dst_y + $y, $newcolor);
 			}
 		}
 		return true;
 	}
 
 
-	static function ProportionalResize($old_width, $old_height, $new_width=false, $new_height=false) {
+	public static function ProportionalResize($old_width, $old_height, $new_width=false, $new_height=false) {
 		$old_aspect_ratio = $old_width / $old_height;
 		if (($new_width === false) && ($new_height === false)) {
 			return false;
@@ -416,13 +431,16 @@ static function ProportionalResize($old_width, $old_height, $new_width=false, $n
 			// limited by height
 			$new_width = $new_height * $old_aspect_ratio;
 		}
-		return array(intval(round($new_width)), intval(round($new_height)));
+		return array(
+			(int) round($new_width),
+			(int) round($new_height)
+		);
 	}
 
 
-	static function FunctionIsDisabled($function) {
+	public static function FunctionIsDisabled($function) {
 		static $DisabledFunctions = null;
-		if (is_null($DisabledFunctions)) {
+		if (null === $DisabledFunctions) {
 			$disable_functions_local  = explode(',',     strtolower(@ini_get('disable_functions')));
 			$disable_functions_global = explode(',', strtolower(@get_cfg_var('disable_functions')));
 			foreach ($disable_functions_local as $key => $value) {
@@ -440,12 +458,12 @@ static function FunctionIsDisabled($function) {
 	}
 
 
-	static function SafeExec($command) {
+	public static function SafeExec($command) {
 		static $AllowedExecFunctions = array();
 		if (empty($AllowedExecFunctions)) {
 			$AllowedExecFunctions = array('shell_exec'=>true, 'passthru'=>true, 'system'=>true, 'exec'=>true);
 			foreach ($AllowedExecFunctions as $key => $value) {
-				$AllowedExecFunctions[$key] = !phpthumb_functions::FunctionIsDisabled($key);
+				$AllowedExecFunctions[$key] = !self::FunctionIsDisabled($key);
 			}
 		}
 		$command .= ' 2>&1'; // force redirect stderr to stdout
@@ -481,9 +499,9 @@ static function SafeExec($command) {
 	}
 
 
-	static function ApacheLookupURIarray($filename) {
+	public static function ApacheLookupURIarray($filename) {
 		// apache_lookup_uri() only works when PHP is installed as an Apache module.
-		if (php_sapi_name() == 'apache') {
+		if (PHP_SAPI == 'apache') {
 			//$property_exists_exists = function_exists('property_exists');
 			$keys = array('status', 'the_request', 'status_line', 'method', 'content_type', 'handler', 'uri', 'filename', 'path_info', 'args', 'boundary', 'no_cache', 'no_local_copy', 'allowed', 'send_bodyct', 'bytes_sent', 'byterange', 'clength', 'unparsed_uri', 'mtime', 'request_time');
 			if ($apacheLookupURIobject = @apache_lookup_uri($filename)) {
@@ -498,9 +516,9 @@ static function ApacheLookupURIarray($filename) {
 	}
 
 
-	static function gd_is_bundled() {
+	public static function gd_is_bundled() {
 		static $isbundled = null;
-		if (is_null($isbundled)) {
+		if (null === $isbundled) {
 			$gd_info = gd_info();
 			$isbundled = (strpos($gd_info['GD Version'], 'bundled') !== false);
 		}
@@ -508,7 +526,7 @@ static function gd_is_bundled() {
 	}
 
 
-	static function gd_version($fullstring=false) {
+	public static function gd_version($fullstring=false) {
 		static $cache_gd_version = array();
 		if (empty($cache_gd_version)) {
 			$gd_info = gd_info();
@@ -520,22 +538,22 @@ static function gd_version($fullstring=false) {
 				$cache_gd_version[0] = (float) substr($gd_info['GD Version'], 0, 3); // e.g. "1.6" (not "1.6.2 or higher")
 			}
 		}
-		return $cache_gd_version[intval($fullstring)];
+		return $cache_gd_version[ (int) $fullstring ];
 	}
 
 
-	static function filesize_remote($remotefile, $timeout=10) {
+	public static function filesize_remote($remotefile, $timeout=10) {
 		$size = false;
-		$url = phpthumb_functions::ParseURLbetter($remotefile);
-		if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
-			fwrite($fp, 'HEAD '.@$url['path'].@$url['query'].' HTTP/1.0'."\r\n".'Host: '.@$url['host']."\r\n\r\n");
-			if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=')) {
+		$parsed_url = self::ParseURLbetter($remotefile);
+		if ($fp = @fsockopen($parsed_url['host'], $parsed_url['port'], $errno, $errstr, $timeout)) {
+			fwrite($fp, 'HEAD '.$parsed_url['path'].$parsed_url['query'].' HTTP/1.0'."\r\n".'Host: '.$parsed_url['host']."\r\n\r\n");
+			if (self::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
 				stream_set_timeout($fp, $timeout);
 			}
 			while (!feof($fp)) {
 				$headerline = fgets($fp, 4096);
 				if (preg_match('#^Content-Length: (.*)#i', $headerline, $matches)) {
-					$size = intval($matches[1]);
+					$size = (int) $matches[ 1];
 					break;
 				}
 			}
@@ -545,12 +563,12 @@ static function filesize_remote($remotefile, $timeout=10) {
 	}
 
 
-	static function filedate_remote($remotefile, $timeout=10) {
+	public static function filedate_remote($remotefile, $timeout=10) {
 		$date = false;
-		$url = phpthumb_functions::ParseURLbetter($remotefile);
-		if ($fp = @fsockopen($url['host'], ($url['port'] ? $url['port'] : 80), $errno, $errstr, $timeout)) {
-			fwrite($fp, 'HEAD '.@$url['path'].@$url['query'].' HTTP/1.0'."\r\n".'Host: '.@$url['host']."\r\n\r\n");
-			if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.0', '>=')) {
+		$parsed_url = self::ParseURLbetter($remotefile);
+		if ($fp = @fsockopen($parsed_url['host'], $parsed_url['port'], $errno, $errstr, $timeout)) {
+			fwrite($fp, 'HEAD '.$parsed_url['path'].$parsed_url['query'].' HTTP/1.0'."\r\n".'Host: '.$parsed_url['host']."\r\n\r\n");
+			if (self::version_compare_replacement(PHP_VERSION, '4.3.0', '>=')) {
 				stream_set_timeout($fp, $timeout);
 			}
 			while (!feof($fp)) {
@@ -566,7 +584,7 @@ static function filedate_remote($remotefile, $timeout=10) {
 	}
 
 
-	static function md5_file_safe($filename) {
+	public static function md5_file_safe($filename) {
 		// md5_file() doesn't exist in PHP < 4.2.0
 		if (function_exists('md5_file')) {
 			return md5_file($filename);
@@ -584,7 +602,7 @@ static function md5_file_safe($filename) {
 	}
 
 
-	static function nonempty_min() {
+	public static function nonempty_min() {
 		$arg_list = func_get_args();
 		$acceptable = array();
 		foreach ($arg_list as $arg) {
@@ -596,16 +614,16 @@ static function nonempty_min() {
 	}
 
 
-	static function LittleEndian2String($number, $minbytes=1) {
+	public static function LittleEndian2String($number, $minbytes=1) {
 		$intstring = '';
 		while ($number > 0) {
-			$intstring = $intstring.chr($number & 255);
-			$number >>= 8;
+			$intstring .= chr($number & 255);
+			$number    >>= 8;
 		}
 		return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
 	}
 
-	static function OneOfThese() {
+	public static function OneOfThese() {
 		// return the first useful (non-empty/non-zero/non-false) value from those passed
 		$arg_list = func_get_args();
 		foreach ($arg_list as $key => $value) {
@@ -616,7 +634,7 @@ static function OneOfThese() {
 		return false;
 	}
 
-	static function CaseInsensitiveInArray($needle, $haystack) {
+	public static function CaseInsensitiveInArray($needle, $haystack) {
 		$needle = strtolower($needle);
 		foreach ($haystack as $key => $value) {
 			if (is_array($value)) {
@@ -628,31 +646,33 @@ static function CaseInsensitiveInArray($needle, $haystack) {
 		return false;
 	}
 
-	static function URLreadFsock($host, $file, &$errstr, $successonly=true, $port=80, $timeout=10) {
-		if (!function_exists('fsockopen') || phpthumb_functions::FunctionIsDisabled('fsockopen')) {
-			$errstr = 'fsockopen() unavailable';
+	public static function URLreadFsock($host, $file, &$errstr, $successonly=true, $port=-1, $timeout=10) {
+		if (!function_exists('fsockopen') || self::FunctionIsDisabled('fsockopen')) {
+			$errstr = 'URLreadFsock says: function fsockopen() unavailable';
 			return false;
 		}
-		if ($fp = @fsockopen($host, $port, $errno, $errstr, $timeout)) {
+		$port = (int) ($port ? $port : -1); // passing anything as the $port parameter (even empty values like null, false, 0, "") will override the default -1. fsockopen uses -1 as the default port value.
+		//if ($fp = @fsockopen($host, $port, $errno, $errstr, $timeout)) {
+		if ($fp = @fsockopen((($port == 443) ? 'ssl://' : '').$host, $port, $errno, $errstr, $timeout)) { // https://github.com/JamesHeinrich/phpThumb/issues/39
 			$out  = 'GET '.$file.' HTTP/1.0'."\r\n";
 			$out .= 'Host: '.$host."\r\n";
 			$out .= 'Connection: Close'."\r\n\r\n";
 			fwrite($fp, $out);
 
 			$isHeader = true;
-			$Data_header = '';
-			$Data_body   = '';
+			$data_header = '';
+			$data_body   = '';
 			$header_newlocation = '';
 			while (!feof($fp)) {
 				$line = fgets($fp, 1024);
 				if ($isHeader) {
-					$Data_header .= $line;
+					$data_header .= $line;
 				} else {
-					$Data_body .= $line;
+					$data_body .= $line;
 				}
-				if (preg_match('#^HTTP/[\\.0-9]+ ([0-9]+) (.+)$#i', rtrim($line), $matches)) {
-					list($dummy, $errno, $errstr) = $matches;
-					$errno = intval($errno);
+				if (preg_match('#^HTTP/[\\.\d]+ ([\d]+)\s*(.+)?$#i', rtrim($line), $matches)) {
+					list( , $errno, $errstr) = $matches;
+					$errno = (int) $errno;
 				} elseif (preg_match('#^Location: (.*)$#i', rtrim($line), $matches)) {
 					$header_newlocation = $matches[1];
 				}
@@ -674,17 +694,17 @@ static function URLreadFsock($host, $file, &$errstr, $successonly=true, $port=80
 				}
 			}
 			fclose($fp);
-			return $Data_body;
+			return $data_body;
 		}
 		return null;
 	}
 
-	static function CleanUpURLencoding($url, $queryseperator='&') {
-		if (!preg_match('#^http#i', $url)) {
+	public static function CleanUpURLencoding($url, $queryseperator='&') {
+		if (!0 === stripos($url, "http") ) {
 			return $url;
 		}
-		$parse_url = phpthumb_functions::ParseURLbetter($url);
-		$pathelements = explode('/', $parse_url['path']);
+		$parsed_url = self::ParseURLbetter($url);
+		$pathelements = explode('/', $parsed_url['path']);
 		$CleanPathElements = array();
 		$TranslationMatrix = array(' '=>'%20');
 		foreach ($pathelements as $key => $pathelement) {
@@ -696,7 +716,7 @@ static function CleanUpURLencoding($url, $queryseperator='&') {
 			}
 		}
 
-		$queries = explode($queryseperator, (isset($parse_url['query']) ? $parse_url['query'] : ''));
+		$queries = explode($queryseperator, $parsed_url['query']);
 		$CleanQueries = array();
 		foreach ($queries as $key => $query) {
 			@list($param, $value) = explode('=', $query);
@@ -708,43 +728,47 @@ static function CleanUpURLencoding($url, $queryseperator='&') {
 			}
 		}
 
-		$cleaned_url  = $parse_url['scheme'].'://';
-		$cleaned_url .= (@$parse_url['username'] ? $parse_url['host'].(@$parse_url['password'] ? ':'.$parse_url['password'] : '').'@' : '');
-		$cleaned_url .= $parse_url['host'];
-		$cleaned_url .= ((!empty($parse_url['port']) && ($parse_url['port'] != 80)) ? ':'.$parse_url['port'] : '');
+		$cleaned_url  = $parsed_url['scheme'].'://';
+		$cleaned_url .= ($parsed_url['user'] ? $parsed_url['user'].($parsed_url['pass'] ? ':'.$parsed_url['pass'] : '').'@' : '');
+		$cleaned_url .= $parsed_url['host'];
+		$cleaned_url .= (($parsed_url['port'] && ($parsed_url['port'] != self::URLschemeDefaultPort($parsed_url['scheme']))) ? ':'.$parsed_url['port'] : '');
 		$cleaned_url .= '/'.implode('/', $CleanPathElements);
-		$cleaned_url .= (@$CleanQueries ? '?'.implode($queryseperator, $CleanQueries) : '');
+		$cleaned_url .= (!empty($CleanQueries) ? '?'.implode($queryseperator, $CleanQueries) : '');
 		return $cleaned_url;
 	}
 
-	static function ParseURLbetter($url) {
+	public static function URLschemeDefaultPort($scheme) {
+		static $schemePort = array(
+			'ftp'   => 21,
+			'http'  => 80,
+			'https' => 443,
+		);
+		return (isset($schemePort[strtolower($scheme)]) ? $schemePort[strtolower($scheme)] : null);
+	}
+
+	public static function ParseURLbetter($url) {
 		$parsedURL = @parse_url($url);
-		if (!@$parsedURL['port']) {
-			switch (strtolower(@$parsedURL['scheme'])) {
-				case 'ftp':
-					$parsedURL['port'] = 21;
-					break;
-				case 'https':
-					$parsedURL['port'] = 443;
-					break;
-				case 'http':
-					$parsedURL['port'] = 80;
-					break;
+		foreach (array('scheme', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment') as $key) { // ensure all possible array keys are always returned
+			if (!array_key_exists($key, $parsedURL)) {
+				$parsedURL[$key] = null;
 			}
 		}
+		$parsedURL['port'] = ($parsedURL['port'] ? $parsedURL['port'] : self::URLschemeDefaultPort($parsedURL['scheme']));
 		return $parsedURL;
 	}
 
-	static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
-		$error = '';
+	public static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
+		$error   = '';
+		$errstr  = '';
+		$rawData = '';
 
-		$parsed_url = phpthumb_functions::ParseURLbetter($url);
+		$parsed_url = self::ParseURLbetter($url);
 		$alreadyLookedAtURLs[trim($url)] = true;
 
 		while (true) {
 			$tryagain = false;
-			$rawData = phpthumb_functions::URLreadFsock(@$parsed_url['host'], @$parsed_url['path'].'?'.@$parsed_url['query'], $errstr, true, (@$parsed_url['port'] ? @$parsed_url['port'] : 80), $timeout);
-			if (preg_match('#302 [a-z ]+; Location\\: (http.*)#i', $errstr, $matches)) {
+			$rawData = self::URLreadFsock($parsed_url['host'], $parsed_url['path'].'?'.$parsed_url['query'], $errstr, true, $parsed_url['port'], $timeout);
+			if ($followredirects && preg_match('#302 [a-z ]+; Location\\: (http.*)#i', $errstr, $matches)) {
 				$matches[1] = trim(@$matches[1]);
 				if (!@$alreadyLookedAtURLs[$matches[1]]) {
 					// loop through and examine new URL
@@ -752,7 +776,7 @@ static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
 
 					$tryagain = true;
 					$alreadyLookedAtURLs[$matches[1]] = true;
-					$parsed_url = phpthumb_functions::ParseURLbetter($matches[1]);
+					$parsed_url = self::ParseURLbetter($matches[ 1]);
 				}
 			}
 			if (!$tryagain) {
@@ -770,12 +794,15 @@ static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
 			return $rawData;
 		}
 
-		if (function_exists('curl_version') && !phpthumb_functions::FunctionIsDisabled('curl_exec')) {
+		if (function_exists('curl_version') && !self::FunctionIsDisabled('curl_exec')) {
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_URL, $url);
 			curl_setopt($ch, CURLOPT_HEADER, false);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, (bool) $followredirects);
 			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
 			$rawData = curl_exec($ch);
 			curl_close($ch);
@@ -789,8 +816,8 @@ static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
 		}
 
 		$BrokenURLfopenPHPversions = array('4.4.2');
-		if (in_array(phpversion(), $BrokenURLfopenPHPversions)) {
-			$error .= 'fopen(URL) broken in PHP v'.phpversion().'; ';
+		if (in_array(PHP_VERSION, $BrokenURLfopenPHPversions)) {
+			$error .= 'fopen(URL) broken in PHP v'. PHP_VERSION .'; ';
 		} elseif (@ini_get('allow_url_fopen')) {
 			$rawData = '';
 			$error_fopen = '';
@@ -818,17 +845,30 @@ static function SafeURLread($url, &$error, $timeout=10, $followredirects=true) {
 		return false;
 	}
 
-	static function EnsureDirectoryExists($dirname) {
-		$directory_elements = explode(DIRECTORY_SEPARATOR, $dirname);
-		$startoffset = (!$directory_elements[0] ? 2 : 1);  // unix with leading "/" then start with 2nd element; Windows with leading "c:\" then start with 1st element
-		$open_basedirs = preg_split('#[;:]#', ini_get('open_basedir'));
+	public static function EnsureDirectoryExists($dirname, $mask=0755) {
+		// https://www.php.net/manual/en/ini.core.php#ini.open-basedir says:
+		// "Under Windows, separate the directories with a semicolon. On all other systems, separate the directories with a colon."
+		$config_open_basedir = ini_get('open_basedir');
+		$startoffset = 2; // 1-based counting, first element to left of first directory separator will either be drive letter (Windows) or blank (unix). May be overridden below.
+		if (self::is_windows()) {
+			$delimiter = ';';
+			$case_insensitive_pathname = true;
+			// unix OSs will always use "/", some Windows configurations you may find "/" used interchangeably with the OS-correct "\", so standardize for ease of comparison
+			$dirname             = str_replace('/', DIRECTORY_SEPARATOR, $dirname);
+			$config_open_basedir = str_replace('/', DIRECTORY_SEPARATOR, $config_open_basedir);
+		} else {
+			$delimiter = ':';
+			$case_insensitive_pathname = false;
+		}
+		$open_basedirs = explode($delimiter, $config_open_basedir);
 		foreach ($open_basedirs as $key => $open_basedir) {
-			if (preg_match('#^'.preg_quote($open_basedir).'#', $dirname) && (strlen($dirname) > strlen($open_basedir))) {
-				$startoffset = count(explode(DIRECTORY_SEPARATOR, $open_basedir));
+			if (preg_match('#^'.preg_quote($open_basedir).'#'.($case_insensitive_pathname ? 'i' : ''), $dirname) && (strlen($dirname) > strlen($open_basedir))) {
+				$startoffset = substr_count($open_basedir, DIRECTORY_SEPARATOR) + 1;
 				break;
 			}
 		}
-		$i = $startoffset;
+
+		$directory_elements = explode(DIRECTORY_SEPARATOR, $dirname);
 		$endoffset = count($directory_elements);
 		for ($i = $startoffset; $i <= $endoffset; $i++) {
 			$test_directory = implode(DIRECTORY_SEPARATOR, array_slice($directory_elements, 0, $i));
@@ -840,9 +880,9 @@ static function EnsureDirectoryExists($dirname) {
 					// directory name already exists as a file
 					return false;
 				}
-				@mkdir($test_directory, 0755);
-				@chmod($test_directory, 0755);
-				if (!@is_dir($test_directory) || !@is_writeable($test_directory)) {
+				@mkdir($test_directory, $mask);
+				@chmod($test_directory, $mask);
+				if (!@is_dir($test_directory) || !@is_writable($test_directory)) {
 					return false;
 				}
 			}
@@ -851,7 +891,7 @@ static function EnsureDirectoryExists($dirname) {
 	}
 
 
-	static function GetAllFilesInSubfolders($dirname) {
+	public static function GetAllFilesInSubfolders($dirname) {
 		$AllFiles = array();
 		$dirname = rtrim(realpath($dirname), '/\\');
 		if ($dirhandle = @opendir($dirname)) {
@@ -867,7 +907,7 @@ static function GetAllFilesInSubfolders($dirname) {
 
 						default:
 							$AllFiles[] = $fullfilename;
-							$subfiles = phpthumb_functions::GetAllFilesInSubfolders($fullfilename);
+							$subfiles = self::GetAllFilesInSubfolders($fullfilename);
 							foreach ($subfiles as $filename) {
 								$AllFiles[] = $filename;
 							}
@@ -884,14 +924,23 @@ static function GetAllFilesInSubfolders($dirname) {
 	}
 
 
-	static function SanitizeFilename($filename) {
+	public static function SanitizeFilename($filename) {
 		$filename = preg_replace('/[^'.preg_quote(' !#$%^()+,-.;<>=@[]_{}').'a-zA-Z0-9]/', '_', $filename);
-		if (phpthumb_functions::version_compare_replacement(phpversion(), '4.1.0', '>=')) {
+		if (self::version_compare_replacement(PHP_VERSION, '4.1.0', '>=')) {
 			$filename = trim($filename, '.');
 		}
 		return $filename;
 	}
 
+	public static function PasswordStrength($password) {
+		$strength = 0;
+		$strength += strlen(preg_replace('#[^a-z]#',       '', $password)) * 0.5; // lowercase characters are weak
+		$strength += strlen(preg_replace('#[^A-Z]#',       '', $password)) * 0.8; // uppercase characters are somewhat better
+		$strength += strlen(preg_replace('#[^0-9]#',       '', $password)) * 1.0; // numbers are somewhat better
+		$strength += strlen(preg_replace('#[a-zA-Z0-9]#',  '', $password)) * 2.0; // other non-alphanumeric characters are best
+		return $strength;
+	}
+
 }
 
 
@@ -930,8 +979,8 @@ function gd_info() {
 			}
 			if (empty($gd_info['GD Version'])) {
 				// probable cause: "phpinfo() disabled for security reasons"
-				if (function_exists('ImageTypes')) {
-					$imagetypes = ImageTypes();
+				if (function_exists('imagetypes')) {
+					$imagetypes = imagetypes();
 					if ($imagetypes & IMG_PNG) {
 						$gd_info['PNG Support'] = true;
 					}
@@ -945,22 +994,24 @@ function gd_info() {
 						$gd_info['WBMP Support'] = true;
 					}
 				}
-				// to determine capability of GIF creation, try to use ImageCreateFromGIF on a 1px GIF
-				if (function_exists('ImageCreateFromGIF')) {
+				// to determine capability of GIF creation, try to use imagecreatefromgif on a 1px GIF
+				if (function_exists('imagecreatefromgif')) {
 					if ($tempfilename = phpthumb::phpThumb_tempnam()) {
 						if ($fp_tempfile = @fopen($tempfilename, 'wb')) {
 							fwrite($fp_tempfile, base64_decode('R0lGODlhAQABAIAAAH//AP///ywAAAAAAQABAAACAUQAOw==')); // very simple 1px GIF file base64-encoded as string
 							fclose($fp_tempfile);
+							$phpthumb_temp = new phpthumb();
+							@chmod($tempfilename, $phpthumb_temp->getParameter('config_file_create_mask'));
 
 							// if we can convert the GIF file to a GD image then GIF create support must be enabled, otherwise it's not
-							$gd_info['GIF Read Support'] = (bool) @ImageCreateFromGIF($tempfilename);
+							$gd_info['GIF Read Support'] = (bool) @imagecreatefromgif($tempfilename);
 						}
 						unlink($tempfilename);
 					}
 				}
-				if (function_exists('ImageCreateTrueColor') && @ImageCreateTrueColor(1, 1)) {
+				if (function_exists('imagecreatetruecolor') && @imagecreatetruecolor(1, 1)) {
 					$gd_info['GD Version'] = '2.0.1 or higher (assumed)';
-				} elseif (function_exists('ImageCreate') && @ImageCreate(1, 1)) {
+				} elseif (function_exists('imagecreate') && @imagecreate(1, 1)) {
 					$gd_info['GD Version'] = '1.6.0 or higher (assumed)';
 				}
 			}
@@ -985,8 +1036,8 @@ function preg_quote($string, $delimiter='\\') {
 		static $preg_quote_array = array();
 		if (empty($preg_quote_array)) {
 			$escapeables = '.\\+*?[^]$(){}=!<>|:';
-			for ($i = 0; $i < strlen($escapeables); $i++) {
-				$strtr_preg_quote[$escapeables{$i}] = $delimiter.$escapeables{$i};
+			for ($i = 0, $iMax = strlen($escapeables); $i < $iMax; $i++) {
+				$strtr_preg_quote[$escapeables[$i]] = $delimiter.$escapeables[$i];
 			}
 		}
 		return strtr($string, $strtr_preg_quote);
@@ -1042,5 +1093,3 @@ function imagesavealpha(&$img, $blendmode=true) {
 		return true;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/phpthumb/phpthumb.gif.php b/lib/phpthumb/phpthumb.gif.php
index d6ecffd5..94babc3e 100644
--- a/lib/phpthumb/phpthumb.gif.php
+++ b/lib/phpthumb/phpthumb.gif.php
@@ -43,14 +43,14 @@ function gif_loadFileToGDimageResource($gifFilename, $bgColor = -1)
 		}
 		// general strategy: convert raw data to PNG then convert PNG data to GD image resource
 		$PNGdata = $gif->getPng($bgColor);
-		if ($img = @ImageCreateFromString($PNGdata)) {
+		if ($img = @imagecreatefromstring($PNGdata)) {
 
 			// excellent - PNG image data successfully converted to GD image
 			return $img;
 
 		} elseif ($img = $gif->getGD_PixelPlotterVersion()) {
 
-			// problem: ImageCreateFromString() didn't like the PNG image data.
+			// problem: imagecreatefromstring() didn't like the PNG image data.
 			//   This has been known to happen in PHP v4.0.6
 			// solution: take the raw image data and create a new GD image and plot
 			//   pixel-by-pixel on the GD image. This is extremely slow, but it does
@@ -66,7 +66,7 @@ function gif_loadFileToGDimageResource($gifFilename, $bgColor = -1)
 
 function gif_outputAsBmp($gif, $lpszFileName, $bgColor = -1)
 {
-	if (!isSet($gif) || (@get_class($gif) <> 'cgif') || !$gif->loaded() || ($lpszFileName == '')) {
+	if (!isset($gif) || (@get_class($gif) <> 'cgif') || !$gif->loaded() || ($lpszFileName == '')) {
 		return false;
 	}
 
@@ -111,26 +111,26 @@ function gif_outputAsPng($gif, $lpszFileName, $bgColor = -1)
 function gif_outputAsJpeg($gif, $lpszFileName, $bgColor = -1)
 {
 	// JPEG output that does not require cjpeg added by James Heinrich <info@silisoftware.com> - December 10, 2003
-	if ((strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') && (file_exists('/usr/local/bin/cjpeg') || `which cjpeg`)) {
+	if ((strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') && (file_exists('/usr/local/bin/cjpeg') || shell_exec('which cjpeg'))) {
 
 		if (gif_outputAsBmp($gif, $lpszFileName.'.bmp', $bgColor)) {
 			exec('cjpeg '.$lpszFileName.'.bmp >'.$lpszFileName.' 2>/dev/null');
-			@unLink($lpszFileName.'.bmp');
+			@unlink($lpszFileName.'.bmp');
 
 			if (@file_exists($lpszFileName)) {
-				if (@fileSize($lpszFileName) > 0) {
+				if (@filesize($lpszFileName) > 0) {
 					return true;
 				}
 
-				@unLink($lpszFileName);
+				@unlink($lpszFileName);
 			}
 		}
 
 	} else {
 
 		// either Windows, or cjpeg not found in path
-		if ($img = @ImageCreateFromString($gif->getPng($bgColor))) {
-			if (@ImageJPEG($img, $lpszFileName)) {
+		if ($img = @imagecreatefromstring($gif->getPng($bgColor))) {
+			if (@imagejpeg($img, $lpszFileName)) {
 				return true;
 			}
 		}
@@ -163,14 +163,14 @@ function gif_getSize($gif, &$width, &$height)
 
 class CGIFLZW
 {
-	var $MAX_LZW_BITS;
-	var $Fresh, $CodeSize, $SetCodeSize, $MaxCode, $MaxCodeSize, $FirstCode, $OldCode;
-	var $ClearCode, $EndCode, $Next, $Vals, $Stack, $sp, $Buf, $CurBit, $LastBit, $Done, $LastByte;
+	public $MAX_LZW_BITS;
+	public $Fresh, $CodeSize, $SetCodeSize, $MaxCode, $MaxCodeSize, $FirstCode, $OldCode;
+	public $ClearCode, $EndCode, $Next, $Vals, $Stack, $sp, $Buf, $CurBit, $LastBit, $Done, $LastByte;
 
 	///////////////////////////////////////////////////////////////////////////
 
 	// CONSTRUCTOR
-	function CGIFLZW()
+	public function __construct()
 	{
 		$this->MAX_LZW_BITS = 12;
 		unSet($this->Next);
@@ -186,7 +186,7 @@ function CGIFLZW()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function deCompress($data, &$datLen)
+	public function deCompress($data, &$datLen)
 	{
 		$stLen  = strlen($data);
 		$datLen = 0;
@@ -210,10 +210,10 @@ function deCompress($data, &$datLen)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function LZWCommand(&$data, $bInit)
+	public function LZWCommand(&$data, $bInit)
 	{
 		if ($bInit) {
-			$this->SetCodeSize = ord($data{0});
+			$this->SetCodeSize = ord($data[0]);
 			$data = substr($data, 1);
 
 			$this->CodeSize    = $this->SetCodeSize + 1;
@@ -325,7 +325,7 @@ function LZWCommand(&$data, $bInit)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function GetCode(&$data, $bInit)
+	public function GetCode(&$data, $bInit)
 	{
 		if ($bInit) {
 			$this->CurBit   = 0;
@@ -347,12 +347,12 @@ function GetCode(&$data, $bInit)
 			$this->Buf[0] = $this->Buf[$this->LastByte - 2];
 			$this->Buf[1] = $this->Buf[$this->LastByte - 1];
 
-			$Count = ord($data{0});
+			$Count = ord($data[0]);
 			$data  = substr($data, 1);
 
 			if ($Count) {
 				for ($i = 0; $i < $Count; $i++) {
-					$this->Buf[2 + $i] = ord($data{$i});
+					$this->Buf[2 + $i] = ord($data[$i]);
 				}
 				$data = substr($data, $Count);
 			} else {
@@ -366,7 +366,7 @@ function GetCode(&$data, $bInit)
 
 		$iRet = 0;
 		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
-			$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+			$iRet |= (($this->Buf[ (int) ($i / 8) ] & (1 << ($i % 8))) != 0) << $j;
 		}
 
 		$this->CurBit += $this->CodeSize;
@@ -378,13 +378,13 @@ function GetCode(&$data, $bInit)
 
 class CGIFCOLORTABLE
 {
-	var $m_nColors;
-	var $m_arColors;
+	public $m_nColors;
+	public $m_arColors;
 
 	///////////////////////////////////////////////////////////////////////////
 
 	// CONSTRUCTOR
-	function CGIFCOLORTABLE()
+	public function __construct()
 	{
 		unSet($this->m_nColors);
 		unSet($this->m_arColors);
@@ -392,7 +392,7 @@ function CGIFCOLORTABLE()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function load($lpData, $num)
+	public function load($lpData, $num)
 	{
 		$this->m_nColors  = 0;
 		$this->m_arColors = array();
@@ -403,7 +403,7 @@ function load($lpData, $num)
 				return false;
 			}
 
-			$this->m_arColors[] = (ord($rgb{2}) << 16) + (ord($rgb{1}) << 8) + ord($rgb{0});
+			$this->m_arColors[] = (ord($rgb[2]) << 16) + (ord($rgb[1]) << 8) + ord($rgb[0]);
 			$this->m_nColors++;
 		}
 
@@ -412,13 +412,13 @@ function load($lpData, $num)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function toString()
+	public function toString()
 	{
 		$ret = '';
 
 		for ($i = 0; $i < $this->m_nColors; $i++) {
 			$ret .=
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
+				chr($this->m_arColors[ $i] & 0x000000FF)       . // R
 				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
 				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
 		}
@@ -428,7 +428,7 @@ function toString()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function toRGBQuad()
+	public function toRGBQuad()
 	{
 		$ret = '';
 
@@ -436,7 +436,7 @@ function toRGBQuad()
 			$ret .=
 				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16) . // B
 				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
+				chr($this->m_arColors[ $i] & 0x000000FF)       . // R
 				"\x00";
 		}
 
@@ -445,13 +445,14 @@ function toRGBQuad()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function colorIndex($rgb)
+	public function colorIndex($rgb)
 	{
-		$rgb  = intval($rgb) & 0xFFFFFF;
-		$r1   = ($rgb & 0x0000FF);
-		$g1   = ($rgb & 0x00FF00) >>  8;
-		$b1   = ($rgb & 0xFF0000) >> 16;
-		$idx  = -1;
+		$rgb = (int) $rgb & 0xFFFFFF;
+		$r1  = ($rgb & 0x0000FF);
+		$g1  = ($rgb & 0x00FF00) >>  8;
+		$b1  = ($rgb & 0xFF0000) >> 16;
+		$idx = -1;
+		$dif = 0;
 
 		for ($i = 0; $i < $this->m_nColors; $i++) {
 			$r2 = ($this->m_arColors[$i] & 0x000000FF);
@@ -473,21 +474,21 @@ function colorIndex($rgb)
 
 class CGIFFILEHEADER
 {
-	var $m_lpVer;
-	var $m_nWidth;
-	var $m_nHeight;
-	var $m_bGlobalClr;
-	var $m_nColorRes;
-	var $m_bSorted;
-	var $m_nTableSize;
-	var $m_nBgColor;
-	var $m_nPixelRatio;
-	var $m_colorTable;
+	public $m_lpVer;
+	public $m_nWidth;
+	public $m_nHeight;
+	public $m_bGlobalClr;
+	public $m_nColorRes;
+	public $m_bSorted;
+	public $m_nTableSize;
+	public $m_nBgColor;
+	public $m_nPixelRatio;
+	public $m_colorTable;
 
 	///////////////////////////////////////////////////////////////////////////
 
 	// CONSTRUCTOR
-	function CGIFFILEHEADER()
+	public function __construct()
 	{
 		unSet($this->m_lpVer);
 		unSet($this->m_nWidth);
@@ -503,7 +504,7 @@ function CGIFFILEHEADER()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function load($lpData, &$hdrLen)
+	public function load($lpData, &$hdrLen)
 	{
 		$hdrLen = 0;
 
@@ -518,13 +519,13 @@ function load($lpData, &$hdrLen)
 			return false;
 		}
 
-		$b = ord(substr($lpData, 10, 1));
+		$b = ord($lpData[ 10 ]);
 		$this->m_bGlobalClr  = ($b & 0x80) ? true : false;
 		$this->m_nColorRes   = ($b & 0x70) >> 4;
 		$this->m_bSorted     = ($b & 0x08) ? true : false;
 		$this->m_nTableSize  = 2 << ($b & 0x07);
-		$this->m_nBgColor    = ord(substr($lpData, 11, 1));
-		$this->m_nPixelRatio = ord(substr($lpData, 12, 1));
+		$this->m_nBgColor    = ord($lpData[ 11 ]);
+		$this->m_nPixelRatio = ord($lpData[ 12 ]);
 		$hdrLen = 13;
 
 		if ($this->m_bGlobalClr) {
@@ -540,9 +541,9 @@ function load($lpData, &$hdrLen)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function w2i($str)
+	public function w2i($str)
 	{
-		return ord(substr($str, 0, 1)) + (ord(substr($str, 1, 1)) << 8);
+		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
 	}
 }
 
@@ -550,20 +551,20 @@ function w2i($str)
 
 class CGIFIMAGEHEADER
 {
-	var $m_nLeft;
-	var $m_nTop;
-	var $m_nWidth;
-	var $m_nHeight;
-	var $m_bLocalClr;
-	var $m_bInterlace;
-	var $m_bSorted;
-	var $m_nTableSize;
-	var $m_colorTable;
+	public $m_nLeft;
+	public $m_nTop;
+	public $m_nWidth;
+	public $m_nHeight;
+	public $m_bLocalClr;
+	public $m_bInterlace;
+	public $m_bSorted;
+	public $m_nTableSize;
+	public $m_colorTable;
 
 	///////////////////////////////////////////////////////////////////////////
 
 	// CONSTRUCTOR
-	function CGIFIMAGEHEADER()
+	public function __construct()
 	{
 		unSet($this->m_nLeft);
 		unSet($this->m_nTop);
@@ -578,7 +579,7 @@ function CGIFIMAGEHEADER()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function load($lpData, &$hdrLen)
+	public function load($lpData, &$hdrLen)
 	{
 		$hdrLen = 0;
 
@@ -591,7 +592,7 @@ function load($lpData, &$hdrLen)
 			return false;
 		}
 
-		$b = ord($lpData{8});
+		$b = ord($lpData[8]);
 		$this->m_bLocalClr  = ($b & 0x80) ? true : false;
 		$this->m_bInterlace = ($b & 0x40) ? true : false;
 		$this->m_bSorted    = ($b & 0x20) ? true : false;
@@ -611,9 +612,9 @@ function load($lpData, &$hdrLen)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function w2i($str)
+	public function w2i($str)
 	{
-		return ord(substr($str, 0, 1)) + (ord(substr($str, 1, 1)) << 8);
+		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
 	}
 }
 
@@ -621,19 +622,19 @@ function w2i($str)
 
 class CGIFIMAGE
 {
-	var $m_disp;
-	var $m_bUser;
-	var $m_bTrans;
-	var $m_nDelay;
-	var $m_nTrans;
-	var $m_lpComm;
-	var $m_gih;
-	var $m_data;
-	var $m_lzw;
+	public $m_disp;
+	public $m_bUser;
+	public $m_bTrans;
+	public $m_nDelay;
+	public $m_nTrans;
+	public $m_lpComm;
+	public $m_gih;
+	public $m_data;
+	public $m_lzw;
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function CGIFIMAGE()
+	public function __construct()
 	{
 		unSet($this->m_disp);
 		unSet($this->m_bUser);
@@ -648,12 +649,12 @@ function CGIFIMAGE()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function load($data, &$datLen)
+	public function load($data, &$datLen)
 	{
 		$datLen = 0;
 
 		while (true) {
-			$b = ord($data{0});
+			$b = ord($data[0]);
 			$data = substr($data, 1);
 			$datLen++;
 
@@ -695,26 +696,26 @@ function load($data, &$datLen)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function skipExt(&$data, &$extLen)
+	public function skipExt(&$data, &$extLen)
 	{
 		$extLen = 0;
 
-		$b = ord($data{0});
+		$b = ord($data[0]);
 		$data = substr($data, 1);
 		$extLen++;
 
 		switch($b) {
 		case 0xF9: // Graphic Control
-			$b = ord($data{1});
+			$b = ord($data[1]);
 			$this->m_disp   = ($b & 0x1C) >> 2;
 			$this->m_bUser  = ($b & 0x02) ? true : false;
 			$this->m_bTrans = ($b & 0x01) ? true : false;
 			$this->m_nDelay = $this->w2i(substr($data, 2, 2));
-			$this->m_nTrans = ord($data{4});
+			$this->m_nTrans = ord($data[4]);
 			break;
 
 		case 0xFE: // Comment
-			$this->m_lpComm = substr($data, 1, ord($data{0}));
+			$this->m_lpComm = substr($data, 1, ord($data[0]));
 			break;
 
 		case 0x01: // Plain text
@@ -725,13 +726,13 @@ function skipExt(&$data, &$extLen)
 		}
 
 		// SKIP DEFAULT AS DEFS MAY CHANGE
-		$b = ord($data{0});
+		$b = ord($data[0]);
 		$data = substr($data, 1);
 		$extLen++;
 		while ($b > 0) {
 			$data = substr($data, $b);
 			$extLen += $b;
-			$b    = ord($data{0});
+			$b    = ord($data[0]);
 			$data = substr($data, 1);
 			$extLen++;
 		}
@@ -740,16 +741,18 @@ function skipExt(&$data, &$extLen)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function w2i($str)
+	public function w2i($str)
 	{
-		return ord(substr($str, 0, 1)) + (ord(substr($str, 1, 1)) << 8);
+		return ord($str[ 0 ]) + (ord($str[ 1 ]) << 8);
 	}
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function deInterlace()
+	public function deInterlace()
 	{
 		$data = $this->m_data;
+		$s = 0;
+		$y = 0;
 
 		for ($i = 0; $i < 4; $i++) {
 			switch($i) {
@@ -793,15 +796,15 @@ function deInterlace()
 
 class CGIF
 {
-	var $m_gfh;
-	var $m_lpData;
-	var $m_img;
-	var $m_bLoaded;
+	public $m_gfh;
+	public $m_lpData;
+	public $m_img;
+	public $m_bLoaded;
 
 	///////////////////////////////////////////////////////////////////////////
 
 	// CONSTRUCTOR
-	function CGIF()
+	public function __construct()
 	{
 		$this->m_gfh     = new CGIFFILEHEADER();
 		$this->m_img     = new CGIFIMAGE();
@@ -811,7 +814,7 @@ function CGIF()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function loadFile($lpszFileName, $iIndex)
+	public function loadFile($lpszFileName, $iIndex)
 	{
 		if ($iIndex < 0) {
 			return false;
@@ -821,7 +824,7 @@ function loadFile($lpszFileName, $iIndex)
 		if (!($fh = @fopen($lpszFileName, 'rb'))) {
 			return false;
 		}
-		$this->m_lpData = @fRead($fh, @fileSize($lpszFileName));
+		$this->m_lpData = @fread($fh, @filesize($lpszFileName));
 		fclose($fh);
 
 		// GET FILE HEADER
@@ -844,12 +847,12 @@ function loadFile($lpszFileName, $iIndex)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function getSize($lpszFileName, &$width, &$height)
+	public function getSize($lpszFileName, &$width, &$height)
 	{
 		if (!($fh = @fopen($lpszFileName, 'rb'))) {
 			return false;
 		}
-		$data = @fRead($fh, @fileSize($lpszFileName));
+		$data = @fread($fh, @filesize($lpszFileName));
 		@fclose($fh);
 
 		$gfh = new CGIFFILEHEADER();
@@ -864,7 +867,7 @@ function getSize($lpszFileName, &$width, &$height)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function getBmp($bgColor)
+	public function getBmp($bgColor)
 	{
 		$out = '';
 
@@ -887,6 +890,7 @@ function getBmp($bgColor)
 			}
 		} else {
 			$nColors =  0;
+			$rgbq    = '';
 			$bgColor = -1;
 		}
 
@@ -903,7 +907,7 @@ function getBmp($bgColor)
 					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
 					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
 					// PART OF IMAGE
-					if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
+					if (@$this->m_img->m_bTrans && (ord($data[$nPxl]) == $this->m_img->m_nTrans)) {
 						// TRANSPARENT -> BACKGROUND
 						if ($bgColor == -1) {
 							$bmp .= chr($this->m_gfh->m_nBgColor);
@@ -911,7 +915,7 @@ function getBmp($bgColor)
 							$bmp .= chr($bgColor);
 						}
 					} else {
-						$bmp .= $data{$nPxl};
+						$bmp .= $data[$nPxl];
 					}
 				} else {
 					// BACKGROUND
@@ -963,7 +967,7 @@ function getBmp($bgColor)
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function getPng($bgColor)
+	public function getPng($bgColor)
 	{
 		$out = '';
 
@@ -986,6 +990,7 @@ function getPng($bgColor)
 			}
 		} else {
 			$nColors =  0;
+			$pal     = '';
 			$bgColor = -1;
 		}
 
@@ -1002,7 +1007,7 @@ function getPng($bgColor)
 					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
 					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
 					// PART OF IMAGE
-					$bmp .= $data{$nPxl};
+					$bmp .= $data[$nPxl];
 				} else {
 					// BACKGROUND
 					if ($bgColor == -1) {
@@ -1066,8 +1071,8 @@ function getPng($bgColor)
 	// Added by James Heinrich <info@silisoftware.com> - January 5, 2003
 
 	// Takes raw image data and plots it pixel-by-pixel on a new GD image and returns that
-	// It's extremely slow, but the only solution when ImageCreateFromString() fails
-	function getGD_PixelPlotterVersion()
+	// It's extremely slow, but the only solution when imagecreatefromstring() fails
+	public function getGD_PixelPlotterVersion()
 	{
 		if (!$this->m_bLoaded) {
 			return false;
@@ -1082,14 +1087,15 @@ function getGD_PixelPlotterVersion()
 			die('No color table available in getGD_PixelPlotterVersion()');
 		}
 
-		$PlottingIMG = ImageCreate($this->m_gfh->m_nWidth, $this->m_gfh->m_nHeight);
+		$PlottingIMG = imagecreate($this->m_gfh->m_nWidth, $this->m_gfh->m_nHeight);
 		$NumColorsInPal = floor(strlen($pal) / 3);
+		$ThisImageColor = array();
 		for ($i = 0; $i < $NumColorsInPal; $i++) {
-			$ThisImageColor[$i] = ImageColorAllocate(
+			$ThisImageColor[$i] = imagecolorallocate(
 									$PlottingIMG,
-									ord($pal{(($i * 3) + 0)}),
-									ord($pal{(($i * 3) + 1)}),
-									ord($pal{(($i * 3) + 2)}));
+									ord($pal{($i * 3) + 0}),
+									ord($pal{($i * 3) + 1}),
+									ord($pal{($i * 3) + 2}));
 		}
 
 		// PREPARE BITMAP BITS
@@ -1106,14 +1112,14 @@ function getGD_PixelPlotterVersion()
 					($x <  ($this->m_img->m_gih->m_nLeft + $this->m_img->m_gih->m_nWidth)) &&
 					($y <  ($this->m_img->m_gih->m_nTop  + $this->m_img->m_gih->m_nHeight))) {
 					// PART OF IMAGE
-					if (@$this->m_img->m_bTrans && (ord($data{$nPxl}) == $this->m_img->m_nTrans)) {
-						ImageSetPixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
+					if (@$this->m_img->m_bTrans && (ord($data[$nPxl]) == $this->m_img->m_nTrans)) {
+						imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
 					} else {
-						ImageSetPixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[ord($data{$nPxl})]);
+						imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[ord($data[$nPxl])]);
 					}
 				} else {
 					// BACKGROUND
-					ImageSetPixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
+					imagesetpixel($PlottingIMG, $x, $this->m_gfh->m_nHeight - $y - 1, $ThisImageColor[$this->m_gfh->m_nBgColor]);
 				}
 			}
 			$nPxl -= $this->m_gfh->m_nWidth << 1;
@@ -1125,49 +1131,45 @@ function getGD_PixelPlotterVersion()
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function dword($val)
+	public function dword($val)
 	{
-		$val = intval($val);
+		$val = (int) $val;
 		return chr($val & 0xFF).chr(($val & 0xFF00) >> 8).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF000000) >> 24);
 	}
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function ndword($val)
+	public function ndword($val)
 	{
-		$val = intval($val);
+		$val = (int) $val;
 		return chr(($val & 0xFF000000) >> 24).chr(($val & 0xFF0000) >> 16).chr(($val & 0xFF00) >> 8).chr($val & 0xFF);
 	}
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function width()
+	public function width()
 	{
 		return $this->m_gfh->m_nWidth;
 	}
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function height()
+	public function height()
 	{
 		return $this->m_gfh->m_nHeight;
 	}
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function comment()
+	public function comment()
 	{
 		return $this->m_img->m_lpComm;
 	}
 
 	///////////////////////////////////////////////////////////////////////////
 
-	function loaded()
+	public function loaded()
 	{
 		return $this->m_bLoaded;
 	}
 }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-?>
\ No newline at end of file
diff --git a/lib/phpthumb/phpthumb.ico.php b/lib/phpthumb/phpthumb.ico.php
index aed7214c..9c906134 100644
--- a/lib/phpthumb/phpthumb.ico.php
+++ b/lib/phpthumb/phpthumb.ico.php
@@ -1,7 +1,8 @@
 <?php
 //////////////////////////////////////////////////////////////
-///  phpThumb() by James Heinrich <info@silisoftware.com>   //
-//        available at http://phpthumb.sourceforge.net     ///
+//   phpThumb() by James Heinrich <info@silisoftware.com>   //
+//        available at http://phpthumb.sourceforge.net      //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
 //////////////////////////////////////////////////////////////
 ///                                                         //
 // phpthumb.ico.php - .ICO output format functions          //
@@ -11,18 +12,20 @@
 
 class phpthumb_ico {
 
-	function phpthumb_ico() {
-		return true;
-	}
-
-
-	function GD2ICOstring(&$gd_image_array) {
+	public function GD2ICOstring(&$gd_image_array) {
+		$ImageWidths  = array();
+		$ImageHeights = array();
+		$bpp          = array();
+		$totalcolors  = array();
+		$icXOR        = array();
+		$icAND        = array();
+		$icANDmask    = array();
 		foreach ($gd_image_array as $key => $gd_image) {
 
-			$ImageWidths[$key]  = ImageSX($gd_image);
-			$ImageHeights[$key] = ImageSY($gd_image);
-	    	$bpp[$key]          = ImageIsTrueColor($gd_image) ? 32 : 24;
-	    	$totalcolors[$key]  = ImageColorsTotal($gd_image);
+			$ImageWidths[$key]  = imagesx($gd_image);
+			$ImageHeights[$key] = imagesy($gd_image);
+			$bpp[$key]          = imageistruecolor($gd_image) ? 32 : 24;
+			$totalcolors[$key]  = imagecolorstotal($gd_image);
 
 			$icXOR[$key] = '';
 			for ($y = $ImageHeights[$key] - 1; $y >= 0; $y--) {
@@ -52,31 +55,31 @@ function GD2ICOstring(&$gd_image_array) {
 			}
 			$icAND[$key] = '';
 			foreach ($icANDmask[$key] as $y => $scanlinemaskbits) {
-				for ($i = 0; $i < strlen($scanlinemaskbits); $i += 8) {
+				for ($i = 0, $iMax = strlen($scanlinemaskbits); $i < $iMax; $i += 8) {
 					$icAND[$key] .= chr(bindec(str_pad(substr($scanlinemaskbits, $i, 8), 8, '0', STR_PAD_LEFT)));
 				}
 			}
 
 		}
 
-	    foreach ($gd_image_array as $key => $gd_image) {
+		foreach ($gd_image_array as $key => $gd_image) {
 			$biSizeImage = $ImageWidths[$key] * $ImageHeights[$key] * ($bpp[$key] / 8);
 
-	    	// BITMAPINFOHEADER - 40 bytes
+			// BITMAPINFOHEADER - 40 bytes
 			$BitmapInfoHeader[$key]  = '';
 			$BitmapInfoHeader[$key] .= "\x28\x00\x00\x00";                              // DWORD  biSize;
 			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageWidths[$key], 4);      // LONG   biWidth;
 			// The biHeight member specifies the combined
 			// height of the XOR and AND masks.
 			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($ImageHeights[$key] * 2, 4); // LONG   biHeight;
-	    	$BitmapInfoHeader[$key] .= "\x01\x00";                                      // WORD   biPlanes;
-	   		$BitmapInfoHeader[$key] .= chr($bpp[$key])."\x00";                          // wBitCount;
+			$BitmapInfoHeader[$key] .= "\x01\x00";                                      // WORD   biPlanes;
+			$BitmapInfoHeader[$key] .= chr($bpp[$key])."\x00";                          // wBitCount;
 			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biCompression;
 			$BitmapInfoHeader[$key] .= phpthumb_functions::LittleEndian2String($biSizeImage, 4);            // DWORD  biSizeImage;
-	    	$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biXPelsPerMeter;
-	    	$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biYPelsPerMeter;
-	    	$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrUsed;
-	    	$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrImportant;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biXPelsPerMeter;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // LONG   biYPelsPerMeter;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrUsed;
+			$BitmapInfoHeader[$key] .= "\x00\x00\x00\x00";                              // DWORD  biClrImportant;
 		}
 
 
@@ -86,34 +89,32 @@ function GD2ICOstring(&$gd_image_array) {
 
 		$dwImageOffset = 6 + (count($gd_image_array) * 16);
 		foreach ($gd_image_array as $key => $gd_image) {
-	    	// ICONDIRENTRY   idEntries[1]; // An entry for each image (idCount of 'em)
+			// ICONDIRENTRY   idEntries[1]; // An entry for each image (idCount of 'em)
 
-	    	$icondata .= chr($ImageWidths[$key]);                     // bWidth;          // Width, in pixels, of the image
-	    	$icondata .= chr($ImageHeights[$key]);                    // bHeight;         // Height, in pixels, of the image
-	    	$icondata .= chr($totalcolors[$key]);                     // bColorCount;     // Number of colors in image (0 if >=8bpp)
-	    	$icondata .= "\x00";                                      // bReserved;       // Reserved ( must be 0)
+			$icondata .= chr($ImageWidths[$key]);                     // bWidth;          // Width, in pixels, of the image
+			$icondata .= chr($ImageHeights[$key]);                    // bHeight;         // Height, in pixels, of the image
+			$icondata .= chr($totalcolors[$key]);                     // bColorCount;     // Number of colors in image (0 if >=8bpp)
+			$icondata .= "\x00";                                      // bReserved;       // Reserved ( must be 0)
 
-	    	$icondata .= "\x01\x00";                                  // wPlanes;         // Color Planes
+			$icondata .= "\x01\x00";                                  // wPlanes;         // Color Planes
 			$icondata .= chr($bpp[$key])."\x00";                      // wBitCount;       // Bits per pixel
 
 			$dwBytesInRes = 40 + strlen($icXOR[$key]) + strlen($icAND[$key]);
 			$icondata .= phpthumb_functions::LittleEndian2String($dwBytesInRes, 4);       // dwBytesInRes;    // How many bytes in this resource?
 
-		    $icondata .= phpthumb_functions::LittleEndian2String($dwImageOffset, 4);      // dwImageOffset;   // Where in the file is this image?
+			$icondata .= phpthumb_functions::LittleEndian2String($dwImageOffset, 4);      // dwImageOffset;   // Where in the file is this image?
 			$dwImageOffset += strlen($BitmapInfoHeader[$key]);
 			$dwImageOffset += strlen($icXOR[$key]);
 			$dwImageOffset += strlen($icAND[$key]);
-	    }
+		}
 
-	    foreach ($gd_image_array as $key => $gd_image) {
+		foreach ($gd_image_array as $key => $gd_image) {
 			$icondata .= $BitmapInfoHeader[$key];
 			$icondata .= $icXOR[$key];
 			$icondata .= $icAND[$key];
-	    }
+		}
 
-	    return $icondata;
+		return $icondata;
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/phpthumb/phpthumb.unsharp.php b/lib/phpthumb/phpthumb.unsharp.php
index 33a0da66..a5c454ee 100644
--- a/lib/phpthumb/phpthumb.unsharp.php
+++ b/lib/phpthumb/phpthumb.unsharp.php
@@ -3,18 +3,19 @@
 ////
 ////            Unsharp Mask for PHP - version 2.1.1
 ////
-////    Unsharp mask algorithm by Torstein Hønsi 2003-07.
+////    Unsharp mask algorithm by Torstein Hønsi 2003-07.
 ////             thoensi_at_netcom_dot_no.
 ////               Please leave this notice.
 ////
 //////////////////////////////////////////////////////////////
-/// From: http://vikjavev.no/computing/ump.php              //
+//  From: http://vikjavev.no/computing/ump.php              //
 //                                                          //
 //  Reformatted by James Heinrich <info@silisoftware.com>   //
 //    for use in phpThumb() on 3 February 2003.             //
 //    updated to v2.1.1 on 24 April 2011                    //
 //                                                          //
-//  phpThumb() is found at http://phpthumb.sourceforge.net ///
+//  phpThumb() is found at http://phpthumb.sourceforge.net  //
+//         and/or https://github.com/JamesHeinrich/phpThumb //
 //////////////////////////////////////////////////////////////
 
 /*
@@ -36,13 +37,13 @@
 this means that low-contrast areas of the picture are left unrendered whereas edges
 are treated normally. This is good for pictures of e.g. skin or blue skies.
 
-Any suggenstions for improvement of the algorithm, expecially regarding the speed
+Any suggenstions for improvement of the algorithm, especially regarding the speed
 and the roundoff errors in the Gaussian blur process, are welcome.
 */
 
 class phpUnsharpMask {
 
-	function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
+	public static function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
 
 		// $img is an image that is already created within php using
 		// imgcreatetruecolor. No url! $img must be a truecolor image.
@@ -54,10 +55,10 @@ function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
 		if ($radius == 0) {
 			return true;
 		}
-		$w = ImageSX($img);
-		$h = ImageSY($img);
-		$imgCanvas = ImageCreateTrueColor($w, $h);
-		$imgBlur   = ImageCreateTrueColor($w, $h);
+		$w = imagesx($img);
+		$h = imagesy($img);
+		$imgCanvas = imagecreatetruecolor($w, $h);
+		$imgBlur   = imagecreatetruecolor($w, $h);
 
 		// Gaussian blur matrix:
 		//
@@ -73,20 +74,20 @@ function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
 				array(2, 4, 2),
 				array(1, 2, 1)
 			);
-			ImageCopy($imgBlur, $img, 0, 0, 0, 0, $w, $h);
-			ImageConvolution($imgBlur, $matrix, 16, 0);
+			imagecopy($imgBlur, $img, 0, 0, 0, 0, $w, $h);
+			imageconvolution($imgBlur, $matrix, 16, 0);
 
 		} else {
 
 			// Move copies of the image around one pixel at the time and merge them with weight
 			// according to the matrix. The same matrix is simply repeated for higher radii.
 			for ($i = 0; $i < $radius; $i++)    {
-				ImageCopy(     $imgBlur,   $img,       0, 0, 1, 0, $w - 1, $h);               // left
-				ImageCopyMerge($imgBlur,   $img,       1, 0, 0, 0, $w    , $h,     50);       // right
-				ImageCopyMerge($imgBlur,   $img,       0, 0, 0, 0, $w    , $h,     50);       // center
-				ImageCopy(     $imgCanvas, $imgBlur,   0, 0, 0, 0, $w    , $h);
-				ImageCopyMerge($imgBlur,   $imgCanvas, 0, 0, 0, 1, $w    , $h - 1, 33.33333); // up
-				ImageCopyMerge($imgBlur,   $imgCanvas, 0, 1, 0, 0, $w    , $h,     25);       // down
+				imagecopy(     $imgBlur,   $img,       0, 0, 1, 0, $w - 1, $h);               // left
+				imagecopymerge($imgBlur,   $img,       1, 0, 0, 0, $w    , $h,     50);       // right
+				imagecopymerge($imgBlur,   $img,       0, 0, 0, 0, $w    , $h,     50);       // center
+				imagecopy(     $imgCanvas, $imgBlur,   0, 0, 0, 0, $w    , $h);
+				imagecopymerge($imgBlur,   $imgCanvas, 0, 0, 0, 1, $w    , $h - 1, 33.33333); // up
+				imagecopymerge($imgBlur,   $imgCanvas, 0, 1, 0, 0, $w    , $h,     25);       // down
 			}
 		}
 
@@ -96,12 +97,12 @@ function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
 			for ($x = 0; $x < $w-1; $x++)    { // each row
 				for ($y = 0; $y < $h; $y++)    { // each pixel
 
-					$rgbOrig = ImageColorAt($img, $x, $y);
+					$rgbOrig = imagecolorat($img, $x, $y);
 					$rOrig = (($rgbOrig >> 16) & 0xFF);
 					$gOrig = (($rgbOrig >>  8) & 0xFF);
 					$bOrig =  ($rgbOrig        & 0xFF);
 
-					$rgbBlur = ImageColorAt($imgBlur, $x, $y);
+					$rgbBlur = imagecolorat($imgBlur, $x, $y);
 
 					$rBlur = (($rgbBlur >> 16) & 0xFF);
 					$gBlur = (($rgbBlur >>  8) & 0xFF);
@@ -114,20 +115,20 @@ function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
 					$bNew = ((abs($bOrig - $bBlur) >= $threshold) ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig)) : $bOrig);
 
 					if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
-						$pixCol = ImageColorAllocate($img, $rNew, $gNew, $bNew);
-						ImageSetPixel($img, $x, $y, $pixCol);
+						$pixCol = imagecolorallocate($img, $rNew, $gNew, $bNew);
+						imagesetpixel($img, $x, $y, $pixCol);
 					}
 				}
 			}
 		} else {
 			for ($x = 0; $x < $w; $x++)    { // each row
 				for ($y = 0; $y < $h; $y++)    { // each pixel
-					$rgbOrig = ImageColorAt($img, $x, $y);
+					$rgbOrig = imagecolorat($img, $x, $y);
 					$rOrig = (($rgbOrig >> 16) & 0xFF);
 					$gOrig = (($rgbOrig >>  8) & 0xFF);
 					$bOrig =  ($rgbOrig        & 0xFF);
 
-					$rgbBlur = ImageColorAt($imgBlur, $x, $y);
+					$rgbBlur = imagecolorat($imgBlur, $x, $y);
 
 					$rBlur = (($rgbBlur >> 16) & 0xFF);
 					$gBlur = (($rgbBlur >>  8) & 0xFF);
@@ -137,13 +138,12 @@ function applyUnsharpMask(&$img, $amount, $radius, $threshold) {
 					$gNew = min(255, max(0, ($amount * ($gOrig - $gBlur)) + $gOrig));
 					$bNew = min(255, max(0, ($amount * ($bOrig - $bBlur)) + $bOrig));
 					$rgbNew = ($rNew << 16) + ($gNew <<8) + $bNew;
-					ImageSetPixel($img, $x, $y, $rgbNew);
+					imagesetpixel($img, $x, $y, $rgbNew);
 				}
 			}
 		}
-		ImageDestroy($imgCanvas);
-		ImageDestroy($imgBlur);
+		imagedestroy($imgCanvas);
+		imagedestroy($imgBlur);
 		return true;
 	}
 }
-?>
\ No newline at end of file
diff --git a/lib/rss.php b/lib/rss.php
index 1f99f348..8add6a1f 100755
--- a/lib/rss.php
+++ b/lib/rss.php
@@ -48,7 +48,7 @@ function get_opendb_rss_feed_config($feed) {
 	reset ( $feeds_r );
 	
 	$buffer = '';
-	while ( list ( , $feed_r ) = each ( $feeds_r ) ) {
+	foreach ($feeds_r as $key => $feed_r) {
 		if ($feed_r ['feed'] == $feed) {
 			return $feed_r;
 		}
@@ -62,11 +62,11 @@ function get_opendb_rss_feeds_links($browser = 'firefox') {
 	reset ( $feeds_r );
 	
 	$buffer = "\n";
-	
-	while ( list ( , $feed_r ) = each ( $feeds_r ) ) {
+
+	foreach ($feeds_r as $key => $feed_r) {
 		$buffer .= "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $feed_r ['title'] . "\" href=\"./rss.php?feed=" . $feed_r ['feed'] . "\">\n";
 	}
 	return $buffer;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/secretimage.php b/lib/secretimage.php
index bcafa065..20ae581b 100755
--- a/lib/secretimage.php
+++ b/lib/secretimage.php
@@ -21,7 +21,7 @@
  */
 include_once("./lib/config.php");
 include_once("./lib/http.php");
-require_once ("./lib/GDImage.class.php");
+require_once ("./lib/ODImage.class.php");
 
 function get_secret_image_random_num() {
 	mt_srand ( ( double ) microtime () * 1000000 );
@@ -73,7 +73,7 @@ function CenterImageString($image, $image_width, $string, $font_size, $y, $color
 }
 
 function render_secret_image($random_num) {
-	$gdImage = new GDImage ( get_opendb_image_type () );
+	$gdImage = new ODImage ( get_opendb_image_type () );
 	$gdImage->createImage ( 'code_bg' );
 	$image = & $gdImage->getImage ();
 	$text_color = ImageColorAllocate ( $image, 80, 80, 80 );
diff --git a/lib/site/amazon.class.php b/lib/site/amazon.class.php
index 4aaa2a7f..c95b39aa 100644
--- a/lib/site/amazon.class.php
+++ b/lib/site/amazon.class.php
@@ -31,8 +31,8 @@ class amazon extends SitePlugin {
 				'amazonde' => array('asinId' => 'amazdeasin', 'url' => 'www.amazon.de')
 	);
 
-	function amazon($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 
 		$this->asinId = $this->sites[$site_type]['asinId'];
 		$this->url = $this->sites[$site_type]['url'];
@@ -217,7 +217,7 @@ function queryItem($search_attributes_r, $s_item_type) {
 		}
 
 		if (preg_match_all("!registerImage\(\"cust_image[^\"]*\", \"([^\"]+)\"!", $pageBuffer, $regs)) {
-			while (list(, $image) = each($regs[1])) {
+			foreach ($regs[1] as $image) {
                 // remove image extras _xxx_.
 				$image = preg_replace('!(\/[^.]+\.)_[^.]+_\.!', "$1", $image);
 				$this->addItemAttribute('cust_imageurl', $image);
@@ -682,7 +682,7 @@ function parse_amazon_video_data($search_attributes_r, $s_item_type, $pageBuffer
 					array("Spanish"), 
 					array("German"));
 
-			while (list(, $audio_lang) = @each($audio_lang_r)) {
+			foreach ($audio_lang_r as $audio_lang) {
 				$key = parse_language_info($audio_lang, $amazon_dvd_audio_map);
 				if ($key !== NULL) {
 					$this->addItemAttribute('audio_lang', $key);
@@ -700,7 +700,7 @@ function parse_amazon_video_data($search_attributes_r, $s_item_type, $pageBuffer
 
 			$audio_lang_r = explode(',', $regs[1]);
 
-			while (list(, $audio_lang) = @each($audio_lang_r)) {
+			foreach ($audio_lang_r as $audio_lang) {
 				$key = parse_language_info($audio_lang, $amazon_video_subtitle_map);
 				if ($key !== NULL) {
 					$this->addItemAttribute('subtitles', $key);
@@ -715,7 +715,7 @@ function parse_amazon_video_data($search_attributes_r, $s_item_type, $pageBuffer
 			if (preg_match_all("/<li>(.*)<\/li>/mUi", $dvdFeaturesBlock, $matches)) {
 				$dvd_extras = NULL;
 
-				while (list(, $item) = @each($matches[1])) {
+				foreach ($matches[1] as $item) {
 					$item = html_entity_decode(strip_tags($item), ENT_COMPAT, get_opendb_config_var('themes', 'charset') == 'utf-8' ? 'UTF-8' : 'ISO-8859-1');
 
 					// We may have a hard space here, so get rid of it.
@@ -757,7 +757,7 @@ function parse_amazon_video_data($search_attributes_r, $s_item_type, $pageBuffer
 					$itemData = $sitePlugin->getItemData();
 					if (is_array($itemData)) {
 						// merge data in here.
-						while (list($key, $value) = each($itemData)) {
+						foreach ($itemData as $key => $value) {
 							if ($key == 'actors')
 								$this->replaceItemAttribute('actors', $value);
 							else if ($key == 'director')
diff --git a/lib/site/amazonutils.php b/lib/site/amazonutils.php
index 1cf890ba..0ab693fa 100644
--- a/lib/site/amazonutils.php
+++ b/lib/site/amazonutils.php
@@ -145,12 +145,12 @@ function parse_amazon_video_people($header, $pageBuffer) {
 
 function parse_language_info($audio_lang, $audio_map) {
 	@reset($audio_map);
-	while (list($key, $find_r) = @each($audio_map)) {
+	foreach ($audio_map as $key => $find_r) {
 		$match = NULL;
 
 		// all components of the $find_r have to be present for a match to occur
 		$found = TRUE;
-		while (list(, $srch) = each($find_r)) {
+		foreach ($find_r as $srch) {
 			if (strpos($audio_lang, $srch) !== FALSE) {
 				if (strlen($match) > 0)
 					$match .= ' ';
@@ -192,4 +192,4 @@ function unaccent($text) {
 	}
 	return str_replace($search, $replace, $text);
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/site/cmbkdbt.class.php b/lib/site/cmbkdbt.class.php
index 3355a6af..f883710f 100644
--- a/lib/site/cmbkdbt.class.php
+++ b/lib/site/cmbkdbt.class.php
@@ -39,8 +39,8 @@
 include_once("./lib/SitePlugin.class.php");
 
 class cmbkdbt extends SitePlugin {
-	function cmbkdbt($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
@@ -398,4 +398,4 @@ function queryItemIssue($search_attributes_r, $s_item_type) {
 		return FALSE;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/site/dvdempire.class.php b/lib/site/dvdempire.class.php
index 722520ef..a928f89c 100644
--- a/lib/site/dvdempire.class.php
+++ b/lib/site/dvdempire.class.php
@@ -104,7 +104,7 @@ function parse_film_info_block($blockid, $block) {
 		$end = strlen($block);
 
 		reset($term);
-		while (list(, $value) = each($term)) {
+		foreach ($term as $value) {
 			$idx = strpos($block, "<b>$value:</b>", $start);
 
 			if ($idx !== FALSE && $idx < $end) {
@@ -126,8 +126,8 @@ function parse_film_info_block($blockid, $block) {
 }
 
 class dvdempire extends SitePlugin {
-	function dvdempire($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
@@ -266,7 +266,7 @@ function parse_dvdempire_video_data($search_attributes_r, $s_item_type, $buffer)
 			}
 
 			$ratio_list_r = array('1.33', '1.66', '1.78', '1.85', '2.35', '2.78');
-			while (list(, $ratio) = @each($ratio_list_r)) {
+			foreach ($ratio_list_r as $ratio) {
 				if (preg_match('/' . $ratio . ':1/', $video)) {
 					$this->addItemAttribute('ratio', $ratio);
 				}
diff --git a/lib/site/dvdfr.class.php b/lib/site/dvdfr.class.php
index bf16d64b..4871e822 100644
--- a/lib/site/dvdfr.class.php
+++ b/lib/site/dvdfr.class.php
@@ -50,8 +50,8 @@ function parse_dvdfr_release_date($day, $monthname, $year) {
 // Search for 'Au-dela de la gloire' to get an exact title match.
 //
 class dvdfr extends SitePlugin {
-	function dvdfr($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
@@ -198,7 +198,7 @@ function queryItem($search_attributes_r, $s_item_type) {
 		// Subtitles available
 		if (preg_match(":title=\"Sous-titres disponibles\"(.*?)</td>:sim", $parseblock, $regs)) {
 			if (preg_match_all(":<small>[\s]*(.*?)[\s]*</small>:sim", $regs[1], $result)) {
-				while (list(, $subtitle) = each($result[1])) {
+				foreach ($result[1] as $subtitle) {
 					if (substr($subtitle, -1) == '.') {
 						$subtitle = substr($subtitle, 0, -1);
 					}
@@ -232,4 +232,4 @@ function queryItem($search_attributes_r, $s_item_type) {
 		return TRUE;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/site/emusic.class.php b/lib/site/emusic.class.php
index 8c013aff..40106186 100644
--- a/lib/site/emusic.class.php
+++ b/lib/site/emusic.class.php
@@ -40,9 +40,8 @@
 include_once("./lib/SitePlugin.class.php");
 
 class emusic extends SitePlugin {
-
-	function emusic($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
diff --git a/lib/site/freedb.class.php b/lib/site/freedb.class.php
index a66c177d..8234f900 100644
--- a/lib/site/freedb.class.php
+++ b/lib/site/freedb.class.php
@@ -30,8 +30,8 @@ function get_hello_param() {
 // discid search
 
 class freedb extends SitePlugin {
-	function freedb($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function doDiscidSearch($search_vars_r) {
@@ -40,7 +40,7 @@ function doDiscidSearch($search_vars_r) {
 		$entries = NULL;
 
 		reset($freedb_categories);
-		while (list(, $cat) = each($freedb_categories)) {
+		foreach ($freedb_categories as $cat) {
 			$result = $this->fetchURI("http://freedb2.org/~cddb/cddb.cgi?cmd=cddb+read+$cat+" . $search_vars_r['freedb_id'] . "&hello=" . get_hello_param() . "&proto=5");
 			if (preg_match("/([0-9]+) /", $result, $regs) && $regs[1] != '401') {
 				$entry['cddbgenre'] = $cat;
@@ -80,7 +80,7 @@ function doAlbumSearch($search_vars_r) {
 
 				//blues 590ff119 Various Artists / Cool, Cool Blues, The Classic Sides (1951-54) - Disc B (Jackson, MS)
 				reset($lines);
-				while (list(, $line) = each($lines)) {
+				foreach ($lines as $line) {
 					$entry = NULL;
 					if (preg_match("/([^\ ]+) ([^\ ]+) ([^$]+)/", $line, $matches)) {
 						$entry['cddbgenre'] = $matches[1];
@@ -113,7 +113,7 @@ function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_
 			}
 
 			if (is_array($entries)) {
-				while (list(, $entry) = each($entries)) {
+				foreach ($entries as $entry) {
 					$this->addListingRow($entry['artist'] . ' / ' . $entry['title'], NULL, $entry['cddbgenre'] . '/' . $entry['freedb_id'], array('freedb_id' => $entry['freedb_id'], 'cddbgenre' => $entry['cddbgenre']));
 				}
 			}
diff --git a/lib/site/gbooks.class.php b/lib/site/gbooks.class.php
index 178cd899..485aaf4e 100755
--- a/lib/site/gbooks.class.php
+++ b/lib/site/gbooks.class.php
@@ -31,8 +31,8 @@ class gbooks extends SitePlugin {
 	
 	var $base_url='https://www.googleapis.com/books/v1/volumes';
 	
-	function gbooks($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
diff --git a/lib/site/hminfo.class.php b/lib/site/hminfo.class.php
index 935a3f90..df2844c9 100644
--- a/lib/site/hminfo.class.php
+++ b/lib/site/hminfo.class.php
@@ -105,8 +105,8 @@ function fetch_hometheaterinfo_rs($title, $upc_id = NULL, $hmi_id = NULL, $start
 }
 
 class hminfo extends SitePlugin {
-	function hminfo($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
@@ -206,7 +206,7 @@ function queryItem($search_attributes_r, $s_item_type) {
 			//------------------
 			if (strlen($hometheaterinfo_r['dvd_format']) > 0) {
 				$dvd_format_r = trim_explode(',', $hometheaterinfo_r['dvd_format']);
-				while (list(, $dvd_format) = each($dvd_format_r)) {
+				foreach ($dvd_format_r as $dvd_format) {
 					switch ($dvd_format) {
 					case 'LBX':
 						$this->addItemAttribute('dvd_format', 'LBX');
diff --git a/lib/site/iblist.class.php b/lib/site/iblist.class.php
index 33464f87..73f69eff 100644
--- a/lib/site/iblist.class.php
+++ b/lib/site/iblist.class.php
@@ -28,8 +28,8 @@
 include_once("./lib/SitePlugin.class.php");
 
 class iblist extends SitePlugin {
-	function iblist($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
diff --git a/lib/site/imdbphp.class.php b/lib/site/imdbphp.class.php
index 5fcdd2a5..5a27e3f8 100644
--- a/lib/site/imdbphp.class.php
+++ b/lib/site/imdbphp.class.php
@@ -31,8 +31,8 @@
 
 class imdbphp extends SitePlugin {
 	var $results;
-	function imdbphp($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
@@ -156,10 +156,10 @@ function queryItem($search_attributes_r, $s_item_type) {
 		$age_certification_codes_r = $this->getConfigValue('age_certification_codes');
 		if (!is_array($age_certification_codes_r) && strlen($age_certification_codes_r) > 0) // single value
 			$age_certification_codes_r = array($age_certification_codes_r);
-		if (is_array($age_certification_codes_r)) // get a single value for the age rating depending on the users settings
- {
+		if (is_array($age_certification_codes_r)) {
+			// get a single value for the age rating depending on the users settings
 			reset($age_certification_codes_r);
-			while (list(, $country) = @each($age_certification_codes_r)) {
+			foreach ($age_certification_codes_r as $country) {
 				$country = strtolower($country);
 
 				$ageRating = $this->getItemAttribute($country . '_age_rating');
diff --git a/lib/site/mangaupdat.class.php b/lib/site/mangaupdat.class.php
index ed5cc93e..609d4e31 100644
--- a/lib/site/mangaupdat.class.php
+++ b/lib/site/mangaupdat.class.php
@@ -27,8 +27,8 @@ function _html_to_utf8($data) {
 }
 
 class mangaupdat extends SitePlugin {
-	function mangaupdat($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
diff --git a/lib/site/michaeld.class.php b/lib/site/michaeld.class.php
index dceaf6c0..3fb0c031 100644
--- a/lib/site/michaeld.class.php
+++ b/lib/site/michaeld.class.php
@@ -25,8 +25,8 @@
 include_once("./lib/item_attribute.php");
 
 class michaeld extends SitePlugin {
-	function michaeld($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
@@ -246,7 +246,7 @@ function queryItem($search_attributes_r, $s_item_type) {
 						$itemData = $sitePlugin->getItemData();
 						if (is_array($itemData)) {
 							// merge data in here.
-							while (list($key, $value) = each($itemData)) {
+							foreach ($itemData as $key => $value) {
 								if ($key == 'actors')
 									$this->replaceItemAttribute('actors', $value);
 								else if ($key == 'director')
diff --git a/lib/site/mobygames.class.php b/lib/site/mobygames.class.php
index a5422a0a..cf393913 100644
--- a/lib/site/mobygames.class.php
+++ b/lib/site/mobygames.class.php
@@ -77,8 +77,8 @@ function parse_mobygames_release_date($date) {
     436	=> Not free for minors
  */
 class mobygames extends SitePlugin {
-	function mobygames($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
diff --git a/lib/site/moviemeter.class.php b/lib/site/moviemeter.class.php
index cd29ccef..1cd7209b 100644
--- a/lib/site/moviemeter.class.php
+++ b/lib/site/moviemeter.class.php
@@ -24,8 +24,8 @@
 include_once("./lib/SitePlugin.class.php");
 
 class moviemeter extends SitePlugin {
-	function moviemeter($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 	}
 
 	function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_vars_r) {
diff --git a/lib/site/odbamazonecs.class.php b/lib/site/odbamazonecs.class.php
index 65d39c11..cc32a8b1 100644
--- a/lib/site/odbamazonecs.class.php
+++ b/lib/site/odbamazonecs.class.php
@@ -26,8 +26,8 @@ class odbamazonecs extends SitePlugin {
 	private $isConfigured = FALSE;
 	private $client;
 
-	function odbamazonecs($site_type) {
-		parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 
 		$this->siteAttributeType = strtolower(fetch_site_attribute_type($site_type));
 
@@ -62,7 +62,7 @@ function queryListing($page_no, $items_per_page, $offset, $s_item_type, $search_
 			if (is_array($response['Items']) && is_array($response['Items']['Request']) && $response['Items']['Request']['IsValid'] == 'True') {
 				$this->setTotalCount($response['Items']['TotalResults']);
 
-				while (list(, $item_r) = each($response['Items']['Item'])) {
+				foreach ($response['Items']['Item'] as $item_r) {
 					$this->addListingRow($item_r['ItemAttributes']['Title'], $item_r['SmallImage']['URL'], NULL, array($this->siteAttributeType => $item_r['ASIN'], 'search.title' => $search_vars_r['title']));
 
 				}
@@ -96,7 +96,7 @@ function queryItem($search_attributes_r, $s_item_type) {
 			}
 
 			if (is_array($response['EditorialReviews']) && is_array($response['EditorialReviews']['EditorialReview'])) {
-				while (list(, $review_r) = each($response['EditorialReviews']['EditorialReview'])) {
+				foreach ($response['EditorialReviews']['EditorialReview'] as $review_r) {
 					$review = $review_r['Content'];
 					$review = str_replace("<br />", "\n", $review);
 					$review = trim(html_entity_decode(strip_tags($review)));
@@ -144,7 +144,7 @@ function queryItem($search_attributes_r, $s_item_type) {
 
 	function parse_video_data($attributes) {
 		if (is_array($attributes['Languages'])) {
-			while (list(, $lang_r) = each($attributes['Languages'])) {
+			foreach ($attributes['Languages'] as $lang_r) {
 				if ($lang_r['Type'] == 'Subtitled') {
 					$this->addItemAttribute('subtitles', $lang_r['Name']);
 				} else {
@@ -154,13 +154,13 @@ function parse_video_data($attributes) {
 		}
 
 		if (is_array($attributes['Actor'])) {
-			while (list(, $actor) = each($attributes['Actor'])) {
+			foreach ($attributes['Actor'] as $actor) {
 				$this->addItemAttribute('actors', $actor);
 			}
 		}
 
 		if (is_array($attributes['Director'])) {
-			while (list(, $director) = each($attributes['Director'])) {
+			foreach ($attributes['Director'] as $director) {
 				$this->addItemAttribute('director', $director);
 			}
 		} else {
@@ -186,11 +186,11 @@ function parse_video_data($attributes) {
 		}
 
 		if (is_array($attributes['Feature'])) {
-			while (list(, $feature) = each($attributes['Feature'])) {
+			foreach ($attributes['Feature'] as $feature) {
 				$this->addItemAttribute('dvd_extras', $feature);
 			}
 		}
 
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/site/tmdb.class.php b/lib/site/tmdb.class.php
index a47971c4..339344b1 100644
--- a/lib/site/tmdb.class.php
+++ b/lib/site/tmdb.class.php
@@ -29,8 +29,8 @@ class tmdb extends SitePlugin {
     private $imgResultsSize = '';
     private $apikey = '';
 
-    function tmdb($site_type) {
-        parent::SitePlugin($site_type);
+	function __construct($site_type) {
+		parent::__construct($site_type);
 
         $this->apikey = $this->_site_plugin_conf_r['tmdb_apikey'];
 
diff --git a/lib/site_plugin.php b/lib/site_plugin.php
index 2db14610..2043dc57 100644
--- a/lib/site_plugin.php
+++ b/lib/site_plugin.php
@@ -514,7 +514,7 @@ function get_expanded_and_mapped_site_plugin_item_variables_r($site_type, $s_ite
 	
 	// now for any variables that do not have a mapping, add them to the $new_attributes_r
 	reset ( $site_item_attributes_r );
-	while ( list ( $key, $value ) = @each ( $site_item_attributes_r ) ) {
+	foreach ( $site_item_attributes_r as $key => $value ) {
 		$key = strtolower ( $key );
 		if (isset ( $new_attributes_r [$key] )) {
 			$oldValue = NULL;
@@ -530,8 +530,8 @@ function get_expanded_and_mapped_site_plugin_item_variables_r($site_type, $s_ite
 				$new_attributes_r [$key] = $value;
 			else
 				$new_attributes_r [$key] [] = $value;
-			
-			while ( list ( , $value ) = each ( $oldValue ) ) {
+
+			foreach ( $oldValue as $value ) {
 				if (! in_array ( $value, $new_attributes_r [$key] )) {
 					$new_attributes_r [$key] [] = $value;
 				}
@@ -546,7 +546,7 @@ function get_expanded_and_mapped_site_plugin_item_variables_r($site_type, $s_ite
 	// now we need to check to see if any lookup mappings exist for each
 	// of the attribute values, and update the $value's appropriately.
 	reset ( $new_attributes_r );
-	while ( list ( $key, $value ) = @each ( $new_attributes_r ) ) {
+	foreach ( $new_attributes_r as $key => $value ) {
 		// temporary UPPER so we can work with actual s_attribute_type records in database
 		$s_attribute_type = strtoupper ( $key );
 		
@@ -674,4 +674,4 @@ function get_expanded_and_mapped_site_plugin_item_variables_r($site_type, $s_ite
 	
 	return $site_item_attributes_r;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/sortutils.php b/lib/sortutils.php
index b080c258..2a46328e 100644
--- a/lib/sortutils.php
+++ b/lib/sortutils.php
@@ -45,7 +45,7 @@ function get_usort_function($order_by_clause) {
 	
 	$first_element = TRUE;
 	$retval = NULL;
-	while ( list ( , $order_by ) = each ( $order_by_options_r ) ) {
+	foreach ($order_by_options_r as $order_by) {
 		if (strlen ( $retval ) > 0) {
 			$inner_val = $retval;
 		}
@@ -72,4 +72,4 @@ function get_usort_function($order_by_clause) {
 	
 	return $retval;
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/statsdata.php b/lib/statsdata.php
index 3edf220b..86d767a4 100644
--- a/lib/statsdata.php
+++ b/lib/statsdata.php
@@ -111,7 +111,7 @@ function build_item_ownership_chart_data() {
 			$num_total = 0;
 			if (is_not_empty_array ( $status_type_rs )) {
 				reset ( $status_type_rs );
-				while ( list ( $key, $status_type_r ) = each ( $status_type_rs ) ) {
+				foreach ($status_type_rs as $key => $status_type_r) {
 					$status_total = fetch_owner_s_status_type_item_cnt ( $user_r ['user_id'], $status_type_r ['s_status_type'] );
 					$num_total += $status_total;
 				}
@@ -207,4 +207,4 @@ function get_chart_alt_text($graphType, $itemType = NULL) {
 			return NULL;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/theme.php b/lib/theme.php
index e9b4c171..4b5f9147 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -1,5 +1,5 @@
 <?php
-/* 	
+/*
 	Open Media Collectors Database
 	Copyright (C) 2001,2013 by Jason Pell
 
@@ -59,13 +59,13 @@ function _theme_header($title = NULL, $inc_menu = TRUE) {
 		}
 		
 		$include_menu = ($inc_menu !== FALSE && $inc_menu !== 'N' ? TRUE : FALSE);
-		if (! $include_menu && strlen ( $HTTP_VARS ['mode'] ) == 0) {
-			$HTTP_VARS ['mode'] = 'no-menu';
+		if (! $include_menu && strlen($HTTP_VARS['mode'] ) == 0) {
+			$HTTP_VARS['mode'] = 'no-menu';
 		}
 		
 		$pageId = basename ( $PHP_SELF, '.php' );
 		
-		return theme_header ( $pageId, $title, $include_menu, $HTTP_VARS ['mode'], $user_id );
+		return theme_header( $pageId, $title, $include_menu, $HTTP_VARS['mode'], $user_id );
 	} else {
 		return NULL;
 	}
@@ -109,8 +109,8 @@ function get_theme_javascript($pageid) {
 	}
 	
 	$buffer = '';
-	
-	while ( list ( , $script ) = each ( $scripts ) ) {
+
+	foreach ($scripts as $script) {
 		$buffer .= get_javascript ( $script );
 	}
 	
@@ -122,24 +122,24 @@ function get_theme_css($pageid, $mode = NULL) {
 	
 	$buffer = "\n";
 	
-	$file_list = _theme_css_file_list ( $pageid );
+	$file_list = _theme_css_file_list( $pageid );
 	if (count ( $file_list ) > 0) {
-		while ( list ( , $css_file_r ) = each ( $file_list ) ) {
-			if (strlen ( $css_file_r ['browser'] ) == 0 || $_OpendbBrowserSniffer->isBrowser ( $css_file_r ['browser'] )) {
-				$buffer .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . $css_file_r ['file'] . "\">\n";
+		foreach ($file_list as $css_file_r) {
+			if (!isset($css_file_r['browser'] ) || $_OpendbBrowserSniffer->isBrowser ( $css_file_r['browser'] )) {
+				$buffer .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . $css_file_r['file'] . "\">\n";
 			}
 		}
 	}
-	
+
 	if ($mode == 'printable' || $mode == 'no-menu') {
 		$file_list = _theme_css_file_list ( $pageid, $mode );
 		if (count ( $file_list ) > 0) {
-			while ( list ( , $css_file_r ) = each ( $file_list ) ) {
+			foreach ($file_list as $css_file_r) {
 				$buffer .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . $css_file_r ['file'] . "\">\n";
 			}
 		}
 	}
-	
+
 	return $buffer;
 }
 
@@ -158,7 +158,7 @@ function _theme_css_file_list($pageid, $mode = NULL) {
 	$css_map = _theme_css_map ( $pageid );
 	if (is_not_empty_array ( $css_map )) {
 		reset ( $css_map );
-		while ( list ( , $page ) = each ( $css_map ) ) {
+		foreach ($css_map as $page) {
 			add_css_files ( $page, $mode, $css_file_list );
 		}
 	}
@@ -176,11 +176,11 @@ function add_css_files($pageid, $mode, &$css_file_list) {
 	if (strlen ( $mode ) == 0) {
 		if (strlen ( $theme ) > 0 && file_exists ( "./theme/$theme/${pageid}.css" )) {
 			$css_file_list [] = array (
-					'file' => "./theme/$theme/${pageid}.css" );
+				'file' => "./theme/$theme/${pageid}.css" );
 		}
 		
 		$browsers_r = $_OpendbBrowserSniffer->getSupportedBrowsers ();
-		while ( list ( , $browser ) = each ( $browsers_r ) ) {
+		foreach ($browsers_r as $browser) {
 			$suffix = str_replace ( ".", NULL, $browser );
 			
 			if (strlen ( $theme ) > 0 && file_exists ( "./theme/$theme/${pageid}_${suffix}.css" )) {
@@ -253,10 +253,10 @@ function theme_image_src($src) {
 
 		// temporary until we fix up the theme image calls to use the actual images that exist.
 		$extension_r = array($file_r['extension'], 'png', 'jpg', 'gif');
-		
-		while ( list ( , $dir ) = each ( $dirPaths ) ) {
+
+		foreach($dirPaths as $dir) {
 			reset ( $extension_r );
-			while ( list ( , $extension ) = each ( $extension_r ) ) {
+			foreach ($extension_r as $extension) {
 				$file = './' . $dir . '/' . $src . '.' . $extension;
 				if (file_exists ( $file )) {
 					return $file;
@@ -268,18 +268,6 @@ function theme_image_src($src) {
 	return FALSE; // no image found.
 }
 
-function find_filename() {
-	while ( list ( , $dir ) = each ( $dirPaths ) ) {
-		reset ( $extension_r );
-		while ( list ( , $extension ) = each ( $extension_r ) ) {
-			$file = './' . $dir . '/' . $src . '.' . $extension;
-			if (file_exists ( $file )) {
-				return $file;
-			}
-		}
-	}
-}
-
 /**
  * Guarantees that any image sources referenced are relative to opendb and currently
  * to make this validation simpler, only images which have at most one directory
@@ -355,7 +343,7 @@ function _theme_graph_config() {
 }
 
 function is_exists_theme($theme) {
-	if (strlen ( $theme ) <= 20 && file_exists ( "./theme/$theme/theme.php" ))
+	if (strlen( $theme ) <= 20 && file_exists( "./theme/$theme/theme.php" ))
 		return TRUE;
 	else
 		return FALSE;
@@ -404,4 +392,4 @@ function opendb_not_authorised_page($permission = NULL, $HTTP_VARS = NULL) {
 		echo _theme_footer ();
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/user.php b/lib/user.php
index 0497d24d..d33c0947 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -621,7 +621,7 @@ function generate_password($length) {
 
 function has_role_permission($role_name) {
     $user_r = fetch_user_r(get_opendb_session_var('user_id'));
-    if ($user_r['user_role'] == null) {
+    if ($user_r === FALSE || $user_r['user_role'] == null) {
         // Explicitly set role name to public access by default.
         $user_r['user_role'] = get_public_access_rolename();
     }
diff --git a/lib/utils.php b/lib/utils.php
index 11619e55..ba82c355 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -53,7 +53,7 @@ function deduplicate_array($value1, $value2) {
 // Only tested with normal $HTTP_VARS arrays which should _not_ go deeper than 2 levels in OpenDb.
 function stripslashes_array($array) {
 	$rs = array ();
-	while ( list ( $key, $val ) = @each ( $array ) ) {
+	foreach ($array as $key => $val) {
 		if (is_array ( $val )) {
 			$rs [$key] = stripslashes_array ( $val );
 		} else {
@@ -66,7 +66,7 @@ function stripslashes_array($array) {
 // Only tested with normal $HTTP_VARS arrays which should _not_ go deeper than 2 levels in OpenDb.
 function strip_tags_array($params) {
 	$rs = array ();
-	while ( list ( $key, $val ) = @each ( $params ) ) {
+	foreach ($params as $key => $val) {
 		if (is_array ( $val )) {
 			$rs [$key] = strip_tags_array ( $val );
 		} else {
@@ -89,10 +89,10 @@ function generate_random_num() {
 	instead.
 */
 function ifempty($value, $ifnull) {
-	if (strlen ( $value ) == 0)
-		return $ifnull;
-	else
+	if (isset($value) && strlen( $value ) > 0)
 		return $value;
+	else
+		return $ifnull;
 }
 
 /**
@@ -101,7 +101,7 @@ function ifempty($value, $ifnull) {
 	combination which is pissing me off.
 */
 function is_not_empty_array($array) {
-	if (is_array ( $array ) && count ( $array ) > 0)
+	if (isset( $array ) && is_array( $array ) && count( $array ) > 0)
 		return TRUE;
 	else
 		return FALSE;
@@ -254,7 +254,7 @@ function trim_url($str, $length) {
 function array_search2($needle, $haystack, $strcasecmp = FALSE) {
 	if (is_array ( $haystack )) {
 		reset ( $haystack );
-		while ( list ( $key, $value ) = each ( $haystack ) ) {
+		foreach ( $haystack as $key => $value ) {
 			if (($strcasecmp !== TRUE && strcmp ( $value, $needle ) === 0) || ($strcasecmp === TRUE && strcasecmp ( $value, $needle ) === 0)) {
 				return $key;
 			}
@@ -288,8 +288,8 @@ function format_sql_in_clause($values_r) {
 				$values_r );
 	else
 		$array_of_values = $values_r;
-	
-	while ( list ( , $value ) = @each ( $array_of_values ) ) {
+
+    foreach ($array_of_values as $value) {
 		if (strlen ( $inclause ) > 0)
 			$inclause .= ', ';
 		$inclause .= "'$value'";
@@ -319,7 +319,7 @@ function validate_ind_column($column, $options_r = NULL) {
 	Note: Match is NOT case sensitive.
 */
 function format_title_grammar_article($title, $articles) {
-	while ( list ( , $article ) = each ( $articles ) ) {
+    foreach ($articles as $article) {
 		$article = trim ( $article );
 		
 		// If $title starts with $entry - NOT CASE SENSITIVE!!!
@@ -359,7 +359,7 @@ function fetch_results_array($results) {
 		while ( $record_r = db_fetch_assoc ( $results ) ) {
 			$record_rs [] = $record_r;
 		}
-		db_free_result ( $lookup_results );
+		db_free_result ( $results );
 		
 		return $record_rs;
 	} else if (is_array ( $results )) {
diff --git a/lib/welcome/CategoryStats.class.php b/lib/welcome/CategoryStats.class.php
index c744afea..b039a6f1 100644
--- a/lib/welcome/CategoryStats.class.php
+++ b/lib/welcome/CategoryStats.class.php
@@ -29,12 +29,12 @@
  * 
  */
 class CategoryStats extends WelcomeBlock {
-	function CategoryStats() {
-		parent::WelcomeBlock('categorystats', 'category_stats', 'category_stats', PERM_VIEW_STATS);
+	function __construct() {
+		parent::__construct('categorystats', 'category_stats', 'category_stats', PERM_VIEW_STATS);
 	}
 
 	function renderBlock($userid, $lastvisit) {
 		return "\n<ul>" . "<li>" . render_chart_image('categories') . "</li>" . "\n</ul>";
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/welcome/LastItemsList.class.php b/lib/welcome/LastItemsList.class.php
index b2aac7c2..2fdfbb19 100644
--- a/lib/welcome/LastItemsList.class.php
+++ b/lib/welcome/LastItemsList.class.php
@@ -23,8 +23,8 @@
 include_once("./lib/whatsnew.php");
 
 class LastItemsList extends WelcomeBlock {
-	function LastItemsList() {
-		parent::WelcomeBlock('lastitemslist', 'last_items_list', 'last_items_list', PERM_VIEW_LISTINGS);
+	function __construct() {
+		parent::__construct('lastitemslist', 'last_items_list', 'last_items_list', PERM_VIEW_LISTINGS);
 	}
 
 	function renderBlock($userid, $lastvisit) {
@@ -35,4 +35,4 @@ function renderBlock($userid, $lastvisit) {
 			return FALSE;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/welcome/WhatsNew.class.php b/lib/welcome/WhatsNew.class.php
index 1fee340f..6a6f3f0a 100644
--- a/lib/welcome/WhatsNew.class.php
+++ b/lib/welcome/WhatsNew.class.php
@@ -23,21 +23,21 @@
 include_once("./lib/whatsnew.php");
 
 class WhatsNew extends WelcomeBlock {
-	function WhatsNew() {
-		parent::WelcomeBlock('whatsnew', 'whats_new', 'whats_new', PERM_VIEW_WHATSNEW);
+	function __construct() {
+		parent::__construct('whatsnew', 'whats_new', 'whats_new', PERM_VIEW_WHATSNEW);
 	}
 
 	function renderBlock($userid, $lastvisit) {
 		$whats_new_rs = get_whats_new_details($lastvisit, $userid);
 		if (is_array($whats_new_rs)) {
-			$buffer .= "\n<ul>";
-			while (list(, $whats_new_r) = each($whats_new_rs)) {
+			$buffer = "\n<ul>";
+			foreach ( $whats_new_rs as $key => $whats_new_r ) {
 				if (is_array($whats_new_r['items'])) {
 					$buffer .= "\n<li><ul class=\"block\">";
 					$buffer .= "\n<h4>" . $whats_new_r['heading'] . "</h4>";
 
 					reset($whats_new_r['items']);
-					while (list(, $item_rs) = each($whats_new_r['items'])) {
+					foreach ( $whats_new_r['items'] as $k => $item_rs ) {
 						$buffer .= "\n<li class=\"" . $item_rs['class'] . "\">" . $item_rs['content'] . "</li>";
 					}
 					$buffer .= "\n</ul></li>";
@@ -51,4 +51,4 @@ function renderBlock($userid, $lastvisit) {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/whatsnew.php b/lib/whatsnew.php
index 9f3b4298..14dfdc8e 100644
--- a/lib/whatsnew.php
+++ b/lib/whatsnew.php
@@ -28,6 +28,7 @@
 include_once("./lib/TitleMask.class.php");
 
 function get_last_num_items_rs($num_of_items, $owner_id = NULL, $s_item_type = NULL, $update_on = NULL, $not_owner_id = NULL, $site_url_prefix = NULL, $title_mask_id = NULL) {
+	$search_vars_r = array();
 	if (strlen ( $owner_id ) > 0)
 		$search_vars_r ['owner_id'] = $owner_id;
 	
@@ -100,9 +101,11 @@ function get_last_num_items_rs($num_of_items, $owner_id = NULL, $s_item_type = N
 					if ($site_url_prefix != NULL) {
 						$item_r ['imageurl'] ['url'] = $site_url_prefix . $item_r ['imageurl'] ['url'];
 					}
-					
-					$item_r ['imageurl'] ['width'] = $file_r ['thumbnail'] ['width'];
-					$item_r ['imageurl'] ['height'] = $file_r ['thumbnail'] ['height'];
+
+					if (isset($file_r['thumbnail']['width']))
+						$item_r['imageurl']['width'] = $file_r['thumbnail'] ['width'];
+					if (isset($file_r['thumbnail']['height']))
+						$item_r['imageurl']['height'] = $file_r['thumbnail']['height'];
 					
 					$item_r ['imageurl'] ['title'] = $item_r ['title'];
 				}
@@ -118,14 +121,14 @@ function get_last_num_items_rs($num_of_items, $owner_id = NULL, $s_item_type = N
 }
 
 function get_last_item_list($num_of_items, $owner_id = NULL, $s_item_type = NULL, $update_on = NULL, $not_owner_id = NULL, $site_url_prefix = NULL, $is_new_window_item_display = FALSE) {
-	$list_item_rs = get_last_num_items_rs ( $num_of_items, 	// number of items to return
-$owner_id, 	//owner_id 
-$s_item_type, 	// s_item_type
-$update_on, 	//update_on
-$not_owner_id, 	// not_owner_id
-$site_url_prefix, 'last_items_list' );
-	
-	while ( list ( , $list_item_r ) = @each ( $list_item_rs ) ) {
+	$list_item_rs = get_last_num_items_rs ( $num_of_items, 	// number of items to return
+											$owner_id, 	//owner_id
+											$s_item_type, 	// s_item_type
+											$update_on, 	//update_on
+											$not_owner_id, 	// not_owner_id
+											$site_url_prefix, 'last_items_list' );
+
+	foreach ( $list_item_rs as $key => $list_item_r ) {
 		$item_block = '';
 		
 		if ($is_new_window_item_display) {
@@ -168,9 +171,9 @@ function get_image_block($image_r, $class = NULL) {
 		if ($class != NULL)
 			$imageblock .= ' class="' . $class . '"';
 		
-		if (is_numeric ( $image_r ['width'] ))
+		if (is_numeric ( $image_r ['width'] ?? ""))
 			$imageblock .= ' width="' . $image_r ['width'] . '"';
-		if (is_numeric ( $image_r ['height'] ))
+		if (is_numeric ( $image_r ['height'] ?? "" ))
 			$imageblock .= ' height="' . $image_r ['height'] . '"';
 		
 		$imageblock .= ">";
@@ -181,7 +184,7 @@ function get_image_block($image_r, $class = NULL) {
 function get_last_item_list_marquee($blocks_r) {
 	$buffer = '';
 	if (is_array ( $blocks_r )) {
-		while ( list ( , $block ) = @each ( $blocks_r ) ) {
+		foreach ( $blocks_r as $key => $block ) {
 			$buffer .= "\n<div class=\"lastitemlist-item\" style=\"display: none;\">";
 			$buffer .= $block;
 			$buffer .= "</div>";
@@ -195,7 +198,7 @@ function get_last_item_list_table($blocks_r) {
 	$buffer = '';
 	if (is_array ( $blocks_r )) {
 		$buffer .= "\n<ul>";
-		while ( list ( , $block ) = @each ( $blocks_r ) ) {
+		foreach ( $blocks_r as $key => $block ) {
 			$buffer .= "\n<li>" . $block . "\n</li>";
 		}
 		$buffer .= "\n</ul>";
@@ -246,7 +249,7 @@ function get_whats_new_details($update_on, $user_id = NULL) {
 				
 				if ($status_items_updated > 0) {
 					$item_r ['class'] = 'tick';
-					$item_r ['content'] = '<a href="listings.php?' . (strlen ( $search_vars_r ['not_owner_id'] ) > 0 ? 'not_owner_id=' . $search_vars_r ['not_owner_id'] . '&' : '') . 's_status_type=' . $status_type_r ['s_status_type'] . '&update_on=' . urlencode ( $update_on ) . '">' . $status_title . '</a>';
+					$item_r ['content'] = '<a href="listings.php?' . (strlen ( $search_vars_r['not_owner_id'] ?? '' ) > 0 ? 'not_owner_id=' . $search_vars_r ['not_owner_id'] . '&' : '') . 's_status_type=' . $status_type_r ['s_status_type'] . '&update_on=' . urlencode ( $update_on ) . '">' . $status_title . '</a>';
 				} else {
 					$item_r ['class'] = 'cross';
 					$item_r ['content'] = $status_title;
@@ -323,4 +326,4 @@ function get_whats_new_details($update_on, $user_id = NULL) {
 		return NULL;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/widgets.php b/lib/widgets.php
index 3267da1d..f621181e 100644
--- a/lib/widgets.php
+++ b/lib/widgets.php
@@ -98,7 +98,7 @@ function custom_select($name, $lookup_results, $display_mask, $size = 1, $value
 	$empty_display_mask = expand_display_mask ( $display_mask, NULL, '%' );
 	
 	$value_found = FALSE;
-	while ( $lookup_r = each ( $lookup_results ) ) {
+	foreach ( $lookup_results as $lookup_r ) {
 		// Check if this record should be included in list of values.
 		if (! function_exists ( $include_ind_func ) || $include_ind_func ( $lookup_r )) {
 			$lookup_value = get_array_variable_value ( $lookup_r, $value_column );
@@ -106,8 +106,7 @@ function custom_select($name, $lookup_results, $display_mask, $size = 1, $value
 			$display = expand_display_mask ( $display_mask, $lookup_r, '%' );
 			
 			// if all variables were replaced with nothing, then assume empty option
-			if (strlen ( strval ( $lookup_value ) ) == 0 && $display == $empty_display_mask) 			//thawn: added strval() to fix variable type mismatch warning in php5.3
-{
+			if (strlen ( strval ( $lookup_value ) ) == 0 && $display == $empty_display_mask) {			//thawn: added strval() to fix variable type mismatch warning in php5.3
 				$display = '';
 			}
 			
@@ -117,11 +116,11 @@ function custom_select($name, $lookup_results, $display_mask, $size = 1, $value
 				else
 					$var .= "\n<option value=\"" . $lookup_value . "\">$display";
 			} else {
-				if (! $value_found && $value == NULL && $lookup_r [$checked_ind] == 'Y')
+				if (!$value_found && $value == NULL && ( $checked_ind == "" || $lookup_r [$checked_ind] == 'Y')) {
 					$var .= "\n<option value=\"" . $lookup_value . "\" SELECTED>$display";
-				else {
-					if (strcasecmp ( trim ( $value ), strval ( $lookup_value ) ) === 0) 					//thawn: added strval() to fix variable type mismatch warning in php5.3
-{
+					$value_found = TRUE;
+				} else {
+					if (strcasecmp ( trim ( $value ), strval ( $lookup_value ) ) === 0) { 					//thawn: added strval() to fix variable type mismatch warning in php5.3
 						$value_found = TRUE;
 						$var .= "\n<option value=\"" . $lookup_value . "\" SELECTED>$display";
 					} else {
@@ -219,15 +218,15 @@ function format_footer_links($links_rs) {
 			}
 			
 			$field .= "\"><a";
-			if (strlen ( $footer_links_r ['url'] ) > 0) {
+			if (strlen ( $footer_links_r ['url'] ?? '' ) > 0) {
 				$field .= " href=\"" . $footer_links_r ['url'] . "\"";
 			}
 			
-			if (strlen ( $footer_links_r ['onclick'] ) > 0) {
+			if (strlen ( $footer_links_r ['onclick'] ?? '') > 0) {
 				$field .= " onclick=\"" . $footer_links_r ['onclick'] . "\" ";
 			}
 			
-			if (starts_with ( $footer_links_r ['target'], 'popup' )) {
+			if (starts_with ( $footer_links_r ['target'] ?? '', 'popup' )) {
 				$spec = prc_function_spec ( $footer_links_r ['target'] );
 				
 				if (! is_array ( $spec ['args'] )) {
@@ -237,10 +236,10 @@ function format_footer_links($links_rs) {
 				
 				$field .= " onclick=\"popup('" . $footer_links_r ['url'] . "','" . $spec ['args'] [0] . "','" . $spec ['args'] [1] . "'); return false;\">";
 			} else {
-				$field .= (strlen ( $footer_links_r ['target'] ) > 0 ? "target=\"" . $footer_links_r ['target'] . "\"" : "") . ">";
+				$field .= (strlen ( $footer_links_r ['target'] ?? "") > 0 ? "target=\"" . $footer_links_r ['target'] . "\"" : "") . ">";
 			}
 			
-			if (strlen ( $footer_links_r ['img'] ) > 0) {
+			if (strlen ( $footer_links_r ['img'] ?? '' ) > 0) {
 				$field .= '<img src="' . $footer_links_r ['img'] . '" title="' . $footer_links_r ['text'] . '">';
 			}
 			
@@ -271,11 +270,11 @@ function _format_help_list($help_entry) {
 	$field = '';
 	
 	if (is_array ( $help_entry ) && ! isset ( $help_entry ['text'] )) {
-		while ( list ( $key, $entry ) = each ( $help_entry ) ) {
+		foreach ( $help_entry as $entry ) {
 			$field .= _format_help_list ( $entry );
 		}
 	} else {
-		$field .= "\n<li class=\"help_entry_" . $help_entry ['type'] . "\">" . _format_help_entry ( $help_entry ) . "</li>";
+		$field .= "\n<li>" . _format_help_entry ( $help_entry ) . "</li>";
 	}
 	
 	return $field;
@@ -291,6 +290,8 @@ function format_help_block($help_entries_rs) {
 				$help_entries_rs );
 	else if (is_array ( $help_entries_rs ))
 		$entries [] = & $help_entries_rs;
+	else
+		$entries = array();
 	
 	if (is_array ( $entries )) {
 		return "\n<ul class=\"help\">" . _format_help_list ( $entries ) . "</ul>\n";
@@ -302,12 +303,15 @@ function format_help_block($help_entries_rs) {
 function format_action_links($action_links_rs) {
 	$field = '';
 	$first = TRUE;
-	while ( list ( , $action_link_r ) = @each ( $action_links_rs ) ) {
+	if (!isset($action_links_rs))
+		return NULL;
+
+	foreach ($action_links_rs as $action_link_r) {
 		if (strlen ( $action_link_r ['img'] ) > 0)
 			$action_image = theme_image ( 'action_' . $action_link_r ['img'], $action_link_r ['text'], "action" );
 		else
 			$action_image = FALSE;
-		
+
 		$field .= "<li class=\"" . ($first ? 'first' : '') . "\"><a href=\"" . $action_link_r ['url'] . "\">";
 		if ($first)
 			$first = FALSE;
@@ -336,7 +340,7 @@ function format_checkbox_action_links($cbname, $not_checked_message, $action_lin
 	$first = TRUE;
 	
 	@reset ( $action_links_rs );
-	while ( list ( , $action_links_r ) = @each ( $action_links_rs ) ) {
+	foreach ($action_links_rs as $action_links_r) {
 		$field .= "<li class=\"" . ($first ? 'first' : '') . "\">";
 		
 		if ($action_links_r ['checked'] !== FALSE) {
@@ -387,7 +391,7 @@ function format_error_block($errors, $err_type = 'error') {
 		$error_rs = $errors;
 	
 	$error_entries = NULL;
-	while ( list ( , $error ) = each ( $error_rs ) ) {
+	foreach ($error_rs as $error) {
 		if (is_not_empty_array ( $error )) {
 			$error_entry = $error ['error'];
 			
@@ -398,7 +402,7 @@ function format_error_block($errors, $err_type = 'error') {
 			
 			if (is_not_empty_array ( $detail_rs )) {
 				$details = "";
-				while ( list ( , $detail ) = each ( $detail_rs ) ) {
+				foreach ( $detail_rs as $detail ) {
 					$details .= "\n<li class=\"$smclass\">" . $detail . "</li>";
 				}
 				
@@ -414,7 +418,7 @@ function format_error_block($errors, $err_type = 'error') {
 	
 	if (count ( $error_entries ) > 1) {
 		$error_block = "\n<ul>";
-		while ( list ( , $error_entry ) = each ( $error_entries ) ) {
+		foreach ( $error_entries as $error_entry ) {
 			$error_block .= "\n<li class=\"$class\">$error_entry</li>";
 		}
 		$error_block .= "</ul>";
diff --git a/lib/xajax/xajax_core/plugin_layer/support/xajaxUserFunction.inc.php b/lib/xajax/xajax_core/plugin_layer/support/xajaxUserFunction.inc.php
index 661f5d17..c49aa03e 100644
--- a/lib/xajax/xajax_core/plugin_layer/support/xajaxUserFunction.inc.php
+++ b/lib/xajax/xajax_core/plugin_layer/support/xajaxUserFunction.inc.php
@@ -106,7 +106,7 @@ class.
 				
 			$xajax->register(XAJAX_FUNCTION, $myUserFunction);				
 	*/
-	public function xajaxUserFunction($uf) // /*deprecated parameters */ $sInclude=NULL, $aConfiguration=array())
+	public function __construct($uf) // /*deprecated parameters */ $sInclude=NULL, $aConfiguration=array())
 	{
 		$this->sAlias = '';
 		$this->uf = $uf;
diff --git a/lib/xajax/xajax_core/plugin_layer/xajaxEventPlugin.inc.php b/lib/xajax/xajax_core/plugin_layer/xajaxEventPlugin.inc.php
index 215f77a4..3c25e64f 100644
--- a/lib/xajax/xajax_core/plugin_layer/xajaxEventPlugin.inc.php
+++ b/lib/xajax/xajax_core/plugin_layer/xajaxEventPlugin.inc.php
@@ -72,7 +72,7 @@ class xajaxEventPlugin extends xajaxRequestPlugin
 	/*
 		Function: xajaxEventPlugin
 	*/
-	function xajaxEventPlugin()
+	function __construct()
 	{
 		$this->aEvents = array();
 
diff --git a/lib/xajax/xajax_core/plugin_layer/xajaxFunctionPlugin.inc.php b/lib/xajax/xajax_core/plugin_layer/xajaxFunctionPlugin.inc.php
index 51ef0ec5..a0d249c5 100644
--- a/lib/xajax/xajax_core/plugin_layer/xajaxFunctionPlugin.inc.php
+++ b/lib/xajax/xajax_core/plugin_layer/xajaxFunctionPlugin.inc.php
@@ -81,7 +81,7 @@ class xajaxFunctionPlugin extends xajaxRequestPlugin
 		be used to determine if the request is for a registered function in
 		<xajaxFunctionPlugin->canProcessRequest>
 	*/
-	function xajaxFunctionPlugin()
+	function __construct()
 	{
 		$this->aFunctions = array();
 
diff --git a/lib/xajax/xajax_core/plugin_layer/xajaxScriptPlugin.inc.php b/lib/xajax/xajax_core/plugin_layer/xajaxScriptPlugin.inc.php
index ba867da1..d4dfd10f 100644
--- a/lib/xajax/xajax_core/plugin_layer/xajaxScriptPlugin.inc.php
+++ b/lib/xajax/xajax_core/plugin_layer/xajaxScriptPlugin.inc.php
@@ -66,7 +66,7 @@ class xajaxScriptPlugin extends xajaxRequestPlugin
 		GET data (parameters passed on the request URI) and store them
 		for later use.
 	*/
-	function xajaxScriptPlugin()
+	function __construct()
 	{
 		$this->sRequestURI = '';
 		$this->bDeferScriptGeneration = false;
diff --git a/lib/xajax/xajax_core/xajaxArgumentManager.inc.php b/lib/xajax/xajax_core/xajaxArgumentManager.inc.php
index 6c997bbc..2c43d3b6 100644
--- a/lib/xajax/xajax_core/xajaxArgumentManager.inc.php
+++ b/lib/xajax/xajax_core/xajaxArgumentManager.inc.php
@@ -241,9 +241,6 @@ private function __construct()
 			$this->nMethod = XAJAX_METHOD_GET;
 			$this->aArgs = $_GET['xjxargs'];
 		}
-		if (1 == get_magic_quotes_gpc())
-			array_walk($this->aArgs, array(&$this, '__argumentStripSlashes'));
-
 		array_walk($this->aArgs, array(&$this, '__argumentDecode'));
 	}
 	
diff --git a/lib/xajax/xajax_core/xajaxRequest.inc.php b/lib/xajax/xajax_core/xajaxRequest.inc.php
index a6ae6ae2..fb396a96 100644
--- a/lib/xajax/xajax_core/xajaxRequest.inc.php
+++ b/lib/xajax/xajax_core/xajaxRequest.inc.php
@@ -312,7 +312,7 @@ class xajaxCustomRequest extends xajaxRequest
 		aVariables - (associative array, optional):  An array of variable name, 
 			value pairs that will be passed to <xajaxCustomRequest->setVariable>
 	*/
-	function xajaxCustomRequest($sScript)
+	function __construct($sScript)
 	{
 		$this->aVariables = array();
 		$this->sScript = $sScript;
diff --git a/lib/xajax/xajax_core/xajaxResponse.inc.php b/lib/xajax/xajax_core/xajaxResponse.inc.php
index ca24ccb4..563b3943 100644
--- a/lib/xajax/xajax_core/xajaxResponse.inc.php
+++ b/lib/xajax/xajax_core/xajaxResponse.inc.php
@@ -1974,7 +1974,7 @@ class xajaxCustomResponse
 	protected $sCharacterEncoding;
 	protected $bOutputEntities;
 	
-	function xajaxCustomResponse($sContentType)
+	function __construct($sContentType)
 	{
 		$this->sOutput = '';
 		$this->sContentType = $sContentType;
diff --git a/listings.php b/listings.php
index 8d46d6cd..9765c5e5 100644
--- a/listings.php
+++ b/listings.php
@@ -51,7 +51,7 @@ function getListingFiltersBlock() {
 
 	$buffer = '';
 
-	if ($HTTP_VARS['listings.filters'] != 'N' && get_opendb_config_var('listings.filters', 'enable') !== FALSE) {
+	if (($HTTP_VARS['listings.filters'] ?? '') != 'N' && get_opendb_config_var('listings.filters', 'enable') !== FALSE) {
 		$excluded_vars_list = NULL;
 
 		$buffer .= "<div id=\"listing-filters\" class=\"menuContainer toggleContainer\">";
@@ -131,7 +131,10 @@ function getListingFiltersBlock() {
 function fetch_cached_attribute_type_r($s_attribute_type) {
 	global $_OPENDB_DB_CACHE;
 
-	if (!is_array($_OPENDB_DB_CACHE['s_attribute_type']) || !is_array($_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type])) {
+	if (!isset($_OPENDB_DB_CACHE['s_attribute_type']) ||
+        !is_array($_OPENDB_DB_CACHE['s_attribute_type']) ||
+		!isset($_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type]) ||
+        !is_array($_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type])) {
 		$_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type] = fetch_attribute_type_r($s_attribute_type);
 	}
 
@@ -177,7 +180,7 @@ function get_list_item_type_groups() {
 
 function is_item_type_in_item_type_r($v_item_types, $s_item_type) {
 	reset($v_item_types);
-	while (list(, $item_type_r) = each($v_item_types)) {
+	foreach ( $v_item_types as $item_type_r ) {
 		if ($item_type_r['value'] == $s_item_type) {
 			return TRUE;
 		}
@@ -300,27 +303,45 @@ function &filter_for_printable_list($column_display_config_rs) {
 }
 
 function get_column_display_config(&$HTTP_VARS, $show_owner_column, $show_action_column, $show_interest_column) {
-	$v_column_display_config_rs = get_s_item_listing_column_conf_rs($HTTP_VARS['s_item_type_group'], $HTTP_VARS['s_item_type']);
+	$v_column_display_config_rs = get_s_item_listing_column_conf_rs($HTTP_VARS['s_item_type_group'] ?? '', $HTTP_VARS['s_item_type'] ?? '');
 
 	if ($HTTP_VARS['mode'] == 'printable') {
 		$v_column_display_config_rs = &filter_for_printable_list($v_column_display_config_rs);
 	}
 
-	if ($HTTP_VARS['attr_match'] != 'category' && strlen($HTTP_VARS['attribute_type']) > 0) {
+	if (isset($HTTP_VARS['attr_match']) && $HTTP_VARS['attr_match'] != 'category' && strlen($HTTP_VARS['attribute_type']) > 0) {
 		// Now we have to merge in search terms, and add them after the 'title' column_id
-		$v_column_display_config_rs = &merge_display_column_config_arrays($v_column_display_config_rs,
-				array(
-						array('column_type' => 's_attribute_type', 's_attribute_type' => $HTTP_VARS['attribute_type'], 'attribute_val' => $HTTP_VARS['attribute_val'], 'lookup_attribute_val' => $HTTP_VARS['lookup_attribute_val'], 'attr_match' => $HTTP_VARS['attr_match'],
-								'attr_update_on' => $HTTP_VARS['attr_update_on'], 'orderby_support_ind' => 'Y', 'attr_update_on_days' => $HTTP_VARS['attr_update_on_days'], 'search_attribute_ind' => ifempty($HTTP_VARS['search_list'], $HTTP_VARS['attribute_list']))));
+		$v_column_display_config_rs = &merge_display_column_config_arrays(
+			$v_column_display_config_rs,
+			array(
+				array('column_type' => 's_attribute_type',
+					  's_attribute_type' => $HTTP_VARS['attribute_type'],
+					  'attribute_val' => $HTTP_VARS['attribute_val'],
+					  'lookup_attribute_val' => $HTTP_VARS['lookup_attribute_val'],
+					  'attr_match' => $HTTP_VARS['attr_match'],
+					  'attr_update_on' => $HTTP_VARS['attr_update_on'],
+					  'attr_update_on_days' => $HTTP_VARS['attr_update_on_days'],
+					  'orderby_support_ind' => 'Y',
+					  'search_attribute_ind' => ifempty($HTTP_VARS['search_list'], $HTTP_VARS['attribute_list']))));
 	}
 
 	// need to add status_comment to listing if search for status comment enabled.							
-	if (strlen($HTTP_VARS['status_comment']) > 0) {
-		$v_column_display_config_rs = &merge_display_column_config_arrays($v_column_display_config_rs, array(array('column_type' => 's_field_type', 's_field_type' => 'STATUSCMNT')));
+	if (strlen($HTTP_VARS['status_comment'] ?? '') > 0) {
+		$v_column_display_config_rs = &merge_display_column_config_arrays(
+			$v_column_display_config_rs,
+			array(
+				array(
+					'column_type' => 's_field_type',
+					's_field_type' => 'STATUSCMNT')));
 	}
 
-	if (strlen($HTTP_VARS['rating']) > 0) {
-		$v_column_display_config_rs = &merge_display_column_config_arrays($v_column_display_config_rs, array(array('column_type' => 's_field_type', 's_field_type' => 'RATING')));
+	if (strlen($HTTP_VARS['rating'] ?? '') > 0) {
+		$v_column_display_config_rs = &merge_display_column_config_arrays(
+			$v_column_display_config_rs,
+			array(
+				array(
+					'column_type' => 's_field_type',
+					's_field_type' => 'RATING')));
 	}
 
 	for ($i = 0; $i < count($v_column_display_config_rs); $i++) {
@@ -329,7 +350,7 @@ function get_column_display_config(&$HTTP_VARS, $show_owner_column, $show_action
 		if ($v_column_display_config_rs[$i]['column_type'] == 's_attribute_type') {
 			$v_attribute_type_r = fetch_cached_attribute_type_r($v_column_display_config_rs[$i]['s_attribute_type']);
 			if (is_array($v_attribute_type_r)) {
-				if (strlen($HTTP_VARS['s_item_type']) > 0) {
+				if (strlen($HTTP_VARS['s_item_type'] ?? '') > 0) {
 					$v_column_display_config_rs[$i]['prompt'] = ifempty(fetch_s_item_type_attr_prompt($HTTP_VARS['s_item_type'], $v_column_display_config_rs[$i]['s_attribute_type']), $v_attribute_type_r['prompt']);
 				} else {
 					$v_column_display_config_rs[$i]['prompt'] = ifempty($v_column_display_config_rs[$i]['override_prompt'], $v_attribute_type_r['prompt']);
@@ -339,7 +360,9 @@ function get_column_display_config(&$HTTP_VARS, $show_owner_column, $show_action
 				if ($v_attribute_type_r['lookup_attribute_ind'] == 'Y') {
 					$v_column_display_config_rs[$i]['lookup_attribute_ind'] = 'Y';
 
-					if (strlen($v_column_display_config_rs[$i]['lookup_attribute_val']) == 0 && strlen($v_column_display_config_rs[$i]['attribute_val']) > 0) {
+					if (strlen($v_column_display_config_rs[$i]['lookup_attribute_val'] ?? '') == 0 &&
+						strlen($v_column_display_config_rs[$i]['attribute_val'] ?? '') > 0)
+					{
 						$v_column_display_config_rs[$i]['lookup_attribute_val'] = $v_column_display_config_rs[$i]['attribute_val'];
 						$v_column_display_config_rs[$i]['attribute_val'] = NULL;
 					}
@@ -359,7 +382,11 @@ function get_column_display_config(&$HTTP_VARS, $show_owner_column, $show_action
 				$v_column_display_config_rs[$i]['include_in_listing'] = FALSE;
 
 				// TODO - revise to get rid of this reverse logic!!!! 
-				if ($v_column_display_config_rs[$i]['search_attribute_ind'] != 'y' || $v_column_display_config_rs[$i]['item_listing_conf_ind'] == 'Y' || $v_column_display_config_rs[$i]['attr_match'] != 'exact' || get_opendb_config_var('listings', 'show_exact_match_search_columns') !== FALSE) {
+				if (($v_column_display_config_rs[$i]['search_attribute_ind'] ?? '') != 'y' ||
+					$v_column_display_config_rs[$i]['item_listing_conf_ind'] == 'Y' ||
+					$v_column_display_config_rs[$i]['attr_match'] != 'exact' ||
+					get_opendb_config_var('listings', 'show_exact_match_search_columns') !== FALSE)
+				{
 					$v_column_display_config_rs[$i]['include_in_listing'] = TRUE;
 				}
 			} else {
@@ -455,7 +482,7 @@ function get_match_type($match) {
 		$HTTP_VARS['title_match'] = ifempty($HTTP_VARS['title_match'], 'exact');
 
 		if ($HTTP_VARS['title_match'] == 'word' || $HTTP_VARS['title_match'] == 'partial') {
-			if (is_null($HTTP_VARS['title_case']))
+			if (!isset($HTTP_VARS['title_case']))
 				$searches[] = array('prompt' => get_opendb_lang_var('title') . ' (<em>' . get_match_type($HTTP_VARS['title_match']) . '</em>)', 'field' => $HTTP_VARS['title']);
 			else
 				$searches[] = array('prompt' => get_opendb_lang_var('title') . ' (<em>' . get_match_type($HTTP_VARS['title_match']) . ', ' . get_opendb_lang_var('case_sensitive') . '</em>)', 'field' => $HTTP_VARS['title']);
@@ -464,7 +491,7 @@ function get_match_type($match) {
 		}
 	}
 
-	if (strlen($HTTP_VARS['category']) > 0) {
+	if (strlen($HTTP_VARS['category'] ?? '') > 0) {
 		// If s_item_type defined, we can get at the s_attribute_type of the category value.
 		if (strlen($HTTP_VARS['s_item_type']) > 0) {
 			$attribute_type_r = fetch_sfieldtype_item_attribute_type_r($HTTP_VARS['s_item_type'], 'CATEGORY');
@@ -474,17 +501,17 @@ function get_match_type($match) {
 		}
 	}
 
-	if (strlen($HTTP_VARS['owner_id']) > 0) {
+	if (strlen($HTTP_VARS['owner_id'] ?? '') > 0) {
 		$username = fetch_user_name($HTTP_VARS['owner_id']);
 		if (strlen($username) > 0)
 			$searches[] = array('prompt' => get_opendb_lang_var('owner'), 'field' => $username . ' (' . $HTTP_VARS['owner_id'] . ')');
 	}
 
-	if (strlen($HTTP_VARS['s_item_type_group']) > 0) {
+	if (strlen($HTTP_VARS['s_item_type_group'] ?? '') > 0) {
 		$searches[] = array('prompt' => get_opendb_lang_var('s_item_type_group'), 'field' => $HTTP_VARS['s_item_type_group']);
 	}
 
-	if (is_array($HTTP_VARS['s_item_type'])) {
+	if (is_array($HTTP_VARS['s_item_type'] ?? '')) {
 		$field = '';
 		for ($i = 0; $i < count($HTTP_VARS['s_item_type']); $i++) {
 			$item_type_r = fetch_item_type_r($HTTP_VARS['s_item_type'][$i]);
@@ -492,19 +519,20 @@ function get_match_type($match) {
 		}
 
 		$searches[] = array('prompt' => get_opendb_lang_var('s_item_type'), 'field' => $field);
-	} else if (strlen($HTTP_VARS['s_item_type']) > 0) {
+
+	} else if (strlen($HTTP_VARS['s_item_type'] ?? '') > 0) {
 		$item_type_r = fetch_item_type_r($HTTP_VARS['s_item_type']);
 		$searches[] = array('prompt' => get_opendb_lang_var('s_item_type'), 'field' => theme_image($item_type_r['image'], $item_type_r['description'], 's_item_type'));
 	}
 
-	if (is_numeric($HTTP_VARS['rating'])) {
+	if (is_numeric($HTTP_VARS['rating'] ?? '')) {
 		$attribute_type_r = fetch_cached_attribute_type_r('S_RATING');
 
 		$searches[] = array('prompt' => $attribute_type_r['prompt'], 'field' => get_display_field($attribute_type_r['s_attribute_type'], NULL, 'review()', $HTTP_VARS['rating'], FALSE));
 	}
 
 	$attribute_type_r = NULL;
-	if (strlen($HTTP_VARS['attribute_type']) > 0) {
+	if (strlen($HTTP_VARS['attribute_type'] ?? '') > 0) {
 		$attribute_type_r = fetch_cached_attribute_type_r($HTTP_VARS['attribute_type']);
 		if (is_not_empty_array($attribute_type_r)) {
 			$attribute_type_r['listing_link_ind'] = 'N';
@@ -536,8 +564,8 @@ function get_match_type($match) {
 			}
 		}//if(is_not_empty_array($attribute_type_r))
 	} else {
-		if (strlen($HTTP_VARS['attribute_val']) > 0) { // specified a search term without attribute type, this is a global search.
- 			if (is_null($HTTP_VARS['attr_case'])) {
+		if (strlen($HTTP_VARS['attribute_val'] ?? '') > 0) { // specified a search term without attribute type, this is a global search.
+ 			if (!isset($HTTP_VARS['attr_case'])) {
 				$searches[] = array('prompt' => get_opendb_lang_var('attribute_val') . ' (<em>' . get_match_type(ifempty($HTTP_VARS['attr_match'], 'exact')) . '</em>)', 'field' => stripslashes($HTTP_VARS['attribute_val']));
 			} else {
 				$searches[] = array('prompt' => get_opendb_lang_var('attribute_val') . ' (<em>' . get_match_type(ifempty($HTTP_VARS['attr_match'], 'exact')) . ', ' . get_opendb_lang_var('case_sensitive') . '</em>)', 'field' => stripslashes($HTTP_VARS['attribute_val']));
@@ -546,7 +574,7 @@ function get_match_type($match) {
 	}
 
 	// add another search field if update_on value also specified.	
-	if (strlen($HTTP_VARS['attr_update_on']) > 0) {
+	if (strlen($HTTP_VARS['attr_update_on'] ?? '') > 0) {
 		if (is_not_empty_array($attribute_type_r))
 			$prompt = get_opendb_lang_var('attribute_prompt_updated', array('s_attribute_type' => $attribute_type_r['s_attribute_type'], 'prompt' => $attribute_type_r['prompt']));
 		else
@@ -556,7 +584,7 @@ function get_match_type($match) {
 			$searches[] = array('prompt' => $prompt, 'field' => $HTTP_VARS['attr_update_on'] . ' (' . $HTTP_VARS['datetimemask'] . ')');
 		else
 			$searches[] = array('prompt' => $prompt, 'field' => $HTTP_VARS['attr_update_on']);
-	} else if (is_numeric($HTTP_VARS['attr_update_on_days'])) {
+	} else if (is_numeric($HTTP_VARS['attr_update_on_days'] ?? '')) {
 		if (is_not_empty_array($attribute_type_r))
 			$prompt = get_opendb_lang_var('attribute_prompt_updated', array('s_attribute_type' => $attribute_type_r['s_attribute_type'], 'prompt' => $attribute_type_r['prompt']));
 		else
@@ -574,12 +602,12 @@ function get_match_type($match) {
 		$searches[] = array('prompt' => $prompt, 'field' => $field);
 	}
 
-	if (strlen($HTTP_VARS['update_on']) > 0) {
+	if (strlen($HTTP_VARS['update_on'] ?? '') > 0) {
 		if (strlen($HTTP_VARS['datetimemask']) > 0)
 			$searches[] = array('prompt' => get_opendb_lang_var('updated'), 'field' => $HTTP_VARS['update_on'] . ' (' . $HTTP_VARS['datetimemask'] . ')');
 		else
 			$searches[] = array('prompt' => get_opendb_lang_var('updated'), 'field' => $HTTP_VARS['update_on']);
-	} else if (is_numeric($HTTP_VARS['update_on_days'])) {
+	} else if (is_numeric($HTTP_VARS['update_on_days'] ?? '')) {
 		if ($HTTP_VARS['update_on_days'] == '1')
 			$field = get_opendb_lang_var('one_day_ago');
 		else if ($HTTP_VARS['update_on_days'] == '7')
@@ -592,7 +620,7 @@ function get_match_type($match) {
 		$searches[] = array('prompt' => get_opendb_lang_var('updated'), 'field' => $field);
 	}
 
-	if (is_not_empty_array($HTTP_VARS['s_status_type']) > 0) {
+	if (is_not_empty_array($HTTP_VARS['s_status_type'] ?? NULL) > 0) {
 		$search = '';
 		for ($i = 0; $i < count($HTTP_VARS['s_status_type']); $i++) {
 			if (strlen($search) > 0) {
@@ -610,12 +638,12 @@ function get_match_type($match) {
 		}
 	}
 
-	if (strlen($HTTP_VARS['status_comment']) > 0) {
+	if (strlen($HTTP_VARS['status_comment'] ?? NULL) > 0) {
 		// Default status_comment match is exact match.
 		$HTTP_VARS['status_comment_match'] = ifempty($HTTP_VARS['status_comment_match'], 'exact');
 
 		if ($HTTP_VARS['status_comment_match'] == 'word' || $HTTP_VARS['status_comment_match'] == 'partial' || $HTTP_VARS['status_comment_match'] == 'exact') {
-			if (is_null($HTTP_VARS['status_comment_case']))
+			if (!isset($HTTP_VARS['status_comment_case']))
 				$searches[] = array('prompt' => get_opendb_lang_var('status_comment') . ' (<em>' . get_match_type($HTTP_VARS['status_comment_match']) . '</em>)', 'field' => $HTTP_VARS['status_comment']);
 			else
 				$searches[] = array('prompt' => get_opendb_lang_var('status_comment') . ' (<em>' . get_match_type($HTTP_VARS['status_comment_match']) . ', ' . get_opendb_lang_var('case_sensitive') . '</em>)', 'field' => $HTTP_VARS['status_comment']);
@@ -623,7 +651,7 @@ function get_match_type($match) {
 			$searches[] = array('prompt' => get_opendb_lang_var('status_comment'), 'field' => $HTTP_VARS['status_comment']);
 		}
 	}
-	if (is_numeric($HTTP_VARS['interest_level']) && $HTTP_VARS['interest_level'] > 0) {
+	if (is_numeric($HTTP_VARS['interest_level'] ?? NULL) && $HTTP_VARS['interest_level'] > 0) {
 		$searches[] = array('prompt' => get_opendb_lang_var('interest'), 'field' => theme_image("interest_1.gif", get_opendb_lang_var('interest'), 's_item_type'));
 	}
 
@@ -633,9 +661,9 @@ function get_match_type($match) {
 if (is_site_enabled()) {
 	if (is_opendb_valid_session() || is_site_public_access()) {
 		if (is_user_granted_permission(PERM_VIEW_LISTINGS)) {
-			$v_item_types = get_list_item_types($HTTP_VARS['s_item_type_group'], $HTTP_VARS['s_item_type']);
-			if (!is_array($HTTP_VARS['s_item_type']) && strlen($HTTP_VARS['s_item_type']) > 0 && is_not_empty_array($v_item_types)) {
-				if (!is_item_type_in_item_type_r($v_item_types, $HTTP_VARS['s_item_type'])) {
+			$v_item_types = get_list_item_types($HTTP_VARS['s_item_type_group'] ?? "", $HTTP_VARS['s_item_type'] ?? NULL);
+			if (!is_array($HTTP_VARS['s_item_type'] ?? "") && strlen($HTTP_VARS['s_item_type'] ?? "") > 0 && is_not_empty_array($v_item_types)) {
+				if (!is_item_type_in_item_type_r($v_item_types, $HTTP_VARS['s_item_type'] ?? NULL)) {
 					unset($HTTP_VARS['s_item_type']);
 				}
 			}
@@ -656,7 +684,7 @@ function get_match_type($match) {
 				$xajax->processRequest();
 			}
 
-			if (strlen($HTTP_VARS['owner_id']) > 0)
+			if (strlen($HTTP_VARS['owner_id'] ?? '') > 0)
 				$show_owner_column = FALSE;
 			else
 				$show_owner_column = TRUE;
@@ -680,7 +708,7 @@ function get_match_type($match) {
 			}
 
 			if (get_opendb_config_var('listings', 'show_input_actions') !== FALSE) {
-				if (is_user_granted_permission(PERM_ITEM_OWNER) && (strlen($HTTP_VARS['not_owner_id']) == 0 || $HTTP_VARS['not_owner_id'] != get_opendb_session_var('user_id')) && (strlen($HTTP_VARS['owner_id']) == 0 || $HTTP_VARS['owner_id'] == get_opendb_session_var('user_id'))) {
+				if (is_user_granted_permission(PERM_ITEM_OWNER) && (strlen($HTTP_VARS['not_owner_id'] ?? "") == 0 || $HTTP_VARS['not_owner_id'] != get_opendb_session_var('user_id')) && (strlen($HTTP_VARS['owner_id'] ?? '') == 0 || $HTTP_VARS['owner_id'] == get_opendb_session_var('user_id'))) {
 					$show_action_column = TRUE;
 				}
 			}
@@ -689,7 +717,7 @@ function get_match_type($match) {
 
 			$page_title = NULL;
 			if ($HTTP_VARS['search_list'] == 'y' || $HTTP_VARS['attribute_list'] == 'y') {
-				if (strlen($HTTP_VARS['override_page_title']) > 0)
+				if (strlen($HTTP_VARS['override_page_title'] ?? '') > 0)
 					$page_title = $HTTP_VARS['override_page_title'];
 				else
 					$page_title = get_opendb_lang_var('search_results');
@@ -715,21 +743,24 @@ function get_match_type($match) {
 					$page_title = get_opendb_lang_var('all_item_listing');
 			}
 
-			echo (_theme_header($page_title, $HTTP_VARS['inc_menu']));
+			echo (_theme_header($page_title, $HTTP_VARS['inc_menu'] ?? NULL));
 			echo ('<h2>' . $page_title . '</h2>');
 
 			if ($HTTP_VARS['search_list'] == 'y' || $HTTP_VARS['attribute_list'] == 'y') {
 				// default search term if attribute_type specified, but no value provided.
-				if (strlen($HTTP_VARS['attribute_type']) > 0 && strlen($HTTP_VARS['attribute_val']) == 0 && strlen($HTTP_VARS['lookup_attribute_val']) == 0) {
+				if (strlen($HTTP_VARS['attribute_type'] ?? '') > 0 &&
+					strlen($HTTP_VARS['attribute_val'] ?? '') == 0 &&
+					strlen($HTTP_VARS['lookup_attribute_val'] ?? '') == 0)
+				{
 					$HTTP_VARS['attribute_val'] = '%';
 				}
 
-				if ($HTTP_VARS['show_search_query_matrix'] != 'N') {
+				if (($HTTP_VARS['show_search_query_matrix'] ?? '') != 'N') {
 					$matrix_rs = get_search_query_matrix($HTTP_VARS);
 					if (is_not_empty_array($matrix_rs)) {
 						echo ('<div class="search-query"><dl>');
 
-						while (list(, $matrix_r) = each($matrix_rs)) {
+						foreach ( $matrix_rs as $matrix_r ) {
 							echo ('<dt>' . $matrix_r['prompt'] . '</dt>' . '<dd>' . $matrix_r['field'] . '</dd>');
 						}
 						echo ('</dl></div>');
diff --git a/login.php b/login.php
index aa74a984..c0aea8e4 100644
--- a/login.php
+++ b/login.php
@@ -113,6 +113,7 @@ function show_login_form($HTTP_VARS, $errors = NULL) {
 		document.forms['login']['uid'].focus();
 	</script>");
 
+	$footer_links_r = array();
 	if (is_site_enabled() && is_valid_opendb_mailer()) {
 		if (strlen($HTTP_VARS['uid']) > 0 && get_opendb_config_var('login', 'enable_new_pwd_gen') !== FALSE && is_user_granted_permission(PERM_CHANGE_PASSWORD, $HTTP_VARS['uid'])) {
 			$footer_links_r[] = array('url' => $PHP_SELF . "?op=newpassword&uid=" . urlencode($HTTP_VARS['uid']), 'text' => get_opendb_lang_var('forgot_your_pwd'));
@@ -240,4 +241,4 @@ function perform_newpassword($HTTP_VARS, &$errors) {
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/quick_checkout.php b/quick_checkout.php
index d46aea8d..e5d005ba 100644
--- a/quick_checkout.php
+++ b/quick_checkout.php
@@ -85,14 +85,14 @@ function display_borrower_form($HTTP_VARS) {
 function is_item_instance_in_array($item_instance_r, $item_instance_rs) {
 	if (is_array($item_instance_rs)) {
 		reset($item_instance_rs);
-		while (list(, $instance_r) = each($item_instance_rs)) {
-			if ($instance_r['item_id'] == $item_instance_r['item_id'] && $instance_r['instance_no'] == $item_instance_r['instance_no']) {
+		foreach ($item_instance_rs as $instance_r) {
+			if ($instance_r['item_id'] == $item_instance_r['item_id'] &&
+				$instance_r['instance_no'] == $item_instance_r['instance_no']) {
 				return TRUE;
 			}
 		}
 	}
 
-	//else
 	return FALSE;
 }
 
@@ -143,7 +143,7 @@ function get_decoded_item_instance_rs($op, $item_instance_list_r) {
 	$item_instance_rs = array();
 	if (is_array($item_instance_list_r)) {
 		reset($item_instance_list_r);
-		while (list(, $item_id_and_instance_no) = each($item_instance_list_r)) {
+		foreach($item_instance_list_r as $item_id_and_instance_no) {
 			if (strlen($item_id_and_instance_no) > 0) {
 				$item_instance_r = get_item_id_and_instance_no($item_id_and_instance_no);
 				if (is_not_empty_array($item_instance_r)) {
@@ -171,7 +171,7 @@ function get_encoded_item_instance_rs($checkout_item_instance_rs) {
 
 	if (is_array($checkout_item_instance_rs)) {
 		reset($checkout_item_instance_rs);
-		while (list(, $item_instance_r) = each($checkout_item_instance_rs)) {
+		foreach ($checkout_item_instance_rs as $item_instance_r) {
 			$encoded_item_instance_r[] = $item_instance_r['item_id'] . '_' . $item_instance_r['instance_no'];
 		}
 	}
@@ -182,7 +182,7 @@ function get_encoded_item_instance_rs($checkout_item_instance_rs) {
 function get_borrowed_item_sequence_number_r($altid_item_instance_rs) {
 	if (is_array($altid_item_instance_rs)) {
 		reset($altid_item_instance_rs);
-		while (list(, $altid_item_instance_r) = each($altid_item_instance_rs)) {
+		foreach ($altid_item_instance_rs as $altid_item_instance_r) {
 			$sequence_number[] = $altid_item_instance_r['sequence_number'];
 		}
 	}
@@ -197,7 +197,7 @@ function update_altid_item_instance_rs($op, $alt_item_id, $attribute_type_r, $al
 	if (strlen($alt_item_id) > 0) {
 		$item_instance_rs = get_new_altid_item_instance_rs($alt_item_id, $attribute_type_r, $altid_item_instance_rs);
 		if (is_array($item_instance_rs)) {
-			while (list(, $item_instance_r) = each($item_instance_rs)) {
+			foreach ($item_instance_rs as $item_instance_r) {
 				if ($item_instance_r['owner_id'] != $HTTP_VARS['borrower_id']) {
 					if ($op == 'checkout') {
 						if (is_item_instance_checkoutable($item_instance_r, $errors)) {
@@ -352,7 +352,7 @@ function validate_borrower_id($borrower_id, &$errors) {
 						}
 
 						if (is_not_empty_array($altid_item_instance_rs)) {
-							while (list(, $item_instance_r) = each($altid_item_instance_rs)) {
+							foreach ($altid_item_instance_rs as $item_instance_r) {
 								$listingObject->startRow();
 
 								$listingObject->addItemTypeImageColumn($item_instance_r['s_item_type']);
@@ -402,4 +402,4 @@ function validate_borrower_id($borrower_id, &$errors) {
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/rss.php b/rss.php
index eba926ef..add86219 100644
--- a/rss.php
+++ b/rss.php
@@ -61,7 +61,7 @@ function build_new_items_feed($URL, $datemask) {
 	
 	if (is_not_empty_array ( $list_item_rs )) {
 		reset ( $list_item_rs );
-		while ( list ( , $list_item_r ) = @each ( $list_item_rs ) ) {
+		foreach ( $list_item_rs as $list_item_r ) {
 			$rssout .= "\n	<item>" . "\n		<title>" . rss_encoded ( $list_item_r ['title'] ) . "</title>" . "\n		<link>" . rss_encoded ( $URL . $list_item_r ['item_display_url'] ) . "</link>" . "\n		<pubDate>" . $list_item_r ['update_on'] . " " . date ( 'T' ) . "</pubDate>" . "\n		<guid>" . rss_encoded ( $URL . $list_item_r ['item_display_url'] ) . "</guid>" . "\n		<description>";
 			
 			$results = fetch_item_attribute_type_rs ( $list_item_r ['s_item_type'], 'rss_ind' );
@@ -76,7 +76,7 @@ function build_new_items_feed($URL, $datemask) {
 						$attributes_r = fetch_attribute_val_r ( $list_item_r ['item_id'], $list_item_r ['instance_no'], $item_attribute_type_r ['s_attribute_type'], $item_attribute_type_r ['order_no'] );
 						if (is_array ( $attributes_r )) {
 							$attribute = "";
-							while ( list ( , $value ) = each ( $attributes_r ) ) {
+							foreach ( $attributes_r as $value ) {
 								if (strlen ( $attribute ) > 0)
 									$attribute .= ", ";
 								
@@ -140,7 +140,7 @@ function rss_encoded($inString) {
 			echo "<ul id=\"rssfeeds\">";
 			
 			reset ( $feeds_r );
-			while ( list ( , $feed_r ) = each ( $feeds_r ) ) {
+			foreach ( $feeds_r  as $feed_r ) {
 				echo ('<li><a href="' . $PHP_SELF . '?feed=' . $feed_r ['feed'] . '">' . $feed_r ['title'] . '</a></dd>');
 			}
 			echo "</ul>";
diff --git a/search.php b/search.php
index f55668a7..eb8b76bf 100644
--- a/search.php
+++ b/search.php
@@ -108,7 +108,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 	if (is_array($arrayOfUniqueCategories)) {
 		asort($arrayOfUniqueCategories);
 		reset($arrayOfUniqueCategories);
-		while (list($value, $display) = each($arrayOfUniqueCategories)) {
+		foreach ($arrayOfUniqueCategories as $value => $display) {
 			$arrayOfUniqueCatValues .= "\narrayOfUniqueCatValues[$arrayOfUniqueCatValuesCount] = new LookupAttribute('',\"$value\",\"$display\");";
 			$arrayOfUniqueCatValuesCount++;
 		}
@@ -143,7 +143,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 				$catTypeSelect = "<select name=\"category\" id=\"search-category\">" . "\n<option value=\"\">-------------- " . get_opendb_lang_var('all') . " --------------";
 
 				reset($category_type_rs);
-				while (list($value, $display) = each($category_type_rs)) {
+				foreach ($category_type_rs as $value => $display) {
 					$catTypeSelect .= "\n<option value=\"$value\">$display";
 				}
 				$itemTypeBlock .= "</select>";
@@ -163,7 +163,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 						. "\n<option value=\"\">-------------- " . get_opendb_lang_var('all') . " --------------";
 
 				reset($item_type_rs);
-				while (list(, $item_type_r) = each($item_type_rs)) {
+				foreach ($item_type_rs as $item_type_r) {
 					$itemTypeSelect .= "\n<option value=\"" . $item_type_r['s_item_type'] . "\" >" . $item_type_r['s_item_type'] . " - " . $item_type_r['description'];
 				}
 				$itemTypeBlock .= "</select>";
@@ -175,7 +175,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 					. "\n<option value=\"\">-------------- " . get_opendb_lang_var('all') . " --------------";
 
 			@reset($item_attribute_type_rs);
-			while (list(, $item_attribute_type_r) = @each($item_attribute_type_rs)) {
+			foreach ($item_attribute_type_rs as  $item_attribute_type_r) {
                 if (has_role_permission($item_attribute_type_r['view_perm'])) {
 				    $attrTypeSelect .= "\n<option value=\"" . $item_attribute_type_r['s_attribute_type'] . "\">" . $item_attribute_type_r['s_attribute_type'] . " - " . $item_attribute_type_r['description'];
                 }
diff --git a/stats.php b/stats.php
index 2e5484da..7eba9930 100644
--- a/stats.php
+++ b/stats.php
@@ -90,7 +90,7 @@ function build_item_stats() {
 
 	if (is_not_empty_array($status_type_rs)) {
 		reset($status_type_rs);
-		while (list(, $status_type_r) = each($status_type_rs)) {
+		foreach ( $status_type_rs as $status_type_r ) {
 			echo ("<th>" . theme_image($status_type_r['img'], $status_type_r['description'], "s_status_type") . "</th>");
 		}
 	}
@@ -121,7 +121,7 @@ function build_item_stats() {
 			$num_total = 0;
 			if (is_not_empty_array($status_type_rs)) {
 				reset($status_type_rs);
-				while (list($key, $status_type_r) = each($status_type_rs)) {
+				foreach ( $status_type_rs as $key => $status_type_r ) {
 					$status_total = fetch_owner_s_status_type_item_cnt($user_r['user_id'], $status_type_r['s_status_type']);
 					$status_type_rs[$key]['total'] += $status_total;
 
@@ -147,7 +147,7 @@ function build_item_stats() {
 
 		if (is_not_empty_array($status_type_rs)) {
 			reset($status_type_rs);
-			while (list(, $status_type_r) = each($status_type_rs)) {
+			foreach ( $status_type_rs as $status_type_r ) {
 				echo ("<td>" . $status_type_r['total'] . "</td>");
 			}
 			echo ("<td>" . $sum_total . "</td>");
@@ -249,7 +249,7 @@ function build_borrower_stats() {
 					echo ("<li id=\"menu-breakdown\" class=\"first activeTab\" onclick=\"return activateTab('breakdown', 'tab-menu', 'tab-content', 'activeTab', 'tabContent')\">" . get_opendb_lang_var('overview') . "</li>");
 
 					reset($item_type_rs);
-					while (list(, $item_type_r) = each($item_type_rs)) {
+					foreach ( $item_type_rs as $item_type_r ) {
 						echo ("<li id=\"menu-${item_type_r['s_item_type']}\" onclick=\"return activateTab('${item_type_r['s_item_type']}', 'tab-menu', 'tab-content', 'activeTab', 'tabContent')\">${item_type_r['s_item_type']}</li>");
 					}
 					echo ("</ul>");
@@ -272,7 +272,7 @@ function build_borrower_stats() {
 					echo ("</div>");
 
 					reset($item_type_rs);
-					while (list(, $item_type_r) = each($item_type_rs)) {
+					foreach ( $item_type_rs as $item_type_r) {
 						echo ("\n<div class=\"tabContentHidden\" id=\"${item_type_r['s_item_type']}\">");
 						echo ("<h3>" . get_opendb_lang_var('itemtype_breakdown', array('desc' => $item_type_r['description'], 's_item_type' => $item_type_r['s_item_type'], 'total' => $item_type_r['count'])) . "</h3>");
 						echo ("<ul class=\"graph\">");
@@ -300,4 +300,4 @@ function build_borrower_stats() {
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/test/GDImageTest.php b/test/GDImageTest.php
index fe89463e..7c698610 100644
--- a/test/GDImageTest.php
+++ b/test/GDImageTest.php
@@ -19,12 +19,12 @@
 */
 
 chdir(dirname(dirname(__FILE__)));
-require_once("./lib/GDImage.class.php");
+require_once("./lib/ODImage.class.php");
 
 class GDImageTest extends PHPUnit_Framework_TestCase
 {
 	function testPngBasicFunctions() {
-		$gdImage = new GDImage('png');
+		$gdImage = new ODImage('png');
 		$this->assertEquals('png', $gdImage->getImageType());
 		$this->assertEquals('png', $gdImage->getImageExtension());
 		$this->assertEquals('image/png', $gdImage->getImageContentType());
@@ -37,7 +37,7 @@ function testPngBasicFunctions() {
 	}
 	
 	function testJpgBasicFunctions() {
-		$gdImage = new GDImage('jpg');
+		$gdImage = new ODImage('jpg');
 		$this->assertEquals('jpg', $gdImage->getImageExtension());
 		
 		print_r($gdImage->getErrors());
@@ -48,14 +48,14 @@ function testJpgBasicFunctions() {
 	 *
 	 */
 	function testAutoBasicFunctions() {
-		$gdImage = new GDImage('auto');
+		$gdImage = new ODImage('auto');
 		$this->assertEquals('png', $gdImage->getImageExtension());
 		
 		print_r($gdImage->getErrors());
 	}
 	
 	function testGetImageConfig() {
-		$gdImage = new GDImage('png');
+		$gdImage = new ODImage('png');
 		$image_config_r = $gdImage->getImageTypeConfig();
 		$this->assertEquals('png', $image_config_r['extension']);
 		
@@ -63,7 +63,7 @@ function testGetImageConfig() {
 	}
 	
 	function testImageCreate() {
-		$gdImage = new GDImage('png');
+		$gdImage = new ODImage('png');
 		
 		$this->assertEquals(FALSE, $gdImage->createImage('code_bg.png'));
 		
@@ -75,8 +75,8 @@ function testImageCreate() {
 	
 	// run after disabling ImagePNG
 //	function testImageCreateWithoutPng() {
-//		$gdImage = new GDImage();
+//		$gdImage = new ODImage();
 //		$this->assertEquals('jpg', $gdImage->getImageType());
 //	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/user_admin.php b/user_admin.php
index 890a7e38..544e007c 100644
--- a/user_admin.php
+++ b/user_admin.php
@@ -1035,21 +1035,21 @@ function send_signup_info_to_admin($HTTP_VARS, &$errors) {
 				if (is_user_granted_permission(PERM_ADMIN_USER_PROFILE)) {
 					echo _theme_header(get_opendb_lang_var('activate_users'));
 					echo ("<h2>" . get_opendb_lang_var('activate_users') . "</h2>");
-	
+
 					// handle activate of single user in the same way
 					if (!is_array($HTTP_VARS['user_id_rs']) && is_user_valid($HTTP_VARS['user_id'])) {
 						$HTTP_VARS['user_id_rs'][] = $HTTP_VARS['user_id'];
 						unset($HTTP_VARS['user_id']);
 					}
-	
+
 					if (is_not_empty_array($HTTP_VARS['user_id_rs'])) {
 						// do not display confirm screen
 						$HTTP_VARS['confirmed'] = 'true';
-	
+
 						$success_userid_rs = NULL;
 						$failure_userid_rs = NULL;
-	
-						while (list(, $userid) = each($HTTP_VARS['user_id_rs'])) {
+
+						foreach ($HTTP_VARS['user_id_rs'] as $userid) {
 							// if newly activated user, then we want to reset password and send notification email.
 							$new_activated_user = is_user_not_activated($userid);
 	
@@ -1181,4 +1181,4 @@ function send_signup_info_to_admin($HTTP_VARS, &$errors) {
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>
diff --git a/welcome.php b/welcome.php
index 7f669087..95586456 100644
--- a/welcome.php
+++ b/welcome.php
@@ -76,7 +76,7 @@ function get_announcements_block() {
 		// include a login warning if user password and email are still the defaults
 		if (get_opendb_session_var('user_id') == 'admin') {
 			$announcements_rs = get_admin_announcements_rs();
-			while (list(, $announcement_r) = each($announcements_rs)) {
+			foreach ( $announcements_rs as $announcement_r ) {
 				$buffer .= "<li><h4>" . $announcement_r['heading'] . "</h4>
 					<p class=\"content\">" . $announcement_r['message'] . "<a class=\"adminLink\" href=\"" . $announcement_r['link'] . "\">" . $announcement_r['link_text'] . "</a></p>";
 			}
@@ -105,8 +105,9 @@ function get_announcements_block() {
 
 function display_last_login_block($userid, $lastvisit) {
 	$plugins_r = get_welcome_block_plugin_r();
+	$buffer = "";
 	if (is_array($plugins_r)) {
-		while (list(, $plugin) = each($plugins_r)) {
+		foreach ( $plugins_r as $plugin ) {
 			$buffer .= renderWelcomeBlockPlugin($plugin, $userid, $lastvisit);
 		}
 	}
@@ -133,4 +134,4 @@ function display_last_login_block($userid, $lastvisit) {
 
 // Cleanup after begin.inc.php
 require_once("./include/end.inc.php");
-?>
\ No newline at end of file
+?>

From 21559cce2a306db69b82b6bf55d1762b435af8e4 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Sat, 16 Oct 2021 10:29:08 -0400
Subject: [PATCH 02/11] Fix item_input

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 lib/item.php | 62 ++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/item.php b/lib/item.php
index f7ba8b82..f7101454 100644
--- a/lib/item.php
+++ b/lib/item.php
@@ -332,42 +332,42 @@ function fetch_item_instance_relationship_r($item_id, $instance_no = NULL, $rela
 }
 
 function fetch_available_item_parents($HTTP_VARS, $item_r, $filter = null, $include_parents = true) {
-    $current_parents = array();
-    if ($HTTP_VARS['parent_item_id'] > 0) {
-        $current_parents[] = $HTTP_VARS['parent_item_id'];
-    } else {
-        $parent_instance_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no'], RELATED_PARENTS_MODE);
+	$current_parents = array();
+	if ($HTTP_VARS['parent_item_id'] ?? 0 > 0) {
+		$current_parents[] = $HTTP_VARS['parent_item_id'];
+	} else {
+		$parent_instance_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no'], RELATED_PARENTS_MODE);
 
-        if ($parent_instance_rs !== false) {
-            foreach ($parent_instance_rs as $parent_instance_r) {
-                $current_parents[] = $parent_instance_r['item_id'];
-            }
+		if ($parent_instance_rs !== false) {
+			foreach ($parent_instance_rs as $parent_instance_r) {
+				$current_parents[] = $parent_instance_r['item_id'];
+			}
+			db_free_result($parent_instance_rs);
         }
-
-        db_free_result($parent_instance_rs);
     }
 
-    $children_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no']);
-    $children = array();
-    while ($child = db_fetch_assoc($children_rs)) {
-        $children[] = $child;
-    }
-    db_free_result($children_rs);
+	$children_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no']);
+	$children = array();
+	if ($children_rs !== false) {
+		while ($child = db_fetch_assoc($children_rs)) {
+			$children[] = $child;
+		}
+		db_free_result($children_rs);
+	x}
     
-    $items = array();
-
-    if (is_null($filter)) {
-        // Fetch every item.
-        $items_rs = fetch_item_listing_rs(null, null, 'title', 'asc');
-    } elseif ($filter == '%parent_only%') {
-        // Fetch parent items only.
-        foreach ($current_parents as $parent) {
-            $item = fetch_item_r($parent);
-            $item['current_parent'] = true;
-            $items[] = $item;
-        }
-        
-        return $items;
+	$items = array();
+
+	if (is_null($filter)) {
+		// Fetch every item.
+		$items_rs = fetch_item_listing_rs(null, null, 'title', 'asc');
+	} elseif ($filter == '%parent_only%') {
+		// Fetch parent items only.
+		foreach ($current_parents as $parent) {
+			$item = fetch_item_r($parent);
+			$item['current_parent'] = true;
+			$items[] = $item;
+		}
+		return $items;
     } else {
         // Filter items.
         $items_rs = fetch_item_listing_rs(array('title' => $filter, 'title_match' => 'partial'), array(), 'title', 'asc');

From 14e7091c580b7e8ad2511b91f74b49f653f54de4 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Sun, 17 Oct 2021 07:26:06 -0400
Subject: [PATCH 03/11] Fix typo

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 lib/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/item.php b/lib/item.php
index f7101454..e1e83d70 100644
--- a/lib/item.php
+++ b/lib/item.php
@@ -353,7 +353,7 @@ function fetch_available_item_parents($HTTP_VARS, $item_r, $filter = null, $incl
 			$children[] = $child;
 		}
 		db_free_result($children_rs);
-	x}
+	}
     
 	$items = array();
 

From 3c9bcb7dbb777c1ad6c18ac7bddc94d56246031c Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Mon, 18 Oct 2021 11:10:45 -0400
Subject: [PATCH 04/11] Run php lint and adress review comments

phplint: "php -l" on each php file
A few more warnings, and bugs squashed.

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 Readme                                       |  4 +++-
 admin/item_cache/ItemCacheAjaxJobs.class.php |  6 +++---
 lib/inputfields.php                          |  2 ++
 lib/item_attribute.php                       |  2 +-
 lib/logging.php                              |  2 +-
 lib/phpmailer/PHPMailerAutoload.php          | 18 +-----------------
 lib/phpthumb/phpthumb.gif.php                |  6 +++---
 lib/site/imdbphp2/imdbsearch.class.php       |  1 -
 search.php                                   | 10 +++++-----
 9 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/Readme b/Readme
index 5bdadf12..1e2377a7 100644
--- a/Readme
+++ b/Readme
@@ -39,7 +39,9 @@ Post any bugs to https://github.com/pellcorp/opendb/issues
 
 - phpSniff - Copyright 2002-2004 Roger Raymond <epsilon7@users.sourceforge.net>
 
-- phpThumb() - The PHP thumbnail creator.  by James Heinrich <info@silisoftware.com> 
+- phpThumb() - The PHP thumbnail creator by James Heinrich <info@silisoftware.com>
+
+- PHPMailer - 5.2.x - https://github.com/PHPMailer/PHPMailer
 
 - adodb-time.inc.php - ADODb Date / Time functions.  
   Copyright (c) 2000, 2001, 2002, 2003 John Lim
diff --git a/admin/item_cache/ItemCacheAjaxJobs.class.php b/admin/item_cache/ItemCacheAjaxJobs.class.php
index 99aa4c74..1c753c32 100644
--- a/admin/item_cache/ItemCacheAjaxJobs.class.php
+++ b/admin/item_cache/ItemCacheAjaxJobs.class.php
@@ -3,8 +3,8 @@
 include_once("./lib/AdminAjaxJobs.class.php");
 
 class ItemCacheAjaxJobs extends AdminAjaxJobs {
-	function ItemCacheAjaxJobs($job) {
-		parent::AdminAjaxJobs(get_class($this), $job, 10);
+	function __construct($job) {
+		parent::__construct(get_class($this), $job, 10);
 	}
 
 	function __executeJob() {
@@ -95,4 +95,4 @@ function __perform_refresh_thumbnails_batch() {
 		$this->_remaining = fetch_file_cache_missing_thumbs_cnt('ITEM');
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/inputfields.php b/lib/inputfields.php
index cd0182ae..6354e45e 100644
--- a/lib/inputfields.php
+++ b/lib/inputfields.php
@@ -631,6 +631,8 @@ function datetime_field($name, $prompt, $format_mask, $auto_datetime, $compulsor
 	} else {
 		$onchange = "onchange=\"$onchange_event\"";
 	}
+
+    $size = strlen($format_mask);
 	
 	if ($multi_value) {
 		for($i = 0; $i < count ( $value ); $i ++) {
diff --git a/lib/item_attribute.php b/lib/item_attribute.php
index c7ed2e14..f854ab3f 100644
--- a/lib/item_attribute.php
+++ b/lib/item_attribute.php
@@ -104,7 +104,7 @@ function fetch_attribute_type_lookup_rs($s_attribute_type = NULL, $order_by = 'v
 	}
 	
 	if (is_string ( $order_by )) {
-		$query .= " ORDER BY order_no, $order_by $order";
+		$query .= " ORDER BY order_no, $order_by";
 	}
 	
 	$result = db_query ( $query );
diff --git a/lib/logging.php b/lib/logging.php
index dbbf804c..abfd3e22 100644
--- a/lib/logging.php
+++ b/lib/logging.php
@@ -123,7 +123,7 @@ function fget_tokenised_log_entry(&$file) {
 						$count ++;
 					}
 					
-					$column .= $line[$id];
+					$column .= $line[$i];
 					break;
 				
 				default :
diff --git a/lib/phpmailer/PHPMailerAutoload.php b/lib/phpmailer/PHPMailerAutoload.php
index eaa2e303..e41e8b67 100644
--- a/lib/phpmailer/PHPMailerAutoload.php
+++ b/lib/phpmailer/PHPMailerAutoload.php
@@ -30,20 +30,4 @@ function PHPMailerAutoload($classname)
     }
 }
 
-if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
-    //SPL autoloading was introduced in PHP 5.1.2
-    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-        spl_autoload_register('PHPMailerAutoload', true, true);
-    } else {
-        spl_autoload_register('PHPMailerAutoload');
-    }
-} else {
-    /**
-     * Fall back to traditional autoload for old PHP versions
-     * @param string $classname The name of the class to load
-     */
-    function __autoload($classname)
-    {
-        PHPMailerAutoload($classname);
-    }
-}
+spl_autoload_register('PHPMailerAutoload', true, true);
diff --git a/lib/phpthumb/phpthumb.gif.php b/lib/phpthumb/phpthumb.gif.php
index 94babc3e..3081b9bf 100644
--- a/lib/phpthumb/phpthumb.gif.php
+++ b/lib/phpthumb/phpthumb.gif.php
@@ -1093,9 +1093,9 @@ public function getGD_PixelPlotterVersion()
 		for ($i = 0; $i < $NumColorsInPal; $i++) {
 			$ThisImageColor[$i] = imagecolorallocate(
 									$PlottingIMG,
-									ord($pal{($i * 3) + 0}),
-									ord($pal{($i * 3) + 1}),
-									ord($pal{($i * 3) + 2}));
+									ord($pal[($i * 3) + 0]),
+									ord($pal[($i * 3) + 1]),
+									ord($pal[($i * 3) + 2]));
 		}
 
 		// PREPARE BITMAP BITS
diff --git a/lib/site/imdbphp2/imdbsearch.class.php b/lib/site/imdbphp2/imdbsearch.class.php
index ff793235..ea4fa521 100644
--- a/lib/site/imdbphp2/imdbsearch.class.php
+++ b/lib/site/imdbphp2/imdbsearch.class.php
@@ -128,7 +128,6 @@ public function results($url="",$series=TRUE,$s_episodes=TRUE,$s_games=TRUE,$s_v
             mdb_base::debug_scalar("No immediate response body - we are redirected.<br>New URL: $header");
             if ( preg_match('!\.imdb\.(com|de|it)/find\?!',$header) ) {
               return $this->results($header);
-              break(4);
             }
             $url = explode("/",$header);
             $id  = substr($url[count($url)-1],2);
diff --git a/search.php b/search.php
index eb8b76bf..17517bff 100644
--- a/search.php
+++ b/search.php
@@ -58,7 +58,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 						// This array, is only so we can make sure that we have unique attributes only!
 						$arrayOfUniqueAttributes[] = $item_attribute_type_r['s_attribute_type'];
 
-						$jsArrayOfUniqueAttributes .= "\narrayOfAttributes[$jsArrayOfAttributesCount] = new LookupAttribute(\"\",\"" . $item_attribute_type_r['s_attribute_type'] . "\",\"" . $item_attribute_type_r['s_attribute_type'] . " - " . $item_attribute_type_r['description'] . "\");";
+#						$jsArrayOfUniqueAttributes .= "\narrayOfAttributes[$jsArrayOfAttributesCount] = new LookupAttribute(\"\",\"" . $item_attribute_type_r['s_attribute_type'] . "\",\"" . $item_attribute_type_r['s_attribute_type'] . " - " . $item_attribute_type_r['description'] . "\");";
 
 						$item_attribute_type_rs[] = $item_attribute_type_r;
 					}
@@ -101,7 +101,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 	$buffer .= "\n\narrayOfAttributes = new Array($jsArrayOfAttributesCount);";
 	$buffer .= $jsArrayOfAttributes;
 
-	$arrayOfUniqueCategoryValues = "";
+	$arrayOfUniqueCatValues = "";
 	$arrayOfUniqueCatValuesCount = 0;
 
 	// Now sort all values into alphabetical order!
@@ -146,7 +146,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 				foreach ($category_type_rs as $value => $display) {
 					$catTypeSelect .= "\n<option value=\"$value\">$display";
 				}
-				$itemTypeBlock .= "</select>";
+				$catTypeSelect .= "</select>";
 
 				echo format_field(get_opendb_lang_var('category'), $catTypeSelect);
 			}
@@ -166,7 +166,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 				foreach ($item_type_rs as $item_type_r) {
 					$itemTypeSelect .= "\n<option value=\"" . $item_type_r['s_item_type'] . "\" >" . $item_type_r['s_item_type'] . " - " . $item_type_r['description'];
 				}
-				$itemTypeBlock .= "</select>";
+				$itemTypeSelect .= "</select>";
 
 				echo format_field(get_opendb_lang_var('item_type'), $itemTypeSelect);
 			}
@@ -180,7 +180,7 @@ function encode_search_javascript_arrays(&$item_type_rs, &$arrayOfUniqueCategori
 				    $attrTypeSelect .= "\n<option value=\"" . $item_attribute_type_r['s_attribute_type'] . "\">" . $item_attribute_type_r['s_attribute_type'] . " - " . $item_attribute_type_r['description'];
                 }
 			}
-			$itemTypeBlock .= "</select>";
+			$attrTypeSelect .= "</select>";
 
 			echo format_field(get_opendb_lang_var('s_attribute_type'), $attrTypeSelect);
 

From 603aa7d8abf9eb514be014ee5ac7766e29121a8c Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Wed, 20 Oct 2021 08:46:37 -0400
Subject: [PATCH 05/11] Address review comments, and fix other bugs

Remove some unused "$key" variables in foreach statements.
Use ?? operator instead of checking isset() in some places.

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 admin/s_language/index.php     |  3 ++-
 item_display.php               |  4 ++--
 lib/TitleMask.class.php        |  2 +-
 lib/admin.php                  |  1 +
 lib/config.php                 |  4 ++--
 lib/filecache.php              | 10 ++++------
 lib/inputfields.php            |  4 ++--
 lib/item.php                   | 22 +++++++++-------------
 lib/language.php               |  4 ++--
 lib/rss.php                    |  4 ++--
 lib/utils.php                  |  4 ++--
 lib/welcome/WhatsNew.class.php |  4 ++--
 lib/widgets.php                |  3 ++-
 listings.php                   |  8 +++-----
 14 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/admin/s_language/index.php b/admin/s_language/index.php
index 9f306efd..cbfa6e5f 100644
--- a/admin/s_language/index.php
+++ b/admin/s_language/index.php
@@ -377,8 +377,9 @@ function update_lang_vars($HTTP_VARS) {
 	} else {
 		echo ("<div class=\"error\">" . get_opendb_lang_var('operation_not_available') . "</div>");
 	}
+
 } else if ($HTTP_VARS['op'] == '') {
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? NULL))
 		echo format_error_block($errors);
 
 	// list languages and options
diff --git a/item_display.php b/item_display.php
index 0ab1fade..7af37241 100644
--- a/item_display.php
+++ b/item_display.php
@@ -101,9 +101,9 @@
 							}
 							echo ("<img src=\"" . $file_r['thumbnail']['url'] . "\" title=\"" . htmlspecialchars($coverimage_r['prompt']) . "\" ");
 
-							if (is_numeric($file_r['thumbnail']['width'] ?? ""))
+							if (is_numeric($file_r['thumbnail']['width'] ?? FALSE))
 								echo (' width="' . $file_r['thumbnail']['width'] . '"');
-							if (is_numeric($file_r['thumbnail']['height'] ?? ""))
+							if (is_numeric($file_r['thumbnail']['height'] ?? FALSE))
 								echo (' height="' . $file_r['thumbnail']['height'] . '"');
 
 							echo (">");
diff --git a/lib/TitleMask.class.php b/lib/TitleMask.class.php
index 6f414145..04bf1c75 100755
--- a/lib/TitleMask.class.php
+++ b/lib/TitleMask.class.php
@@ -842,7 +842,7 @@ function _get_title_mask_idx($s_item_type_group, $s_item_type) {
 			$item_type_group_r = fetch_item_type_groups_for_item_type_r ( $s_item_type, 'Y' );
 			if (is_array ( $item_type_group_r )) {
 				reset ( $item_type_group_r );
-				foreach ( $item_type_group_r as $key => $group ) {
+				foreach ( $item_type_group_r as $group ) {
 					$index = $this->_find_title_mask_idx ( $group, NULL );
 					if ($index != - 1) {
 						// cache mapping
diff --git a/lib/admin.php b/lib/admin.php
index eec70d40..aed75bc0 100644
--- a/lib/admin.php
+++ b/lib/admin.php
@@ -172,6 +172,7 @@ function execute_sql_install($ADMIN_TYPE, $sqlfile, &$errors) {
 function generate_sql_list($ADMIN_TYPE, $typeName, $sqlRegexp, $is_not_exists_function) {
 	$filelist = get_file_list ( './admin/' . $ADMIN_TYPE . '/sql/', 'sql' );
 	$sitelist = NULL;
+	$sqllist = NULL;
 	if (is_not_empty_array ( $filelist )) {
 		for($i = 0; $i < count ( $filelist ); $i ++) {
 			$parsedfile_r = parse_file ( $filelist [$i] );
diff --git a/lib/config.php b/lib/config.php
index ae7ac72b..73a0d70c 100755
--- a/lib/config.php
+++ b/lib/config.php
@@ -244,8 +244,8 @@ function get_db_config_var($type, $vars_r, $group, $id, $keyid) {
 	if (count ( $vars_r ) > 1) {
 		if ($type == 'boolean') {
 			$boolean_vars_r = NULL;
-			reset ( $vars_r );
-			foreach ($vars_r as $key=>$value) {
+			reset( $vars_r );
+			foreach ($vars_r as $key => $value) {
 				if ($value == 'TRUE')
 					$boolean_vars_r[$key] = TRUE;
 				else //if($value == 'FALSE')
diff --git a/lib/filecache.php b/lib/filecache.php
index c56a9b4c..a1d42459 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -249,12 +249,10 @@ function file_cache_get_image_r($url, $type) {
 			}
 		}
 		
-		if (! is_numeric ( $file_r['thumbnail']['width'] ?? '' ) && ! is_numeric ( $file_r['thumbnail']['height'] ?? '' )) {
-			if (isset($thumbnail_size_r ['width']))
-				$file_r ['thumbnail'] ['width'] = $thumbnail_size_r ['width'];
-			if (isset($thumbnail_size_r ['height']))
-				$file_r ['thumbnail'] ['height'] = $thumbnail_size_r ['height'];
-		}
+		if (is_numeric($thumbnail_size_r ['width'] ?? ''))
+			$file_r ['thumbnail'] ['width'] = $thumbnail_size_r ['width'];
+		if (is_numeric($thumbnail_size_r ['height'] ?? ''))
+			$file_r ['thumbnail'] ['height'] = $thumbnail_size_r ['height'];
 		
 		return $file_r;
 	}
diff --git a/lib/inputfields.php b/lib/inputfields.php
index 6354e45e..b92331c5 100644
--- a/lib/inputfields.php
+++ b/lib/inputfields.php
@@ -68,7 +68,7 @@ function get_item_input_field($fieldname, $item_attribute_type_r, $item_r, $valu
 		$widget ['args'] [4] = $item_attribute_type_r ['input_type_arg5'];
 	}
 	
-	if (isset($item_attribute_type_r ['multi_attribute_ind']) && $item_attribute_type_r ['multi_attribute_ind'] == 'Y') {
+	if (($item_attribute_type_r['multi_attribute_ind'] ?? '') == 'Y') {
 		$multi_value = TRUE;
 		
 		if (! is_array ( $value )) {
@@ -717,7 +717,7 @@ function url($name, $item_r, $item_attribute_type_r, $prompt, $length, $maxlengt
 		$onchange = "onchange=\"$onchange_event\"";
 	}
 	
-	if (isset($item_attribute_type_r ['file_attribute_ind']) && $item_attribute_type_r ['file_attribute_ind'] == 'Y') {
+	if (($item_attribute_type_r ['file_attribute_ind'] ?? '') == 'Y') {
 		$field .= "\n<ul class=\"urlOptionsMenu\" id=\"${name}-tab-menu\" class=\"file-upload-menu\">";
 		$field .= "<li id=\"menu-${name}_saveurl\" class=\"activeTab\" onclick=\"return activateTab('${name}_saveurl', '${name}-tab-menu', '${name}-tab-content', 'activeTab', 'fieldContent');\">URL</li>";
 		if (is_file_upload_enabled ()) {
diff --git a/lib/item.php b/lib/item.php
index e1e83d70..943e47b9 100644
--- a/lib/item.php
+++ b/lib/item.php
@@ -830,9 +830,9 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	// Owner restriction
 	//
-	if (isset( $HTTP_VARS ['owner_id'] ))
+	if (strlen($HTTP_VARS ['owner_id'] ?? '') > 0)
 		$where_r [] = 'ii.owner_id = \'' . $HTTP_VARS ['owner_id'] . '\'';
-	else if (isset( $HTTP_VARS ['not_owner_id'] )) //For not showing current user items.
+	else if (strlen( $HTTP_VARS ['not_owner_id'] ?? '' ) > 0) //For not showing current user items.
 		$where_r [] = 'ii.owner_id <> \'' . $HTTP_VARS ['not_owner_id'] . '\'';
 
 	//
@@ -843,12 +843,11 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 		strlen( $HTTP_VARS['s_item_type'] ) > 0)
 	{
 		$where_r [] = 'i.s_item_type = \'' . $HTTP_VARS ['s_item_type'] . '\'';
-	} else if (isset( $HTTP_VARS ['s_item_type_group'] )) {
+	} else if (strlen( $HTTP_VARS ['s_item_type_group'] ?? '') > 0) {
 		$from_r [] = 's_item_type_group_rltshp sitgr';
 		$where_r [] = 'sitgr.s_item_type = i.s_item_type';
 		$where_r [] = 'sitgr.s_item_type_group = \'' . $HTTP_VARS ['s_item_type_group'] . '\'';
-	} else if (isset( $HTTP_VARS['s_item_type'] ) &&
-			   is_not_empty_array( $HTTP_VARS['s_item_type'] )) {
+	} else if (is_not_empty_array( $HTTP_VARS['s_item_type'] ?? '' )) {
 		$where_r [] = 'i.s_item_type IN(' . format_sql_in_clause ( $HTTP_VARS ['s_item_type'] ) . ')';
 	}
 
@@ -858,11 +857,9 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	// Status Type restriction
 	//
-	if (isset( $HTTP_VARS['s_status_type'] ) &&
-		is_not_empty_array ( $HTTP_VARS['s_status_type'] )) {
+	if (is_not_empty_array( $HTTP_VARS['s_status_type'] ?? '' )) {
 		$where_r [] = 'sst.s_status_type IN(' . format_sql_in_clause ( $HTTP_VARS ['s_status_type'] ) . ')';
-	} else if (isset( $HTTP_VARS ['s_status_type'] ) &&
-			   $HTTP_VARS ['s_status_type'] != 'ALL' ) {
+	} else if (($HTTP_VARS ['s_status_type'] ?? '') != 'ALL' ) {
 		$where_r [] = 'sst.s_status_type = \'' . $HTTP_VARS ['s_status_type'] . '\'';
 	}
 
@@ -874,8 +871,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	// User and Status type restriction
 	//
-	if (isset($HTTP_VARS['owner_id']) &&
-		strcmp( $HTTP_VARS['owner_id'], get_opendb_session_var( 'user_id' ) ) !== 0) {	// not current user
+	if (strcmp( ($HTTP_VARS['owner_id'] ?? ''), get_opendb_session_var( 'user_id' ) ) !== 0) {	// not current user
 		$from_r [] = 'user u';
 		$where_r [] = 'u.user_id = ii.owner_id';
 		$where_r [] = 'u.active_ind = \'Y\'';
@@ -884,7 +880,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	// Status Comment restriction
 	//
-	if (isset( $HTTP_VARS['status_comment'] )) {
+	if (strlen( $HTTP_VARS['status_comment'] ?? '') > 0) {
 		// Escape only the single quote!
 		$HTTP_VARS['status_comment'] = str_replace( "'", "\\'", $HTTP_VARS['status_comment'] );
 
@@ -908,7 +904,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	// Title restriction
 	//
-	if (isset( $HTTP_VARS ['title'] )) {
+	if (strlen( $HTTP_VARS ['title'] ?? '') > 0) {
 		// Escape only the single quote!
 		$HTTP_VARS ['title'] = str_replace ( "'", "\\'", $HTTP_VARS ['title'] );
 
diff --git a/lib/language.php b/lib/language.php
index 20772bf0..81323d03 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -150,7 +150,7 @@ function get_opendb_lang_var($varname, $find = NULL, $replace = NULL) {
 	global $LANG_VARS;
 	global $_OPENDB_LANGUAGE;
 	
-	if (!isset($LANG_VARS[$varname]) || strlen( $LANG_VARS[$varname] ) == 0) {
+	if (strlen( $LANG_VARS[$varname] ?? '' ) == 0) {
 		$value = fetch_opendb_db_lang_var( $_OPENDB_LANGUAGE, $varname );
 		if ($value !== FALSE) {
 			$LANG_VARS[$varname] = $value;
@@ -277,7 +277,7 @@ function get_system_table_r() {
 	$tables_r = NULL;
 	
 	reset ( $_OPENDB_LANG_SYSTEM_TABLES );
-	foreach ( $_OPENDB_LANG_SYSTEM_TABLES as $key => $table ) {
+	foreach ( $_OPENDB_LANG_SYSTEM_TABLES as $table => $_v ) {
 		$tables_r [] = $table;
 	}
 	
diff --git a/lib/rss.php b/lib/rss.php
index 8add6a1f..ca052e0f 100755
--- a/lib/rss.php
+++ b/lib/rss.php
@@ -48,7 +48,7 @@ function get_opendb_rss_feed_config($feed) {
 	reset ( $feeds_r );
 	
 	$buffer = '';
-	foreach ($feeds_r as $key => $feed_r) {
+	foreach ($feeds_r as $feed_r) {
 		if ($feed_r ['feed'] == $feed) {
 			return $feed_r;
 		}
@@ -63,7 +63,7 @@ function get_opendb_rss_feeds_links($browser = 'firefox') {
 	
 	$buffer = "\n";
 
-	foreach ($feeds_r as $key => $feed_r) {
+	foreach ($feeds_r as $feed_r) {
 		$buffer .= "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $feed_r ['title'] . "\" href=\"./rss.php?feed=" . $feed_r ['feed'] . "\">\n";
 	}
 	return $buffer;
diff --git a/lib/utils.php b/lib/utils.php
index ba82c355..fb31cd4c 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -89,7 +89,7 @@ function generate_random_num() {
 	instead.
 */
 function ifempty($value, $ifnull) {
-	if (isset($value) && strlen( $value ) > 0)
+	if (strlen( $value ?? '' ) > 0)
 		return $value;
 	else
 		return $ifnull;
@@ -101,7 +101,7 @@ function ifempty($value, $ifnull) {
 	combination which is pissing me off.
 */
 function is_not_empty_array($array) {
-	if (isset( $array ) && is_array( $array ) && count( $array ) > 0)
+	if (is_array( $array ?? '' ) && count( $array ) > 0)
 		return TRUE;
 	else
 		return FALSE;
diff --git a/lib/welcome/WhatsNew.class.php b/lib/welcome/WhatsNew.class.php
index 6a6f3f0a..e5638ade 100644
--- a/lib/welcome/WhatsNew.class.php
+++ b/lib/welcome/WhatsNew.class.php
@@ -31,13 +31,13 @@ function renderBlock($userid, $lastvisit) {
 		$whats_new_rs = get_whats_new_details($lastvisit, $userid);
 		if (is_array($whats_new_rs)) {
 			$buffer = "\n<ul>";
-			foreach ( $whats_new_rs as $key => $whats_new_r ) {
+			foreach ( $whats_new_rs as $whats_new_r ) {
 				if (is_array($whats_new_r['items'])) {
 					$buffer .= "\n<li><ul class=\"block\">";
 					$buffer .= "\n<h4>" . $whats_new_r['heading'] . "</h4>";
 
 					reset($whats_new_r['items']);
-					foreach ( $whats_new_r['items'] as $k => $item_rs ) {
+					foreach ( $whats_new_r['items'] as $item_rs ) {
 						$buffer .= "\n<li class=\"" . $item_rs['class'] . "\">" . $item_rs['content'] . "</li>";
 					}
 					$buffer .= "\n</ul></li>";
diff --git a/lib/widgets.php b/lib/widgets.php
index f621181e..bfede46f 100644
--- a/lib/widgets.php
+++ b/lib/widgets.php
@@ -98,7 +98,8 @@ function custom_select($name, $lookup_results, $display_mask, $size = 1, $value
 	$empty_display_mask = expand_display_mask ( $display_mask, NULL, '%' );
 	
 	$value_found = FALSE;
-	foreach ( $lookup_results as $lookup_r ) {
+	foreach ( $lookup_results as $lookup_r_key => $lookup_r_value ) {
+		$lookup_r = ["key" => $lookup_r_key, "value" => $lookup_r_value];
 		// Check if this record should be included in list of values.
 		if (! function_exists ( $include_ind_func ) || $include_ind_func ( $lookup_r )) {
 			$lookup_value = get_array_variable_value ( $lookup_r, $value_column );
diff --git a/listings.php b/listings.php
index 9765c5e5..993dca79 100644
--- a/listings.php
+++ b/listings.php
@@ -131,10 +131,8 @@ function getListingFiltersBlock() {
 function fetch_cached_attribute_type_r($s_attribute_type) {
 	global $_OPENDB_DB_CACHE;
 
-	if (!isset($_OPENDB_DB_CACHE['s_attribute_type']) ||
-        !is_array($_OPENDB_DB_CACHE['s_attribute_type']) ||
-		!isset($_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type]) ||
-        !is_array($_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type])) {
+	if (!is_array($_OPENDB_DB_CACHE['s_attribute_type'] ?? '') ||
+		!is_array($_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type] ?? '')) {
 		$_OPENDB_DB_CACHE['s_attribute_type'][$s_attribute_type] = fetch_attribute_type_r($s_attribute_type);
 	}
 
@@ -309,7 +307,7 @@ function get_column_display_config(&$HTTP_VARS, $show_owner_column, $show_action
 		$v_column_display_config_rs = &filter_for_printable_list($v_column_display_config_rs);
 	}
 
-	if (isset($HTTP_VARS['attr_match']) && $HTTP_VARS['attr_match'] != 'category' && strlen($HTTP_VARS['attribute_type']) > 0) {
+	if (($HTTP_VARS['attr_match'] ?? '') != 'category' && strlen($HTTP_VARS['attribute_type']) > 0) {
 		// Now we have to merge in search terms, and add them after the 'title' column_id
 		$v_column_display_config_rs = &merge_display_column_config_arrays(
 			$v_column_display_config_rs,

From 42e12adb55bae96e798b7a4b60f99411a416daa9 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Wed, 20 Oct 2021 08:54:22 -0400
Subject: [PATCH 06/11] Fix typos

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 admin.php    | 2 +-
 lib/item.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin.php b/admin.php
index 3459d875..e7e95290 100644
--- a/admin.php
+++ b/admin.php
@@ -37,7 +37,7 @@
 if (is_site_enabled()) {
 	if (is_opendb_valid_session()) {
 		if (is_user_granted_permission(PERM_ADMIN_TOOLS)) {
-			$HTTP_VARS['type'] = ifempty($HTTP_VARS['type'], 'config');
+			$HTTP_VARS['type'] = ifempty($HTTP_VARS['type'] ?? NULL, 'config');
 
 			$ADMIN_TYPE = $HTTP_VARS['type'];
 			$ADMIN_DIR = './admin/' . $ADMIN_TYPE;
diff --git a/lib/item.php b/lib/item.php
index 943e47b9..11d80fd8 100644
--- a/lib/item.php
+++ b/lib/item.php
@@ -859,7 +859,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 	//
 	if (is_not_empty_array( $HTTP_VARS['s_status_type'] ?? '' )) {
 		$where_r [] = 'sst.s_status_type IN(' . format_sql_in_clause ( $HTTP_VARS ['s_status_type'] ) . ')';
-	} else if (($HTTP_VARS ['s_status_type'] ?? '') != 'ALL' ) {
+	} else if (isset($HTTP_VARS ['s_status_type']) && $HTTP_VARS ['s_status_type'] != 'ALL' ) {
 		$where_r [] = 'sst.s_status_type = \'' . $HTTP_VARS ['s_status_type'] . '\'';
 	}
 

From 9c77be0c6618f34ac40ca93d16d0e0b676976cff Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Wed, 20 Oct 2021 09:26:25 -0400
Subject: [PATCH 07/11] More warnings silenced

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 item_input.php        | 23 ++++++++++++-----------
 lib/Listing.class.php |  8 ++++----
 lib/inputfields.php   |  8 +++++---
 lib/item.php          | 11 +++++++----
 lib/language.php      |  2 +-
 lib/widgets.php       |  1 +
 listings.php          |  2 +-
 7 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/item_input.php b/item_input.php
index 7b27f267..e6d32cb3 100644
--- a/item_input.php
+++ b/item_input.php
@@ -91,7 +91,7 @@ function format_item_parents_select($HTTP_VARS, $item_r, $filter = null) {
 	}
 
 	foreach ($possible_parents as $parent) {
-		if (!$parent['current_parent']) {
+		if (!isset($parent['current_parent'])) {
 			$parent ['title'] = $titleMaskCfg->expand_item_title ( $parent );
 			$parent_item_list .= '<option value="' . $parent['item_id'] . '_' . $parent['instance_no'] . '">'
 					. utf8_encode($parent['title']) . '</option>';
@@ -472,7 +472,7 @@ function get_field_value($op, $item_r, $s_attribute_type, $order_no, $s_field_ty
  		$fieldname = get_field_name($s_attribute_type, $order_no);
 
 		// refresh operation!
-		if (!is_array($HTTP_VARS[$fieldname])) {
+		if (isset($HTTP_VARS[$fieldname]) && !is_array($HTTP_VARS[$fieldname])) {
 			if (preg_match("/new([0-9]+)/", $HTTP_VARS[$fieldname], $matches) && isset($HTTP_VARS[$fieldname . '_' . $matches[0]])) {
 				$HTTP_VARS[$fieldname] = $HTTP_VARS[$fieldname . '_' . $matches[0]];
 			} else if ($HTTP_VARS[$fieldname] == 'old') {
@@ -665,7 +665,7 @@ function get_edit_item_form($op, $item_r, $HTTP_VARS, &$upload_file_fields) {
 
 	$results = fetch_item_attribute_type_rs($item_r['s_item_type'], 'not_instance_field_types');
 	if ($results) {
-		$formContents .= "\n<table>";
+		$formContents = "\n<table>";
 		while ($item_attribute_type_r = db_fetch_assoc($results)) {
 			if ($item_attribute_type_r['s_field_type'] == 'ITEM_ID') {
 				continue;
@@ -784,7 +784,7 @@ function get_edit_item_instance_form($op, $item_r, $status_type_r, $HTTP_VARS) {
 
 		while ($item_attribute_type_r = db_fetch_assoc($results)) {
 			if ($item_attribute_type_r['s_field_type'] == 'STATUSTYPE') {
-				$status_type = ifempty(filter_item_input_field($item_attribute_type_r, $HTTP_VARS['s_status_type']), $item_r['s_status_type']);
+				$status_type = ifempty(filter_item_input_field($item_attribute_type_r, $HTTP_VARS['s_status_type'] ?? FALSE), $item_r['s_status_type']);
 
 				if ($op == 'new' || $op == 'site' || $op == 'newinstance' || $op == 'clone_item') {
 					$lookup_results = fetch_newitem_status_type_rs();
@@ -798,12 +798,12 @@ function get_edit_item_instance_form($op, $item_r, $status_type_r, $HTTP_VARS) {
 					'VERTICAL', $status_type)); // value
 				}
 			} else if ($item_attribute_type_r['s_field_type'] == 'STATUSCMNT') {
-				$status_comment = ifempty(filter_item_input_field($item_attribute_type_r, $HTTP_VARS['status_comment']), $item_r['status_comment']);
+				$status_comment = ifempty(filter_item_input_field($item_attribute_type_r, $HTTP_VARS['status_comment'] ?? FALSE), $item_r['status_comment']);
 
 				$formContents .= get_item_input_field('status_comment', $item_attribute_type_r, NULL, //$item_r
 				$status_comment);
 			} else if ($item_attribute_type_r['s_field_type'] == 'DURATION') {
-				$borrow_duration = ifempty(filter_item_input_field($item_attribute_type_r, $HTTP_VARS['borrow_duration']), $item_r['borrow_duration']);
+				$borrow_duration = ifempty(filter_item_input_field($item_attribute_type_r, $HTTP_VARS['borrow_duration'] ?? FALSE), $item_r['borrow_duration']);
 
 				// The S_DURATION lookup list will most likely include an 'Undefined' option, that equates
 				// to an empty string.  So for Updates, we want to allow for a match, by forcing any NULL
@@ -889,8 +889,10 @@ function get_edit_form($op, $item_r, $status_type_r, $HTTP_VARS) {
 		$pageContents .= "\n<input type=\"hidden\" name=\"start-op\" value=\"$op\">";
 		$pageContents .= "\n<input type=\"hidden\" name=\"s_item_type\" value=\"" . $item_r['s_item_type'] . "\">";
 
-		$pageContents .= "\n<input type=\"hidden\" name=\"parent_item_id\" value=\"" . $HTTP_VARS['parent_item_id'] . "\">";
-		$pageContents .= "\n<input type=\"hidden\" name=\"parent_instance_no\" value=\"" . $HTTP_VARS['parent_instance_no'] . "\">";
+		if (strlen( $HTTP_VARS['parent_item_id'] ?? '') > 0)
+			$pageContents .= "\n<input type=\"hidden\" name=\"parent_item_id\" value=\"" . $HTTP_VARS['parent_item_id'] . "\">";
+		if (strlen( $HTTP_VARS['parent_instance_no'] ?? '') > 0)
+			$pageContents .= "\n<input type=\"hidden\" name=\"parent_instance_no\" value=\"" . $HTTP_VARS['parent_instance_no'] . "\">";
 
 		if ($op == 'clone_item' || is_not_empty_array($item_r)) {
 			if (is_numeric($item_r['item_id']))
@@ -899,9 +901,8 @@ function get_edit_form($op, $item_r, $status_type_r, $HTTP_VARS) {
 				$pageContents .= "\n<input type=\"hidden\" name=\"instance_no\" value=\"" . $item_r['instance_no'] . "\">";
 		}
 
-		if (strlen($HTTP_VARS['owner_id']) > 0) {
+		if (strlen($HTTP_VARS['owner_id'] ?? '') > 0)
 			$pageContents .= "\n<input type=\"hidden\" name=\"owner_id\" value=\"" . $HTTP_VARS['owner_id'] . "\">";
-		}
 
 		$pageContents .= $formContents;
 
@@ -1117,7 +1118,7 @@ function do_op_title($item_r, $status_type_r, $op) {
 		$item_title = get_opendb_lang_var('new_item_instance_title', array('display_title' => $titleMaskCfg->expand_item_title($item_r)));
 	}
 
-	echo _theme_header($item_title, $HTTP_VARS['inc_menu']);
+	echo _theme_header($item_title, $HTTP_VARS['inc_menu'] ?? NULL);
 	echo ("<h2>" . $item_title . " " . get_item_image($item_r['s_item_type']) . "</h2>\n");
 }
 
diff --git a/lib/Listing.class.php b/lib/Listing.class.php
index 7c98ba8c..3485fe55 100644
--- a/lib/Listing.class.php
+++ b/lib/Listing.class.php
@@ -81,10 +81,10 @@ function setShowItemImages($b) {
 	function setTotalItems($total_items) {
 		$this->_total_items = $total_items;
 		
-		if (is_numeric ( $this->_total_items ) && $this->_total_items > 0) {
-			if (is_numeric ( $this->_items_per_page ) && $this->_items_per_page > 0) {
-				if (is_numeric ( $this->_http_vars ['page_no'] )) {
-					$this->_page_no = $this->_http_vars ['page_no'];
+		if (is_numeric( $this->_total_items ) && $this->_total_items > 0) {
+			if (is_numeric( $this->_items_per_page ) && $this->_items_per_page > 0) {
+				if (is_numeric( $this->_http_vars['page_no'] ?? '' )) {
+					$this->_page_no = $this->_http_vars['page_no'];
 					
 					// We need to ensure that the $page_no is realistic for the number of items.
 					$this->_start_index = ($this->_page_no - 1) * $this->_items_per_page;
diff --git a/lib/inputfields.php b/lib/inputfields.php
index b92331c5..f59d85d7 100644
--- a/lib/inputfields.php
+++ b/lib/inputfields.php
@@ -97,7 +97,7 @@ function get_item_input_field($fieldname, $item_attribute_type_r, $item_r, $valu
 	} else if ($item_attribute_type_r ['input_type'] == 'readonly') {
 		$field = readonly_field ( $fieldname, $value );
 	} else if ($item_attribute_type_r ['input_type'] == 'textarea' || $item_attribute_type_r ['input_type'] == 'htmlarea') { 	// arg[0] = rows, arg[1] = cols, arg[2] = length
-		$field = textarea_field ( $fieldname, $prompt, $widget ['args'] ['0'], $widget ['args'] ['1'], $widget ['widget'] ['2'], $compulsory_ind, $value, $onchange_event, $disabled );
+		$field = textarea_field ( $fieldname, $prompt, $widget ['args'] ['0'], $widget ['args'] ['1'], $widget ['args'] ['2'], $compulsory_ind, $value, $onchange_event, $disabled );
 	} else if ($item_attribute_type_r ['input_type'] == 'text') {	// arg[0] = length of field, arg[1] = maxlength of field
 		$field = text_field ( $fieldname, $prompt, $widget ['args'] ['0'], $widget ['args'] ['1'], $compulsory_ind, $value, $onchange_event, $disabled, $multi_value );
 	} else if ($item_attribute_type_r ['input_type'] == 'password') { 	// arg[0] = length of field, arg[1] = maxlength of field
@@ -469,7 +469,7 @@ function readonly_field($name, $value) {
  * Generic function to be used by all 'text' fields
  */
 function multivalue_text_field($class, $name, $size, $maxlength, $onchange, $value) {
-	$buffer .= "\n<div class=\"multiValue\">";
+	$buffer = "\n<div class=\"multiValue\">";
 	$buffer .= "<ul class=\"multiValue\" id=\"${name}-multi_value_list\">";
 	for($i = 0; $i < count ( $value ); $i ++) {
 		$buffer .= "\n<li><input type=\"text\" class=\"text\" name=\"" . $name . "[]\" $onchange size=\"" . $size . "\" " . (is_numeric ( $maxlength ) ? "maxlength=\"" . $maxlength . "\"" : "") . " value=\"" . $value [$i] . "\"></li>";
@@ -633,6 +633,7 @@ function datetime_field($name, $prompt, $format_mask, $auto_datetime, $compulsor
 	}
 
     $size = strlen($format_mask);
+    $maxlength = $size + 2;
 	
 	if ($multi_value) {
 		for($i = 0; $i < count ( $value ); $i ++) {
@@ -716,7 +717,8 @@ function url($name, $item_r, $item_attribute_type_r, $prompt, $length, $maxlengt
 	} else {
 		$onchange = "onchange=\"$onchange_event\"";
 	}
-	
+
+    $field = '';
 	if (($item_attribute_type_r ['file_attribute_ind'] ?? '') == 'Y') {
 		$field .= "\n<ul class=\"urlOptionsMenu\" id=\"${name}-tab-menu\" class=\"file-upload-menu\">";
 		$field .= "<li id=\"menu-${name}_saveurl\" class=\"activeTab\" onclick=\"return activateTab('${name}_saveurl', '${name}-tab-menu', '${name}-tab-content', 'activeTab', 'fieldContent');\">URL</li>";
diff --git a/lib/item.php b/lib/item.php
index 11d80fd8..1241163b 100644
--- a/lib/item.php
+++ b/lib/item.php
@@ -336,7 +336,7 @@ function fetch_available_item_parents($HTTP_VARS, $item_r, $filter = null, $incl
 	if ($HTTP_VARS['parent_item_id'] ?? 0 > 0) {
 		$current_parents[] = $HTTP_VARS['parent_item_id'];
 	} else {
-		$parent_instance_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no'], RELATED_PARENTS_MODE);
+		$parent_instance_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no'] ?? NULL, RELATED_PARENTS_MODE);
 
 		if ($parent_instance_rs !== false) {
 			foreach ($parent_instance_rs as $parent_instance_r) {
@@ -346,7 +346,7 @@ function fetch_available_item_parents($HTTP_VARS, $item_r, $filter = null, $incl
         }
     }
 
-	$children_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no']);
+	$children_rs = fetch_item_instance_relationship_rs($item_r['item_id'], $item_r['instance_no'] ?? NULL);
 	$children = array();
 	if ($children_rs !== false) {
 		while ($child = db_fetch_assoc($children_rs)) {
@@ -390,7 +390,7 @@ function fetch_available_item_parents($HTTP_VARS, $item_r, $filter = null, $incl
                 }
             }
 
-            if (!$item['current_parent'] || ($item['current_parent'] && $include_parents)) {
+            if (!isset($item['current_parent']) || ($item['current_parent'] && $include_parents)) {
                 $items[] = $item;
             }
         }
@@ -657,7 +657,10 @@ function fetch_item_listing_cnt($HTTP_VARS, $column_display_config_rs = NULL) {
 			if ($column_display_config_rs [$i] ['column_type'] == 's_attribute_type') {
 				// if not an order by column, we want to generate the fields individually in the listings page.
 				if ($column_display_config_rs [$i] ['orderby_support_ind'] === 'Y') {
-					if (strlen ( $column_display_config_rs [$i] ['attribute_val'] ) > 0 && ($column_display_config_rs [$i] ['attr_match'] == 'word' || $column_display_config_rs [$i] ['attr_match'] == 'partial') && $column_display_config_rs [$i] ['search_attribute_ind'] == 'y') {
+					if (strlen ( $column_display_config_rs[$i]['attribute_val'] ?? '') > 0 &&
+						($column_display_config_rs[$i]['attr_match'] == 'word' ||
+						 $column_display_config_rs[$i]['attr_match'] == 'partial') &&
+						$column_display_config_rs[$i]['search_attribute_ind'] == 'y') {
 						$query .= ', ifnull(ia' . $i . '.attribute_val,ia' . $i . '.lookup_attribute_val)';
 					}
 				}
diff --git a/lib/language.php b/lib/language.php
index 81323d03..10b3324a 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -163,7 +163,7 @@ function get_opendb_lang_var($varname, $find = NULL, $replace = NULL) {
 		}
 	}
 	
-	if (strlen ( $LANG_VARS [$varname] ) > 0) {
+	if (strlen ( $LANG_VARS [$varname] ?? '') > 0) {
 		$langval = trim ( str_replace ( "\\n", "\n", $LANG_VARS [$varname] ) );
 		
 		if (is_array ( $find )) {
diff --git a/lib/widgets.php b/lib/widgets.php
index bfede46f..8807226d 100644
--- a/lib/widgets.php
+++ b/lib/widgets.php
@@ -257,6 +257,7 @@ function format_footer_links($links_rs) {
 
 function _format_help_entry($help_entry_r) {
 	if (is_array ( $help_entry_r )) {
+		$entry = '';
 		if (isset ( $help_entry_r ['img'] ))
 			$entry .= theme_image ( $help_entry_r ['img'], $help_entry_r ['text'] ) . " ";
 		$entry .= $help_entry_r ['text'];
diff --git a/listings.php b/listings.php
index 993dca79..153cc5f2 100644
--- a/listings.php
+++ b/listings.php
@@ -307,7 +307,7 @@ function get_column_display_config(&$HTTP_VARS, $show_owner_column, $show_action
 		$v_column_display_config_rs = &filter_for_printable_list($v_column_display_config_rs);
 	}
 
-	if (($HTTP_VARS['attr_match'] ?? '') != 'category' && strlen($HTTP_VARS['attribute_type']) > 0) {
+	if (($HTTP_VARS['attr_match'] ?? '') != 'category' && strlen($HTTP_VARS['attribute_type'] ?? '') > 0) {
 		// Now we have to merge in search terms, and add them after the 'title' column_id
 		$v_column_display_config_rs = &merge_display_column_config_arrays(
 			$v_column_display_config_rs,

From 13254ec391c98e7d062dd630981e4d621b755a75 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Wed, 20 Oct 2021 10:38:20 -0400
Subject: [PATCH 08/11] Fix more warnings and uninitialized values

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 lib/BooleanParser.class.php | 16 ++++++++--------
 lib/item.php                |  2 +-
 lib/whatsnew.php            |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/BooleanParser.class.php b/lib/BooleanParser.class.php
index c2349ead..b27847a3 100644
--- a/lib/BooleanParser.class.php
+++ b/lib/BooleanParser.class.php
@@ -40,9 +40,9 @@ function parse($string, $lookahead = NULL) {
 			$this->lookahead = $lookahead;
 		else
 			$this->lookahead = 0; // no lookahead
-			
 
 		// Initialise lookahead stack
+		$this->tokPtr = 0;
 		$this->stackPtr = 0;
 		$this->tokenStack = array();
 	}
@@ -257,7 +257,7 @@ function parseBooleanStatement($statement) {
 		$this->lexer->parse ( $statement, 1 );
 
 		while ( true ) {
-			$statement = $this->parseStatement ();
+			$statement = $this->parseStatement();
 			if ($statement === FALSE)
 				return FALSE;
 			else if ($statement !== NULL)
@@ -266,7 +266,7 @@ function parseBooleanStatement($statement) {
 				break; // finished
 		}
 
-		return $statements;
+		return $statements ?? NULL;
 	}
 
 	function getError() {
@@ -315,12 +315,12 @@ function parseCompoundStatement() {
 			$condition = $token;
 		}
 		
-		if ($condition !== FALSE) {
-			$conditions [] = $condition;
+		if ($condition ?? TRUE !== FALSE) {
+			$conditions [] = $condition ?? NULL;
 			while ( true ) {
-				$token = $this->lexer->nextToken ();
+				$token = $this->lexer->nextToken();
 				if ($token == 'AND') {
-					$condition = $this->parseCompoundStatement ();
+					$condition = $this->parseCompoundStatement();
 					if ($condition !== FALSE)
 						$conditions [] = $condition;
 					else
@@ -331,7 +331,7 @@ function parseCompoundStatement() {
 				}
 			}
 			
-			if (is_array ( $conditions ) && count ( $conditions ) > 1)
+			if (is_array ( $conditions ?? '' ) && count ( $conditions ) > 1)
 				return array (
 						'and' => $conditions );
 			else
diff --git a/lib/item.php b/lib/item.php
index 1241163b..f4497b44 100644
--- a/lib/item.php
+++ b/lib/item.php
@@ -915,7 +915,7 @@ function from_and_where_clause($HTTP_VARS, $column_display_config_rs = NULL, $qu
 			$parser = new BooleanParser ();
 			$statements = $parser->parseBooleanStatement ( $HTTP_VARS ['title'] );
 			if (is_array ( $statements )) {
-				$where_r [] = build_boolean_clause ( $statements, 'i.title', $HTTP_VARS ['title_match'], 'AND', $HTTP_VARS ['title_case'] );
+				$where_r [] = build_boolean_clause ( $statements, 'i.title', $HTTP_VARS ['title_match'], 'AND', $HTTP_VARS ['title_case'] ?? NULL);
 			}
 		} else {
 			if (is_null ( $HTTP_VARS ['title_case'] )) {
diff --git a/lib/whatsnew.php b/lib/whatsnew.php
index 14dfdc8e..68d6421a 100644
--- a/lib/whatsnew.php
+++ b/lib/whatsnew.php
@@ -84,7 +84,7 @@ function get_last_num_items_rs($num_of_items, $owner_id = NULL, $s_item_type = N
 			$item_r ['itemtypeimage'] ['title'] = $item_type_r ['description'];
 			$item_r ['itemtypeimage'] ['s_item_type'] = $item_r ['s_item_type'];
 			
-			if (get_opendb_config_var ( 'welcome.last_items_list', 'show_item_image' ) !== FALSE) {
+			if (get_opendb_config_var ( 'listings', 'show_item_image' ) !== FALSE) {
 				if (! is_array ( $image_attribute_type_rs ) || ! is_array ( $image_attribute_type_rs [$item_r ['s_item_type']] )) {
 					$image_attribute_type_rs [$item_r ['s_item_type']] = fetch_sfieldtype_item_attribute_type_r ( $item_r ['s_item_type'], 'IMAGE' );
 				}

From 9a01168f71c700c3f4abd9ae8b8a60a206da11ed Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Wed, 20 Oct 2021 14:32:54 -0400
Subject: [PATCH 09/11] Fix incorrect const, and warnings

borrow.php: Fix incorrect constant name

Fix warnings of uninitialized variables.

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 borrow.php            |  8 ++++----
 lib/displayfields.php | 10 +++++-----
 stats.php             |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/borrow.php b/borrow.php
index 7607b92e..7143099d 100644
--- a/borrow.php
+++ b/borrow.php
@@ -232,7 +232,7 @@
 					echo ("\n<input type=\"hidden\" name=\"op\" value=\"my_history\">");
 
 					echo ("\n<table>");
-					$results = fetch_user_rs(PERM_USER_BORROWER, ROLE_PERMISSIONS_INCLUDE, INCLUDE_CURRENT_USER, EXCLUDE_DEACTIVATED_USER, "fullname", "ASC");
+					$results = fetch_user_rs(PERM_USER_BORROWER, INCLUDE_ROLE_PERMISSIONS, INCLUDE_CURRENT_USER, EXCLUDE_DEACTIVATED_USER, "fullname", "ASC");
 					echo (format_field(get_opendb_lang_var('borrower'), custom_select('uid', $results, '%fullname% (%user_id%)', 1, get_opendb_session_var('user_id'), 'user_id')));
 
 					echo ("</table>");
@@ -252,7 +252,7 @@
 
 				if ($show_listings) {
 					echo (_theme_header($page_title));
-					echo ('<h2>' . $page_title . ' ' . $page_image . '</h2>');
+					echo ('<h2>' . $page_title . ' ' . ($page_image ?? '') . '</h2>');
 
 					$listingObject->startListing($page_title);
 
@@ -298,7 +298,7 @@
 					$listingObject->addHeaderColumn(get_opendb_lang_var('more_information'));
 
 					// If mysql resultset or static $item_reservation_rs array defined, we can continue.
-					if ($result) {
+					if (isset($result)) {
 						while ($borrowed_item_r = db_fetch_assoc($result)) {
 							$listingObject->startRow();
 
@@ -497,7 +497,7 @@
 
 					echo ("<p class=\"listingDate\">" . get_opendb_lang_var('listing_generated', 'datetime', get_localised_timestamp(get_opendb_config_var('listings', 'print_listing_datetime_mask'))) . "</p>");
 
-					echo (format_footer_links($footer_links_r));
+					echo (format_footer_links($footer_links_r ?? ''));
 					echo (_theme_footer());
 
 				}//end if($show_listings)		
diff --git a/lib/displayfields.php b/lib/displayfields.php
index 99754859..eb4e6fe9 100644
--- a/lib/displayfields.php
+++ b/lib/displayfields.php
@@ -42,11 +42,11 @@ function get_display_field($s_attribute_type, $prompt, $display_type, $value, $d
 			's_attribute_type' => $s_attribute_type,
 			'prompt' => $prompt,
 			'display_type' => $display_type_def ['type'],
-			'display_type_arg1' => $display_type_def ['args'] [0],
-			'display_type_arg2' => $display_type_def ['args'] [1],
-			'display_type_arg3' => $display_type_def ['args'] [2],
-			'display_type_arg4' => $display_type_def ['args'] [3],
-			'display_type_arg5' => $display_type_def ['args'] [4] ), $value, $dowrap, $prompt_mask );
+			'display_type_arg1' => $display_type_def ['args'] [0] ?? '',
+			'display_type_arg2' => $display_type_def ['args'] [1] ?? '',
+			'display_type_arg3' => $display_type_def ['args'] [2] ?? '',
+			'display_type_arg4' => $display_type_def ['args'] [3] ?? '',
+			'display_type_arg5' => $display_type_def ['args'] [4] ?? '' ), $value, $dowrap, $prompt_mask );
 }
 
 function get_item_display_field($item_r, $item_attribute_type_r, $value = NULL, $dowrap = TRUE, $prompt_mask = NULL) {
diff --git a/stats.php b/stats.php
index 7eba9930..48937bf1 100644
--- a/stats.php
+++ b/stats.php
@@ -104,8 +104,7 @@ function build_item_stats() {
 		$toggle = TRUE;
 
 		// Totals.
-		$sum_loaned = 0;
-		$sum_reserved = 0;
+		$sum_total = 0;
 
 		while ($user_r = db_fetch_assoc($result)) {
 			$user_name = get_opendb_lang_var('user_name', array('fullname' => $user_r['fullname'], 'user_id' => $user_r['user_id']));

From a469d8e37c372ba4c1e9d1b0273a8621422f6b20 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Sun, 24 Oct 2021 14:15:14 -0400
Subject: [PATCH 10/11] Fix bug in item input

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 item_input.php  | 2 +-
 lib/widgets.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/item_input.php b/item_input.php
index e6d32cb3..59cc2728 100644
--- a/item_input.php
+++ b/item_input.php
@@ -420,7 +420,7 @@ function start_item_input_form($HTTP_VARS, $op) {
 		echo ("<input type=hidden name=\"parent_item_id\" value=\"" . $HTTP_VARS['parent_item_id'] . "\">\n");
 	if (isset($HTTP_VARS['parent_instance_no']))
 		echo ("<input type=hidden name=\"parent_instance_no\" value=\"" . $HTTP_VARS['parent_instance_no'] . "\">\n");
-	echo ("<input type=hidden name=\"" . $op . "\" value=\"site-search\">\n");
+	echo ("<input type=hidden  name=\"op\" value=\"" . $op . "\">\n");
 }
 
 /**
diff --git a/lib/widgets.php b/lib/widgets.php
index 8807226d..fa868390 100644
--- a/lib/widgets.php
+++ b/lib/widgets.php
@@ -402,7 +402,7 @@ function format_error_block($errors, $err_type = 'error') {
 			else if (is_array ( $error ['detail'] ))
 				$detail_rs = $error ['detail'];
 			
-			if (is_not_empty_array ( $detail_rs )) {
+			if (is_not_empty_array ( $detail_rs ?? "")) {
 				$details = "";
 				foreach ( $detail_rs as $detail ) {
 					$details .= "\n<li class=\"$smclass\">" . $detail . "</li>";

From 7daa5074fdd4ae9d68ea3a81d1c8a9d81468be44 Mon Sep 17 00:00:00 2001
From: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Date: Thu, 11 Nov 2021 15:29:52 -0500
Subject: [PATCH 11/11] Fix admin attribute changes

Also more warnings

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
---
 admin/backup/index.php           |  1 +
 admin/s_attribute_type/index.php |  8 ++--
 lib/admin.php                    |  2 +-
 lib/filecache.php                | 78 ++++++++++++++++----------------
 lib/item_attribute.php           |  2 +-
 lib/whatsnew.php                 | 12 +++--
 listings.php                     |  2 +-
 login.php                        |  2 +-
 url.php                          |  2 +-
 9 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/admin/backup/index.php b/admin/backup/index.php
index 13dca4cf..7bf78d29 100644
--- a/admin/backup/index.php
+++ b/admin/backup/index.php
@@ -126,6 +126,7 @@ function get_table_content($table, $crlf) {
 	echo ("<ul class=\"checkboxGridOptionsVertical\">");
 
 	$opendb_tables_r = fetch_opendb_table_list_r();
+	$count = 0;
 	foreach ($opendb_tables_r as $table) {
 		// the cache tables cannot be backed up as they might contain
 		// binary data, which we don't yet support.
diff --git a/admin/s_attribute_type/index.php b/admin/s_attribute_type/index.php
index 36c3b631..6774861a 100644
--- a/admin/s_attribute_type/index.php
+++ b/admin/s_attribute_type/index.php
@@ -246,7 +246,7 @@ function display_lookup_attribute_type_form($HTTP_VARS) {
 		db_free_result($results);
 	}
 
-	$emptyrows = 20 - (count($attribute_type_rows) % 20);
+	$emptyrows = 20 - (count($attribute_type_rows ?? []) % 20);
 	if ($emptyrows == 0)
 		$emptyrows = 20;
 
@@ -786,7 +786,7 @@ function set_attribute_ind_type(&$HTTP_VARS) {
 		$save_button = 'Insert';
 	}
 
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? ""))
 		echo format_error_block($errors);
 
 	echo ("\n<form name=\"s_attribute_type\" action=\"$PHP_SELF\" method=\"POST\">");
@@ -798,7 +798,7 @@ function set_attribute_ind_type(&$HTTP_VARS) {
 	display_edit_form($attribute_type_r, $HTTP_VARS);
 	echo ("\n</table>");
 
-	echo (format_help_block(array('img' => 'compulsory.gif', 'text' => get_opendb_lang_var('compulsory_field'), id => 'compulsory')));
+	echo (format_help_block(array('img' => 'compulsory.gif', 'text' => get_opendb_lang_var('compulsory_field'), 'id' => 'compulsory')));
 
 	if (get_opendb_config_var('widgets', 'enable_javascript_validation') !== FALSE)
 		echo ("\n<input type=\"button\" class=\"button\" value=\"$save_button\" onclick=\"if(!checkForm(this.form)){return false;}else{this.form.submit();}\">");
@@ -831,7 +831,7 @@ function toggleChecked(element, name)
 
 	echo ("\n<h3>Edit " . $HTTP_VARS['s_attribute_type'] . " Attribute Type Lookups</h3>");
 
-	if (is_not_empty_array($errors))
+	if (is_not_empty_array($errors ?? ""))
 		echo format_error_block($errors);
 
 	display_lookup_attribute_type_form($HTTP_VARS);
diff --git a/lib/admin.php b/lib/admin.php
index aed75bc0..d117ea93 100644
--- a/lib/admin.php
+++ b/lib/admin.php
@@ -53,7 +53,7 @@ function get_user_browser_crlf() {
 	
 	if ($browser_os == 'Win') // Win case
 		return "\r\n";
-	else if (PMA_USR_OS == 'Mac') // Mac case
+	else if ($browser_os == 'Mac') // Mac case
 		return "\r";
 	else // Others
 		return "\n";
diff --git a/lib/filecache.php b/lib/filecache.php
index a1d42459..29960717 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -114,14 +114,14 @@ function get_item_input_file_upload_url($filename) {
 }
 
 function filecache_generate_cache_filename($file_cache_r, $thumbnail = FALSE) {
-	$prefix = strtolower ( $file_cache_r ['cache_type'] );
+	$prefix = strtolower( $file_cache_r['cache_type'] );
 	if ($thumbnail)
 		$prefix .= 'Thumb';
 	
-	$randomNum = $file_cache_r ['sequence_number'] . '_' . generate_random_num ();
-	$extension = $file_cache_r ['extension'];
+	$randomNum = $file_cache_r['sequence_number'] . '_' . generate_random_num ();
+	$extension = $file_cache_r['extension'];
 	
-	return $prefix . $sequence_number . '_' . $randomNum . '.' . $extension;
+	return $prefix . $randomNum . '.' . $extension;
 }
 
 function save_uploaded_file($tmpFile, $name) {
@@ -158,24 +158,23 @@ function save_uploaded_file($tmpFile, $name) {
 }
 
 /**
-	Returns an array which includes fullsize and cached image versions, complete
-	with dimensions.  Its quite possible that the dimensions for the fullsize image
-	will not be available in which case it should be set in the calling function
-	for the popup window size.
-
-	array(
-	'thumbnail'=>
-	array('url'=>urlOfThumbnail,
-	'width'=>widthOfThumbnail,
-	'height'=>heightOfThumbnail),
-	'fullsize'=>
-	array('url'=>urlOfFullsize,
-	'width'=>widthOfFullsize,
-	'height'=>heightOfFullsize));
-
-	NOTE: There is an assumption that this function is only ever used for IMAGE
-	group entries.
-	*/
+ *	Returns an array which includes fullsize and cached image versions, complete
+ *	with dimensions.  Its quite possible that the dimensions for the fullsize image
+ *	will not be available in which case it should be set in the calling function
+ *	for the popup window size.
+ *
+ *	array('thumbnail'=>
+ *	          array('url'=>urlOfThumbnail,
+ *	                'width'=>widthOfThumbnail,
+ *	                'height'=>heightOfThumbnail),
+ *	      'fullsize'=>
+ *	          array('url'=>urlOfFullsize,
+ *	                'width'=>widthOfFullsize,
+ *	                'height'=>heightOfFullsize));
+ *
+ *	NOTE: There is an assumption that this function is only ever used for IMAGE
+ *	group entries.
+ */
 function file_cache_get_image_r($url, $type) {
 	if ($type == 'display')
 		$thumbnail_size_r = get_opendb_config_var ( 'item_display', 'item_image_size' );
@@ -185,6 +184,9 @@ function file_cache_get_image_r($url, $type) {
 		$thumbnail_size_r = get_opendb_config_var ( 'item_input.site', 'item_image_size' );
 	
 	$file_r = array ();
+	$uploadUrl = FALSE;
+	$file = FALSE;
+	$thumbnail_file = FALSE;
 	
 	if (strlen ( $url ) > 0) {
 		$file_cache_r = fetch_url_file_cache_r ( $url, 'ITEM', INCLUDE_EXPIRED );
@@ -207,20 +209,20 @@ function file_cache_get_image_r($url, $type) {
 			$file_r ['thumbnail'] ['url'] = $uploadUrl;
 			$file_r ['url'] = $uploadUrl;
 		}
-		
+
 		if ($file_cache_r !== FALSE) {
 			$file = file_cache_get_cache_file ( $file_cache_r );
 			$thumbnail_file = file_cache_get_cache_file_thumbnail ( $file_cache_r );
-		} else if ($uploadUrl !== FALSE) {
+		} else if ($uploadUrl) {
 			$file = $uploadUrl;
 			$thumbnail_file = $uploadUrl;
 		}
-		
+
 		// defaults
 		$file_r ['fullsize'] ['width'] = '400';
 		$file_r ['fullsize'] ['height'] = '300';
-		
-		if ($file !== FALSE) {
+
+		if ($file) {
 			$size = @getimagesize ( $file );
 			
 			if (is_array ( $size ) && $size [0] > 0 && $size [1] > 0) {
@@ -228,23 +230,23 @@ function file_cache_get_image_r($url, $type) {
 				$file_r ['fullsize'] ['height'] = $size [1];
 			}
 		}
-		
-		if ($thumbnail_file !== FALSE) {
+
+		if ($thumbnail_file) {
 			$size = @getimagesize ( $thumbnail_file );
-			if (is_array ( $size )) {
-				$file_r ['thumbnail'] ['width'] = $size [0];
-				$file_r ['thumbnail'] ['height'] = $size [1];
+			if (is_array( $size )) {
+				$file_r['thumbnail']['width'] = $size[0];
+				$file_r['thumbnail']['height'] = $size[1];
 				
-				if (is_numeric ( $thumbnail_size_r ['width'] ) && $thumbnail_size_r ['width'] < $file_r ['thumbnail'] ['width']) {
-					$file_r ['thumbnail'] ['width'] = $thumbnail_size_r ['width'];
+				if (is_numeric( $thumbnail_size_r['width'] ?? "") && $thumbnail_size_r['width'] < $file_r['thumbnail']['width']) {
+					$file_r['thumbnail']['width'] = $thumbnail_size_r['width'];
 					
 					// let browser auto dither image
-					$file_r ['thumbnail'] ['height'] = NULL;
-				} else if (is_numeric ( $thumbnail_size_r ['height'] ) && $thumbnail_size_r ['height'] < $file_r ['thumbnail'] ['height']) {
-					$file_r ['thumbnail'] ['height'] = $thumbnail_size_r ['height'];
+					$file_r['thumbnail']['height'] = NULL;
+				} else if (is_numeric( $thumbnail_size_r['height'] ) && $thumbnail_size_r['height'] < $file_r['thumbnail']['height']) {
+					$file_r['thumbnail']['height'] = $thumbnail_size_r['height'];
 					
 					// let browser auto dither image
-					$file_r ['thumbnail'] ['width'] = NULL;
+					$file_r['thumbnail']['width'] = NULL;
 				}
 			}
 		}
diff --git a/lib/item_attribute.php b/lib/item_attribute.php
index f854ab3f..7af6c454 100644
--- a/lib/item_attribute.php
+++ b/lib/item_attribute.php
@@ -781,7 +781,7 @@ function _insert_or_update_item_attributes($item_id, $instance_no, $s_item_type,
 			
 			db_query ( "UNLOCK TABLES" );
 			
-			if (is_array ( $file_attributes_rs )) {
+			if (isset( $file_attributes_rs )) {
 				foreach ($file_attributes_rs as $file_attribute_r) {
 					file_cache_insert_file ( $file_attribute_r ['attribute_val'], NULL, NULL, NULL, 'ITEM', $file_attribute_r ['file_attribute_ind'] == 'Y' );
 				}
diff --git a/lib/whatsnew.php b/lib/whatsnew.php
index 68d6421a..7a946f7d 100644
--- a/lib/whatsnew.php
+++ b/lib/whatsnew.php
@@ -69,11 +69,13 @@ function get_last_num_items_rs($num_of_items, $owner_id = NULL, $s_item_type = N
 			
 			$item_type_r = fetch_item_type_r ( $item_r ['s_item_type'] );
 			$itemtypeimagesrc = theme_image_src ( $item_type_r ['image'] );
-			
-			$size = @getimagesize ( $itemtypeimagesrc );
-			if (is_array ( $size )) {
-				$item_r ['itemtypeimage'] ['width'] = $size [0];
-				$item_r ['itemtypeimage'] ['height'] = $size [1];
+
+			if ($itemtypeimagesrc) {
+				$size = @getimagesize ( $itemtypeimagesrc );
+				if (is_array ( $size )) {
+					$item_r ['itemtypeimage'] ['width'] = $size [0];
+					$item_r ['itemtypeimage'] ['height'] = $size [1];
+				}
 			}
 			
 			$item_r ['itemtypeimage'] ['url'] = $itemtypeimagesrc;
diff --git a/listings.php b/listings.php
index 153cc5f2..51a9aaa8 100644
--- a/listings.php
+++ b/listings.php
@@ -1013,7 +1013,7 @@ function get_match_type($match) {
 
 			echo ("<ul class=\"listingControls\">");
 			if (get_opendb_config_var('listings', 'allow_override_show_item_image') !== FALSE) {
-				echo ("<li>" . getToggleControl($PHP_SELF, $HTTP_VARS, get_opendb_lang_var('show_item_image'), 'show_item_image', ifempty($HTTP_VARS['show_item_image'], get_opendb_config_var('listings', 'show_item_image') == TRUE ? 'Y' : 'N')) . "</li>");
+				echo ("<li>" . getToggleControl($PHP_SELF, $HTTP_VARS, get_opendb_lang_var('show_item_image'), 'show_item_image', ifempty($HTTP_VARS['show_item_image'] ?? "", get_opendb_config_var('listings', 'show_item_image') == TRUE ? 'Y' : 'N')) . "</li>");
 			}
 			echo ("<li>" . getItemsPerPageControl($PHP_SELF, $HTTP_VARS) . "</li>");
 			echo ("</ul>");
diff --git a/login.php b/login.php
index c0aea8e4..1b4eb77d 100644
--- a/login.php
+++ b/login.php
@@ -214,7 +214,7 @@ function perform_newpassword($HTTP_VARS, &$errors) {
 			return;
 		}
 	} else { //if($HTTP_VARS['op'] == 'login')
-		if (strlen($HTTP_VARS['uid']) > 0 && strlen($HTTP_VARS['passwd']) > 0) {
+		if (strlen($HTTP_VARS['uid'] ?? "") > 0 && strlen($HTTP_VARS['passwd']) > 0) {
 			$result = perform_login($HTTP_VARS);
 			if ($result === TRUE) {
 				if (strlen($HTTP_VARS['redirect']) > 0) {
diff --git a/url.php b/url.php
index d07c9dc3..0b584796 100644
--- a/url.php
+++ b/url.php
@@ -87,7 +87,7 @@ function handle_file_cache($file_cache_r, $isThumbnail = FALSE) {
 	if (is_opendb_valid_session() || is_site_public_access()) {
 		$isThumbnail = ifempty($HTTP_VARS['op'], 'fullscreen') == 'thumbnail';
 
-		if (is_numeric($HTTP_VARS['id'])) {
+		if (is_numeric($HTTP_VARS['id'] ?? "")) {
 			$file_cache_r = fetch_file_cache_r($HTTP_VARS['id']);
 			if ($file_cache_r !== FALSE) {
 				if ($file_cache_r['cache_type'] != 'ITEM' || is_user_granted_permission(PERM_VIEW_ITEM_COVERS)) {