From a32ed62f6efccd13c99fded2323665520d12bcd5 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 26 Feb 2017 21:57:03 +0100 Subject: [PATCH] Continued: - added namespace to class config entries - opps, need to multiply by 100 - added "import" of RandomNumberGenerator - added "import" of BaseAction MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- framework/config.php | 18 +++++++++--------- framework/main/classes/actions/class_ | 8 +++++++- .../html/class_HtmlLoginProfileAction.php | 1 + .../class_LoginAfterRegistrationAction.php | 1 + .../main/classes/class_BaseFrameworkSystem.php | 1 + .../change/class_PasswordChangeFilter.php | 2 +- .../classes/stacker/filo/class_FiLoStacker.php | 2 +- .../streams/crypto/class_McryptStream.php | 3 +++ ..._TestConfigurationLoadableClassesFilter.php | 2 +- 9 files changed, 25 insertions(+), 13 deletions(-) diff --git a/framework/config.php b/framework/config.php index c7265271..5de88af9 100644 --- a/framework/config.php +++ b/framework/config.php @@ -203,10 +203,10 @@ $cfg->setConfigEntry('username_validator_filter_class', 'CoreFramework\Filter\Va $cfg->setConfigEntry('username_is_guest_filter_class', 'CoreFramework\Filter\User\Username\UserNameIsGuestFilter'); // CFG: PASSWORD-VALIDATOR-FILTER-CLASS -$cfg->setConfigEntry('password_validator_filter_class', 'PasswordValidatorFilter'); +$cfg->setConfigEntry('password_validator_filter_class', 'CoreFramework\Filter\Validator\Password\PasswordValidatorFilter'); // CFG: RULES-ACCEPTED-FILTER-CLASS -$cfg->setConfigEntry('rules_accepted_filter_class', 'RulesAcceptedFilter'); +$cfg->setConfigEntry('rules_accepted_filter_class', 'CoreFramework\Filter\RulesCheckbox\RulesAcceptedFilter'); // CFG: USERNAME-VERIFIER-FILTER-CLASS $cfg->setConfigEntry('username_verifier_filter_class', 'CoreFramework\Filter\Verifier\User\UserNameVerifierFilter'); @@ -218,16 +218,16 @@ $cfg->setConfigEntry('user_guest_verifier_filter_class', 'CoreFramework\Filter\V $cfg->setConfigEntry('email_verifier_filter_class', 'EmailVerifierFilter'); // CFG: PASSWORD-VERIFIER-FILTER-CLASS -$cfg->setConfigEntry('password_verifier_filter_class', 'PasswordVerifierFilter'); +$cfg->setConfigEntry('password_verifier_filter_class', 'CoreFramework\Filter\Verifier\Password\PasswordVerifierFilter'); // CFG: PASSWD-GUEST-VERIFIER-FILTER-CLASS -$cfg->setConfigEntry('passwd_guest_verifier_filter_class', 'PasswordGuestVerifierFilter'); +$cfg->setConfigEntry('passwd_guest_verifier_filter_class', 'CoreFramework\Filter\Verifier\User\PasswordGuestVerifierFilter'); // CFG: EMAIL-CHANGE-FILTER-CLASS $cfg->setConfigEntry('email_change_filter_class', 'EmailChangeFilter'); // CFG: PASSWORD-CHANGE-FILTER-CLASS -$cfg->setConfigEntry('password_change_filter_class', 'PasswordChangeFilter'); +$cfg->setConfigEntry('password_change_filter_class', 'CoreFramework\Filter\Change\Password\PasswordChangeFilter'); // CFG: ACCOUNT-PASSWORD-FILTER-CLASS $cfg->setConfigEntry('account_password_filter_class', 'AccountPasswordVerifierFilter'); @@ -242,7 +242,7 @@ $cfg->setConfigEntry('user_unconfirmed_filter_class', 'CoreFramework\Filter\Veri $cfg->setConfigEntry('crypto_class', 'CryptoHelper'); // CFG: RNG-CLASS -$cfg->setConfigEntry('rng_class', 'RandomNumberGenerator'); +$cfg->setConfigEntry('rng_class', 'CoreFramework\Crypto\RandomNumber\RandomNumberGenerator'); // CFG: USER-DB-WRAPPER-CLASS $cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Wrapper\Database\User\UserDatabaseWrapper'); @@ -293,7 +293,7 @@ $cfg->setConfigEntry('hash_normal_mask', '%1s:%2s'); // 1=salt, 2=plain password $cfg->setConfigEntry('is_single_server', 'Y'); // CFG: POST-REGISTRATION-CLASS -$cfg->setConfigEntry('post_registration_class', 'LoginAfterRegistrationAction'); +$cfg->setConfigEntry('post_registration_class', 'CoreFramework\Action\PostRegistration\Login\LoginAfterRegistrationAction'); // CFG: USER-CLASS $cfg->setConfigEntry('user_class', 'CoreFramework\User\Login\Member'); @@ -329,7 +329,7 @@ $cfg->setConfigEntry('product_install_mode', 'debug'); $cfg->setConfigEntry('decimals', 3); // CFG: MENU-STACKER-CLASS -$cfg->setConfigEntry('menu_stacker_class', 'FiLoStacker'); +$cfg->setConfigEntry('menu_stacker_class', 'CoreFramework\Stacker\File\FiLoStacker'); // CFG: STACKER-GENERIC-MAX-SIZE $cfg->setConfigEntry('stacker_generic_max_size', 100); @@ -452,7 +452,7 @@ $cfg->setConfigEntry('default_image_command', 'build'); $cfg->setConfigEntry('default_image_controller', 'build'); // CFG: MENU-TEMPLATE-CLASS -$cfg->setConfigEntry('menu_template_class', 'MenuTemplateEngine'); +$cfg->setConfigEntry('menu_template_class', 'CoreFramework\Template\Engine\MenuTemplateEngine'); // CFG: MENU-TEMPLATE-EXTENSION $cfg->setConfigEntry('menu_template_extension', '.xml'); diff --git a/framework/main/classes/actions/class_ b/framework/main/classes/actions/class_ index 6cc3c9c6..99f59291 100644 --- a/framework/main/classes/actions/class_ +++ b/framework/main/classes/actions/class_ @@ -1,6 +1,12 @@ * @version 0.0.0 diff --git a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php index 2917f7f7..32581c3c 100644 --- a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php +++ b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php @@ -3,6 +3,7 @@ namespace CoreFramework\Action\Login; // Import framework stuff +use CoreFramework\Action\BaseAction; use CoreFramework\Action\PerformableAction; use CoreFramework\Controller\Controller; use CoreFramework\Factory\ObjectFactory; diff --git a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php index c12ab629..dbcf6dda 100644 --- a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php +++ b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php @@ -3,6 +3,7 @@ namespace CoreFramework\Action\PostRegistration\Login; // Import framework stuff +use CoreFramework\Action\BaseAction; use CoreFramework\Action\PerformableAction; use CoreFramework\Generic\FrameworkException; use CoreFramework\Request\Requestable; diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index 45645cff..3de9284b 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -10,6 +10,7 @@ use CoreFramework\Controller\Controller; use CoreFramework\Criteria\Criteria; use CoreFramework\Criteria\Local\LocalSearchCriteria; use CoreFramework\Criteria\Local\LocalUpdateCriteria; +use CoreFramework\Crypto\RandomNumber\RandomNumberGenerator; use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Filesystem\Block; diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php index 28216b78..a3ccfb82 100644 --- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php +++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php @@ -1,6 +1,6 @@ debugOutput(sprintf('Test result: %d okay, %d failed (%0.02f%% passed)', $passed, $failed, ($passed / ($passed + $failed)))); + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('Test result: %d okay, %d failed (%0.02f%% passed)', $passed, $failed, ($passed / ($passed + $failed) * 100))); // Implement this! $this->partialStub('Please implement this method.'); -- 2.39.5