Version 4.1.2

2025-12-19 05:32:19 -08:00
1 parent 3ba79295ee
commit 28bd025b35
@@ -6,7 +6,8 @@
 	<pre class="ipsCode prettyprint lang-sql">{$query}{{if mb_substr( $query, -1 ) != ';'}};{{endif}}</pre>
 {{endforeach}}
 <div class="ipsAreaBackground ipsPad ipsType_center">
-	<a href="{$url->setQueryString( array( 'key' => $_SESSION['uniqueKey'], 'mr_continue' => NULL, 'run_anyway' => 1, 'mr' => \IPS\Request::i()->mr ) )}" data-action="redirectContinue" class="ipsButton ipsButton_primary">{lang="manual_query_auto"}</a>
+	{{$mr = \IPS\core\Setup\Upgrade::adjustMultipleRedirect( array( 'extra' => array( 'lastSqlId' => $_SESSION['lastJsonIndex'] - 0.1 ) ) );}}
+	<a href="{$url->setQueryString( array( 'key' => $_SESSION['uniqueKey'], 'mr_continue' => NULL, 'run_anyway' => 1, 'mr' => $mr ) )}" data-action="redirectContinue" class="ipsButton ipsButton_primary">{lang="manual_query_auto"}</a>
 	&nbsp;{lang="or"}&nbsp;
 	<a href="{$url}" data-action="redirectContinue" class="ipsButton ipsButton_primary">{lang="manual_query_manual"}</a>
 </div>
@@ -21,7 +21,7 @@
 		<script src="js/multipleRedirect.js"></script>
 	</head>
 	<body class='ipsApp ipsApp_installer'>
-		<!-- Nulled by IAF -->
+		
 		<div id='elInstaller_wrap'>
 			<div id='ipsLayout_header' class='ipsClearfix' role='banner'>
 				<header>
@@ -59,6 +59,7 @@
 						</p>
 						<br><br>
 						<a href='{expression="\IPS\Settings::i()->base_url"}' class='ipsButton ipsButton_large ipsButton_primary'>Go to the suite</a>
+						<a href='{expression="rtrim( \IPS\Settings::i()->base_url, '/' ) . '/' . \IPS\CP_DIRECTORY"}' class='ipsButton ipsButton_large ipsButton_normal'>Go to the AdminCP</a>
 						<br><br>
 						<a href="{expression="\IPS\Http\Url::ips('docs/docs')"}" target="_blank">Suite Documentation</a>
 					</div>
@@ -80,7 +81,6 @@
 						<a href="{expression="\IPS\Http\Url::ips('docs/install_guide')"}" target="_blank">Install Guide</a>
 					</div>
 				{{endif}}
-				<p style="text-align: right">Nulled by IAF</p>
 			</main>
 		</div>
 	</body>
@@ -28,8 +28,8 @@
 		<br><br>
 		<p class="ipsType_normal">None of these items are required in order to continue with the upgrade right now. However, they will be required in a future version of IPS Community Suite. You should make a note of them and contact your hosting provider or system administrator after the upgrade to address them. You can re-run these checks later from the <em>Support</em> section of the Administrator Control Panel.</p>
 		<ul class="ipsPad ipsType_large ipsList_checks">
-			{{foreach $requirements['advice'] as $item}}
-				<li class="advisory">{$item}</li>
+			{{foreach $requirements['advice'] as $key => $item}}
+				<li class="{{if $key === 'php'}}ipsMessage ipsMessage_warning{{else}}advisory{{endif}}">{$item}</li>
 			{{endforeach}}
 		</ul>
 	{{endif}}
@@ -6,6 +6,7 @@ $(function(){
 	
 		$.ajax( url, {
 			dataType: 'json',
+			cache:	  false,
 			timeout:  IPS_TIMEOUT !== false ? parseInt( IPS_TIMEOUT * 1000 ) : 30000,
 			complete: function( jqXHR, textStatus )
 			{
@@ -43,7 +43,7 @@ $lang = array(
 	'login_err_bad_password'		=> "The password you entered is incorrect. Please try again (make sure your caps lock is off).",
 	'login_err_locked_unlock'		=> "Your account has been locked. Try again in {# [1:minute][?:minutes]}.",
 	'login_err_locked_nounlock'		=> "Your account has been locked. Try again later.",
-	'login_err_no_cookies'			=> "Your browser does not accept cookies which is required in order to log in.",
+	'login_err_no_cookies'			=> "Your browser does not accept cookies which are required in order to log in.",
 	'sign_in_with_these'			=> "Or sign in with one of these services",
 	'login_err_remote_validate'		=> "You must validate your account at another site before you can log in successfully. Please <a href='%s' target='_blank'>click here</a> to validate your account.",
 	'login_connect_generic_error'	=> "There was an error processing your login request at one of the sites in our network.",
@@ -58,8 +58,9 @@ $lang = array(
 	'login_live'						=> "Sign in with Microsoft",
 	
 	'requirements_php_version_success'	=> "PHP version %s.",
+	'requirements_php_version_success_53x'	=> "PHP version %s. <strong>Please see advice below</strong>",
 	'requirements_php_version_fail'		=> "You are running PHP version %s. You need PHP 5.3.0 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 5.4.0 or above.",
+	'requirements_php_version_advice'	=> "You are running PHP version %s which is now end of life.<br>Please note that IPS Community Suite 4.1.1 and newer <strong>will require PHP 5.4.0</strong> as a minimum.<br>You can continue to upgrade to IPS Community Suite 4.1.0 using your current PHP version.",
 	'requirements_curl_success'			=> "cURL extension loaded.",
 	'requirements_curl_fopen'			=> "fsockopen function available",
 	'requirements_curl_advice'			=> "You do not have the cURL PHP extension loaded or it is running a version less than 7.36. While this is not required, it is recommended.",
@@ -487,4 +488,13 @@ $lang = array(
    '100003_no_convert'                 => "Don't convert",
    '100003_convert'                    => "Convert",
    '100003_convert_desc'               => "In this version of IPS Community Suite, members can no longer add other members as friends. However members can follow other members and receive notifications when the members they are following post. You can convert friends to followers, so any members who are friends with another member will now be following them, however this will mean they will start receiving notifications which may be undesired. It is recommended you do not convert.",
+
+	/* ! 101000 revert globalTemplate */
+	'101000_globalTemplate_revert'      => "Revert custom themes which contain out of date globalTemplate templates?",
+	'101000_globalTemplate_revert_desc' => "In IPS Community Suite 4.1, the template 'utilitiesMenu' has been removed. This is used within the globalTemplate. After upgrading, you may see a message about the theme being out of date if you do not revert.<br><strong>Reverting templates will lose any customizations</strong>",
+	'101000_yes'						=> "Yes, revert losing customiztions",
+	'101000_no'							=> "No, I will manually adjust the templates after upgrading",
+	
+	/* ! CMS 101000 Options */
+	'40000_cms_htmlconversion'			=> "Pages HTML",
 );