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

Version 4.3.6

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:49:12 -08:00
1 parent fe1acf984a
commit 1a0c7fd3c2
609 files changed
+14707 -5726
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/modules/admin/system/login.php
+21 -15
View File
@@ -28,9 +28,24 @@ class _login extends \IPS\Dispatcher\Controller
* @return void
*/
protected function manage()
{
{
/* Do we have an unfinished upgrade? */
if ( !\IPS\IN_DEV and !isset( \IPS\Request::i()->noWarning ) )
{
if( \IPS\Application::load('core')->long_version < \IPS\Application::getAvailableVersion('core') and \IPS\Application::load('core')->version != \IPS\Application::getAvailableVersion( 'core', TRUE ) )
{
include( \IPS\ROOT_PATH . '/' . \IPS\CP_DIRECTORY . '/upgrade/upgradeAvailable.html' );
session_abort();
exit;
}
}
/* Init login class */
$url = \IPS\Http\Url::internal( "app=core&module=system&controller=login", 'admin' );
if ( isset( \IPS\Request::i()->noWarning ) )
{
$url = $url->setQueryString( 'noWarning', 1 );
}
if ( isset( \IPS\Request::i()->ref ) )
{
$url = $url->setQueryString( 'ref', \IPS\Request::i()->ref );
@@ -63,7 +78,8 @@ class _login extends \IPS\Dispatcher\Controller
}
\IPS\Output::i()->redirect( $url );
}
$success->device->updateAfterAuthentication( FALSE, $success->handler, FALSE, FALSE );
/* Otherwise go ahead */
$this->_doLogin( $success->member );
}
@@ -95,21 +111,11 @@ class _login extends \IPS\Dispatcher\Controller
break;
}
}
/* Do we need to show a message about an unfinished upgrade? */
$upgradeError = FALSE;
if ( !\IPS\IN_DEV and !isset( \IPS\Request::i()->noWarning ) )
{
if( \IPS\Application::load('core')->long_version < \IPS\Application::getAvailableVersion('core') and \IPS\Application::load('core')->version != \IPS\Application::getAvailableVersion( 'core', TRUE ) )
{
$upgradeError = \IPS\Application::getAvailableVersion( 'core', TRUE );
}
}
/* Display Login Form */
\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_system.js', 'core', 'admin' ) );
\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'system/login.css', 'core', 'admin' ) );
\IPS\Output::i()->sendOutput( \IPS\Theme::i()->getTemplate( 'system' )->login( $login, $error, $upgradeError ) );
\IPS\Output::i()->sendOutput( \IPS\Theme::i()->getTemplate( 'system' )->login( $login, $error, FALSE ) );
}
/**
@@ -213,7 +219,7 @@ class _login extends \IPS\Dispatcher\Controller
}
else
{
\IPS\Output::i()->redirect( \IPS\Http\Url::internal( http_build_query( $queryString ) ), '', 303 );
\IPS\Output::i()->redirect( \IPS\Http\Url::internal( http_build_query( $queryString, '', '&' ) ), '', 303 );
}
}