From 662a43449fe72501c6c58a78e58da4e1114afcac Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 20 Jan 2009 16:47:54 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:cd=202?= =?UTF-8?q?10=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20Demo?= =?UTF-8?q?=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:sis?= =?UTF-8?q?temato=20il=20cambio=20di=20reseller=20in=20aggiornamento=20da?= =?UTF-8?q?=20internet;=20non=20=C3=A8=20ammesso!=20e'=20rimasto=20quello?= =?UTF-8?q?=20da=20disco,=20perch=C3=A8=20nel=20caso=20del=20cliente=20non?= =?UTF-8?q?=20d=C3=A0=20fastidio,=20nel=20caso=20nostro=20si?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@18063 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba1700.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ba/ba1700.cpp b/ba/ba1700.cpp index 25b64213e..0386f611a 100755 --- a/ba/ba1700.cpp +++ b/ba/ba1700.cpp @@ -1450,7 +1450,22 @@ void TInstaller_mask::install_selection() local_file.add(*row); remote_file = http_path; remote_file.add(*row); - file_copied = http_get(http_server, remote_file, local_file); //occhio alle maiuscole!!!! + //via web NON deve copiare oem.ini perchè NON deve poter cambiare il reseller (solo via disco sarà.. + //..possibile) + const bool is_oem_ini = xvt_str_compare_ignoring_case(remote_file.name(), "oem.ini") == 0; + if (is_oem_ini) + { + const int old_oem = xvt_sys_get_profile_int(local_file, "MAIN", "OEM", -1); + file_copied = http_get(http_server, remote_file, local_file); //occhio alle maiuscole!!!! + const int new_oem = xvt_sys_get_profile_int(local_file, "MAIN", "OEM", -1); + if (new_oem != old_oem) + { + TString4 str_oem; str_oem << ' ' << old_oem; + xvt_sys_set_profile_string(local_file, "MAIN", "OEM", str_oem); + } + } + else + file_copied = http_get(http_server, remote_file, local_file); //occhio alle maiuscole!!!! } } update_install_ini(); //aggiorna l'install.ini