From c66bc47a3bb89b56bd1bc8c9b5cb1a4ded4faefb Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 31 Mar 2004 13:02:54 +0000
Subject: [PATCH] Corretta la gestione degli utenti e delle connessioni per la
 versione Terminal Server

git-svn-id: svn://10.65.10.50/trunk@11926 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/cfiles.c    | 60 +++++----------------------------------------
 include/strings.cpp | 13 ++--------
 2 files changed, 8 insertions(+), 65 deletions(-)

diff --git a/include/cfiles.c b/include/cfiles.c
index c0733c5a7..788d40d82 100755
--- a/include/cfiles.c
+++ b/include/cfiles.c
@@ -1,12 +1,6 @@
 #define __CFILES_C /* fv */
 
 #include <xvt.h>
-
-#ifdef LINUX
-extern const char * _c_user;
-extern BOOLEAN _is_admin; 
-#endif
-
 #include "cfiles.h"
 
 int  dirfl[2] = {0, 0}, recfl[2] = {0, 0} ;
@@ -390,30 +384,13 @@ HIDDEN BOOLEAN CGetFirmDir()
   if (good)  
   {
     int len = 0;
-#ifdef LINUX
-		good = FALSE;
-		if (!_is_admin)
-		{
-			char varname[80];
-			sprintf(varname, "Study[%s]", _c_user);
-    	len = xvt_sys_get_profile_string(prawin, "Main", varname, "", __ptprf, sizeof(__ptprf));
-    	good = len > 0;
-		}
-		if (!good)
-		{
-#endif
-    	len = xvt_sys_get_profile_string(prawin, "Main", "Study", "", __ptprf, sizeof(__ptprf));
-    	good = len > 0;
-#ifdef LINUX
-		}
-#endif
+
+   	len = xvt_sys_get_profile_string(prawin, "Main", "Study", "", __ptprf, sizeof(__ptprf));
+   	good = len > 0;
     if (good)
     {
       char firm[8];
       long ditta;
-#ifdef LINUX
-	    char path[_MAX_PATH], user[80];
-#endif
     
       if (__ptprf[len-1] != '\\' && __ptprf[len-1] != '/')
       {
@@ -421,14 +398,7 @@ HIDDEN BOOLEAN CGetFirmDir()
         __ptprf[len+1] = '\0';
       }
       
-#ifdef LINUX
-			strcpy(user, _c_user),
-			xvt_str_make_lower(user);
-			sprintf(path, "%sconfig%c%s.ini", __ptprf, DIRSEP, user);
-      len = xvt_sys_get_profile_string(path, "Main", "Firm", "", firm, sizeof(firm));
-			if (len == 0)
-#endif
-      	xvt_sys_get_profile_string(prawin, "Main", "Firm", "com", firm, sizeof(firm));
+     	xvt_sys_get_profile_string(prawin, "Main", "Firm", "com", firm, sizeof(firm));
       ditta = atol(firm);
       if (ditta > 0) sprintf(firm, "%05lda", ditta);
       xvt_fsys_build_pathname(cprefix, NULL, __ptprf, firm, NULL, NULL);
@@ -441,27 +411,9 @@ HIDDEN BOOLEAN CGetFirmDir()
 BOOLEAN CPutFirmDir(const char* pref)
 {           
   const char* prawin = CGetCampoIni();
-#ifdef LINUX
-  char path[_MAX_PATH], user[80];
+  const BOOLEAN good = xvt_sys_set_profile_string(prawin, "Main", "Firm", pref);
 
-	strcpy(user, _c_user),
-	xvt_str_make_lower(user);
-	sprintf(path, "%sconfig%c%s.ini", __ptprf, DIRSEP, user);
-  BOOLEAN good = xvt_sys_set_profile_string(path, "Main", "Firm", pref);
-#else
-  BOOLEAN good = xvt_sys_set_profile_string(prawin, "Main", "Firm", pref);
-#endif
-
-#ifdef LINUX
-	if (!_is_admin)
-	{
-		char varname[80];
-		sprintf(varname, "Study[%s]", _c_user);
-   	xvt_sys_set_profile_string(prawin, "Main", varname, __ptprf);
- 	}
-  else
-#endif
-	  xvt_sys_set_profile_string(prawin, "Main", "Study", __ptprf);
+	xvt_sys_set_profile_string(prawin, "Main", "Study", __ptprf);
   return good;
 }
 
diff --git a/include/strings.cpp b/include/strings.cpp
index 82f84637e..b0b457679 100755
--- a/include/strings.cpp
+++ b/include/strings.cpp
@@ -18,11 +18,6 @@
 #include <regexp.h>
 #include <utility.h>
 
-#ifdef LINUX
-	const char * _c_user = NULL;
-	bool _is_admin = FALSE;
-#endif
-
 // @doc EXTERNAL
 
 // @func Ritorna il nome dell'utente attuale
@@ -30,12 +25,8 @@
 // @rdesc Ritorno il nome dell'utente attuale
 TString& user()
 {
-  static TString16 _user;
-#ifdef LINUX
-	if (_c_user == NULL)
-		 _c_user = (const char *) _user;
-	_is_admin = (_user == ::dongle().administrator());
-#endif
+  static TString8 _user;
+
   return _user;
 }