diff --git a/Credits.txt b/Credits.txt index 4d366122..c8081d33 100644 --- a/Credits.txt +++ b/Credits.txt @@ -1,12 +1,12 @@ -IPS Community Suite +Invision Community (c) Invision Power Services, Inc. Invision Power Services, Inc. is grateful to the following projects, whose work -has been used throughout the IPS Community Suite to add style, flair and functionality +has been used throughout Invision Community to add style, flair and functionality to our product. NULLING - Last Updated: 04 May 2017 + Last Updated: 25 July 2017 Author: IPBMafia.ru AES implementation in PHP @@ -16,15 +16,14 @@ AES implementation in PHP Website: http://www.movable-type.co.uk/scripts/aes-php.html License: http://creativecommons.org/licenses/by/3.0/ -Base64.js Polyfill - Description: Polyfill for JS AtoB and BtoA methods in Chat - Location: /applications/chat/interface/base64/base64.js - Included version: 0.3.0 - Website: https://github.com/davidchambers/Base64.js - License: http://www.apache.org/licenses/LICENSE-2.0 +BMDoHyeon font package + Description: Provides unicode font files for Korean language + Location: system/3rd_party/Fonts + Website: http://font.woowahan.com/dohyeon/ + License: Open Font License Buzz.js - Description: HTML5 audio support for notifications & chat + Description: HTML5 audio support for notifications Location: applications/core/interface/buzz Included version: 1.2 Website: http://buzz.jaysalvat.com/ @@ -33,30 +32,29 @@ Buzz.js CKEditor Description: Provides the editor functionality for submitting content. Location: In development: applications/core/dev/ckeditor (custom build with additional plugins and some code changes) - Included version: 4.6.2 + Included version: 4.7.1 Website: http://ckeditor.com License: http://www.gnu.org/copyleft/lesser.html Codemirror (with C-like, CSS, HTMLMixed, JavaScript, PHP, SQL and XML modes and merge, search, and searchcursor addons) Description: Provides code editor for adding code to content, editing templates in the AdminCP, etc. Location: In development: applications/core/dev/codemirror - Included version: 5.22.1 + Included version: 5.25.2 Website: http://codemirror.net License: http://codemirror.net/LICENSE Cropper Description: Provides cropping functionality for profile photos Location: applications/core/interface/cropper - Included version: 0.8 + Included version: 3.0.0-rc Website: https://github.com/fengyuanchen/cropper License: http://opensource.org/licenses/MIT - -Esrever - Description: Unicode-aware string reversing, used in Chat - Location: /applications/chat/interface/esrever/esrever.js - Included version: 0.2.0 - Website: https://github.com/mathiasbynens/esrever - License: http://opensource.org/licenses/MIT + +Devices Icon Pack + Description: Icon pack for representing different devices + Location: In development: applications/core/dev/resources/front/devices + Website: https://www.iconfinder.com/iconsets/devices-42 + License: Free for commercial use FontAwesome Description: General icons for UI @@ -78,12 +76,19 @@ google-code-prettify License: http://www.apache.org/licenses/LICENSE-2.0 google-diff-mode-patch - Description: @todo - Location: @todo + Description: Provides diff comparisons for CodeMirror + Location: applications/core/interface/codemirror/diff_match_patch.js Included version: 19 November 2012 Website: https://code.google.com/p/google-diff-match-patch/ License: http://www.apache.org/licenses/LICENSE-2.0 +Hanazono Mincho font package + Description: Provides unicode font files for CJK (Chinese, Japanese and Korean) languages + Note: We only include HanMinA (a HanMinB file is also available with additional glyphs) + Location: system/3rd_party/Fonts + Website: http://fonts.jp/hanazono/ + License: Hanazono Font License or Open Font License + history.js Description: HTML5 history API, used extensively in controllers Location: /dev/js/library/jquery/jquery.history.js @@ -94,14 +99,14 @@ history.js HTML5shiv Description: Provides some HTML5 compatability for IE8 Location: applications/core/interface/html5shiv/html5shiv.js - Included version: 3.7.2 + Included version: 3.7.3 Website: https://github.com/afarkas/html5shiv License: License: http://opensource.org/licenses/MIT HTMLPurifier Description: Validates and cleans submitted HTML for content Location: system/3rd_party/HTMLPurifier - Included version: 4.8.0 + Included version: 4.9.3 Website: http://htmlpurifier.org License: http://www.gnu.org/copyleft/lesser.html @@ -114,7 +119,7 @@ IcoMoon jQuery Description: JavaScript Library Location: In development: dev/js/library/jquery/jquery.js - Included version: 1.12.4 + Included version: 2.2.4 Website: http://jquery.com License: http://jquery.org/license @@ -128,14 +133,14 @@ jQuery dotdotdot jquery.hoverintent.js Description: Hover library for jQuery used for main navigation Location: dev/js/library/jquery/jquery.hoverintent.js - Included version: 1.8.0 + Included version: 1.8.1 Website: http://cherne.net/brian/resources/jquery.hoverIntent.html License: http://opensource.org/licenses/MIT jQuery imagesLoaded plugin Description: Plugin that can defer script execution until specified images have loaded Location: dev/js/library/jquery/jquery.imagesloaded.js - Included version: 2.1.2 (3.x API isn't compatible with IPS4 at this time) + Included version: 4.4.1 Website: http://desandro.github.io/imagesloaded/ License: http://opensource.org/licenses/MIT @@ -167,10 +172,10 @@ jQuery.transform.js Website: https://github.com/louisremi/jquery.transform.js License: http://opensource.org/licenses/MIT -jQuery UI (core.js, widget.js, mouse.js, position.js, draggable.js, droppable.js, resizable.js, sortable.js, datepicker.js, progressbar.js) +jQuery UI Description: Javascript library for drag+drop, resizing, date polyfill Location: applications/core/interface/jquery/jquery-ui.js - Included version: 1.11.4 + Included version: 1.12.1 Website: http://jqueryui.com License: http://jquery.org/license @@ -184,7 +189,7 @@ jQuery UI TouchPunch JSColor Description: Color selector polyfill Location: applications/core/interface/jscolor - Included version: 1.4.5 (2.x API isn't compatible with IPS4 at this time) + Included version: 1.4.5 (2.x API isn't compatible at this time) Website: http://jscolor.com License: http://www.gnu.org/copyleft/lesser.html @@ -202,19 +207,33 @@ jsTimezoneDetect Website: https://bitbucket.org/pellepim/jstimezonedetect License: http://www.opensource.org/licenses/mit-license.php +linkify + Description: Provides link detection + Location: dev/js/library/linkify + Included version: 2.1.0 + Website: http://soapbox.github.io/linkifyjs/ + License: http://www.opensource.org/licenses/mit-license.php + Mustache.js Description: JS templating engine Location: dev/js/library/mustache/ - Included version: 2.2.1 + Included version: 2.3.0 Website: http://github.com/janl/mustache.js License: http://opensource.org/licenses/MIT Normalize.css Description: Sets base CSS styles for consistency across browsers Location: applications/core/dev/css/global/framework/normalize.css - Included version: 3.0.2 + Included version: 6.0.0 Website: http://necolas.github.io/normalize.css/ License: http://opensource.org/licenses/MIT + +Noto font package + Description: Provides unicode font files for many of the world's languages + Note: We do not include all of the font files available in the Noto package + Location: system/3rd_party/Fonts + Website: https://www.google.com/get/noto + License: SIL OFL 1.1 (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL) parseUri Description: Used to parse URLs in JS @@ -235,7 +254,14 @@ PclZip Included version: 2.8.2 Website: http://www.phpconcept.net/pclzip/ License: http://www.gnu.org/copyleft/lesser.html - + +phpass + Description: Password strength calculator + Location: system/3rd_party/phpass + Included version: Aug 2012 + Website: https://github.com/rchouinard/phpass + License: http://mit-license.org + PHP Diff Implementation Description: Computes difference between two strings, used to display differences between content revisions, themes, etc. Location: system/3rd_party/Diff @@ -257,10 +283,17 @@ phpQuery Website: https://code.google.com/p/phpquery License: http://opensource.org/licenses/mit-license.php +PHP User Agent Parser + Description: Parses user agent strings + Location: system/3rd_party/PhpUserAgent + Included Version: 0.7.0 + Website: https://github.com/donatj/PhpUserAgent + License: http://opensource.org/licenses/mit-license.php + Plupload Description: Facilitates uploading files Location: applications/core/interface/plupload - Included version: 2.1.9 + Included version: 2.3.1 Website: http://www.plupload.com License: http://www.plupload.com/license/plupload_commercial_oem.txt @@ -285,14 +318,14 @@ Underscore.js Video.js Description: HTML5 video player for Gallery Location: applications/interface/videojs - Included version: 4.12.15 + Included version: 5.19.2 Website: http://www.videojs.com/ License: https://github.com/videojs/video.js/blob/master/LICENSE Whoops Description: Provides error handling for development mode Location: dev/Whoops - Included Version: 2.1.4 + Included Version: 2.1.8 Website: http://filp.github.io/whoops/ License: https://github.com/filp/whoops/blob/master/LICENSE.md @@ -306,12 +339,6 @@ world-flags-sprite XRegExp (with addons) Description: Advanced Regular Expression JS library, used in autolink editor plugin and search result highlighting Location: In development: dev/js/library/xregexp/xregexp-all.js - Included Version: 3.1.1 + Included Version: 3.2.0 Website: http://xregexp.com - License: http://mit-license.org - -phpass - Description: Password strength calculator - Location: system/3rd_party/Diff - Website: https://github.com/rchouinard/phpass License: http://mit-license.org \ No newline at end of file diff --git a/admin/convertutf8/cli.php b/admin/convertutf8/cli.php index 6062dbe9..9a1dc1ad 100644 --- a/admin/convertutf8/cli.php +++ b/admin/convertutf8/cli.php @@ -2,12 +2,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ * @package IPS Tools * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ diff --git a/admin/convertutf8/index.php b/admin/convertutf8/index.php index 18b5dabd..23b048c6 100644 --- a/admin/convertutf8/index.php +++ b/admin/convertutf8/index.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ * @package IPS Tools * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ diff --git a/admin/convertutf8/init.php b/admin/convertutf8/init.php index 2b8910c7..e8dfe29e 100644 --- a/admin/convertutf8/init.php +++ b/admin/convertutf8/init.php @@ -1,23 +1,22 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8; /** - * Class to contain IPS Community Suite autoloader and exception handler + * Class to contain Invision Community autoloader and exception handler */ class IPSUtf8 { /** - * Initiate IPS Community Suite UTF8 Converter, autoloader and exception handler + * Initiate Invision Community UTF8 Converter, autoloader and exception handler * * @return void */ diff --git a/admin/convertutf8/js/app.js b/admin/convertutf8/js/app.js index d3d3934f..dcca36d1 100644 --- a/admin/convertutf8/js/app.js +++ b/admin/convertutf8/js/app.js @@ -1,6 +1,6 @@ /** * IPS UTF8 Converter - * (c) 2013 Invision Power Services - http://www.invisionpower.com + * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * * * Author: Matt "I'm no Rikki Tissier" Mecham diff --git a/admin/convertutf8/modules/browser/archive.php b/admin/convertutf8/modules/browser/archive.php index f6b8159c..773c9b4f 100644 --- a/admin/convertutf8/modules/browser/archive.php +++ b/admin/convertutf8/modules/browser/archive.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 9 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\modules\browser; diff --git a/admin/convertutf8/modules/browser/browser.php b/admin/convertutf8/modules/browser/browser.php index 7e090cd1..aa09db8c 100644 --- a/admin/convertutf8/modules/browser/browser.php +++ b/admin/convertutf8/modules/browser/browser.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 9 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\modules\browser; diff --git a/admin/convertutf8/modules/browser/tools.php b/admin/convertutf8/modules/browser/tools.php index b9542626..04613f8f 100644 --- a/admin/convertutf8/modules/browser/tools.php +++ b/admin/convertutf8/modules/browser/tools.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 9 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\modules\browser; diff --git a/admin/convertutf8/modules/cli/cli.php b/admin/convertutf8/modules/cli/cli.php index 4310fda6..ae0656f8 100644 --- a/admin/convertutf8/modules/cli/cli.php +++ b/admin/convertutf8/modules/cli/cli.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 9 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\modules\cli; diff --git a/admin/convertutf8/readme.html b/admin/convertutf8/readme.html index 0cb51c92..ed5a2dde 100644 --- a/admin/convertutf8/readme.html +++ b/admin/convertutf8/readme.html @@ -45,10 +45,7 @@

