diff --git a/Credits.txt b/Credits.txt index 1b50b0ba..35ef3b88 100644 --- a/Credits.txt +++ b/Credits.txt @@ -5,6 +5,10 @@ Invision Power Services, Inc. is grateful to the following projects, whose work has been used throughout Invision Community to add style, flair and functionality to our product. +NULLING + Last Updated: 23 September 2025 + Author: https://ipbmafia.ru + AES implementation in PHP Description: Used by \IPS\Text\Encrypt to provide two-way text encryption for storing certain data. Location: system/3rd_party/AES @@ -12,6 +16,13 @@ AES implementation in PHP Website: http://www.movable-type.co.uk/scripts/aes-php.html License: http://creativecommons.org/licenses/by/3.0/ +BaconQrCode + Description: Used to generate QR Codes for Authenticator MFA. + Location: system/3rd_party/BaconQrCode + Included version: 2.0.7 + Website: https://github.com/Bacon/BaconQrCode + License: https://github.com/Bacon/BaconQrCode/blob/2.0.8/LICENSE - BSD 2-Clause + Brick/math Description: Arbitrary-precision arithmetic library Location: system/3rd_party/Brick @@ -34,10 +45,10 @@ Clipboard CKEditor Description: Provides the editor functionality for submitting content. - Location: In development: applications/core/dev/ckeditor (custom build with additional plugins) + Location: In development: applications/core/dev/ckeditor (built into applications/core/interface/ckeditor) Included version: 4.21.0 Website: http://ckeditor.com - License: http://www.gnu.org/copyleft/lesser.html + License: https://www.mozilla.org/en-US/MPL/1.1/ 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. @@ -65,6 +76,13 @@ dotdotdot Included version: 1.8.3 Website: https://dotdotdot.frebsite.nl/ License: Commercial license + +Enum + Description: Dependency for BaconQrCode + Location: system/3rd_party/DASPRiD + Included version: 1.0.5 + Website: https://github.com/DASPRiD/Enum + License: https://github.com/DASPRiD/Enum/blob/1.0.5/LICENSE - BSD 2-Clause FontAwesome Description: General icons for UI @@ -116,7 +134,7 @@ Howler HTMLPurifier Description: Validates and cleans submitted HTML for content Location: system/3rd_party/HTMLPurifier - Included version: 4.15.0 + Included version: 4.18.0 Website: http://htmlpurifier.org License: http://www.gnu.org/copyleft/lesser.html @@ -203,12 +221,12 @@ jQuery UI TouchPunch Website: http://touchpunch.furf.com/ License: http://opensource.org/licenses/MIT -JShrink +JS-minify Description: Provides JavaScript minification - Location: system/3rd_party/JShrink - Included version: 1.4.0 - Website: https://github.com/tedious/JShrink - License: https://github.com/tedious/JShrink/blob/master/LICENSE + Location: system/3rd_party/JsMinify + Included version: 1.0.0 + Website: https://github.com/garfix/js-minify + License: https://github.com/garfix/js-minify/blob/main/LICENSE JwtFramework Description: Provides JWT signing & encryption support @@ -296,7 +314,7 @@ phpQuery PHP User Agent Parser Description: Parses user agent strings Location: system/3rd_party/PhpUserAgent - Included Version: 1.7.0 + Included Version: 1.9.0 Website: https://github.com/donatj/PhpUserAgent License: http://opensource.org/licenses/mit-license.php @@ -349,7 +367,7 @@ Web Push Library for PHP Whoops Description: Provides error handling for development mode Location: dev/Whoops - Included Version: 2.15.2 + Included Version: 2.16.0 Website: http://filp.github.io/whoops/ License: https://github.com/filp/whoops/blob/master/LICENSE.md diff --git a/admin/convertutf8/js/app.js b/admin/convertutf8/js/app.js index dcca36d1..cdf11959 100644 --- a/admin/convertutf8/js/app.js +++ b/admin/convertutf8/js/app.js @@ -176,7 +176,7 @@ var ips = {}; * Config getter * * @param {string} key Setting key to return - * @returns {mixed} Config setting, or undefined if it doesn't exist + * @returns {*} Config setting, or undefined if it doesn't exist */ getSetting: function (key) { return ( _settings.hasOwnProperty( key ) ) ? _settings[ key ] : false; diff --git a/admin/install/eula.txt b/admin/install/eula.txt index d4b8c4b5..f5e7b20e 100644 --- a/admin/install/eula.txt +++ b/admin/install/eula.txt @@ -1,5 +1,9 @@ =============================[NOTE]============================= - IPS 4.7.13 (107712) + This software is Nulled! + Nulled by IPBMafia.ru + Buy license at https://invisioncommunity.com/buy/self-hosted/ +================================================================ + IPS 4.7.23 (107827) =============================[NOTE]============================= Invision Community End User License Agreement diff --git a/admin/install/html/global/globalTemplate.phtml b/admin/install/html/global/globalTemplate.phtml index 31c7f150..e032630a 100644 --- a/admin/install/html/global/globalTemplate.phtml +++ b/admin/install/html/global/globalTemplate.phtml @@ -65,6 +65,8 @@ {lang="gotosuite"} {lang="gotoacp"}

+ Russian lang pack +

{lang="docs_link"} {{else}} @@ -86,6 +88,7 @@ {lang="install_guide"} {{endif}} +

Nulled by IPBMafia.ru

