sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.7.0

Browse Source
This commit is contained in:
Neo committed 2025-12-19 16:00:35 -08:00
1 parent 517a5e1f70
commit 8ba7d43898
1933 files changed
+65613 -11332
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/modules/setup/install/applications.php
+7 -1
View File
@@ -84,7 +84,7 @@ class _applications extends \IPS\Dispatcher\Controller
$apps[ (string) $app ] = array(
'name' => (string) $name,
'disabled' => ( !empty( $errors ) or (string) $app === 'core' ),
'disabled' => ( !empty( $errors ) or ( (string) $app === 'core' or (string) $app === 'cloud' ) ),
'errors' => $errors,
);
}
@@ -93,6 +93,11 @@ class _applications extends \IPS\Dispatcher\Controller
/* Bring core app to top */
$system['core'] = $apps['core'];
unset( $apps['core'] );
if ( isset( $apps['cloud'] ) )
{
$system['cloud'] = $apps['cloud'];
unset( $apps['cloud'] );
}
$apps = array_merge( $system, $apps );
$form->add( new \IPS\Helpers\Form\Custom( 'apps', $defaultTicks, TRUE, array(
@@ -120,6 +125,7 @@ class _applications extends \IPS\Dispatcher\Controller
$options = array_combine( array_keys( $apps ), array_map( function( $value ){ return $value['name']; }, $apps ) );
/* But put system app at end of list to ensure it's not selected by default over something else */
unset( $options['core'] );
unset( $options['cloud'] );
$options['core'] = $apps['core']['name'];
return \IPS\Theme::i()->getTemplate( 'forms' )->select( 'default_app', $element->value, TRUE, $options );
},
applications/core/modules/setup/install/license.php
+1 -1
View File
@@ -30,7 +30,7 @@ class _license extends \IPS\Dispatcher\Controller
public function manage()
{
$form = new \IPS\Helpers\Form( 'license', 'continue', \IPS\Http\Url::external( ( \IPS\Request::i()->isSecure() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'] . '?controller=license' ) );
$form->add( new \IPS\Helpers\Form\Text( 'lkey', 'Nulled by IPBMafia.ru | 09.06.2021', TRUE, array( 'size' => 50 ), function( $val )
$form->add( new \IPS\Helpers\Form\Text( 'lkey', 'Nulled by IPBMafia.ru | 06.07.2022', TRUE, array( 'size' => 50 ), function( $val )
{
\IPS\IPS::checkLicenseKey( $val, ( \IPS\Request::i()->isSecure() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . mb_substr( $_SERVER['SCRIPT_NAME'], 0, -mb_strlen( \IPS\CP_DIRECTORY . '/install/index.php' ) ) );
}, NULL, '<a href="' . \IPS\Http\Url::ips( 'docs/find_lkey' ) . '" target="_blank" rel="noopener">' . \IPS\Member::loggedIn()->language()->addToStack('lkey_help') . '</a>' ) );
applications/core/modules/setup/upgrade/applications.php
+12 -3
View File
@@ -58,7 +58,7 @@ class _applications extends \IPS\Dispatcher\Controller
foreach( \IPS\Application::applications() as $app => $data )
{
$path = \IPS\ROOT_PATH . '/applications/' . $app;
$path = \IPS\Application::getRootPath( $app ) . '/applications/' . $app;
if ( $app == 'chat' )
{
@@ -118,15 +118,19 @@ class _applications extends \IPS\Dispatcher\Controller
'errors' => $errors,
'current' => \IPS\Application::load( $app )->version,
'available' => \IPS\Application::getAvailableVersion( $app, TRUE ),
'force' => ( $app === 'core' and $availableVersion > $currentVersion )
'force' => ( ( $app === 'core' or $app === 'cloud' ) and $availableVersion > $currentVersion )
);
}
/* Bring core app to top */
$system['core'] = $apps['core'];
unset( $apps['core'] );
if ( isset( $apps['cloud'] ) )
{
$system['cloud'] = $apps['cloud'];
unset( $apps['cloud'] );
}
$apps = array_merge( $system, $apps );
if( \count( $defaultTicks ) )
{
$form = new \IPS\Helpers\Form( 'applications', 'continue' );
@@ -154,6 +158,11 @@ class _applications extends \IPS\Dispatcher\Controller
{
$_SESSION['apps']['core'] = 'core';
}
if ( isset( $apps['cloud'] ) and $apps['cloud']['force'] )
{
$_SESSION['apps']['cloud'] = 'cloud';
}
if( \count( $values['apps'] ) )
{
applications/core/modules/setup/upgrade/login.php
+1 -1
View File
@@ -80,7 +80,7 @@ class _login extends \IPS\Dispatcher\Controller
$canUpgrade = FALSE;
foreach( \IPS\Application::applications() as $app => $data )
{
$path = \IPS\ROOT_PATH . '/applications/' . $app;
$path = \IPS\Application::getRootPath( $app ) . '/applications/' . $app;
if ( $app != 'chat' and is_dir( $path . '/data' ) )
{