Patch level : 12.00 1262

Files correlati     : ba7.exe ba7100a.mak
Commento            :
Invio postino con ODBC

src/ba/ba2800.cpp

@@ -901,7 +901,7 @@ void Tdninst_mask::save_sheet()
 					}
 
 					// Stampo il messaggio
-					ok ? message_box("DNINST copiato correttamente!") : error_box(FR("Errore durante la copia per la versione %d", prev));
+					ok ? message_box("DNINST copiato correttamente!") : error_box(FR("Errore durante la copia per la versione %d"), prev);
 				}
 			}
 		}

src/ba/ba2900.cpp

@@ -1054,15 +1054,9 @@ void TMSSQLExport_app::main_loop()
 
 	while (msk.run() == K_ENTER)
 	{
-#ifdef DBG
-		const TString& _DSN = "TESTCAMPO2012\\MSSQLSERVER2019@campo13";
-		const TString& _usr = "campo";
-		const TString& _psw = "campo";
-#else
 		const TString& _DSN = msk.get(F_DSN);
 		const TString& _usr = msk.get(F_USR);
 		const TString& _psw = msk.get(F_PWD);
-#endif
 		_visual = true;
 		// Chiamo la funzione globale esporta
 		if(connect(_DSN, _usr, _psw))

src/ba/ba7100.cpp

@@ -1734,6 +1734,10 @@ void TMailer_mask::save() const
   ini.set("Backup",    get(F_BACKUP));
   ini.set("DelCancel", get(F_DELCANCEL));
   
+	ini.set("ODBCDSN", get(F_DSN));
+	ini.set("ODBCUser", get(F_USR));
+	ini.set("ODBCPassword", encode(get(F_PWD)));
+
   save_sheet(ini, F_ADDRESSES, "Recipient");
   save_sheet(ini, F_PARAMS,    "Filter");
   save_sheet(ini, F_SCRIPTS,   "Script");
@@ -1751,6 +1755,10 @@ void TMailer_mask::load()
   set(F_BACKUP,   ini.get("Backup"));
   set(F_DELCANCEL,ini.get("DelCancel"));
 
+	set(F_DSN, ini.get("ODBCDSN"));
+	set(F_USR, ini.get("ODBCUser"));
+	set(F_PWD, decode(ini.get("ODBCPassword")));
+  
   load_sheet(ini, F_ADDRESSES, "Recipient");
   load_sheet(ini, F_PARAMS,    "Filter");
   load_sheet(ini, F_SCRIPTS,   "Script");
@@ -1763,8 +1771,6 @@ TMailer_mask::TMailer_mask()
 {
   load();
   
-  const bool is_super = user() == ::dongle().administrator();
-  enable(-G_SUPERUSER, is_super);
 	TSheet_field & sf = sfield(F_MESSAGES);
 	sf.disable_column(F_CHECKED);
 }
@@ -1800,7 +1806,7 @@ bool TMailer::create()
 {
 	TString arg1 = main_app().argv(2);
 	TString arg2 = main_app().argv(3);
-	TString arg3 = argc() > 2 ? main_app().argv(4) : "";
+	TString arg3 = argc() > 3 ? main_app().argv(4) : "";
 
 	bool multiple_instances = arg1.starts_with("-m") || arg2.starts_with("-m") || arg3.starts_with("-m") ;
 
@@ -1843,11 +1849,14 @@ if (!_start_full_screen && xvt_win_is_taskbar_visible())
 				xvt_vobj_set_visible(TASK_WIN, false);
 		}
 	}
+	if (_start_full_screen)
+		xvt_vobj_show(TASK_WIN);
 	if (_profile.full())
 	{
 		mm.load_profile(_profile, "ADMIN");
 		set_title(_profile);
 	}
+
 	mm.run();
 
   xvt_trayicon_destroy(tray);

src/ba/ba7100a.h

@@ -7,6 +7,9 @@
 #define F_BACKUP    207
 #define F_BATCH     208
 #define F_DELCANCEL 210
+#define F_DSN				211
+#define F_USR				212
+#define F_PWD				213
 
 #define F_MESSAGES  300
 #define F_ADDRESSES 301
@@ -31,6 +34,7 @@
 #define F_FILE      102
 #define F_OPERATOR  103
 #define F_EXPR      104
+#define F_FILES     105
 
 // #define F_CHECKED   101
 #define F_COMMAND   102

src/ba/ba7100a.uml

@@ -164,18 +164,39 @@ BEGIN
   GROUP G_SUPERUSER
 END
 
+STRING F_DSN 260 50
+BEGIN
+  PROMPT 1 9 "ODBC DSN "
+  CHECKTYPE REQUIRED
+END
+
+STRING F_USR 16
+BEGIN
+  PROMPT 1 10 "User     "
+  CHECKTYPE REQUIRED
+END
+
+STRING F_PWD 16
+BEGIN
+  PROMPT 1 11 "Password "
+  CHECKTYPE REQUIRED
+  FLAGS "*"
+END
+
 TEXT DLG_NULL
 BEGIN
-  PROMPT 1 8 "@bRegole"
+  PROMPT 1 13 "@bRegole"
 END
 
+
 SPREADSHEET F_PARAMS
 BEGIN
-  PROMPT 0 9 ""
+  PROMPT 0 14 ""
   ITEM "Indirizzo@40"
   ITEM "File"
   ITEM "OP@2"
   ITEM "Filtro@64"
+  ITEM "ODBC Files@64"
   GROUP G_SUPERUSER
   FLAGS "|"
 END
@@ -355,9 +376,14 @@ BEGIN
   ITEM "O|Or"
 END
 
+STING F_FILES 60
+BEGIN
+  PROMPT 1 3 "ODBC files"
+END
+
 MEMO F_EXPR 60 -3
 BEGIN
-  PROMPT 1 3 "Espressione "
+  PROMPT 1 4 "Espressione "
 END
 
 ENDPAGE