Continued:

- added namespace to class config entries
- opps, need to multiply by 100
- added "import" of RandomNumberGenerator
- added "import" of BaseAction

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/config.php b/framework/config.php
index c7265271aec0971491bfc48aeb90ca6f44e49150..5de88af9fc2fcf77d9e98ba8542311bbbcc45fe4 100644 (file)
--- 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 6cc3c9c67a5e941d45fd3bf84eac24d891681754..99f59291d7c540a1eb0fbf1e229f07af9e767a49 100644 (file)
--- a/framework/main/classes/actions/class_
+++ b/framework/main/classes/actions/class_
@@ -1,6 +1,12 @@
 <?php
+// Own namespace
+namespace CoreFramework\Action\!!!;
+
+// Import framework stuff
+use CoreFramework\Action\BaseAction;
+
 /**
- * 
+ * An action for ???
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @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 2917f7f73852ead76bc8b84715ea6b81f87e5040..32581c3c828e0a66973852ae5224433752e74e4c 100644 (file)
--- 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 c12ab629cf7477e2071a1c2d0da78b6fb9091b4a..dbcf6dda682a96e905c0314091c787cad9bbcb1b 100644 (file)
--- 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 45645cff3509bdbeecffa67be405da37d800458d..3de9284b49e29be98900e15dd218969e10a06d9d 100644 (file)
--- 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 28216b783b9d58141a34978c6f0df6b442baeef9..a3ccfb820d188df214af4a7900e687ae3c8754ea 100644 (file)
--- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php
+++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filter\Change\Email;
+namespace CoreFramework\Filter\Change\Password;
 
 // Import framework stuff
 use CoreFramework\Filter\BaseFilter;

diff --git a/framework/main/classes/stacker/filo/class_FiLoStacker.php b/framework/main/classes/stacker/filo/class_FiLoStacker.php
index f99a16b2352b855ecdcf6d21b5344dcb812edc60..6c280db65dfc17abce955a90d02fdc91998cc1c6 100644 (file)
--- a/framework/main/classes/stacker/filo/class_FiLoStacker.php
+++ b/framework/main/classes/stacker/filo/class_FiLoStacker.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Stacker;
+namespace CoreFramework\Stacker\File;
 
 /**
  * A FiLo Stacker class

diff --git a/framework/main/classes/streams/crypto/class_McryptStream.php b/framework/main/classes/streams/crypto/class_McryptStream.php
index f614d0d32f175b348c21733d06ff0d65c90939b4..c0fa0d0f3e1b38bb4655c5a1f336addf2a529336 100644 (file)
--- a/framework/main/classes/streams/crypto/class_McryptStream.php
+++ b/framework/main/classes/streams/crypto/class_McryptStream.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Stream\Crypto;
 
+// Import framework stuff
+use CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
+
 /**
  * A mcrypt-based encryption stream
  *

diff --git a/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php b/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php
index cf2ff995e9e3a3df474d838f9b689b385ef74d7c..43c58d8bad853b4b04270aea5a444df55c7b6bdf 100644 (file)
--- a/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php
+++ b/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php
@@ -107,7 +107,7 @@ class TestConfigurationLoadableClassesFilter extends BaseTestsFilter implements
                } // END - foreach
 
                // Output result
-               self::createDebugInstance(__CLASS__, __LINE__)->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.');