{lang="server_ip"} {expression="$_SERVER['SERVER_ADDR'] ?? ( $_SERVER['LOCAL_ADDR'] ?? 'unavailable' )"} diff --git a/admin/install/lang.php b/admin/install/lang.php index f556bc45..0f28c43d 100644 --- a/admin/install/lang.php +++ b/admin/install/lang.php @@ -52,7 +52,8 @@ $lang = array( 'requirements_php_version_success' => "PHP version %s.", 'requirements_php_version_fail' => "You are running PHP version %s. You need PHP %s or above (%s or above recommended). You should contact your hosting provider or system administrator to ask for an upgrade.", 'requirements_php_version_fail_no_recommended' => "You are running PHP version %s. You need PHP %s or above. You should contact your hosting provider or system administrator to ask for an upgrade.", - 'requirements_php_version_advice' => "You are running PHP version %s. While this version is compatible, we recommend version %s or above.", + 'requirements_php_version_advice' => "You are running PHP version %s. While this version is compatible, we recommend version %s.", + 'requirements_php_version_advice_max' => "You are running PHP version %s. While this version may work, you may experience errors or other issues. We recommend version %s.", 'requirements_mysql_version_fail' => "You are running MySQL version %s. You need MySQL %s or above (%s or above recommended). You should contact your hosting provider or system administrator to ask for an upgrade.", 'requirements_curl_success' => "cURL extension loaded.", 'requirements_curl_fopen' => "fsockopen function available", @@ -144,7 +145,7 @@ $lang = array( 'err_db_exists' => "There is already an Invision Community installation in that database. Choose a different database or use a table prefix.", 'err_db_cant_create' => "The Database does not exist and cannot be created automatically. Please create the database manually or contact your hosting provider if you are unsure how to do this.", 'diagnostics_reporting' => "Send usage and diagnostics data to IPS?", - 'diagnostics_reporting_desc' => "This distribution is nulled and this setting does not work. Help Invision Community improve by automatically sending usage and diagnostic information including a list of features in use and basic statistics. The data sent does not contain any private information about your users or your community.", + 'diagnostics_reporting_desc' => "Help Invision Community improve by automatically sending usage and diagnostic information including a list of features in use and basic statistics. The data sent does not contain any private information about your users or your community.", 'conf_global_error' => "", diff --git a/admin/upgrade/html/global/globalTemplate.phtml b/admin/upgrade/html/global/globalTemplate.phtml index c5d56f8d..a753dd51 100644 --- a/admin/upgrade/html/global/globalTemplate.phtml +++ b/admin/upgrade/html/global/globalTemplate.phtml @@ -77,6 +77,8 @@ {lang="go_to_suite"} {lang="go_to_acp"}

+ Russian lang pack +

{lang="suite_docs"}
{{else}} @@ -97,6 +99,7 @@ {lang="install_docs"} {{endif}} +

Nulled by IPBMafia.ru

diff --git a/admin/upgrade/html/global/healthcheck.phtml b/admin/upgrade/html/global/healthcheck.phtml index 6d72915e..0e90f602 100644 --- a/admin/upgrade/html/global/healthcheck.phtml +++ b/admin/upgrade/html/global/healthcheck.phtml @@ -1,28 +1,6 @@ - + {{$canProceed = TRUE;}}
- {{if $incorrectFiles !== NULL}} - {{if $incorrectFiles}} - {{$canProceed = FALSE;}} -

{lang="hc_files"}

-

-

{lang="hc_files_fail"}

-
- {lang="hc_files_fail2"} -

-

{lang="hc_files_fail3"}

-
    - {{foreach $incorrectFiles as $file}} -
  • {$file}
    • - {{endforeach}} -
- {{else}} -

{lang="hc_files"}

-
    -
  • {lang="hc_files_ok"}
    • -
- {{endif}} - {{endif}} {{if $designerMode}}

{lang="hc_designers_mode"}

    diff --git a/admin/upgrade/lang.php b/admin/upgrade/lang.php index 47b48ee7..9c198c9b 100644 --- a/admin/upgrade/lang.php +++ b/admin/upgrade/lang.php @@ -72,7 +72,7 @@ $lang = array( 'sign_in_faster' => "Sign In Faster", 'sign_in_connect' => "Sign in via one of these sites.", 'login_facebook' => "Sign in with Facebook", - 'login_twitter' => "Sign in with Twitter", + 'login_twitter' => "Sign in with X", 'login_google' => "Sign in with Google", 'login_linkedin' => "Sign in with LinkedIn", 'login_live' => "Sign in with Microsoft", @@ -80,7 +80,8 @@ $lang = array( 'requirements_php_version_success' => "PHP version %s.", 'requirements_php_version_fail' => "You are running PHP version %s. You need PHP %s or above (%s or above recommended). You should contact your hosting provider or system administrator to ask for an upgrade.", 'requirements_php_version_fail_no_recommended' => "You are running PHP version %s. You need PHP %s or above. You should contact your hosting provider or system administrator to ask for an upgrade.", - 'requirements_php_version_advice' => "You are running PHP version %s. While this version is compatible, we recommend version %s or above.", + 'requirements_php_version_advice' => "You are running PHP version %s. While this version is compatible, we recommend version %s.", + 'requirements_php_version_advice_max' => "You are running PHP version %s. While this version may work, you may experience errors or other issues. We recommend version %s.", 'requirements_curl_success' => "cURL extension loaded.", 'requirements_curl_fopen' => "fsockopen function available", 'requirements_file_uploads' => "File uploads are currently disabled in your PHP configuration, which will prevent many features from working correctly. You should contact your host to have the option `file_uploads` enabled.", @@ -543,7 +544,7 @@ $lang = array( /* ! Core 101079 Diagnostic reporting option */ '101079_diagnostics_reporting' => "Send diagnostics data to IPS?", - '101079_diagnostics_reporting_desc' => "This distribution is nulled and this setting does not work. Help Invision Community improve by automatically sending diagnostic information. The data sent does not contain any private information about your users or your community.", + '101079_diagnostics_reporting_desc' => "Help Invision Community improve by automatically sending diagnostic information. The data sent does not contain any private information about your users or your community.", '104000_es_version' => "Elasticsearch version in use is no longer supported", '104000_paypal_warning' => "PayPal Functionality", @@ -718,4 +719,8 @@ $lang = array(
    We are currently in the process of migrating our platform from PHP7 to PHP8 in order to provide you with the greatest level of performance and security. We've identified and disabled one or more Applications or Plugins currently installed on your site which contain PHP8 incompatible code. Refer to the AdminCP > Support > Get Support page for more information.

    You can re-enable these Applications and Plugins via the AdminCP > Applications page. Please make a note of the following Applications and Plugins so you are clear which have been automatically disabled via the upgrader.
    TEXT, + + + '107783_pbr_captcha' => "Post Before Register Changes" + ); \ No newline at end of file diff --git a/applications/blog/Application.php b/applications/blog/Application.php index ca9e3e28..c1816556 100644 --- a/applications/blog/Application.php +++ b/applications/blog/Application.php @@ -80,11 +80,13 @@ class _Application extends \IPS\Application foreach ( \IPS\blog\Entry::getItemsWithPermission( array( array( 'entry_blog_id=?', $blog->id ), array( 'entry_status!=?', 'draft' ) ), 'entry_date DESC', 25, 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, 0, $member, FALSE, FALSE, FALSE, FALSE, NULL, $blog ) as $entry ) { - $document->addItem( $entry->name, $entry->url(), $entry->content, \IPS\DateTime::ts( $entry->date ), $entry->id ); + $content = $entry->content; + \IPS\Output::i()->parseFileObjectUrls( $content ); + $document->addItem( $entry->name, $entry->url(), $content, \IPS\DateTime::ts( $entry->date ), $entry->id ); } /* @note application/rss+xml is not a registered IANA mime-type so we need to stick with text/xml for RSS */ - \IPS\Output::i()->sendOutput( $document->asXML(), 200, 'text/xml', array(), TRUE ); + \IPS\Output::i()->sendOutput( $document->asXML(), 200, 'text/xml', array(), TRUE, parseFileObjects: FALSE ); } /** diff --git a/applications/blog/api/comments.php b/applications/blog/api/comments.php index bca0f3ae..6a873c6f 100644 --- a/applications/blog/api/comments.php +++ b/applications/blog/api/comments.php @@ -146,7 +146,7 @@ class _comments extends \IPS\Content\Api\CommentController } else { - if ( \IPS\Request::i()->author === 0 ) + if ( (int) \IPS\Request::i()->author === 0 ) { $author = new \IPS\Member; $author->name = \IPS\Request::i()->author_name; diff --git a/applications/blog/api/entries.php b/applications/blog/api/entries.php index cb355409..4f65d18f 100644 --- a/applications/blog/api/entries.php +++ b/applications/blog/api/entries.php @@ -172,7 +172,7 @@ class _entries extends \IPS\Content\Api\ItemController } else { - if ( \IPS\Request::i()->author === 0 ) + if ( (int) \IPS\Request::i()->author === 0 ) { $author = new \IPS\Member; } diff --git a/applications/blog/data/javascript.xml b/applications/blog/data/javascript.xml index 4775b283..0f95d1fc 100644 --- a/applications/blog/data/javascript.xml +++ b/applications/blog/data/javascript.xml @@ -1,6 +1,6 @@ - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -66,7 +66,7 @@ } }); }(jQuery, _)); - - {{#lang}}manage_cats_new_row{{/lang}}\ "); @@ -377,7 +377,6 @@ Debug.js app.js jquery.js jquery-migrate.js -jquery.history.js jquery.transform.js linkify.min.js linkify-jquery.min.js diff --git a/applications/blog/data/lang.xml b/applications/blog/data/lang.xml index a28fce9b..b9c8e983 100644 --- a/applications/blog/data/lang.xml +++ b/applications/blog/data/lang.xml @@ -1,6 +1,6 @@ - + Blogs Blogs a comment on a blog entry @@ -89,6 +89,7 @@ Members allowed to read this blog No Blog Author selected Deleted Blog %s + Deleted Blog Are you sure you want to delete this blog? This will permanently delete the blog and all its entries. Submit New Blog Entry diff --git a/applications/blog/data/theme.xml b/applications/blog/data/theme.xml index 378bc240..0ad77b5a 100644 --- a/applications/blog/data/theme.xml +++ b/applications/blog/data/theme.xml @@ -341,7 +341,7 @@
    {lang="latest_entry"}

    - {{if $blog->latestEntry()->locked()}} {{endif}}{$blog->latestEntry()->caption} + {{if $blog->latestEntry()->locked()}} {{endif}}{expression="(string) $blog->latestEntry()->caption"} {{if $blog->latestEntry()->isFutureDate() || $blog->latestEntry()->mapped('pinned') || $blog->latestEntry()->mapped('featured') || $blog->latestEntry()->hidden() === -1 || $blog->latestEntry()->hidden() === 1 || $blog->latestEntry()->status === 'draft'}} {{if $blog->latestEntry()->isFutureDate()}} @@ -670,6 +670,11 @@ {{endif}} {template="pageHeader" if="!\IPS\Request::i()->isAjax()" group="global" app="core" params="\IPS\Member::loggedIn()->language()->addToStack( 'create_blog_entry' )"} +{{$guestPostBeforeRegister = ( !\IPS\Member::loggedIn()->member_id ) ? !$blog->can( 'add', \IPS\Member::loggedIn(), FALSE ) : NULL;}} +{{$modQueued = \IPS\blog\Entry::moderateNewItems( \IPS\Member::loggedIn(), $blog, $guestPostBeforeRegister );}} +{{if $guestPostBeforeRegister or $modQueued}} + {template="postingInformation" app="core" group="forms" params="$guestPostBeforeRegister, $modQueued, TRUE"} +{{endif}} {$form|raw} {{if $blog and $blog->club()}} @@ -1121,6 +1126,8 @@ {{endif}} {{endif}} {{$commentCount++;}} + + {$comment->html()|raw} {{endforeach}} {template="commentMultimod" app="core" group="global" params="$entry"} @@ -1553,7 +1560,7 @@ {{if $blog->canEdit() AND !$blog->groupblog_ids}}
  • - 'editBlog' ) )}' title="{lang="edit_blog"}" data-ipsDialog data-ipsDialog-title="{lang="edit_blog"}">{lang="edit_blog"} + 'editBlog' ) )->csrf()}' title="{lang="edit_blog"}" data-ipsDialog data-ipsDialog-title="{lang="edit_blog"}">{lang="edit_blog"}
    • {{elseif $blog->canEdit() AND $blog->groupblog_ids}}
  • @@ -1645,7 +1652,7 @@ {template="reputationBadge" group="global" app="core" params="$comment->author()"}

    • - 'findComment', 'comment' => $comment->id ) )}' class='ipsType_blendLinks'>{$comment->dateLine()|raw} + {$comment->dateLine()|raw} {{if $comment->editLine()}} ({lang="edited_lc"}) {{endif}} diff --git a/applications/blog/data/versions.json b/applications/blog/data/versions.json index b44f5cb6..24bc90d1 100644 --- a/applications/blog/data/versions.json +++ b/applications/blog/data/versions.json @@ -579,5 +579,69 @@ "107704": "4.7.12", "107710": "4.7.13 Beta 1", "107711": "4.7.13 Beta 2", - "107712": "4.7.13" + "107712": "4.7.13", + "107713": "4.7.13", + "107714": "4.7.13", + "107715": "4.7.13", + "107720": "4.7.14 Beta 1", + "107721": "4.7.14 Beta 2", + "107722": "4.7.14", + "107723": "4.7.14", + "107724": "4.7.14", + "107730": "4.7.15 Beta 1", + "107731": "4.7.15 Beta 2", + "107732": "4.7.15", + "107733": "4.7.15", + "107734": "4.7.15", + "107740": "4.7.16 Beta 1", + "107741": "4.7.16 Beta 2", + "107742": "4.7.16 Beta 3", + "107743": "4.7.16 Beta 4", + "107744": "4.7.16 Beta 5", + "107745": "4.7.16", + "107746": "4.7.16", + "107747": "4.7.16", + "107748": "4.7.16", + "107749": "4.7.16", + "107750": "4.7.16", + "107751": "4.7.16", + "107760": "4.7.17 Beta 1", + "107761": "4.7.17 Beta 2", + "107762": "4.7.17 Beta 3", + "107763": "4.7.17", + "107764": "4.7.17", + "107765": "4.7.17", + "107770": "4.7.18 Beta 1", + "107771": "4.7.18 Beta 2", + "107772": "4.7.18 Beta 3", + "107773": "4.7.18", + "107774": "4.7.18", + "107775": "4.7.18", + "107780": "4.7.19 Beta 1", + "107781": "4.7.19 Beta 2", + "107782": "4.7.19 Beta 3", + "107783": "4.7.19 Beta 4", + "107784": "4.7.19", + "107785": "4.7.19", + "107786": "4.7.19", + "107787": "4.7.19", + "107795": "4.7.20 Beta 1", + "107796": "4.7.20 Beta 2", + "107797": "4.7.20 Beta 3", + "107798": "4.7.20 Beta 4", + "107799": "4.7.20 Beta 5", + "107800": "4.7.20", + "107801": "4.7.20", + "107802": "4.7.20", + "107803": "4.7.20", + "107810": "4.7.21 Beta 1", + "107811": "4.7.21", + "107815": "4.7.22 Beta 1", + "107816": "4.7.22 Beta 2", + "107817": "4.7.22", + "107818": "4.7.22", + "107819": "4.7.22", + "107820": "4.7.22", + "107826": "4.7.23 Beta 1", + "107827": "4.7.23" } \ No newline at end of file diff --git a/applications/blog/extensions/core/EditorLocations/Blogs.php b/applications/blog/extensions/core/EditorLocations/Blogs.php index 79592bce..3a3489cb 100644 --- a/applications/blog/extensions/core/EditorLocations/Blogs.php +++ b/applications/blog/extensions/core/EditorLocations/Blogs.php @@ -60,7 +60,7 @@ class _Blogs { return FALSE; } - elseif ( preg_match( '/^blogs\-blog\-(\d+)m$/', $field->options['autoSaveKey'] ) ) + elseif ( preg_match( '/^blogs\-blog\-(\d+)(m)?$/', $field->options['autoSaveKey'] ) ) { return FALSE; } diff --git a/applications/blog/extensions/core/GroupForm/Blog.php b/applications/blog/extensions/core/GroupForm/Blog.php index 5276d985..ffeb64e4 100644 --- a/applications/blog/extensions/core/GroupForm/Blog.php +++ b/applications/blog/extensions/core/GroupForm/Blog.php @@ -11,6 +11,8 @@ namespace IPS\blog\extensions\core\GroupForm; +use IPS\Settings; + /* To prevent PHP errors (extending class does not exist) revealing path */ if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) ) { @@ -32,7 +34,7 @@ class _Blog */ public function process( &$form, $group ) { - if( $group->g_id != \IPS\Settings::i()->guest_group ) + if( $group->g_id != Settings::i()->guest_group ) { $form->add(new \IPS\Helpers\Form\YesNo('g_blog_allowlocal', $group->g_blog_allowlocal, FALSE, array('togglesOn' => array('g_blog_maxblogs', 'g_blog_allowprivate', 'g_blog_preventpublish', 'g_blog_allowownmod', 'g_blog_allowdelete')))); $form->add(new \IPS\Helpers\Form\Number('g_blog_maxblogs', $group->g_blog_maxblogs, FALSE, array('unlimited' => 0), NULL, NULL, NULL, 'g_blog_maxblogs')); @@ -42,7 +44,7 @@ class _Blog } $form->add(new \IPS\Helpers\Form\YesNo('g_blog_allowcomment', $group->g_blog_allowcomment)); - if( $group->g_id == \IPS\Settings::i()->guest_group AND \IPS\Settings::i()->post_before_registering ) + if( $group->g_id == Settings::i()->guest_group AND Settings::i()->post_before_registering and Settings::i()->bot_antispam_type !== 'none' ) { \IPS\Member::loggedIn()->language()->words['g_blog_allowcomment_desc'] = \IPS\Member::loggedIn()->language()->addToStack('g_blog_allowcomment_guestreg'); } @@ -57,7 +59,7 @@ class _Blog */ public function save( $values, &$group ) { - if( $group->g_id != \IPS\Settings::i()->guest_group ) + if( $group->g_id != Settings::i()->guest_group ) { /* We intval here because (some of) the columns do not accept null values, but these are null when creating a new group */ $group->g_blog_allowlocal = (int) $values['g_blog_allowlocal']; diff --git a/applications/blog/modules/front/blogs/browse.php b/applications/blog/modules/front/blogs/browse.php index acd1ae29..c5b6c068 100644 --- a/applications/blog/modules/front/blogs/browse.php +++ b/applications/blog/modules/front/blogs/browse.php @@ -91,15 +91,30 @@ class _browse extends \IPS\Dispatcher\Controller $count = \IPS\blog\Entry::getItemsWithPermission( $where, 'entry_date desc', NULL, 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, NULL, TRUE, FALSE, FALSE, TRUE ); $entries = \IPS\blog\Entry::getItemsWithPermission( $where, 'entry_date desc', array( ( $perpage * ( $page - 1 ) ), $perpage ), 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, NULL, TRUE ); + /* Validate Pagination */ + $totalPages = ceil( $count / $perpage ); + $redirect = false; + if ( $page > 1 ) + { + if ( $totalPages and $page > $totalPages) + { + $redirect = true; + } + } + $queryString = 'app=blog&module=blogs&controller=browse'; if( $category ) { $queryString .= '&id=' . $category->_id; } $paginationUrl = \IPS\Http\Url::internal( $queryString, 'front', ( $category ) ? 'blog_category' : 'blogs' ); + if( $redirect ) + { + \IPS\Output::i()->redirect( $paginationUrl->setPage('page', 1 ), NULL, 303 ); + } $pagination = array( 'page' => $page, - 'pages' => ceil( $count / $perpage ), + 'pages' => $totalPages, 'perpage' => $perpage, 'url' => $paginationUrl ); diff --git a/applications/blog/modules/front/blogs/entry.php b/applications/blog/modules/front/blogs/entry.php index bf13e367..ed4e53c7 100644 --- a/applications/blog/modules/front/blogs/entry.php +++ b/applications/blog/modules/front/blogs/entry.php @@ -432,7 +432,7 @@ class _entry extends \IPS\Content\Controller if( isset( $values['moderation_alert_content']) AND $values['moderation_alert_content'] ) { - $item->sendModerationAlert($values, $item); + $this->sendModerationAlert($values, $item); } \IPS\Session::i()->modLog( 'modlog__action_move', array( $item::$title => TRUE, $item->url()->__toString() => FALSE, $item->mapped( 'title' ) ?: ( method_exists( $item, 'item' ) ? $item->item()->mapped( 'title' ) : NULL ) => FALSE ), $item ); diff --git a/applications/blog/setup/upg_107713/data.json b/applications/blog/setup/upg_107713/data.json new file mode 100644 index 00000000..00e57989 --- /dev/null +++ b/applications/blog/setup/upg_107713/data.json @@ -0,0 +1,23 @@ +{ + "id": 107713, + "name": "4.7.13", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107714/data.json b/applications/blog/setup/upg_107714/data.json new file mode 100644 index 00000000..57718642 --- /dev/null +++ b/applications/blog/setup/upg_107714/data.json @@ -0,0 +1,23 @@ +{ + "id": 107714, + "name": "4.7.13", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107715/data.json b/applications/blog/setup/upg_107715/data.json new file mode 100644 index 00000000..e6e279b2 --- /dev/null +++ b/applications/blog/setup/upg_107715/data.json @@ -0,0 +1,23 @@ +{ + "id": 107715, + "name": "4.7.13", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107720/data.json b/applications/blog/setup/upg_107720/data.json new file mode 100644 index 00000000..391cda4c --- /dev/null +++ b/applications/blog/setup/upg_107720/data.json @@ -0,0 +1,23 @@ +{ + "id": 107720, + "name": "4.7.14 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107721/data.json b/applications/blog/setup/upg_107721/data.json new file mode 100644 index 00000000..df0f2ce9 --- /dev/null +++ b/applications/blog/setup/upg_107721/data.json @@ -0,0 +1,23 @@ +{ + "id": 107721, + "name": "4.7.14 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107722/data.json b/applications/blog/setup/upg_107722/data.json new file mode 100644 index 00000000..3fa87df9 --- /dev/null +++ b/applications/blog/setup/upg_107722/data.json @@ -0,0 +1,23 @@ +{ + "id": 107722, + "name": "4.7.14", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107723/data.json b/applications/blog/setup/upg_107723/data.json new file mode 100644 index 00000000..8b33eb52 --- /dev/null +++ b/applications/blog/setup/upg_107723/data.json @@ -0,0 +1,23 @@ +{ + "id": 107723, + "name": "4.7.14", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107724/data.json b/applications/blog/setup/upg_107724/data.json new file mode 100644 index 00000000..62ea1d33 --- /dev/null +++ b/applications/blog/setup/upg_107724/data.json @@ -0,0 +1,23 @@ +{ + "id": 107724, + "name": "4.7.14", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107730/data.json b/applications/blog/setup/upg_107730/data.json new file mode 100644 index 00000000..ca05207f --- /dev/null +++ b/applications/blog/setup/upg_107730/data.json @@ -0,0 +1,23 @@ +{ + "id": 107730, + "name": "4.7.15 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107730/theme.json b/applications/blog/setup/upg_107730/theme.json new file mode 100644 index 00000000..5ddb025a --- /dev/null +++ b/applications/blog/setup/upg_107730/theme.json @@ -0,0 +1,20 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/submit\/submit", + "front\/view\/view" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107731/data.json b/applications/blog/setup/upg_107731/data.json new file mode 100644 index 00000000..28b2ba45 --- /dev/null +++ b/applications/blog/setup/upg_107731/data.json @@ -0,0 +1,23 @@ +{ + "id": 107731, + "name": "4.7.15 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107732/data.json b/applications/blog/setup/upg_107732/data.json new file mode 100644 index 00000000..104cc5b0 --- /dev/null +++ b/applications/blog/setup/upg_107732/data.json @@ -0,0 +1,23 @@ +{ + "id": 107732, + "name": "4.7.15", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107733/data.json b/applications/blog/setup/upg_107733/data.json new file mode 100644 index 00000000..dc434601 --- /dev/null +++ b/applications/blog/setup/upg_107733/data.json @@ -0,0 +1,23 @@ +{ + "id": 107733, + "name": "4.7.15", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107734/data.json b/applications/blog/setup/upg_107734/data.json new file mode 100644 index 00000000..4033f813 --- /dev/null +++ b/applications/blog/setup/upg_107734/data.json @@ -0,0 +1,23 @@ +{ + "id": 107734, + "name": "4.7.15", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107740/data.json b/applications/blog/setup/upg_107740/data.json new file mode 100644 index 00000000..b86b6a57 --- /dev/null +++ b/applications/blog/setup/upg_107740/data.json @@ -0,0 +1,23 @@ +{ + "id": 107740, + "name": "4.7.16 Beta 1", + "steps": { + "queries": false, + "lang": true, + "theme": false, + "themeSettings": false, + "javascript": true, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": true, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107740/javascript.json b/applications/blog/setup/upg_107740/javascript.json new file mode 100644 index 00000000..80c4acd4 --- /dev/null +++ b/applications/blog/setup/upg_107740/javascript.json @@ -0,0 +1,14 @@ +{ + "files": { + "added": [], + "edited": [], + "removed": [] + }, + "orders": { + "added": [], + "edited": [ + "global\/\/dev\/js\/\/library\/\/jquery" + ], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107740/lang.json b/applications/blog/setup/upg_107740/lang.json new file mode 100644 index 00000000..4e2c7c6c --- /dev/null +++ b/applications/blog/setup/upg_107740/lang.json @@ -0,0 +1,14 @@ +{ + "normal": { + "added": [ + "modlog__action_delete_blog_stats" + ], + "edited": [], + "removed": [] + }, + "js": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107741/data.json b/applications/blog/setup/upg_107741/data.json new file mode 100644 index 00000000..e16c396d --- /dev/null +++ b/applications/blog/setup/upg_107741/data.json @@ -0,0 +1,23 @@ +{ + "id": 107741, + "name": "4.7.16 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107742/data.json b/applications/blog/setup/upg_107742/data.json new file mode 100644 index 00000000..2ecc2753 --- /dev/null +++ b/applications/blog/setup/upg_107742/data.json @@ -0,0 +1,23 @@ +{ + "id": 107742, + "name": "4.7.16 Beta 3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107743/data.json b/applications/blog/setup/upg_107743/data.json new file mode 100644 index 00000000..2b993b59 --- /dev/null +++ b/applications/blog/setup/upg_107743/data.json @@ -0,0 +1,23 @@ +{ + "id": 107743, + "name": "4.7.16 Beta 4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107744/data.json b/applications/blog/setup/upg_107744/data.json new file mode 100644 index 00000000..13567140 --- /dev/null +++ b/applications/blog/setup/upg_107744/data.json @@ -0,0 +1,23 @@ +{ + "id": 107744, + "name": "4.7.16 Beta 5", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107745/data.json b/applications/blog/setup/upg_107745/data.json new file mode 100644 index 00000000..bd82ae7f --- /dev/null +++ b/applications/blog/setup/upg_107745/data.json @@ -0,0 +1,23 @@ +{ + "id": 107745, + "name": "4.7.16", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107746/data.json b/applications/blog/setup/upg_107746/data.json new file mode 100644 index 00000000..04ee07d6 --- /dev/null +++ b/applications/blog/setup/upg_107746/data.json @@ -0,0 +1,23 @@ +{ + "id": 107746, + "name": "4.7.16", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107747/data.json b/applications/blog/setup/upg_107747/data.json new file mode 100644 index 00000000..1d44991c --- /dev/null +++ b/applications/blog/setup/upg_107747/data.json @@ -0,0 +1,23 @@ +{ + "id": 107747, + "name": "4.7.16", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107748/data.json b/applications/blog/setup/upg_107748/data.json new file mode 100644 index 00000000..c4bf843a --- /dev/null +++ b/applications/blog/setup/upg_107748/data.json @@ -0,0 +1,23 @@ +{ + "id": 107748, + "name": "4.7.16", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107749/data.json b/applications/blog/setup/upg_107749/data.json new file mode 100644 index 00000000..9f8efdc3 --- /dev/null +++ b/applications/blog/setup/upg_107749/data.json @@ -0,0 +1,23 @@ +{ + "id": 107749, + "name": "4.7.16", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107750/data.json b/applications/blog/setup/upg_107750/data.json new file mode 100644 index 00000000..41523487 --- /dev/null +++ b/applications/blog/setup/upg_107750/data.json @@ -0,0 +1,23 @@ +{ + "id": 107750, + "name": "4.7.16", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107751/data.json b/applications/blog/setup/upg_107751/data.json new file mode 100644 index 00000000..6822cb89 --- /dev/null +++ b/applications/blog/setup/upg_107751/data.json @@ -0,0 +1,23 @@ +{ + "id": 107751, + "name": "4.7.16", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107760/data.json b/applications/blog/setup/upg_107760/data.json new file mode 100644 index 00000000..cc2c6275 --- /dev/null +++ b/applications/blog/setup/upg_107760/data.json @@ -0,0 +1,23 @@ +{ + "id": 107760, + "name": "4.7.17 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107761/data.json b/applications/blog/setup/upg_107761/data.json new file mode 100644 index 00000000..4947b828 --- /dev/null +++ b/applications/blog/setup/upg_107761/data.json @@ -0,0 +1,23 @@ +{ + "id": 107761, + "name": "4.7.17 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107762/data.json b/applications/blog/setup/upg_107762/data.json new file mode 100644 index 00000000..e6e680bb --- /dev/null +++ b/applications/blog/setup/upg_107762/data.json @@ -0,0 +1,23 @@ +{ + "id": 107762, + "name": "4.7.17 Beta 3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107763/data.json b/applications/blog/setup/upg_107763/data.json new file mode 100644 index 00000000..5dfa9c65 --- /dev/null +++ b/applications/blog/setup/upg_107763/data.json @@ -0,0 +1,23 @@ +{ + "id": 107763, + "name": "4.7.17", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107764/data.json b/applications/blog/setup/upg_107764/data.json new file mode 100644 index 00000000..7abb3f65 --- /dev/null +++ b/applications/blog/setup/upg_107764/data.json @@ -0,0 +1,23 @@ +{ + "id": 107764, + "name": "4.7.17", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107765/data.json b/applications/blog/setup/upg_107765/data.json new file mode 100644 index 00000000..bf37606c --- /dev/null +++ b/applications/blog/setup/upg_107765/data.json @@ -0,0 +1,23 @@ +{ + "id": 107765, + "name": "4.7.17", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107770/data.json b/applications/blog/setup/upg_107770/data.json new file mode 100644 index 00000000..d9c5f4b1 --- /dev/null +++ b/applications/blog/setup/upg_107770/data.json @@ -0,0 +1,23 @@ +{ + "id": 107770, + "name": "4.7.18 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107771/data.json b/applications/blog/setup/upg_107771/data.json new file mode 100644 index 00000000..fee74d78 --- /dev/null +++ b/applications/blog/setup/upg_107771/data.json @@ -0,0 +1,23 @@ +{ + "id": 107771, + "name": "4.7.18 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107772/data.json b/applications/blog/setup/upg_107772/data.json new file mode 100644 index 00000000..93f0483b --- /dev/null +++ b/applications/blog/setup/upg_107772/data.json @@ -0,0 +1,23 @@ +{ + "id": 107772, + "name": "4.7.18 Beta 3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107773/data.json b/applications/blog/setup/upg_107773/data.json new file mode 100644 index 00000000..f610357b --- /dev/null +++ b/applications/blog/setup/upg_107773/data.json @@ -0,0 +1,23 @@ +{ + "id": 107773, + "name": "4.7.18", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107774/data.json b/applications/blog/setup/upg_107774/data.json new file mode 100644 index 00000000..51b2b34e --- /dev/null +++ b/applications/blog/setup/upg_107774/data.json @@ -0,0 +1,23 @@ +{ + "id": 107774, + "name": "4.7.18", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107775/data.json b/applications/blog/setup/upg_107775/data.json new file mode 100644 index 00000000..4c16685c --- /dev/null +++ b/applications/blog/setup/upg_107775/data.json @@ -0,0 +1,23 @@ +{ + "id": 107775, + "name": "4.7.18", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107780/data.json b/applications/blog/setup/upg_107780/data.json new file mode 100644 index 00000000..0f215599 --- /dev/null +++ b/applications/blog/setup/upg_107780/data.json @@ -0,0 +1,23 @@ +{ + "id": 107780, + "name": "4.7.19 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107780/theme.json b/applications/blog/setup/upg_107780/theme.json new file mode 100644 index 00000000..06ef13f8 --- /dev/null +++ b/applications/blog/setup/upg_107780/theme.json @@ -0,0 +1,21 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/browse\/rows", + "front\/view\/comments", + "front\/widgets\/blogCommentFeed" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107781/data.json b/applications/blog/setup/upg_107781/data.json new file mode 100644 index 00000000..19d56ab1 --- /dev/null +++ b/applications/blog/setup/upg_107781/data.json @@ -0,0 +1,23 @@ +{ + "id": 107781, + "name": "4.7.19 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107782/data.json b/applications/blog/setup/upg_107782/data.json new file mode 100644 index 00000000..daa648ab --- /dev/null +++ b/applications/blog/setup/upg_107782/data.json @@ -0,0 +1,23 @@ +{ + "id": 107782, + "name": "4.7.19 Beta 3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107783/data.json b/applications/blog/setup/upg_107783/data.json new file mode 100644 index 00000000..3a3219c3 --- /dev/null +++ b/applications/blog/setup/upg_107783/data.json @@ -0,0 +1,23 @@ +{ + "id": 107783, + "name": "4.7.19 Beta 4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107784/data.json b/applications/blog/setup/upg_107784/data.json new file mode 100644 index 00000000..d380afa7 --- /dev/null +++ b/applications/blog/setup/upg_107784/data.json @@ -0,0 +1,23 @@ +{ + "id": 107784, + "name": "4.7.19", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107785/data.json b/applications/blog/setup/upg_107785/data.json new file mode 100644 index 00000000..95c681e9 --- /dev/null +++ b/applications/blog/setup/upg_107785/data.json @@ -0,0 +1,23 @@ +{ + "id": 107785, + "name": "4.7.19", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107786/data.json b/applications/blog/setup/upg_107786/data.json new file mode 100644 index 00000000..5bd423b5 --- /dev/null +++ b/applications/blog/setup/upg_107786/data.json @@ -0,0 +1,23 @@ +{ + "id": 107786, + "name": "4.7.19", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107787/data.json b/applications/blog/setup/upg_107787/data.json new file mode 100644 index 00000000..de5492c9 --- /dev/null +++ b/applications/blog/setup/upg_107787/data.json @@ -0,0 +1,23 @@ +{ + "id": 107787, + "name": "4.7.19", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107795/data.json b/applications/blog/setup/upg_107795/data.json new file mode 100644 index 00000000..2eb7e1b8 --- /dev/null +++ b/applications/blog/setup/upg_107795/data.json @@ -0,0 +1,23 @@ +{ + "id": 107795, + "name": "4.7.20 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107796/data.json b/applications/blog/setup/upg_107796/data.json new file mode 100644 index 00000000..648accd8 --- /dev/null +++ b/applications/blog/setup/upg_107796/data.json @@ -0,0 +1,23 @@ +{ + "id": 107796, + "name": "4.7.20 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107797/data.json b/applications/blog/setup/upg_107797/data.json new file mode 100644 index 00000000..1e45ea9c --- /dev/null +++ b/applications/blog/setup/upg_107797/data.json @@ -0,0 +1,23 @@ +{ + "id": 107797, + "name": "4.7.20 Beta 3", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107798/data.json b/applications/blog/setup/upg_107798/data.json new file mode 100644 index 00000000..e3878a19 --- /dev/null +++ b/applications/blog/setup/upg_107798/data.json @@ -0,0 +1,23 @@ +{ + "id": 107798, + "name": "4.7.20 Beta 4", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107799/data.json b/applications/blog/setup/upg_107799/data.json new file mode 100644 index 00000000..a6ed7079 --- /dev/null +++ b/applications/blog/setup/upg_107799/data.json @@ -0,0 +1,23 @@ +{ + "id": 107799, + "name": "4.7.20 Beta 5", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107800/data.json b/applications/blog/setup/upg_107800/data.json new file mode 100644 index 00000000..9f4e6ccd --- /dev/null +++ b/applications/blog/setup/upg_107800/data.json @@ -0,0 +1,23 @@ +{ + "id": 107800, + "name": "4.7.20", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107801/data.json b/applications/blog/setup/upg_107801/data.json new file mode 100644 index 00000000..fae52035 --- /dev/null +++ b/applications/blog/setup/upg_107801/data.json @@ -0,0 +1,23 @@ +{ + "id": 107801, + "name": "4.7.20", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107802/data.json b/applications/blog/setup/upg_107802/data.json new file mode 100644 index 00000000..e8c7ffe8 --- /dev/null +++ b/applications/blog/setup/upg_107802/data.json @@ -0,0 +1,23 @@ +{ + "id": 107802, + "name": "4.7.20", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107803/data.json b/applications/blog/setup/upg_107803/data.json new file mode 100644 index 00000000..c303dba8 --- /dev/null +++ b/applications/blog/setup/upg_107803/data.json @@ -0,0 +1,23 @@ +{ + "id": 107803, + "name": "4.7.20", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107810/data.json b/applications/blog/setup/upg_107810/data.json new file mode 100644 index 00000000..d6859da8 --- /dev/null +++ b/applications/blog/setup/upg_107810/data.json @@ -0,0 +1,23 @@ +{ + "id": 107810, + "name": "4.7.21 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107811/data.json b/applications/blog/setup/upg_107811/data.json new file mode 100644 index 00000000..21427d5d --- /dev/null +++ b/applications/blog/setup/upg_107811/data.json @@ -0,0 +1,23 @@ +{ + "id": 107811, + "name": "4.7.21", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107815/data.json b/applications/blog/setup/upg_107815/data.json new file mode 100644 index 00000000..069df6ab --- /dev/null +++ b/applications/blog/setup/upg_107815/data.json @@ -0,0 +1,23 @@ +{ + "id": 107815, + "name": "4.7.22 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107816/data.json b/applications/blog/setup/upg_107816/data.json new file mode 100644 index 00000000..f33f25af --- /dev/null +++ b/applications/blog/setup/upg_107816/data.json @@ -0,0 +1,23 @@ +{ + "id": 107816, + "name": "4.7.22 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107817/data.json b/applications/blog/setup/upg_107817/data.json new file mode 100644 index 00000000..29b49df9 --- /dev/null +++ b/applications/blog/setup/upg_107817/data.json @@ -0,0 +1,23 @@ +{ + "id": 107817, + "name": "4.7.22", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107818/data.json b/applications/blog/setup/upg_107818/data.json new file mode 100644 index 00000000..26c77bc5 --- /dev/null +++ b/applications/blog/setup/upg_107818/data.json @@ -0,0 +1,23 @@ +{ + "id": 107818, + "name": "4.7.22", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107819/data.json b/applications/blog/setup/upg_107819/data.json new file mode 100644 index 00000000..968a94ca --- /dev/null +++ b/applications/blog/setup/upg_107819/data.json @@ -0,0 +1,23 @@ +{ + "id": 107819, + "name": "4.7.22", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107820/data.json b/applications/blog/setup/upg_107820/data.json new file mode 100644 index 00000000..5082a5f4 --- /dev/null +++ b/applications/blog/setup/upg_107820/data.json @@ -0,0 +1,23 @@ +{ + "id": 107820, + "name": "4.7.22", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107826/data.json b/applications/blog/setup/upg_107826/data.json new file mode 100644 index 00000000..67c4b57c --- /dev/null +++ b/applications/blog/setup/upg_107826/data.json @@ -0,0 +1,23 @@ +{ + "id": 107826, + "name": "4.7.23 Beta 1", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_107827/data.json b/applications/blog/setup/upg_107827/data.json new file mode 100644 index 00000000..d8181b24 --- /dev/null +++ b/applications/blog/setup/upg_107827/data.json @@ -0,0 +1,23 @@ +{ + "id": 107827, + "name": "4.7.23", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeSettings": false, + "javascript": false, + "emailTemplates": false, + "hooks": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/sources/Blog/Blog.php b/applications/blog/sources/Blog/Blog.php index 23182693..11d30123 100644 --- a/applications/blog/sources/Blog/Blog.php +++ b/applications/blog/sources/Blog/Blog.php @@ -12,6 +12,9 @@ namespace IPS\blog; /* To prevent PHP errors (extending class does not exist) revealing path */ + +use IPS\Content\Comment; + if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) ) { header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' ); @@ -653,7 +656,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E { \IPS\Lang::saveCustom( 'blog', $langKey, $values[ $fieldKey ] ); - if ( $fieldKey === 'blog_name' ) + if ( $fieldKey === 'blog_name_group' ) { $values['seo_name'] = \IPS\Http\Url\Friendly::seoTitle( ( \is_array( $values[ $fieldKey ] ) ) ? $values[ $fieldKey ][ \IPS\Lang::defaultLanguage() ] : $values[ $fieldKey ] ); } @@ -835,15 +838,15 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E * @brief Cached latest entry */ protected $latestEntry = NULL; - + /** * Set last comment * - * @param \IPS\Content\Comment|NULL $comment The latest comment or NULL to work it out - * @return void - * @note Like Gallery, we actually want to set this to the last entry rather than comment. As such $comment is ignored. + * @param Comment|null $comment The latest comment or NULL to work it out + * @param Item|null $updatedItem We sometimes run setLastComment() when an item has been edited, if so, that item will be here + * @return void */ - public function setLastComment( \IPS\Content\Comment $comment=NULL ) + public function _setLastComment( \IPS\Content\Comment $comment=NULL, \IPS\Content\Item $updatedItem=NULL ) { $lastUpdateColumn = static::$databaseColumnMap['date']; diff --git a/applications/blog/sources/Category/Category.php b/applications/blog/sources/Category/Category.php index fa6fffdf..eb4d440e 100644 --- a/applications/blog/sources/Category/Category.php +++ b/applications/blog/sources/Category/Category.php @@ -132,7 +132,7 @@ class _Category extends \IPS\Node\Model $class = \get_called_class(); - $form->add( new \IPS\Helpers\Form\Node( 'category_parent', $this->id ? $this->parent : 0, TRUE, array( 'class' => 'IPS\blog\Category', 'subnodes' => FALSE, 'zeroVal' => 'no_parent', 'permissionCheck' => function( $node ) use ( $class ) + $form->add( new \IPS\Helpers\Form\Node( 'category_parent', $this->id ? $this->parent : 0, TRUE, array('disableCopy' => true,'class' => 'IPS\blog\Category', 'subnodes' => FALSE, 'zeroVal' => 'no_parent', 'permissionCheck' => function( $node ) use ( $class ) { if( isset( $class::$subnodeClass ) AND $class::$subnodeClass AND $node instanceof $class::$subnodeClass ) { @@ -228,16 +228,6 @@ class _Category extends \IPS\Node\Model return \IPS\Http\Url::internal( "app=blog&module=blogs&controller=browse&category={$indexData['index_container_id']}", 'front', 'blog_category', \IPS\Member::loggedIn()->language()->addToStack( 'blog_category_' . $indexData['index_container_id'], FALSE, array( 'seotitle' => TRUE ) ) ); } - /** - * [Node] Get Node Icon - * - * @return string - */ - protected function get__icon() - { - return ( $this->parent > 0 ) ? 'caret-down' : NULL ; - } - /** * Get output for API * diff --git a/applications/blog/sources/Entry/Entry.php b/applications/blog/sources/Entry/Entry.php index 28fdfd58..cde3b5b5 100644 --- a/applications/blog/sources/Entry/Entry.php +++ b/applications/blog/sources/Entry/Entry.php @@ -704,7 +704,8 @@ class _Entry extends \IPS\Content\Item implements { return TRUE; } - elseif ( !$member->member_id and $considerPostBeforeRegistering and \IPS\Settings::i()->post_before_registering and \IPS\Login::registrationType() != 'disabled' ) + elseif ( !$member->member_id and $considerPostBeforeRegistering and \IPS\Settings::i()->post_before_registering + and \IPS\Login::registrationType() != 'disabled'and \IPS\Settings::i()->bot_antispam_type !== 'none' ) { return (bool) \IPS\Member\Group::load( \IPS\Settings::i()->member_group )->g_blog_allowcomment; } @@ -823,7 +824,7 @@ class _Entry extends \IPS\Content\Item implements * @apiresponse datetime date Date * @apiresponse string entry Entry content * @apiresponse int comments Number of comments - * @apiresponse int views Number of posts + * @apiresponse int views Number of views * @apiresponse string prefix The prefix tag, if there is one * @apiresponse [string] tags The tags * @apiresponse bool locked Entry is locked diff --git a/applications/calendar/Application.php b/applications/calendar/Application.php index 4462949d..c964b5f7 100644 --- a/applications/calendar/Application.php +++ b/applications/calendar/Application.php @@ -147,7 +147,9 @@ class _Application extends \IPS\Application foreach ( \IPS\calendar\Event::retrieveEvents( $_today, $endDate, NULL, NULL, FALSE, $member ) as $event ) { $next = ( (int) \IPS\Settings::i()->calendar_rss_feed_order === 0 ) ? $event->nextOccurrence( $_today, 'startDate' ) : \IPS\DateTime::ts( $event->saved ); - $document->addItem( $event->title, $event->url(), $event->content, $next, $event->id ); + $content = $event->content; + \IPS\Output::i()->parseFileObjectUrls( $content ); + $document->addItem( $event->title, $event->url(), $content, $next, $event->id ); } /* @note application/rss+xml is not a registered IANA mime-type so we need to stick with text/xml for RSS */ @@ -197,7 +199,7 @@ class _Application extends \IPS\Application return array_merge( [ 'calendarEvent_rsvp' => [ 'event' => \IPS\calendar\Event::class, - 'action' => "string with the state (attending/etc..)", + 'action' => "string with the state ('no','yes','maybe','leave')", 'attendee' => \IPS\Member::class ] ],parent::getWebhooks()); diff --git a/applications/calendar/api/comments.php b/applications/calendar/api/comments.php index ab7ac22c..eeecacd3 100644 --- a/applications/calendar/api/comments.php +++ b/applications/calendar/api/comments.php @@ -131,7 +131,7 @@ class _comments extends \IPS\Content\Api\CommentController } else { - if ( \IPS\Request::i()->author === 0 ) + if ( (int) \IPS\Request::i()->author === 0 ) { $author = new \IPS\Member; $author->name = \IPS\Request::i()->author_name; diff --git a/applications/calendar/api/events.php b/applications/calendar/api/events.php index 3933a1a2..c5bd56c7 100644 --- a/applications/calendar/api/events.php +++ b/applications/calendar/api/events.php @@ -196,7 +196,7 @@ class _events extends \IPS\Content\Api\ItemController } else { - if ( \IPS\Request::i()->author === 0 ) + if ( (int) \IPS\Request::i()->author === 0 ) { $author = new \IPS\Member; } diff --git a/applications/calendar/api/reviews.php b/applications/calendar/api/reviews.php index 1d7879ce..9d26c375 100644 --- a/applications/calendar/api/reviews.php +++ b/applications/calendar/api/reviews.php @@ -133,7 +133,7 @@ class _reviews extends \IPS\Content\Api\CommentController } else { - if ( \IPS\Request::i()->author === 0 ) + if ( (int) \IPS\Request::i()->author === 0 ) { $author = new \IPS\Member; $author->name = \IPS\Request::i()->author_name; diff --git a/applications/calendar/data/acprestrictions.json b/applications/calendar/data/acprestrictions.json index 20be2507..ec292bff 100644 --- a/applications/calendar/data/acprestrictions.json +++ b/applications/calendar/data/acprestrictions.json @@ -16,9 +16,7 @@ }, "settings": { "settings_manage": "settings_manage" - } - }, - "venues": { + }, "venues": { "venues_manage": "venues_manage" } diff --git a/applications/calendar/data/javascript.xml b/applications/calendar/data/javascript.xml index f8333453..d713783d 100644 --- a/applications/calendar/data/javascript.xml +++ b/applications/calendar/data/javascript.xml @@ -1,6 +1,6 @@ - { + this.scope.html( response ); - $( document ).trigger( 'contentChange', [ self.scope ] ); - - History.pushState( { controller: 'calendarView' }, title, url ); + $( document ).trigger( 'contentChange', [ this.scope ] ); }) - .always( function () { - self._setLoading( false ); + .always(() => { + this._setLoading( false ); }); }, @@ -112,7 +107,7 @@ } }); }(jQuery, _));]]> - - - - this.setupGoogleMaps()) } else { // Pull in the CSS @@ -476,12 +468,12 @@ var PER_PAGE = 16; .then( () => { if ( this.useGeolocation ) { - self.getEventsByLocation(); + this.getEventsByLocation(); } else { - self.fetchEvents(); + this.fetchEvents(); } - self._mapReady = true; + this._mapReady = true; }); } }, @@ -776,7 +768,7 @@ var PER_PAGE = 16; } }); }(jQuery, _));]]> - - - { console.log( response ); - self.scope.html( response ); - + this.scope.html( response ); $( document ).trigger( 'contentChange', [ self.scope ] ); - - History.pushState( { controller: 'venueView' }, title, url ); }) - .always( function () { - self._setLoading( false ); + .always(() => { + this._setLoading( false ); }); }, @@ -2041,7 +2019,7 @@ var PER_PAGE = 16; } }); }(jQuery, _));]]> - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -2234,7 +2212,7 @@ var PER_PAGE = 16; }); }(jQuery, _)); -

    \ ");]]>     - \
    \
    \ @@ -2273,7 +2251,6 @@ Debug.js app.js jquery.js jquery-migrate.js -jquery.history.js jquery.transform.js linkify.min.js linkify-jquery.min.js diff --git a/applications/calendar/data/lang.xml b/applications/calendar/data/lang.xml index 1ba078df..25579845 100644 --- a/applications/calendar/data/lang.xml +++ b/applications/calendar/data/lang.xml @@ -1,6 +1,6 @@ - + Events Events a comment on an event diff --git a/applications/calendar/data/schema.json b/applications/calendar/data/schema.json index fa25b65d..6a34eb47 100644 --- a/applications/calendar/data/schema.json +++ b/applications/calendar/data/schema.json @@ -1169,6 +1169,18 @@ "comment": "", "unsigned": true, "auto_increment": false + }, + "event_views": { + "name": "event_views", + "type": "INT", + "length": null, + "decimals": null, + "values": null, + "allow_null": false, + "default": 0, + "comment": "", + "unsigned": false, + "auto_increment": false } }, "indexes": { diff --git a/applications/calendar/data/theme.xml b/applications/calendar/data/theme.xml index 15fb97be..179993c8 100644 --- a/applications/calendar/data/theme.xml +++ b/applications/calendar/data/theme.xml @@ -351,7 +351,7 @@ {{endif}}
    - {{if $image}}{{endif}} + {{if $image}}{$event->title}{{endif}}
    {{if $event->nextOccurrence( \IPS\calendar\Date::getDate(), 'startDate' )}} @@ -528,7 +528,7 @@
    {{if $image}} - + {$event->title} {{endif}}
    @@ -1357,7 +1357,7 @@ +{{endif}} +
    +]]> @@ -1203,10 +1229,11 @@ {lang="report"} {{endif}} + {{if ! \IPS\Output::i()->reduceLinks()}}
  • - 'findReview', 'review' => $review->id ) )}' title='{lang="share_this_review"}' data-ipsDialog data-ipsDialog-size='narrow' data-ipsDialog-content='#elShareReview_{$review->id}_menu' data-ipsDialog-title="{lang="share_this_review"}" id='elShareReview_{$review->id}' data-role='shareComment'>{lang="share_this_review"} + {lang="share_this_review"}
    • - + {{endif}} {{if $review->canEdit() || ( $review->hidden() == -2 AND \IPS\Member::loggedIn()->modPermission('can_manage_deleted_content') ) || ( $review instanceof \IPS\Content\Hideable && ( ( !$review->hidden() and $review->canHide() ) || ( $review->hidden() and $review->canUnhide() ) ) ) || $review->canDelete()}}
    • {{endif}} @@ -1334,8 +1361,9 @@ {{endif}}
    {{endif}} - +{{if ! \IPS\Output::i()->reduceLinks()}} {template="sharemenu" group="global" app="core" params="$review"} +{{endif}}
    ]]> -