From fd9fe72ca3fbc426d3827859e705fb4b20d7ad41 Mon Sep 17 00:00:00 2001 From: Aivars Zukovskis Date: Thu, 10 Sep 2026 03:14:53 +0300 Subject: [PATCH] *** Core *** --- composer.json | 4 +- development/bin/docker_up.sh | 6 +- .../database/bin/update_sub_db_by_file.sh | 2 +- .../data/elixir_vault_lv/site_cms_msg.txt | 2 +- .../site_cms_msg_translations.txt | 2 +- .../data/elixir_vault_lv/site_map.txt | 2 +- .../data/elixir_vault_lv/temp_cache_exp.txt | 2 +- development/scripts/project_updater.sh | 24 +- docker/development/cron_job | 2 +- docker/development/php.ini | 6 +- tests/BasePhpUnitCase.php | 19 +- tests/BasePhpUnitSeleniumCase.php | 8 +- tests/DataSetup/Constants/siteAccounts.php | 2 +- tests/DataSetup/Constants/siteLanguages.php | 2 +- tests/DataSetup/Constants/siteMap.php | 2 +- tests/DataSetup/Constants/siteUsers.php | 2 +- .../Traits/App/Helpers/assertionsTrait.php | 4 +- .../Traits/App/Helpers/commonTrait.php | 4 +- .../Traits/App/Helpers/dialogTrait.php | 2 +- .../Traits/App/Helpers/formLayoutTrait.php | 2 +- .../App/Helpers/formValidationTrait.php | 4 +- .../Traits/App/Helpers/pageDataTrait.php | 2 +- .../Traits/App/Helpers/tableLayoutTrait.php | 2 +- tests/DataSetup/Traits/App/pubUsersTrait.php | 4 +- .../Traits/Cms/cmsAssertionsTrait.php | 2 +- tests/DataSetup/Traits/Cms/cmsDialogTrait.php | 2 +- tests/DataSetup/Traits/Cms/cmsTableTrait.php | 2 +- tests/ExcelDataExtractForTestingValues.php | 2 +- .../pubUserLoginForcePwdChangeTest.php | 12 +- .../App/PubUsers/pubUserLoginTest.php | 10 +- .../App/PubUsers/pubUserPwdResetTest.php | 12 +- .../App/PubUsers/pubUserRegistrationTest.php | 16 +- .../pubUserTwoFactorAuthActionTest.php | 14 +- tests/SeleniumTests/BaseLoginTest.php | 8 +- .../Sys/SysSiteMap/sysSiteMapRoutesTest.php | 6 +- .../Sys/SysUsersLogin/sysUserLoginTest.php | 6 +- tests/UnitTests/App/Index/indexBase.php | 6 +- tests/UnitTests/App/Index/indexModuleTest.php | 2 +- tests/UnitTests/App/Index/indexTest.php | 2 +- .../App/Index/pageCookiesActionTest.php | 2 +- .../App/Index/pageRegisterActionTest.php | 2 +- .../PubUserManager/UserProfileActionTest.php | 6 +- .../PubUserManager/pubUserManagerBaseTest.php | 8 +- .../pubUserManagerModuleTest.php | 8 +- .../securityEnforcement2faTrapActionTest.php | 8 +- .../UnitTests/App/PubUsers/UserAdvCfgTest.php | 227 ------------------ .../App/PubUsers/accountActivationTest.php | 8 +- .../companySelectionActionRequestTest.php | 126 ---------- .../App/PubUsers/companySettingsTest.php | 79 ------ .../App/PubUsers/loginActionRequestTest.php | 6 +- .../passwordForceChangeActionTest.php | 8 +- .../PubUsers/passwordRecoveryActionTest.php | 10 +- .../App/PubUsers/pubUsersControllerTest.php | 6 +- .../App/PubUsers/pubUsersModuleTest.php | 4 +- .../App/PubUsers/twoFactorAuthActionTest.php | 8 +- .../userAdditionalCompanyRegistrationTest.php | 101 -------- www/ajax-c/ajax.php | 2 +- www/cron-c/cron.php | 4 +- www/sitemap.xml | 6 +- www/sitemap_en.xml | 28 +-- www/sitemap_lv.xml | 26 +- www/sitemap_ru.xml | 30 +-- .../app/pubBuy/inc/pubBuyController.php | 8 +- .../app/pubUsers/inc/pubUsersController.php | 4 +- .../inc/cmsMailEngineController.php | 14 +- .../custom_templates/email_bugs_created.twig | 4 +- .../tmpl/custom_templates/pwd_recovery.twig | 12 +- .../tmpl/custom_templates/registration.twig | 8 +- .../cms/cmsOrders/inc/cmsOrdersController.php | 2 +- www/system-brs-core/config/init.cfg.ini | 14 +- www/system-brs-core/library/cCron/cCron.php | 4 +- www/system-brs-core/library/cMail/cMail.php | 12 +- www/system-brs-core/library/cView/cView.php | 6 + .../library/cView/tpl/core/body.twig | 2 +- .../library/cView/tpl/core/cms-body.twig | 2 +- .../cView/tpl/helpers/pub/cookies.twig | 2 +- .../pub/errors/errDieOn2FAAuthReq.twig | 3 +- .../pub/errors/errDieOnPageAccess.twig | 3 +- .../library/cView/tpl/helpers/pub/footer.twig | 2 +- .../scripts/record_db_cfg_sample.txt | 2 +- .../sys/sysUsersLogin/tmpl/login.twig | 2 +- 81 files changed, 254 insertions(+), 778 deletions(-) delete mode 100644 tests/UnitTests/App/PubUsers/UserAdvCfgTest.php delete mode 100644 tests/UnitTests/App/PubUsers/companySelectionActionRequestTest.php delete mode 100644 tests/UnitTests/App/PubUsers/companySettingsTest.php delete mode 100644 tests/UnitTests/App/PubUsers/userAdditionalCompanyRegistrationTest.php diff --git a/composer.json b/composer.json index 9360a93..53b7810 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "type": "project", - "name": "loreta/application", + "name": "elixir/application", "license": "proprietary", "authors": [ { @@ -58,7 +58,7 @@ }, "autoload-dev": { "psr-4": { - "LoretaAudit\\Tests\\" : "tests/" + "ElixirAudit\\Tests\\" : "tests/" } }, "config": { diff --git a/development/bin/docker_up.sh b/development/bin/docker_up.sh index 05c3d7b..aac03cf 100755 --- a/development/bin/docker_up.sh +++ b/development/bin/docker_up.sh @@ -46,13 +46,13 @@ docker exec -t elixirvault_mysql bash -c 'chmod +x /opt/bin/*.sh' # mkdir -p ./vendor # # sleep 3; -# docker exec loreta_php bash -c "php /usr/local/bin/composer install --working-dir /var/www/html" +# docker exec secretvault_php bash -c "php /usr/local/bin/composer install --working-dir /var/www/html" #else -# docker exec loreta_php bash -c "cd /var/www/html; composer dumpautoload" > /dev/null 2>&1; +# docker exec secretvault_php bash -c "cd /var/www/html; composer dumpautoload" > /dev/null 2>&1; #fi # Disable sendmail_path from php.webdevops.ini cfg file which overrider php.ini -#docker exec -t loreta_php bash -c 'sed -i "s/^sendmail_path/;sendmail_path/" /opt/docker/etc/php/php.webdevops.ini' +#docker exec -t secretvault_php bash -c 'sed -i "s/^sendmail_path/;sendmail_path/" /opt/docker/etc/php/php.webdevops.ini' # Check if db container is loaded, if not wait for it to load printf 'Waiting for database connection ...' > /dev/tty diff --git a/development/database/bin/update_sub_db_by_file.sh b/development/database/bin/update_sub_db_by_file.sh index 0668c9d..9c57db1 100755 --- a/development/database/bin/update_sub_db_by_file.sh +++ b/development/database/bin/update_sub_db_by_file.sh @@ -2,7 +2,7 @@ ## ------------------------------------------------------------------- ## RUNNING THE SCRIPT FILE FOR DOCKER CONTAINER - TEST / DEVELOP -## docker exec -it loreta_mysql bash -c "cd /opt && ./bin/load_all_dbs.sh -folder=data/bulk_db_load_test" +## docker exec -it secretvault_mysql bash -c "cd /opt && ./bin/load_all_dbs.sh -folder=data/bulk_db_load_test" ## ------------------------------------------------------------------- diff --git a/development/database/data/elixir_vault_lv/site_cms_msg.txt b/development/database/data/elixir_vault_lv/site_cms_msg.txt index dffa182..95b0d33 100644 --- a/development/database/data/elixir_vault_lv/site_cms_msg.txt +++ b/development/database/data/elixir_vault_lv/site_cms_msg.txt @@ -359,7 +359,7 @@ 4344 Read 4345 Unread 4346 Z18 -4347 loretasecret.lv +4347 elixirvault.lv 4348 Mail owner 4349 CC owner 4350 Date from diff --git a/development/database/data/elixir_vault_lv/site_cms_msg_translations.txt b/development/database/data/elixir_vault_lv/site_cms_msg_translations.txt index e240369..57d9c75 100644 --- a/development/database/data/elixir_vault_lv/site_cms_msg_translations.txt +++ b/development/database/data/elixir_vault_lv/site_cms_msg_translations.txt @@ -359,7 +359,7 @@ 4344 1 Read 4345 1 Unread 4346 1 Z18 -4347 1 loretasecret.lv +4347 1 elixirvault.lv 4348 1 Mail owner 4349 1 CC owner 4350 1 Date from diff --git a/development/database/data/elixir_vault_lv/site_map.txt b/development/database/data/elixir_vault_lv/site_map.txt index d2dfb64..ef04c3d 100644 --- a/development/database/data/elixir_vault_lv/site_map.txt +++ b/development/database/data/elixir_vault_lv/site_map.txt @@ -23,7 +23,7 @@ 261 classificators Classificators /lslsadmin/content/classificators/ 14 1 1 261 1 2 /lslsadmin/login 1338550438 1556106004 1 5 0 90 1 1 1 0 1 0 0 1 0 0 1 0 1 401 my-profile My profile /lslsadmin/my-profile/ 1 1 1 401 1 2 /lslsadmin/login 1347105343 1550507107 1 5 0 0 1 1 1 0 1 0 0 1 0 0 1 0 0 524 site site 0 0 7 524 0 0 1415452127 1588075986 1 0 0 0 0 1 1 1 0 0 0 1 0 0 0 0 0 -525 index Sākums /index/ LoretaSecret 524 0 7 525 0 675 1415452145 1782913389 1 0 0 0 1 1 1 0 1 0 1 1 0 0 1 0 0 +525 index Sākums /index/ ElixirVault 524 0 7 525 0 675 1415452145 1782913389 1 0 0 0 1 1 1 0 1 0 1 1 0 0 1 0 0 620 site-map Site Map /lslsadmin/site-map/ 1 1 1 620 1 2 /lslsadmin/login 1462202284 1549372729 1 10 0 258 1 1 1 0 1 0 0 1 0 0 0 0 0 621 system-site-map System site map /lslsadmin/site-map/system-site-map/ 620 1 1 621 1 2 /lslsadmin/login 1462205069 1550507286 1 5 0 252 1 1 1 0 1 0 0 1 0 0 0 0 1 624 app-site-map App site map /lslsadmin/site-map/app-site-map/ 620 1 1 624 1 2 /lslsadmin/login 1462208019 1550507292 1 10 0 257 1 1 1 0 1 0 0 0 0 0 0 0 1 diff --git a/development/database/data/elixir_vault_lv/temp_cache_exp.txt b/development/database/data/elixir_vault_lv/temp_cache_exp.txt index b7068cc..fb74659 100644 --- a/development/database/data/elixir_vault_lv/temp_cache_exp.txt +++ b/development/database/data/elixir_vault_lv/temp_cache_exp.txt @@ -1 +1 @@ -3416 loreta_local_APC_DISABLED 1784020582 1815556582 +3416 elixir_local_APC_DISABLED 1784020582 1815556582 diff --git a/development/scripts/project_updater.sh b/development/scripts/project_updater.sh index 37bebcc..47ff422 100755 --- a/development/scripts/project_updater.sh +++ b/development/scripts/project_updater.sh @@ -3,7 +3,7 @@ # --------------------------------------------------------------------------------------------------------------------- # SCRIPT EXEC LOCATION: /opt/update # --------------------------------------------------------------------------------------------------------------------- -# Usage: ./export_project.sh -project=loretasecret.lv -branch="release/legacy-system-php74"= +# Usage: ./export_project.sh -project=elixirvault.lv -branch="release/legacy-system-php74"= git_repository="" www_project_dir="" @@ -27,10 +27,10 @@ for i in "$@"; do esac done -# Override Script dir for testing for loretasecret.local.test -if [[ "$project_title" == "loretasecret.local.test" ]]; then +# Override Script dir for testing for elixirvault.local.test +if [[ "$project_title" == "elixirvault.local.test" ]]; then script_dir="/var/www/html/development/scripts/temp" - script_dir="/Users/marekskeiss/Projects/brsystems/git/LORETA/development/scripts/temp" + script_dir="/Users/marekskeiss/Projects/brsystems/git/ELIXIRVAULT/development/scripts/temp" fi statusOkMessageOutput() { @@ -54,8 +54,8 @@ fi # Declare configuration for export declare -a repoConfiguration -repoConfiguration[0]="loretasecret.lv;ssh://git@gitea.brsystems.lv:2020/brs/LORETA.git;LORETA;/var/www;system-brs-core/config/init.cfg.ini" -repoConfiguration[1]="loretasecret.local.test;ssh://git@gitea.brsystems.lv:2020/brs/LORETA.git;LORETA;$script_dir/www;system-brs-core/config/init.cfg.ini" +repoConfiguration[0]="elixirvault.lv;ssh://git@gitea.brsystems.lv:2020/brs/ELIXIRVAULT.git;ELIXIRVAULT;/var/www;system-brs-core/config/init.cfg.ini" +repoConfiguration[1]="elixirvault.local.test;ssh://git@gitea.brsystems.lv:2020/brs/ELIXIRVAULT.git;ELIXIRVAULT;$script_dir/www;system-brs-core/config/init.cfg.ini" repoConfiguration[3]="domain.fr;fr;http" for page in "${repoConfiguration[@]}" @@ -64,12 +64,12 @@ do # array ['domain.de', 'de', 'https'] IFS=";" read -r -a arr <<< "${page}" - site="${arr[0]}" # loretasecret.lv + site="${arr[0]}" # elixirvault.lv if [[ "$project_title" == "$site" ]]; then - git_repository="${arr[1]}" # ssh://git@gitea.brsystems.lv:2020/brs/LORETA.git - git_clone_dir="${arr[2]}" # LORETA + git_repository="${arr[1]}" # ssh://git@gitea.brsystems.lv:2020/brs/ELIXIRVAULT.git + git_clone_dir="${arr[2]}" # ELIXIRVAULT www_project_dir="${arr[3]}" # /var/www backup_cfg_file_location_check="${arr[4]}" # system-brs-core/config/init.cfg.ini break @@ -263,10 +263,10 @@ case $project_title in statusOkMessageOutput "Composer cfg files copied" "OK" statusOkMessageOutput "Composer install - SLOW!!!" "installing" - # Override composer install for testing for loretasecret.local.test + # Override composer install for testing for elixirvault.local.test # TODO BRS: Be great to create a separate container with same server structure and testing ground - if [[ "$project_title" == "loretasecret.local.test" ]]; then - if [[ $(docker exec -i loreta_php bash -c "cd /var/www/html/development/scripts/temp/$temp_dir_title/new_$project_title; composer install --no-dev" 2>&1 | grep -ic "autoload") -eq 0 ]]; then + if [[ "$project_title" == "elixirvault.local.test" ]]; then + if [[ $(docker exec -i elixirvault_php bash -c "cd /var/www/html/development/scripts/temp/$temp_dir_title/new_$project_title; composer install --no-dev" 2>&1 | grep -ic "autoload") -eq 0 ]]; then echo -e "\n${Red}ABORTING: ${Color_Off}Composer installation failed...${Red}\n" exit 0 fi diff --git a/docker/development/cron_job b/docker/development/cron_job index 1a854a5..9e01f25 100644 --- a/docker/development/cron_job +++ b/docker/development/cron_job @@ -1 +1 @@ -0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58 * * * * wget -q -O /var/www/html/www/logs/cron_call.log http://local.lorettasecret.lv/cron/ctp:ZUTENIS-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3/ct:check +0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58 * * * * wget -q -O /var/www/html/www/logs/cron_call.log http://local.elixirvault.lv/cron/ctp:ZUTENIS-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3/ct:check diff --git a/docker/development/php.ini b/docker/development/php.ini index af4a6ff..48494e3 100644 --- a/docker/development/php.ini +++ b/docker/development/php.ini @@ -19,9 +19,9 @@ memory_limit=-1 xdebug.show_exception_trace=0 [mail function] -SMTP = loreta_mailhog +SMTP = elixirvault_mailhog smtp_port = 1025 mail.add_x_header = On -sendmail_path = /usr/bin/mhsendmail -oi -t --smtp-addr loreta_mailhog:1025 -php_admin_value[sendmail_path] = /usr/bin/mhsendmail -oi -t --smtp-addr loreta_mailhog:1025 +sendmail_path = /usr/bin/mhsendmail -oi -t --smtp-addr elixirvault_mailhog:1025 +php_admin_value[sendmail_path] = /usr/bin/mhsendmail -oi -t --smtp-addr elixirvault_mailhog:1025 mail.log = /var/www/html/www/logs/mail_log.log diff --git a/tests/BasePhpUnitCase.php b/tests/BasePhpUnitCase.php index 941bc2b..c26d978 100644 --- a/tests/BasePhpUnitCase.php +++ b/tests/BasePhpUnitCase.php @@ -1,6 +1,6 @@ rmSlashesIndex($urlData['p_full_url']); $_SERVER['REMOTE_ADDR'] = ''; $_SERVER['SERVER_ADDR'] = ''; diff --git a/tests/BasePhpUnitSeleniumCase.php b/tests/BasePhpUnitSeleniumCase.php index 960f59f..02b36f3 100644 --- a/tests/BasePhpUnitSeleniumCase.php +++ b/tests/BasePhpUnitSeleniumCase.php @@ -1,6 +1,6 @@ unitTestsAreRunning = true; - $this->resetGetAndPost(); - parent::setUp(); - - // Create new class - $this->pubSysDashboard = $this->initBaseClassObjectBySiteMapId(SiteMap::SYSTEM_DASHBOARD); - } - - protected function tearDown(): void - { - $this->reloadDbTables(['mod_users', 'mod_account_manager']); - parent::tearDown(); - } - - public function testGetUserAdvCfgTest(): void - { - // Get partners settings - $data = $this->pubSysDashboard->controller->oUser->getUserAdvCfgData( - pubUsersCfg::ADV_KEY_TBL, - 'pubPartners', - pubUsersCfg::ADV_PROP_SORT - ); - - $this->assertEquals( - [ - 'sortWay' => 0, - 'sortBy' => 'a_title' - ], - $data - ); - } - - public function testSaveUserAdvCfgTest(): void - { - $saveData = [ - 'sortWay' => 0, - 'sortBy' => 'a_ap_nr_custom_column' - ]; - - $this->pubSysDashboard->controller->oUser->updateUserAdvCfgData( - pubUsersCfg::ADV_KEY_TBL, - 'pubPartners', - pubUsersCfg::ADV_PROP_SORT, - $saveData - ); - - $this->assertEquals( - $this->pubSysDashboard->controller->oUser->getUserAdvCfgData( - pubUsersCfg::ADV_KEY_TBL, - 'pubPartners', - pubUsersCfg::ADV_PROP_SORT - ), - $saveData - ); - } - - public function testInitBaseAdvCfg(): void - { - $loginData = $this->getLoginCredentialsByType(siteUsers::loginAppSelfEmployed); - - // Delete user cfg - $this->cDb->_queryUpdate('mod_users', ['user_cfg' => ''], ['id' => $loginData['id']]); - - // Test to load default values from empty user cfg - $userConfig = new pubUsersCfg($this->pubSysDashboard, $loginData['id']); - - $wholeBaseCfg = $userConfig->getBaseCFG(); - - $this->assertEquals( - [ - 'bFullScreen' => 1, - 'bUseDarkMode' => 0, - /*'logoAnimation' => 1, - 'logoSmall' => 0,*/ - 'bShowBtnLabels' => 1, - ], - $wholeBaseCfg[pubUsersCfg::bools] - ); - - $this->assertEquals( - [ - 'iRecordsPerPage' => 20, - 'iActiveYear' => [], - 'vFavoriteCompanyList' => [], - ], - $userConfig->getBaseCFG(pubUsersCfg::values) - ); - } - - public function testGetAndSetProperty(): void - { - $loginData = $this->getLoginCredentialsByType(siteUsers::loginAppSelfEmployed); - - // Delete user cfg - $this->cDb->_queryUpdate('mod_users', ['user_cfg' => ''], ['id' => $loginData['id']]); - - // Test to load default values from empty user cfg - $userConfig = new pubUsersCfg($this->pubSysDashboard, $loginData['id']); - - $this->assertFalse( - $userConfig->getProperty('None_existing_property') - ); - - $userConfig->addProperties('bUseDarkMode', '2025-YEAR'); - $this->assertEquals( - '2025-YEAR', - $userConfig->getProperty('bUseDarkMode') - ); - - // Test table properties - $this->assertFalse( - $userConfig->getTableProperty('None_existing_property') - ); - - $this->assertEquals( - [], - $userConfig->getTableProperty('pubPartners') - ); - - $this->setPost(['table' => 1]); - $userConfig->addProperties('pubPartners', ['a' => 1]); - - $this->assertEquals( - ['a' => 1], - $userConfig->getTableProperty('pubPartners') - ); - - // Array save - $userConfig->addProperties( - [ - 'pubPartners' => ['aa' => 1, 'a' => 2], - 'pubUserManager' => ['bb' => 1] - ] - ); - - $this->assertEquals( - ['aa' => 1, 'a' => 2], - $userConfig->getTableProperty('pubPartners') - ); - $this->assertEquals( - ['bb' => 1], - $userConfig->getTableProperty('pubUserManager') - ); - } - - public function testAddPropertiesAdvanced(): void - { - $loginData = $this->getLoginCredentialsByType(siteUsers::loginAppSelfEmployed); - - // Delete user cfg - $this->cDb->_queryUpdate('mod_users', ['user_cfg' => ''], ['id' => $loginData['id']]); - - // Test to load default values from empty user cfg - $userConfig = new pubUsersCfg($this->pubSysDashboard, $loginData['id']); - - // Test plugins - $this->assertEquals( - [], - $userConfig->getUserCFG(pubUsersCfg::plugins) - ); - $userConfig->addPropertiesAdvanced(['nonexisting_plugin' => 1], pubUsersCfg::plugins); - $this->assertEquals( - [], - $userConfig->getUserCFG(pubUsersCfg::plugins) - ); - - // Test values - $this->assertEquals( - [ - 'iRecordsPerPage' => 20, - 'iActiveYear' => [], - pubUsersCfg::BaseValuesFavoriteCompanyList => [], - ], - $userConfig->getUserCFG(pubUsersCfg::values) - ); - $userConfig->addPropertiesAdvanced( - ['iRecordsPerPage' => 10, 'iActiveYear' => [1,2,3]], - pubUsersCfg::values - ); - $this->assertEquals( - [ - 'iRecordsPerPage' => 10, - 'iActiveYear' => [1,2,3], - pubUsersCfg::BaseValuesFavoriteCompanyList => [], - ], - $userConfig->getUserCFG(pubUsersCfg::values) - ); - - // Test advanced value setup - $this->assertEquals( - [ - 'vDashboardCFG' => [], - 'vAdditionalTableData' => [], - ], - $userConfig->getUserCFG(pubUsersCfg::values_adv) - ); - $userConfig->addPropertiesAdvanced( - ['vDashboardCFG' => [10], 'vAdditionalTableData' => [1,2,3]], - pubUsersCfg::values_adv - ); - $this->assertEquals( - [ - 'vDashboardCFG' => [10], - 'vAdditionalTableData' => [1,2,3], - ], - $userConfig->getUserCFG(pubUsersCfg::values_adv) - ); - - } -} diff --git a/tests/UnitTests/App/PubUsers/accountActivationTest.php b/tests/UnitTests/App/PubUsers/accountActivationTest.php index 039b317..9db768c2 100644 --- a/tests/UnitTests/App/PubUsers/accountActivationTest.php +++ b/tests/UnitTests/App/PubUsers/accountActivationTest.php @@ -1,13 +1,13 @@ unitTestsAreRunning = true; - $this->resetGetAndPost(); - parent::setUp(); - - // Create new class - $this->users = $this->initBaseClassObjectBySiteMapId(SiteMap::PUB_SEL_COMPANY); - } - - protected function tearDown(): void - { - $this->logOutUnitTestUser(); - parent::tearDown(); - } - - public function testCompanySelectionDefaultActionLoginRequirement(): void - { - $this->testModuleLoginRequirement(SiteMap::PUB_SEL_COMPANY); - } - - public function testCompanySelectionDefaultAction(): void - { - // Default form generation - ob_start(); - $this->users->companySelectionAction(); - $pageHTML = ob_get_contents(); - ob_end_clean(); - - $this->assertExpected( - [ - 'Zutenis | Uzņēmuma izvēle', - 'Izvēlieties uzņēmumu / darbības veidu', - 'Mareks Keišs pašn.' - ], - $pageHTML - ); - } - - public function testCompanySelectionSetActiveCompanyAction(): void - { - // Error case - Default with none existing action - $this->setGet(['action' => 'setCp', 'id' => 't3Aj']); - $this->users->controller->suser->URLS2COMPANY = ['t3Aj' => 1]; - - try { - $this->users->companySelectionAction(); - $this->fail('Exception Expected!'); - } catch (Exception $error) { - $this->assertExpected( - ['Redirected to Location:'], - $error->getMessage() - ); - } - - // Default with none existing action - $this->setGet(['action' => 'setCp', 'id' => 't3Aj']); - $this->users->controller->suser->URLS2COMPANY = ['t3Aj' => 23]; - - try { - $this->users->companySelectionAction(); - $this->fail('Exception Expected!'); - } catch (Exception $error) { - $this->assertExpected( - ['Redirected to Location: /gramatvedibas-sistema/sistemas-informacijas-panelis'], - $error->getMessage() - ); - } - } - - public function testCompanySelectionUpdateFavoriteAction(): void - { - // Default with none existing action - $this->setPost(['action' => 'updateFavorite', 'id' => 't3Aj', 'status' => 1]); - - // Error case - Default with none existing action - try { - $this->users->companySelectionAction(); - $this->fail('Exception Expected!'); - } catch (Exception $error) { - $this->assertExpected( - ['{"error":true}'], - $error->getMessage() - ); - } - - // Correct case - $this->users->controller->suser->URLS2COMPANY = ['t3Aj' => 23]; - - try { - $this->users->companySelectionAction(); - $this->fail('Exception Expected!'); - } catch (Exception $error) { - $this->assertExpected( - ['{"jsonok":true}'], - $error->getMessage() - ); - } - - $this->setPost(['action' => 'updateFavorite', 'id' => 't3Aj', 'status' => 0]); - - try { - $this->users->companySelectionAction(); - $this->fail('Exception Expected!'); - } catch (Exception $error) { - $this->assertExpected( - ['{"jsonok":true}'], - $error->getMessage() - ); - } - } -} diff --git a/tests/UnitTests/App/PubUsers/companySettingsTest.php b/tests/UnitTests/App/PubUsers/companySettingsTest.php deleted file mode 100644 index ed9895d..0000000 --- a/tests/UnitTests/App/PubUsers/companySettingsTest.php +++ /dev/null @@ -1,79 +0,0 @@ -unitTestsAreRunning = true; - parent::setUp(); - $this->resetGetAndPost(); - $this->clearDbState(); - - // Create new class - $this->pubSysDashboard = $this->initBaseClassObjectBySiteMapId(SiteMap::SYSTEM_DASHBOARD); - } - - protected function tearDown(): void - { - $this->clearDbState(); - parent::tearDown(); - } - - protected function clearDbState(): void - { - $this->reloadDbTables(['mod_users', 'mod_account_manager']); - } - - public function testGetCompanySettings(): void - { - $data = $this->pubSysDashboard->controller->oUser->getCpCFG(); - - $this->assertEquals( - [ - 'nr' => 1, - 'title' => 1, - 'unit' => 1, - 'count' => 1, - 'sum' => 1, - 'price' => 1, - 'vat' => 1, - ], - $data['outgoingDocTableSettings'] - ); - } - - public function testSaveCompanySettings(): void - { - $saveData = [ - 'nr' => 1, - 'title' => 2 - ]; - - $this->pubSysDashboard->controller->oUser->saveCpCFG( - ['outgoingDocTableSettings' => $saveData] - ); - - $this->assertEquals( - $this->pubSysDashboard->controller->oUser->getCpCFG('outgoingDocTableSettings'), - $saveData - ); - - $this->pubSysDashboard->controller->oUser->saveCpCFG( - ['outgoingDocLayout' => 0] - ); - - $this->assertEquals( - $this->pubSysDashboard->controller->oUser->getCpCFG('outgoingDocLayout'), - 0 - ); - } -} diff --git a/tests/UnitTests/App/PubUsers/loginActionRequestTest.php b/tests/UnitTests/App/PubUsers/loginActionRequestTest.php index c590f5a..cb6d87e 100644 --- a/tests/UnitTests/App/PubUsers/loginActionRequestTest.php +++ b/tests/UnitTests/App/PubUsers/loginActionRequestTest.php @@ -1,12 +1,12 @@ unitTestsAreRunning = true; - $this->resetGetAndPost(); - parent::setUp(); - } - - protected function tearDown(): void - { - $this->reloadDbTables(['mod_users']); - $this->logOutUnitTestUser(); - parent::tearDown(); - } - - public function testUserAdditionalCompanyRegistrationDataRequest(): void - { - // Create new class - $this->pubSysDashboard = $this->initBaseClassObjectBySiteMapId(SiteMap::SYSTEM_DASHBOARD); - - // Get partners settings - $data = $this->pubSysDashboard->controller->oUser->sendActiveUserDataForAdditionalCompanyRegistration( - $this->pubSysDashboard->controller - ); - - unset($data['uid']); - $this->assertEquals( - [ - 'login' => 'testmareks', - 'name' => 'Mareks', - 'surname' => 'Keišs', - 'email' => 'keiss.mareks@gmail.com', - 'phone' => '28639957' - ], - $data - ); - } - - public function testUserAdditionalCompanyRegistrationDataRequestErrors(): void - { - // Delete user 2FA access - $loginData = $this->getLoginCredentialsByType(siteUsers::loginAppSelfEmployed); - $this->cDb->_queryUpdate('mod_users', ['user_2fa_secret_enabled' => ''], ['id' => $loginData['id']]); - - // Create new class / empty class - since it's dying on 2FA entrapment - $this->pubSysDashboard = $this->initBaseClassObjectBySiteMapId( - SiteMap::SYSTEM_DASHBOARD, - siteUsers::loginAppSelfEmployed, - false - ); - - // Create user class - $pubUser = new pubUsers(getFirstMatchByMapId(SiteMap::PUB_LOGIN)); - - // Get partners settings - $data = $pubUser->controller->sendActiveUserDataForAdditionalRegistration( - $this->pubSysDashboard->controller - ); - - $this->assertEquals( - [ - 'error' => 1, - 'msg' => 'Lai turpinātu, lietotāja kontam ir jāaktivizē 2FA.
Lūdzu ienāciet sistēmā ar lietotāju un aktivizējiet 2FA.', - ], - $data - ); - - // Get partners settings - $pubUser->controller->is_post = true; - try { - $data = $pubUser->controller->sendActiveUserDataForAdditionalRegistration( - $this->pubSysDashboard->controller - ); - $this->fail('Exception Expected!'); - } catch (Exception $error) { - $this->assertExpected( - [ - '"error":true', - 'Lai turpin\u0101tu, lietot\u0101ja kontam ir j\u0101aktiviz\u0113 2FA.', - 'L\u016bdzu ien\u0101ciet sist\u0113m\u0101 ar lietot\u0101ju un aktiviz\u0113jiet 2FA.', - ], - $error->getMessage() - ); - } - } -} diff --git a/www/ajax-c/ajax.php b/www/ajax-c/ajax.php index 1ce62e0..4bf2691 100644 --- a/www/ajax-c/ajax.php +++ b/www/ajax-c/ajax.php @@ -156,7 +156,7 @@ switch ($action) { switch (getV('img')) { - case cMail::MAIL_SERVER_LORETA_LV: + case cMail::MAIL_SERVER_DEFAULT: header('Content-Type: image/png'); echo file_get_contents(__IMG__ . "pub/mails/sys_logo4.png"); break; diff --git a/www/cron-c/cron.php b/www/cron-c/cron.php index daecb55..31cade5 100644 --- a/www/cron-c/cron.php +++ b/www/cron-c/cron.php @@ -24,8 +24,8 @@ ini_set('memory_limit', '1024M'); //------------------------------------------------------------------ // Parse URL for extracting params kpsadmin12!@ - CC -// URL: http://www.loretasecret.lv/cron/ctp:LORETA-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3/ct:check -// MAIL SEND INIT: screen -A -m -d -S loreta_mailer curl "http://local.elixirvault.lv/cron/ctp:LORETA-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3/ct:send/id:1" +// URL: http://www.elixirvault.lv/cron/ctp:ELIXIRVAULT-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3/ct:check +// MAIL SEND INIT: screen -A -m -d -S elixirvault_mailer curl "http://local.elixirvault.lv/cron/ctp:ELIXIRVAULT-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3/ct:send/id:1" //------------------------------------------------------------------ $cms = false; $url = new cUrl(); diff --git a/www/sitemap.xml b/www/sitemap.xml index 01e0674..667363b 100644 --- a/www/sitemap.xml +++ b/www/sitemap.xml @@ -1,15 +1,15 @@ - http://local.lorettasecret.lv/sitemap_lv.xml + http://local.elixirvault.lv/sitemap_lv.xml 2026-02-25T05:00:15+02:00 - http://local.lorettasecret.lv/sitemap_en.xml + http://local.elixirvault.lv/sitemap_en.xml 2026-02-25T05:00:15+02:00 - http://local.lorettasecret.lv/sitemap_ru.xml + http://local.elixirvault.lv/sitemap_ru.xml 2026-02-25T05:00:15+02:00 \ No newline at end of file diff --git a/www/sitemap_en.xml b/www/sitemap_en.xml index d7db7d5..b3ff7a7 100644 --- a/www/sitemap_en.xml +++ b/www/sitemap_en.xml @@ -1,84 +1,84 @@ - http://local.lorettasecret.lv/en + http://local.elixirvault.lv/en 2020-04-29T10:15:39+02:00 weekly 1 - http://local.loretasecret.lv/disclaimer/en + http://local.elixirvault.lv/disclaimer/en 2020-04-29T10:15:34+02:00 weekly 1 - http://local.loretasecret.lv/copyrights/en + http://local.elixirvault.lv/copyrights/en 2020-04-29T10:15:29+02:00 weekly 1 - http://local.loretasecret.lv/accounting-system-login/en + http://local.elixirvault.lv/accounting-system-login/en 2020-04-29T10:15:24+02:00 weekly 1 - http://local.loretasecret.lv/password-recovery/en + http://local.elixirvault.lv/password-recovery/en 2020-04-29T10:15:14+02:00 weekly 1 - http://local.loretasecret.lv/cookies/en + http://local.elixirvault.lv/cookies/en 2020-04-29T10:13:09+02:00 weekly 1 - http://local.loretasecret.lv/faq/en + http://local.elixirvault.lv/faq/en 2020-04-29T10:13:04+02:00 weekly 1 - http://local.loretasecret.lv/about-us/en + http://local.elixirvault.lv/about-us/en 2020-04-29T10:13:19+02:00 weekly 1 - http://local.loretasecret.lv/contact-us/en + http://local.elixirvault.lv/contact-us/en 2020-04-29T10:13:24+02:00 weekly 1 - http://local.loretasecret.lv/subscribe/en + http://local.elixirvault.lv/subscribe/en 2020-04-29T10:13:34+02:00 weekly 1 - http://local.loretasecret.lv/unsubscribe/en + http://local.elixirvault.lv/unsubscribe/en 2020-04-29T10:13:29+02:00 weekly 1 - http://local.loretasecret.lv/access-error/en + http://local.elixirvault.lv/access-error/en 2020-04-29T10:13:39+02:00 weekly 1 - http://local.loretasecret.lv/registration/en + http://local.elixirvault.lv/registration/en 2020-04-29T10:12:39+02:00 weekly 1 - http://local.loretasecret.lv/terms-of-use/en + http://local.elixirvault.lv/terms-of-use/en 2020-04-29T10:12:34+02:00 weekly 1 diff --git a/www/sitemap_lv.xml b/www/sitemap_lv.xml index 3e4a172..f17364b 100644 --- a/www/sitemap_lv.xml +++ b/www/sitemap_lv.xml @@ -1,78 +1,78 @@ - http://local.lorettasecret.lv/ + http://local.elixirvault.lv/ 2020-04-29T10:15:39+02:00 weekly 1 - http://local.loretasecret.lv/atruna + http://local.elixirvault.lv/atruna 2020-04-29T10:15:34+02:00 weekly 1 - http://local.loretasecret.lv/autortiesibas + http://local.elixirvault.lv/autortiesibas 2020-04-29T10:15:29+02:00 weekly 1 - http://local.loretasecret.lv/paroles-atgusana + http://local.elixirvault.lv/paroles-atgusana 2020-04-29T10:15:14+02:00 weekly 1 - http://local.loretasecret.lv/piekluves-kluda + http://local.elixirvault.lv/piekluves-kluda 2020-04-29T10:13:39+02:00 weekly 1 - http://local.loretasecret.lv/pierakstities + http://local.elixirvault.lv/pierakstities 2020-04-29T10:13:34+02:00 weekly 1 - http://local.loretasecret.lv/atrakstities + http://local.elixirvault.lv/atrakstities 2020-04-29T10:13:29+02:00 weekly 1 - http://local.loretasecret.lv/sazinies-ar-mums + http://local.elixirvault.lv/sazinies-ar-mums 2020-04-29T10:13:24+02:00 weekly 1 - http://local.loretasecret.lv/par-mums + http://local.elixirvault.lv/par-mums 2020-04-29T10:13:19+02:00 weekly 1 - http://local.loretasecret.lv/sikdatnes + http://local.elixirvault.lv/sikdatnes 2020-04-29T10:13:09+02:00 weekly 1 - http://local.loretasecret.lv/buj + http://local.elixirvault.lv/buj 2020-04-29T10:13:04+02:00 weekly 1 - http://local.loretasecret.lv/registracija + http://local.elixirvault.lv/registracija 2020-04-29T10:12:39+02:00 weekly 1 - http://local.loretasecret.lv/lietosanas-noteikumi + http://local.elixirvault.lv/lietosanas-noteikumi 2020-04-29T10:12:34+02:00 weekly 1 diff --git a/www/sitemap_ru.xml b/www/sitemap_ru.xml index 71ec78b..0f2b3c7 100644 --- a/www/sitemap_ru.xml +++ b/www/sitemap_ru.xml @@ -1,90 +1,90 @@ - http://local.lorettasecret.lv/ru + http://local.elixirvault.lv/ru 2020-04-29T10:15:39+02:00 weekly 1 - http://local.loretasecret.lv/o-nas/ru + http://local.elixirvault.lv/o-nas/ru 2020-04-29T10:13:19+02:00 weekly 1 - http://local.loretasecret.lv/svyazatsya-s-nami/ru + http://local.elixirvault.lv/svyazatsya-s-nami/ru 2020-04-29T10:13:24+02:00 weekly 1 - http://local.loretasecret.lv/czv/ru + http://local.elixirvault.lv/czv/ru 2020-04-29T10:13:04+02:00 weekly 1 - http://local.loretasecret.lv/voyti-v-sistemu-ucheta/ru + http://local.elixirvault.lv/voyti-v-sistemu-ucheta/ru 2020-04-29T10:15:24+02:00 weekly 1 - http://local.loretasecret.lv/podpisyvatsya/ru + http://local.elixirvault.lv/podpisyvatsya/ru 2020-04-29T10:13:34+02:00 weekly 1 - http://local.loretasecret.lv/otpisyvatsya/ru + http://local.elixirvault.lv/otpisyvatsya/ru 2020-04-29T10:13:29+02:00 weekly 1 - http://local.loretasecret.lv/oshibka-dostupa/ru + http://local.elixirvault.lv/oshibka-dostupa/ru 2020-04-29T10:13:39+02:00 weekly 1 - http://local.loretasecret.lv/pechenye/ru + http://local.elixirvault.lv/pechenye/ru 2020-04-29T10:13:09+02:00 weekly 1 - http://local.loretasecret.lv/sistema-ucheta/ru + http://local.elixirvault.lv/sistema-ucheta/ru 2020-04-29T10:12:59+02:00 weekly 1 - http://local.loretasecret.lv/vosstanovleniye-parolya/ru + http://local.elixirvault.lv/vosstanovleniye-parolya/ru 2020-04-29T10:15:14+02:00 weekly 1 - http://local.loretasecret.lv/avtorskiye-prava/ru + http://local.elixirvault.lv/avtorskiye-prava/ru 2020-04-29T10:15:29+02:00 weekly 1 - http://local.loretasecret.lv/ogovorki/ru + http://local.elixirvault.lv/ogovorki/ru 2020-04-29T10:15:34+02:00 weekly 1 - http://local.loretasecret.lv/registratsiya/ru + http://local.elixirvault.lv/registratsiya/ru 2020-04-29T10:12:39+02:00 weekly 1 - http://local.loretasecret.lv/usloviya-ekspluatatsii/ru + http://local.elixirvault.lv/usloviya-ekspluatatsii/ru 2020-04-29T10:12:34+02:00 weekly 1 diff --git a/www/system-brs-core/app/pubBuy/inc/pubBuyController.php b/www/system-brs-core/app/pubBuy/inc/pubBuyController.php index 9c4af67..524d8f9 100644 --- a/www/system-brs-core/app/pubBuy/inc/pubBuyController.php +++ b/www/system-brs-core/app/pubBuy/inc/pubBuyController.php @@ -1342,7 +1342,7 @@ class pubBuyController extends cCore $mm->addMail( $qData['email'], false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, 0, //cMail::MAIL_7_AUCTION_PROD, $this->langId, [ @@ -2605,7 +2605,7 @@ class pubBuyController extends cCore $mId = $mm->addMail( $order['customer_info']['checkout_email'], false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_1_ORDER_CONFIRMATION, $this->langId, $mailData, @@ -2617,7 +2617,7 @@ class pubBuyController extends cCore $this->module->updOrderById($this->cart->orderId, ['o_mid' => $mId]); // Send mail to info - $mm->addMail(cMail::SENDER, cMail::CC_SHOP_OWNER, cMail::MAIL_SERVER_LORETA_LV, cMail::MAIL_1_ORDER_CONFIRMATION, $this->langId, $mailData, '', false); + $mm->addMail(cMail::SENDER, cMail::CC_SHOP_OWNER, cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_1_ORDER_CONFIRMATION, $this->langId, $mailData, '', false); } @@ -2878,7 +2878,7 @@ class pubBuyController extends cCore 'value' => $order['order_sum'], 'currency' => 'LVL', - 'productName' => 'PIRKUMS LORETASECRET.lv/' . trim($prod['prod_sname']), + 'productName' => 'PIRKUMS ELIXIRVAULT.lv/' . trim($prod['prod_sname']), 'productUrl' => $prod['prod_full_url'], ); diff --git a/www/system-brs-core/app/pubUsers/inc/pubUsersController.php b/www/system-brs-core/app/pubUsers/inc/pubUsersController.php index a1b23f7..bc0e211 100644 --- a/www/system-brs-core/app/pubUsers/inc/pubUsersController.php +++ b/www/system-brs-core/app/pubUsers/inc/pubUsersController.php @@ -1013,7 +1013,7 @@ class pubUsersController extends cCore (new cMail())->addMail( $user['user_email'], false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_2_PASSWORD_RECOVERY, (!empty($user['user_lang_id']) ? (int)$user['user_lang_id'] : $this->langId), array( @@ -1251,7 +1251,7 @@ class pubUsersController extends cCore $mm->addMail( $email, false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_1_ACCOUNT_ACTIVATION, $langId, [ diff --git a/www/system-brs-core/cms/cmsMailEngine/inc/cmsMailEngineController.php b/www/system-brs-core/cms/cmsMailEngine/inc/cmsMailEngineController.php index 2674427..8738025 100644 --- a/www/system-brs-core/cms/cmsMailEngine/inc/cmsMailEngineController.php +++ b/www/system-brs-core/cms/cmsMailEngine/inc/cmsMailEngineController.php @@ -564,13 +564,13 @@ class cmsMailEngineController extends cCore // Upon new e-mail insert if(!$recordId){ - $update['mail_sender'] = cMail::$SERVER_CFG[cMail::MAIL_SERVER_LORETA_LV][cMail::SENDER]; + $update['mail_sender'] = cMail::$SERVER_CFG[cMail::MAIL_SERVER_DEFAULT][cMail::SENDER]; $update['mail_inserted'] = time(); $update['mail_priority'] = 1; $update['mail_send_atempt'] = 0; $update['mail_disabled'] = 1; $update['mail_locked'] = 0; - $update['mail_server_type'] = cMail::MAIL_SERVER_LORETA_LV; + $update['mail_server_type'] = cMail::MAIL_SERVER_DEFAULT; $update['mail_lang_id'] = @$dlang['id']; $update['mail_template_id'] = self::CUSTOM_TYPE_MAIL; } @@ -623,7 +623,7 @@ class cmsMailEngineController extends cCore $mm->addMail( $mail, false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_3_SUBSCRIPTION_MAIL, $iDefLangKey, array( @@ -665,7 +665,7 @@ class cmsMailEngineController extends cCore $mm->addMail( $v['user_email'], false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_3_SUBSCRIPTION_MAIL, (!empty($v['user_lang_id']) ? $v['user_lang_id'] : $iDefLangKey), array( @@ -1152,7 +1152,7 @@ class cmsMailEngineController extends cCore $sLoadedImg = "http://{$sHost}/img/pub/default_logo.jpg"; $sTrackingImgUrl = "http://{$sHost}/ajax/ac:track/img:x/m{$data['id']}.png"; switch($data['mail_server_type']){ - case cMail::MAIL_SERVER_LORETA_LV: + case cMail::MAIL_SERVER_DEFAULT: $sLoadedImg = "http://{$sHost}/img/pub/mails/sys_logo4.png"; $sTrackingImgUrl = "http://{$sHost}/ajax/ac:track/img:{$data['mail_server_type']}/m{$data['id']}.png"; break; @@ -1327,9 +1327,9 @@ class cmsMailEngineController extends cCore $langId = getDefaultAppLang(); $mm->addMail( - cMail::$SERVER_CFG[cMail::MAIL_SERVER_LORETA_LV][cMail::SENDER], + cMail::$SERVER_CFG[cMail::MAIL_SERVER_DEFAULT][cMail::SENDER], false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_1_DAILY_REPORT, $langId, array( diff --git a/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/email_bugs_created.twig b/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/email_bugs_created.twig index 53203b0..a593c22 100644 --- a/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/email_bugs_created.twig +++ b/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/email_bugs_created.twig @@ -57,8 +57,8 @@ Bug Tracking System - daily report [%ZUT_TRACK%] Need help?
- info@elixirvault.lv
- elixirvault.lv
+ {{ BRAND_SUPPORT_EMAIL }}
+ {{ BRAND_DOMAIN }}

Informative: +371 2...
diff --git a/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/pwd_recovery.twig b/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/pwd_recovery.twig index 11bfbc5..6a0d95f 100644 --- a/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/pwd_recovery.twig +++ b/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/pwd_recovery.twig @@ -66,14 +66,14 @@ Online Privacy Policy [%ZUT_TRACK%] Nepieciešama palīdzība?
- info@elixirvault.lv
- elixirvault.lv
+ {{ BRAND_SUPPORT_EMAIL }}
+ {{ BRAND_DOMAIN }}

Informatīvais: +371 26475683
Tehn. atbalsts: +371 28639957

-

Jūs saņēmāt šo e-pastu, jo šī e-pasta adrese ir reģistrēta www.elixirvault.lv

+

Jūs saņēmāt šo e-pastu, jo šī e-pasta adrese ir reģistrēta www.{{ BRAND_DOMAIN }}

@@ -127,14 +127,14 @@ Online Privacy Policy [%ZUT_TRACK%] Need help?
- info@elixirvault.lv
- elixirvault.lv
+ {{ BRAND_SUPPORT_EMAIL }}
+ {{ BRAND_DOMAIN }}

Informative: +371 2...
Tech. support: +371 2...

-

You received this e-mail because this email address has been registered on www.elixirvault.lv

+

You received this e-mail because this email address has been registered on www.{{ BRAND_DOMAIN }}

diff --git a/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/registration.twig b/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/registration.twig index 8e2fc6a..2545b45 100644 --- a/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/registration.twig +++ b/www/system-brs-core/cms/cmsMailsConstructor/tmpl/custom_templates/registration.twig @@ -56,7 +56,7 @@
-

+

Labdien, [%FULL USER NAME%]!


@@ -88,13 +88,13 @@
Nepieciešama palīdzība?
- info@elixirvault.lv
- elixirvault.lv
+ {{ BRAND_SUPPORT_EMAIL }}
+ {{ BRAND_DOMAIN }}

Informatívais +371 2...
Tehn. atbalsts +371 2...
-

Jūs saņēmāt šo e-pastu, jo ar šo e-pasta adresi tika pieprasīta reģistrācija interneta vietnē www.elixirvault.lv

+

Jūs saņēmāt šo e-pastu, jo ar šo e-pasta adresi tika pieprasīta reģistrācija interneta vietnē www.{{ BRAND_DOMAIN }}

diff --git a/www/system-brs-core/cms/cmsOrders/inc/cmsOrdersController.php b/www/system-brs-core/cms/cmsOrders/inc/cmsOrdersController.php index 5f9ee39..fd8b410 100644 --- a/www/system-brs-core/cms/cmsOrders/inc/cmsOrdersController.php +++ b/www/system-brs-core/cms/cmsOrders/inc/cmsOrdersController.php @@ -949,7 +949,7 @@ class cmsOrdersController extends cCore $mId = $mm->addMail( $vCustomerData['a_ben_email'], false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_17_ORDER_RECEIPT, $this->langId, $mailData, diff --git a/www/system-brs-core/config/init.cfg.ini b/www/system-brs-core/config/init.cfg.ini index 6b6f54d..ad75535 100644 --- a/www/system-brs-core/config/init.cfg.ini +++ b/www/system-brs-core/config/init.cfg.ini @@ -4,9 +4,9 @@ [domain_cfg] ; Array based CFG [domain_cfg_json] ; JSON encoded config -local.elixirvault.lv = '{"DB_HOST":"elixirvault_mysql","DB_NAME":"elixir_vault_lv","DB_USR":"dAccGlobal","DB_PWD":"dAccGlobal12!@","APC_PREFIX":"loreta_local_"}' -local.app.elixirvault.lv = '{"DB_HOST":"localhost","DB_NAME":"elixir_vault_lv","DB_USR":"dAccGlobal","DB_PWD":"dAccGlobal12!@","APC_PREFIX":"loreta_local_"}' -elixirvault.com = '{"DB_HOST":"localhost","DB_NAME":"elixir_vault_lv","DB_USR":"expLorettaSqlConnection","DB_PWD":"dz[CAZCZ6540V7F)","APC_PREFIX":"loreta_"}' +local.elixirvault.lv = '{"DB_HOST":"elixirvault_mysql","DB_NAME":"elixir_vault_lv","DB_USR":"dAccGlobal","DB_PWD":"dAccGlobal12!@","APC_PREFIX":"elixir_local_"}' +local.app.elixirvault.lv = '{"DB_HOST":"localhost","DB_NAME":"elixir_vault_lv","DB_USR":"dAccGlobal","DB_PWD":"dAccGlobal12!@","APC_PREFIX":"elixir_local_"}' +elixirvault.com = '{"DB_HOST":"localhost","DB_NAME":"elixir_vault_lv","DB_USR":"expLorettaSqlConnection","DB_PWD":"dz[CAZCZ6540V7F)","APC_PREFIX":"elixir_"}' www.elixirvault.com = 'clone:elixirvault.com' default = 'clone:local.elixirvault.lv' @@ -18,6 +18,12 @@ CMS_LOGIN_REQ_LINK = '/lslsadmin/login/action:loginf/'; CMS side logi n request PUB_LOGIN_REQ_LINK = '/ienakt-sistema/action:loginf'; APP side logi n request link with possible replacement link param TOKEN_LIFE = 43200 ; access token life DEFAULT_HOST = 'local.elixirvault.lv' ; Used in cron access +BRAND_NAME = 'Elixir Vault' +BRAND_NAME_UPPER = 'ELIXIRVAULT' +BRAND_DOMAIN = 'elixirvault.lv' +BRAND_LOCAL_DOMAIN = 'local.elixirvault.lv' +BRAND_SUPPORT_EMAIL = 'info@elixirvault.lv' +BRAND_STORE_NAME = 'elixirvault.lv' APC_PREFIX = 'acc_' ; APC prefix SEND_MAILS = 1 ; Send mails from system @@ -26,7 +32,7 @@ SEND_MAIL_COMMAND_PATH = '/usr/bin/mhsendmail -oi -t --smtp-addr elixirvault_mai ; cms side administration folder name - important to ; update site db records upon change. Tables: site_map -ADMINISTRATION_FOLDER = 'azevadmin' +ADMINISTRATION_FOLDER = 'azesadmin' DEBUG_PUB_MAP_ID = 525 ; debug - public site map ID DEBUG_CMS_MAP_ID = 2 ; debug - content management site map ID diff --git a/www/system-brs-core/library/cCron/cCron.php b/www/system-brs-core/library/cCron/cCron.php index 9a20c03..da08d08 100644 --- a/www/system-brs-core/library/cCron/cCron.php +++ b/www/system-brs-core/library/cCron/cCron.php @@ -85,9 +85,9 @@ class cCron if($v && $k != 'usersOnline'){ $mm = new cMail(); $mm->addMail( - cMail::$SERVER_CFG[cMail::MAIL_SERVER_LORETA_LV][cMail::LOGIN], + cMail::$SERVER_CFG[cMail::MAIL_SERVER_DEFAULT][cMail::LOGIN], false, - cMail::MAIL_SERVER_LORETA_LV, + cMail::MAIL_SERVER_DEFAULT, cMail::MAIL_16_SYSTEM_NEW_MAILS, $this->module->getDefaultAppLang(), array( diff --git a/www/system-brs-core/library/cMail/cMail.php b/www/system-brs-core/library/cMail/cMail.php index ab1e8b8..84020ae 100644 --- a/www/system-brs-core/library/cMail/cMail.php +++ b/www/system-brs-core/library/cMail/cMail.php @@ -37,13 +37,13 @@ class cMail CONST REWRITE_SENDER_NAME_TO = 'RW_NAME'; CONST SEND_READ_REC_TO = 'readReceiptTo'; - CONST MAIL_SERVER_LORETA_LV = '1'; + CONST MAIL_SERVER_DEFAULT = '1'; const CC_SHOP_OWNER = 'cc_shop_owner'; // TODO: šo jāuzseto pareizu /* MAIL SERVER CONSTANTS */ static array $SERVER_CFG = [ - self::MAIL_SERVER_LORETA_LV => [ + self::MAIL_SERVER_DEFAULT => [ self::LOGIN => 'info@elixirvault.lv', self::PWD => 'dkq2fecDqy8J43m!@', self::PORT => 465, @@ -56,8 +56,8 @@ class cMail ], ]; - const MAIL_REQUEST_KEY = 'LORETA-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3'; - CONST MAIL_REQUEST_PROCESS_ID = 'loreta_mailer'; + const MAIL_REQUEST_KEY = 'ELIXIRVAULT-A94A8FE5CCB19BA61C4C0873D391E987982FBBD3'; + CONST MAIL_REQUEST_PROCESS_ID = 'elixirvault_mailer'; CONST MAIL_TRACKING_STR = '[%TRACKING_IMG%]'; CONST EHLO_SERVER = 'www.elixirvault.lv'; // Send hello message to check server availability @@ -94,7 +94,7 @@ class cMail * @param string|bool $marker - mail tracking marker to check specific data * @return bool|int - */ - public function addMail($to, $toCC = false, $sMailSrvType = self::MAIL_SERVER_LORETA_LV, $template, $lang, $rdata = array(), $attachment = '', $send = false, $priority = 1, $marker = false){ + public function addMail($to, $toCC = false, $sMailSrvType = self::MAIL_SERVER_DEFAULT, $template, $lang, $rdata = array(), $attachment = '', $send = false, $priority = 1, $marker = false){ // Check mail server if(!isset(self::$SERVER_CFG[$sMailSrvType])) cJSON::sendError(array('msg' => "Passed mail server does'nt exist!")); @@ -174,7 +174,7 @@ class cMail * @param string|bool $marker - mail tracking marker to check specific data * @return bool true/false */ - public function addMailT($to, $toCC = false, $sMailSrvType = self::MAIL_SERVER_LORETA_LV, $mailData = array(), $lang, $rdata = array(), $attachment = '', $send = false, $priority = 1, $marker = false){ + public function addMailT($to, $toCC = false, $sMailSrvType = self::MAIL_SERVER_DEFAULT, $mailData = array(), $lang, $rdata = array(), $attachment = '', $send = false, $priority = 1, $marker = false){ // Check mail server if(!isset(self::$SERVER_CFG[$sMailSrvType])) cJSON::sendError(array('msg' => "Passed mail server does'nt exist!")); diff --git a/www/system-brs-core/library/cView/cView.php b/www/system-brs-core/library/cView/cView.php index 2581dc6..49b0ce6 100644 --- a/www/system-brs-core/library/cView/cView.php +++ b/www/system-brs-core/library/cView/cView.php @@ -919,6 +919,12 @@ class cView // Set constants $this->_params['CMS_VERSION'] = CMS_VERSION; + $this->_params['BRAND_NAME'] = defined('BRAND_NAME') ? BRAND_NAME : 'Elixir Vault'; + $this->_params['BRAND_NAME_UPPER'] = defined('BRAND_NAME_UPPER') ? BRAND_NAME_UPPER : 'ELIXIRVAULT'; + $this->_params['BRAND_DOMAIN'] = defined('BRAND_DOMAIN') ? BRAND_DOMAIN : 'elixirvault.lv'; + $this->_params['BRAND_LOCAL_DOMAIN'] = defined('BRAND_LOCAL_DOMAIN') ? BRAND_LOCAL_DOMAIN : 'local.elixirvault.lv'; + $this->_params['BRAND_SUPPORT_EMAIL'] = defined('BRAND_SUPPORT_EMAIL') ? BRAND_SUPPORT_EMAIL : 'info@elixirvault.lv'; + $this->_params['BRAND_STORE_NAME'] = defined('BRAND_STORE_NAME') ? BRAND_STORE_NAME : 'elixirvault.lv'; } /** diff --git a/www/system-brs-core/library/cView/tpl/core/body.twig b/www/system-brs-core/library/cView/tpl/core/body.twig index 05c8fb1..91c84f7 100644 --- a/www/system-brs-core/library/cView/tpl/core/body.twig +++ b/www/system-brs-core/library/cView/tpl/core/body.twig @@ -11,7 +11,7 @@ {# TITLE #} - Elixir Vault | {% if MAP.p_fulltitle %}{{ MAP.p_fulltitle }}{% else %}{{ MAP.p_title }}{% endif %} + {{ BRAND_NAME }} | {% if MAP.p_fulltitle %}{{ MAP.p_fulltitle }}{% else %}{{ MAP.p_title }}{% endif %} {# FAVICON #} diff --git a/www/system-brs-core/library/cView/tpl/core/cms-body.twig b/www/system-brs-core/library/cView/tpl/core/cms-body.twig index b81c249..f62442d 100644 --- a/www/system-brs-core/library/cView/tpl/core/cms-body.twig +++ b/www/system-brs-core/library/cView/tpl/core/cms-body.twig @@ -6,7 +6,7 @@ - Elixir Vault Admin | {% if MAP.p_fulltitle %}{{MAP.p_fulltitle}}{% else %}{{MAP.p_title}}{% endif %} + {{ BRAND_NAME }} Admin | {% if MAP.p_fulltitle %}{{MAP.p_fulltitle}}{% else %}{{MAP.p_title}}{% endif %} {# KEYWORDS & SEO #} diff --git a/www/system-brs-core/library/cView/tpl/helpers/pub/cookies.twig b/www/system-brs-core/library/cView/tpl/helpers/pub/cookies.twig index 260b658..7e18756 100644 --- a/www/system-brs-core/library/cView/tpl/helpers/pub/cookies.twig +++ b/www/system-brs-core/library/cView/tpl/helpers/pub/cookies.twig @@ -4,7 +4,7 @@
-

{{ dt.gM("There are three main types of cookies that we follow on the elixirVault.lv website.") }}

+

{{ dt.gM("There are three main types of cookies that we follow on the ") }}{{ BRAND_DOMAIN }}{{ dt.gM(" website.") }}

{{ dt.gM('By browsing the site, you accept the use of necessary cookies. You can also accept the use of other cookies.
For more information click here')|raw|replace({'[%REPLACE_URL%]': dt.gL(762)})|raw }}

  • diff --git a/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOn2FAAuthReq.twig b/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOn2FAAuthReq.twig index 141447a..9d9e99d 100644 --- a/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOn2FAAuthReq.twig +++ b/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOn2FAAuthReq.twig @@ -11,7 +11,7 @@ {##} {# TITLE #} - Elixir Vault | {{ dt.gM("Page access error...") }} + {{ BRAND_NAME }} | {{ dt.gM("Page access error...") }} {# FAVICON #} @@ -444,4 +444,3 @@ - diff --git a/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOnPageAccess.twig b/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOnPageAccess.twig index 8180bfe..eebb598 100644 --- a/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOnPageAccess.twig +++ b/www/system-brs-core/library/cView/tpl/helpers/pub/errors/errDieOnPageAccess.twig @@ -11,7 +11,7 @@ {##} {# TITLE #} - Elixir Vault | {{ dt.gM("Page access error...") }} + {{ BRAND_NAME }} | {{ dt.gM("Page access error...") }} {# FAVICON #} @@ -182,4 +182,3 @@ - diff --git a/www/system-brs-core/library/cView/tpl/helpers/pub/footer.twig b/www/system-brs-core/library/cView/tpl/helpers/pub/footer.twig index 03cb174..81c42c9 100644 --- a/www/system-brs-core/library/cView/tpl/helpers/pub/footer.twig +++ b/www/system-brs-core/library/cView/tpl/helpers/pub/footer.twig @@ -158,7 +158,7 @@
    -
    {{ dt.gM("Powered by elixirVault") }}
    +
    {{ dt.gM("Powered by") }} {{ BRAND_NAME }}
    • diff --git a/www/system-brs-core/sys/sysUpdater/scripts/record_db_cfg_sample.txt b/www/system-brs-core/sys/sysUpdater/scripts/record_db_cfg_sample.txt index 7a54819..21bf835 100644 --- a/www/system-brs-core/sys/sysUpdater/scripts/record_db_cfg_sample.txt +++ b/www/system-brs-core/sys/sysUpdater/scripts/record_db_cfg_sample.txt @@ -1,5 +1,5 @@ { - "UPDATE_REQUEST_URL":"http://local.lorettasecret.lv/ajax/ac:%REQUEST_ACTION%/req-type:%TYPE%", + "UPDATE_REQUEST_URL":"http://local.elixirvault.lv/ajax/ac:%REQUEST_ACTION%/req-type:%TYPE%", "BACKUP_FOLDER":"/var/www/backups/b", "UPDATE_INI_CFG":"init.cfg.ini", "SOME_PARAM":"-1" diff --git a/www/system-brs-core/sys/sysUsersLogin/tmpl/login.twig b/www/system-brs-core/sys/sysUsersLogin/tmpl/login.twig index 2639c6b..0ceb93d 100644 --- a/www/system-brs-core/sys/sysUsersLogin/tmpl/login.twig +++ b/www/system-brs-core/sys/sysUsersLogin/tmpl/login.twig @@ -21,7 +21,7 @@ {% else %}
      v{{VERS}} -

      {{ dt.gM("LORETTA SECRET") }}

      +

      {{ BRAND_NAME }}

      {{ dt.gM("BRSystems IT Solutions") }}