From c4d5180afdd55a3110ff64f39f0521c0057a2c3e Mon Sep 17 00:00:00 2001 From: Michael Larabel Date: Tue, 1 Jul 2008 21:59:16 -0400 Subject: Change location of the user agreement check-sum tag within the user-config.xml configuration NOTE: This requires you will now need to re-agree to the end-user agreement. --- PTS-12-CHANGE-LOG | 2 ++ pts-core/functions/pts-functions_config.php | 2 +- pts-core/functions/pts-interfaces.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PTS-12-CHANGE-LOG b/PTS-12-CHANGE-LOG index b193a95..f29dabd 100644 --- a/PTS-12-CHANGE-LOG +++ b/PTS-12-CHANGE-LOG @@ -23,3 +23,5 @@ - Add ProjectURL tag to available test profiles - Introduce a test installation management system and this replaces the previous pts-install management solution. New setup is XML based and monitors time a test was installed, last time a test was run, number of times a test was run by PTS, and this pts-install.xml system will be used for some future features. - With info option, when a test is specified, let the user know whether it's installed. If it's installed, print the last time the test was executed and the total number of times it was executed. +- Change location of results directory tag within the user-config.xml configuration +- Change location of the user agreement check-sum tag within the user-config.xml configuration diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php index 2ca64ac..f5f8a38 100644 --- a/pts-core/functions/pts-functions_config.php +++ b/pts-core/functions/pts-functions_config.php @@ -111,7 +111,7 @@ function pts_user_config_init($UserName = NULL, $UploadKey = NULL, $BatchOptions $config->addXmlObject(P_OPTION_BATCH_PROMPTSAVENAME, 3, $BatchOptions[4]); $config->addXmlObject(P_OPTION_BATCH_CONFIGURED, 3, $BatchOptions[5]); - $config->addXmlObject(P_OPTION_USER_AGREEMENT, 4, $UserAgreement_MD5); + $config->addXmlObject(P_OPTION_USER_AGREEMENT, 3, $UserAgreement_MD5); file_put_contents(PTS_USER_DIR . "user-config.xml", $config->getXML()); } diff --git a/pts-core/functions/pts-interfaces.php b/pts-core/functions/pts-interfaces.php index 3135ee2..27b3701 100644 --- a/pts-core/functions/pts-interfaces.php +++ b/pts-core/functions/pts-interfaces.php @@ -158,7 +158,7 @@ define("P_OPTION_BATCH_UPLOADRESULTS", "PhoronixTestSuite/Options/BatchMode/Uplo define("P_OPTION_BATCH_PROMPTIDENTIFIER", "PhoronixTestSuite/Options/BatchMode/PromptForTestIdentifier"); // Batch mode prompt for test identifier define("P_OPTION_BATCH_PROMPTSAVENAME", "PhoronixTestSuite/Options/BatchMode/PromptSaveName"); // Batch mode prompt for save results name -define("P_OPTION_USER_AGREEMENT", "PhoronixTestSuite/Trondheim/UserAgreement"); // PTS user agreement confirmation +define("P_OPTION_USER_AGREEMENT", "PhoronixTestSuite/Options/General/UserAgreement"); // PTS user agreement confirmation // // TEST INSTALLATION SPECIFICATION -- cgit