Index: branches/5.3.x/core/install/cache/class_structure.php =================================================================== --- branches/5.3.x/core/install/cache/class_structure.php +++ branches/5.3.x/core/install/cache/class_structure.php @@ -81,20 +81,20 @@ 'ImageTagProcessor' => '/core/units/images/image_tag_processor.php', 'ImagesItem' => '/core/units/images/images.php', 'InPortalPrerequisites' => '/core/install/prerequisites.php', + 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand' => '/core/kernel/Console/Command/AbstractCommand.php', + 'InPortal\\Core\\kernel\\Console\\Command\\BuildClassMapCommand' => '/core/kernel/Console/Command/BuildClassMapCommand.php', + 'InPortal\\Core\\kernel\\Console\\Command\\CompletionCommand' => '/core/kernel/Console/Command/CompletionCommand.php', + 'InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand' => '/core/kernel/Console/Command/IConsoleCommand.php', + 'InPortal\\Core\\kernel\\Console\\Command\\ResetCacheCommand' => '/core/kernel/Console/Command/ResetCacheCommand.php', + 'InPortal\\Core\\kernel\\Console\\Command\\RunEventCommand' => '/core/kernel/Console/Command/RunEventCommand.php', + 'InPortal\\Core\\kernel\\Console\\Command\\RunScheduledTaskCommand' => '/core/kernel/Console/Command/RunScheduledTaskCommand.php', + 'InPortal\\Core\\kernel\\Console\\ConsoleApplication' => '/core/kernel/Console/ConsoleApplication.php', + 'InPortal\\Core\\kernel\\Console\\ConsoleCommandProvider' => '/core/kernel/Console/ConsoleCommandProvider.php', + 'InPortal\\Core\\kernel\\Console\\IConsoleCommandProvider' => '/core/kernel/Console/IConsoleCommandProvider.php', + 'InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassDetector' => '/core/kernel/utility/ClassDiscovery/ClassDetector.php', + 'InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassMapBuilder' => '/core/kernel/utility/ClassDiscovery/ClassMapBuilder.php', + 'InPortal\\Core\\kernel\\utility\\ClassDiscovery\\CodeFolderFilterIterator' => '/core/kernel/utility/ClassDiscovery/CodeFolderFilterIterator.php', 'InpCustomFieldsHelper' => '/core/units/helpers/custom_fields_helper.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand' => '/core/kernel/Console/Command/AbstractCommand.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\BuildClassMapCommand' => '/core/kernel/Console/Command/BuildClassMapCommand.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\CompletionCommand' => '/core/kernel/Console/Command/CompletionCommand.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand' => '/core/kernel/Console/Command/IConsoleCommand.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\ResetCacheCommand' => '/core/kernel/Console/Command/ResetCacheCommand.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\RunEventCommand' => '/core/kernel/Console/Command/RunEventCommand.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\RunScheduledTaskCommand' => '/core/kernel/Console/Command/RunScheduledTaskCommand.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\ConsoleApplication' => '/core/kernel/Console/ConsoleApplication.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\ConsoleCommandProvider' => '/core/kernel/Console/ConsoleCommandProvider.php', - 'Intechnic\\InPortal\\Core\\kernel\\Console\\IConsoleCommandProvider' => '/core/kernel/Console/IConsoleCommandProvider.php', - 'Intechnic\\InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassDetector' => '/core/kernel/utility/ClassDiscovery/ClassDetector.php', - 'Intechnic\\InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassMapBuilder' => '/core/kernel/utility/ClassDiscovery/ClassMapBuilder.php', - 'Intechnic\\InPortal\\Core\\kernel\\utility\\ClassDiscovery\\CodeFolderFilterIterator' => '/core/kernel/utility/ClassDiscovery/CodeFolderFilterIterator.php', 'ItemFilterEventHandler' => '/core/units/filters/item_filter_eh.php', 'ItemFilterTagProcessor' => '/core/units/filters/item_filter_tp.php', 'JSONHelper' => '/core/units/helpers/json_helper.php', @@ -839,99 +839,99 @@ 'type' => 1, 'modifiers' => 0, ), - 'InpCustomFieldsHelper' => array( - 'type' => 1, - 'modifiers' => 0, - 'extends' => array( - 0 => 'kHelper', - ), - ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand' => array( + 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand' => array( 'type' => 1, 'modifiers' => 1, 'extends' => array( 0 => 'Symfony\\Component\\Console\\Command\\Command', - 1 => 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand', + 1 => 'InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\BuildClassMapCommand' => array( + 'InPortal\\Core\\kernel\\Console\\Command\\BuildClassMapCommand' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( - 0 => 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', + 0 => 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', 1 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\Completion\\CompletionAwareInterface', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\CompletionCommand' => array( + 'InPortal\\Core\\kernel\\Console\\Command\\CompletionCommand' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( 0 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\CompletionCommand', - 1 => 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand', + 1 => 'InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand' => array( + 'InPortal\\Core\\kernel\\Console\\Command\\IConsoleCommand' => array( 'type' => 2, ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\ResetCacheCommand' => array( + 'InPortal\\Core\\kernel\\Console\\Command\\ResetCacheCommand' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( - 0 => 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', + 0 => 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\RunEventCommand' => array( + 'InPortal\\Core\\kernel\\Console\\Command\\RunEventCommand' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( - 0 => 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', + 0 => 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', 1 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\Completion\\CompletionAwareInterface', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\RunScheduledTaskCommand' => array( + 'InPortal\\Core\\kernel\\Console\\Command\\RunScheduledTaskCommand' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( - 0 => 'Intechnic\\InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', + 0 => 'InPortal\\Core\\kernel\\Console\\Command\\AbstractCommand', 1 => 'Stecman\\Component\\Symfony\\Console\\BashCompletion\\Completion\\CompletionAwareInterface', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\ConsoleApplication' => array( + 'InPortal\\Core\\kernel\\Console\\ConsoleApplication' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( 0 => 'Symfony\\Component\\Console\\Application', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\ConsoleCommandProvider' => array( + 'InPortal\\Core\\kernel\\Console\\ConsoleCommandProvider' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( 0 => 'kBase', - 1 => 'Intechnic\\InPortal\\Core\\kernel\\Console\\IConsoleCommandProvider', + 1 => 'InPortal\\Core\\kernel\\Console\\IConsoleCommandProvider', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\Console\\IConsoleCommandProvider' => array( + 'InPortal\\Core\\kernel\\Console\\IConsoleCommandProvider' => array( 'type' => 2, ), - 'Intechnic\\InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassDetector' => array( + 'InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassDetector' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( 0 => 'PhpParser\\NodeVisitorAbstract', ), ), - 'Intechnic\\InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassMapBuilder' => array( + 'InPortal\\Core\\kernel\\utility\\ClassDiscovery\\ClassMapBuilder' => array( 'type' => 1, 'modifiers' => 0, ), - 'Intechnic\\InPortal\\Core\\kernel\\utility\\ClassDiscovery\\CodeFolderFilterIterator' => array( + 'InPortal\\Core\\kernel\\utility\\ClassDiscovery\\CodeFolderFilterIterator' => array( 'type' => 1, 'modifiers' => 0, 'extends' => array( 0 => 'RecursiveFilterIterator', ), ), + 'InpCustomFieldsHelper' => array( + 'type' => 1, + 'modifiers' => 0, + 'extends' => array( + 0 => 'kHelper', + ), + ), 'ItemFilterEventHandler' => array( 'type' => 1, 'modifiers' => 0, Index: branches/5.3.x/core/install/install_data.sql =================================================================== --- branches/5.3.x/core/install/install_data.sql +++ branches/5.3.x/core/install/install_data.sql @@ -1039,5 +1039,5 @@ INSERT INTO PromoBlockGroups VALUES (DEFAULT, 'Default Group', UNIX_TIMESTAMP(), '1', '7.00', '0.60', '1', 'fade', ''); -INSERT INTO Modules VALUES ('Core', 'core/', 'Intechnic\\InPortal\\Core', 'adm', DEFAULT, 1, 1, '', 0, NULL); -INSERT INTO Modules VALUES ('In-Portal', 'core/', 'Intechnic\\InPortal\\Core', 'm', DEFAULT, 1, 0, '', 0, NULL); \ No newline at end of file +INSERT INTO Modules VALUES ('Core', 'core/', 'InPortal\\Core', 'adm', DEFAULT, 1, 1, '', 0, NULL); +INSERT INTO Modules VALUES ('In-Portal', 'core/', 'InPortal\\Core', 'm', DEFAULT, 1, 0, '', 0, NULL); Index: branches/5.3.x/core/install/upgrades.sql =================================================================== --- branches/5.3.x/core/install/upgrades.sql +++ branches/5.3.x/core/install/upgrades.sql @@ -3021,4 +3021,8 @@ ALTER TABLE SiteDomains CHANGE SSLUrl SSLDomainName VARCHAR(255) NOT NULL DEFAULT '', CHANGE SSLUrlUsesRegExp SSLDomainNameUsesRegExp TINYINT(4) NOT NULL DEFAULT '0'; -DELETE FROM UserPersistentSessionData WHERE VariableName = 'site-domain[Default]columns_.'; \ No newline at end of file +DELETE FROM UserPersistentSessionData WHERE VariableName = 'site-domain[Default]columns_.'; + +UPDATE Modules +SET ClassNamespace = 'InPortal\\Core' +WHERE `Name` IN ('Core', 'In-Portal'); Index: branches/5.3.x/core/kernel/Console/Command/AbstractCommand.php =================================================================== --- branches/5.3.x/core/kernel/Console/Command/AbstractCommand.php +++ branches/5.3.x/core/kernel/Console/Command/AbstractCommand.php @@ -12,10 +12,10 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console\Command; +namespace InPortal\Core\kernel\Console\Command; -use Intechnic\InPortal\Core\kernel\Console\ConsoleApplication; +use InPortal\Core\kernel\Console\ConsoleApplication; use Symfony\Component\Console\Command\Command as SymfonyCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; Index: branches/5.3.x/core/kernel/Console/Command/BuildClassMapCommand.php =================================================================== --- branches/5.3.x/core/kernel/Console/Command/BuildClassMapCommand.php +++ branches/5.3.x/core/kernel/Console/Command/BuildClassMapCommand.php @@ -12,10 +12,10 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console\Command; +namespace InPortal\Core\kernel\Console\Command; -use Intechnic\InPortal\Core\kernel\utility\ClassDiscovery\ClassMapBuilder; +use InPortal\Core\kernel\utility\ClassDiscovery\ClassMapBuilder; use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; use Symfony\Component\Console\Input\InputInterface; Index: branches/5.3.x/core/kernel/Console/Command/CompletionCommand.php =================================================================== --- branches/5.3.x/core/kernel/Console/Command/CompletionCommand.php +++ branches/5.3.x/core/kernel/Console/Command/CompletionCommand.php @@ -12,10 +12,10 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console\Command; +namespace InPortal\Core\kernel\Console\Command; -use Intechnic\InPortal\Core\kernel\Console\ConsoleApplication; +use InPortal\Core\kernel\Console\ConsoleApplication; use Stecman\Component\Symfony\Console\BashCompletion\Completion; use Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand as BashCompletionCommand; use Stecman\Component\Symfony\Console\BashCompletion\CompletionHandler; Index: branches/5.3.x/core/kernel/Console/Command/IConsoleCommand.php =================================================================== --- branches/5.3.x/core/kernel/Console/Command/IConsoleCommand.php +++ branches/5.3.x/core/kernel/Console/Command/IConsoleCommand.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console\Command; +namespace InPortal\Core\kernel\Console\Command; defined('FULL_PATH') or die('restricted access!'); Index: branches/5.3.x/core/kernel/Console/Command/ResetCacheCommand.php =================================================================== --- branches/5.3.x/core/kernel/Console/Command/ResetCacheCommand.php +++ branches/5.3.x/core/kernel/Console/Command/ResetCacheCommand.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console\Command; +namespace InPortal\Core\kernel\Console\Command; use Symfony\Component\Console\Input\InputInterface; Index: branches/5.3.x/core/kernel/Console/Command/RunEventCommand.php =================================================================== --- branches/5.3.x/core/kernel/Console/Command/RunEventCommand.php +++ branches/5.3.x/core/kernel/Console/Command/RunEventCommand.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console\Command; +namespace InPortal\Core\kernel\Console\Command; use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; Index: branches/5.3.x/core/kernel/Console/Command/RunScheduledTaskCommand.php =================================================================== --- branches/5.3.x/core/kernel/Console/Command/RunScheduledTaskCommand.php +++ branches/5.3.x/core/kernel/Console/Command/RunScheduledTaskCommand.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console\Command; +namespace InPortal\Core\kernel\Console\Command; use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; Index: branches/5.3.x/core/kernel/Console/ConsoleApplication.php =================================================================== --- branches/5.3.x/core/kernel/Console/ConsoleApplication.php +++ branches/5.3.x/core/kernel/Console/ConsoleApplication.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console; +namespace InPortal\Core\kernel\Console; use Symfony\Component\Console\Application as BaseApplication; @@ -74,7 +74,7 @@ $default_commands = parent::getDefaultCommands(); $command_provider_classes = $this->Application->getSubClasses( - 'Intechnic\InPortal\Core\kernel\Console\IConsoleCommandProvider' + 'InPortal\Core\kernel\Console\IConsoleCommandProvider' ); foreach ( $command_provider_classes as $command_provider_class ) { Index: branches/5.3.x/core/kernel/Console/ConsoleCommandProvider.php =================================================================== --- branches/5.3.x/core/kernel/Console/ConsoleCommandProvider.php +++ branches/5.3.x/core/kernel/Console/ConsoleCommandProvider.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console; +namespace InPortal\Core\kernel\Console; defined('FULL_PATH') or die('restricted access!'); @@ -29,7 +29,7 @@ { $commands = array(); $command_classes = $this->Application->getSubClasses( - 'Intechnic\InPortal\Core\kernel\Console\Command\IConsoleCommand' + 'InPortal\Core\kernel\Console\Command\IConsoleCommand' ); foreach ( $command_classes as $command_class ) { Index: branches/5.3.x/core/kernel/Console/IConsoleCommandProvider.php =================================================================== --- branches/5.3.x/core/kernel/Console/IConsoleCommandProvider.php +++ branches/5.3.x/core/kernel/Console/IConsoleCommandProvider.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\Console; +namespace InPortal\Core\kernel\Console; defined('FULL_PATH') or die('restricted access!'); Index: branches/5.3.x/core/kernel/application.php =================================================================== --- branches/5.3.x/core/kernel/application.php +++ branches/5.3.x/core/kernel/application.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -use Intechnic\InPortal\Core\kernel\Console\ConsoleApplication; +use InPortal\Core\kernel\Console\ConsoleApplication; defined('FULL_PATH') or die('restricted access!'); @@ -1061,7 +1061,7 @@ */ public function getConsoleApplication() { - return $this->makeClass('Intechnic\InPortal\Core\kernel\Console\ConsoleApplication'); + return $this->makeClass('InPortal\Core\kernel\Console\ConsoleApplication'); } /** Index: branches/5.3.x/core/kernel/utility/ClassDiscovery/ClassDetector.php =================================================================== --- branches/5.3.x/core/kernel/utility/ClassDiscovery/ClassDetector.php +++ branches/5.3.x/core/kernel/utility/ClassDiscovery/ClassDetector.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\utility\ClassDiscovery; +namespace InPortal\Core\kernel\utility\ClassDiscovery; use PhpParser\Node; Index: branches/5.3.x/core/kernel/utility/ClassDiscovery/ClassMapBuilder.php =================================================================== --- branches/5.3.x/core/kernel/utility/ClassDiscovery/ClassMapBuilder.php +++ branches/5.3.x/core/kernel/utility/ClassDiscovery/ClassMapBuilder.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\utility\ClassDiscovery; +namespace InPortal\Core\kernel\utility\ClassDiscovery; use PhpParser\Lexer; Index: branches/5.3.x/core/kernel/utility/ClassDiscovery/CodeFolderFilterIterator.php =================================================================== --- branches/5.3.x/core/kernel/utility/ClassDiscovery/CodeFolderFilterIterator.php +++ branches/5.3.x/core/kernel/utility/ClassDiscovery/CodeFolderFilterIterator.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -namespace Intechnic\InPortal\Core\kernel\utility\ClassDiscovery; +namespace InPortal\Core\kernel\utility\ClassDiscovery; defined('FULL_PATH') or die('restricted access!'); Index: branches/5.3.x/core/kernel/utility/factory.php =================================================================== --- branches/5.3.x/core/kernel/utility/factory.php +++ branches/5.3.x/core/kernel/utility/factory.php @@ -12,7 +12,7 @@ * See http://www.in-portal.org/license for copyright notices and details. */ -use Intechnic\InPortal\Core\kernel\utility\ClassDiscovery\ClassMapBuilder; +use InPortal\Core\kernel\utility\ClassDiscovery\ClassMapBuilder; defined('FULL_PATH') or die('restricted access!');