Version 4.2.0
This commit is contained in:
1 parent
0dc2aee5ed
commit
96997ddd8e
2074 files changed
+125454
-55780
No files matched your search
@@ -70,7 +70,18 @@ class _create extends \IPS\Dispatcher\Controller
|
||||
{
|
||||
if ( ucwords( $node->directory ) === str_replace( '.php', '', $file->getFilename() ) )
|
||||
{
|
||||
if ( $node->directory === 'core' OR $appCount > 0 )
|
||||
$hasFile = FALSE;
|
||||
/* Only show the node if there is a converter available */
|
||||
foreach( new \DirectoryIterator( \IPS\ROOT_PATH . '/applications/convert/sources/Software/' . ucwords( $node->directory ) ) AS $softwareFile )
|
||||
{
|
||||
if( mb_substr( $softwareFile->getFilename(), -3 ) === 'php' )
|
||||
{
|
||||
$hasFile = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( ( $node->directory === 'core' OR $appCount > 0 ) and $hasFile )
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
@@ -214,6 +225,11 @@ class _create extends \IPS\Dispatcher\Controller
|
||||
|
||||
try
|
||||
{
|
||||
if ( !isset( $values['convert_start_database_prefix'] ) )
|
||||
{
|
||||
$values['convert_start_database_prefix'] = '';
|
||||
}
|
||||
|
||||
/* Test the connection */
|
||||
$connectionSettings = array(
|
||||
'sql_host' => $values['convert_start_database_host'],
|
||||
@@ -307,11 +323,6 @@ class _create extends \IPS\Dispatcher\Controller
|
||||
$app->parent = 0;
|
||||
}
|
||||
|
||||
if ( !isset( $values['convert_start_database_prefix'] ) )
|
||||
{
|
||||
$values['convert_start_database_prefix'] = '';
|
||||
}
|
||||
|
||||
$app->db_host = $values['convert_start_database_host'];
|
||||
$app->db_port = $values['convert_start_database_port'];
|
||||
$app->db_db = $values['convert_start_database_name'];
|
||||
|
||||
Reference in new issue
Block a user