Getting Help

- If you encounter any issues while using this converter, please report the issue to our bug tracker. When creating a new - bug report please copy and paste the "info" from the converter output. -
- Active IP.Board license holders can also request support via the client center. + If you encounter any issues while using this converter, you can request support via the client center.
If you're using the command line version, please run php cli.php --info. If you're using the web version, please click on the "Tools" button at the top. This information will help us debug the issue. No sensitive data is ever revealed with this tool. diff --git a/admin/convertutf8/system/Convert/Archive.php b/admin/convertutf8/system/Convert/Archive.php index aa52db9e..03eccf40 100644 --- a/admin/convertutf8/system/Convert/Archive.php +++ b/admin/convertutf8/system/Convert/Archive.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ * @package IPS Tools * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Convert; diff --git a/admin/convertutf8/system/Convert/Convert.php b/admin/convertutf8/system/Convert/Convert.php index 26c4ce53..5040904d 100644 --- a/admin/convertutf8/system/Convert/Convert.php +++ b/admin/convertutf8/system/Convert/Convert.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ * @package IPS Tools * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8; @@ -600,6 +599,12 @@ class Convert static::log( "Duplicate key failure on insert\n{$msg}\n" . var_export( $batch, true ) ); return $this->heal( $limit, $convertCount ); } + else + { + /* Anything else we should probably halt on */ + static::log( "Exception Thrown:\n{$msg}\n" . var_export( $e, true ) ); + throw new \RuntimeException( $msg ); + } } } } @@ -1510,7 +1515,7 @@ class Convert } /** - * Returns whether the database is IPS4 already + * Returns whether the database is Invision Community already * * @return boolean */ diff --git a/admin/convertutf8/system/Db/Bind.php b/admin/convertutf8/system/Db/Bind.php index 0023d86b..fbe2af91 100644 --- a/admin/convertutf8/system/Db/Bind.php +++ b/admin/convertutf8/system/Db/Bind.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 18 Feb 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Db; diff --git a/admin/convertutf8/system/Db/Db.php b/admin/convertutf8/system/Db/Db.php index 21b645a1..4ccd6262 100644 --- a/admin/convertutf8/system/Db/Db.php +++ b/admin/convertutf8/system/Db/Db.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 18 Feb 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8; diff --git a/admin/convertutf8/system/Db/Exception.php b/admin/convertutf8/system/Db/Exception.php index 7ca193aa..eaeb0b47 100644 --- a/admin/convertutf8/system/Db/Exception.php +++ b/admin/convertutf8/system/Db/Exception.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 18 Feb 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Db; diff --git a/admin/convertutf8/system/Db/Select.php b/admin/convertutf8/system/Db/Select.php index 6d26c415..db132f86 100644 --- a/admin/convertutf8/system/Db/Select.php +++ b/admin/convertutf8/system/Db/Select.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 28 Aug 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Db; diff --git a/admin/convertutf8/system/Dispatcher/Browser.php b/admin/convertutf8/system/Dispatcher/Browser.php index 23163800..ed58f18d 100644 --- a/admin/convertutf8/system/Dispatcher/Browser.php +++ b/admin/convertutf8/system/Dispatcher/Browser.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ * @package IPS Tools * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Dispatcher; @@ -22,7 +21,7 @@ class Browser extends \IPSUtf8\Dispatcher */ public function run() { - /* Is this already IPS4 or has the lock been removed? */ + /* Is this already Invision Community or has the lock been removed? */ if( ! \BYPASS_SAFETY_LOCK and \IPSUtf8\Convert::i()->databaseIsIPS4() ) { \IPSUtf8\Output\Browser::i()->error( \IPSUtf8\Output\Browser\Template::errorAlreadyIPS4() ); diff --git a/admin/convertutf8/system/Dispatcher/Cli.php b/admin/convertutf8/system/Dispatcher/Cli.php index f2d58c78..0618b765 100644 --- a/admin/convertutf8/system/Dispatcher/Cli.php +++ b/admin/convertutf8/system/Dispatcher/Cli.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ * @package IPS Tools * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Dispatcher; diff --git a/admin/convertutf8/system/Dispatcher/Controller.php b/admin/convertutf8/system/Dispatcher/Controller.php index b9032835..fafafb46 100644 --- a/admin/convertutf8/system/Dispatcher/Controller.php +++ b/admin/convertutf8/system/Dispatcher/Controller.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 18 Feb 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Dispatcher; diff --git a/admin/convertutf8/system/Dispatcher/Dispatcher.php b/admin/convertutf8/system/Dispatcher/Dispatcher.php index 85143cdd..6157d513 100644 --- a/admin/convertutf8/system/Dispatcher/Dispatcher.php +++ b/admin/convertutf8/system/Dispatcher/Dispatcher.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ * @package IPS Tools * @since 4 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8; diff --git a/admin/convertutf8/system/Output/Browser.php b/admin/convertutf8/system/Output/Browser.php index cc647dcc..9cc5c475 100644 --- a/admin/convertutf8/system/Output/Browser.php +++ b/admin/convertutf8/system/Output/Browser.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 9 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Output; diff --git a/admin/convertutf8/system/Output/Browser/Template.php b/admin/convertutf8/system/Output/Browser/Template.php index ada99808..6cd389d6 100644 --- a/admin/convertutf8/system/Output/Browser/Template.php +++ b/admin/convertutf8/system/Output/Browser/Template.php @@ -1,12 +1,11 @@ Invision Power Services, Inc. - * @copyright (c) 2001 - 2016 Invision Power Services, Inc. - * @license http://www.invisionpower.com/legal/standards/ - * @package IPS Community Suite + * @author Invision Power Services, Inc. + * @copyright (c) Invision Power Services, Inc. + * @license https://www.invisioncommunity.com/legal/standards/ + * @package Invision Community * @since 9 Sept 2013 - * @version SVN_VERSION_NUMBER */ namespace IPSUtf8\Output\Browser; @@ -23,8 +22,8 @@ class Template $url = \IPSUtf8\Output\Browser::$url; $title = ( empty( $title ) ) ? 'IPS Converter' : $title; $active = array( 'convert' => '', 'tools' => '', 'archive' => '' ); + $hasArchive = \IPSUtf8\Session::i()->has_archive; $controller = preg_replace( "/[^a-zA-Z0-9]/", '', empty( \IPSUtf8\Request::i()->controller ) ? 'browser' : \IPSUtf8\Request::i()->controller ); - $controller = empty( \IPSUtf8\Request::i()->controller ) ? 'browser' : \IPSUtf8\Request::i()->controller; $version = \IPSUtf8\Convert::VERSION_ID; $copyrightDate = date('Y'); @@ -182,13 +181,13 @@ EOFHTML; } /** - * Error page explaining about database being IPS4 already + * Error page explaining about database being Invision Community already */ public static function errorAlreadyIPS4() { $html = << - The target database is already IPS4. There is no conversion required and the UTF8 converter is locked. + The target database is already running Invision Community. There is no conversion required and the UTF8 converter is locked.
To override this and unlock the UTF8 converter, please create a file called "constants.php" and upload it to your /admin/convertutf8/ directory with the following contents:

",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"

","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:l.htmlSerialize?[0,"",""]:[1,"X
","
"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("]]> + +]]> @@ -1635,11 +2673,11 @@ {{endforeach}} {{endforeach}} -
-
- +
+
+
-
+
{lang="saving"}   @@ -1657,9 +2695,9 @@
]]> +