root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :10.0

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
trattazione dninst


git-svn-id: svn://10.65.10.50/trunk@19986 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2010-01-26 11:06:08 +00:00
parent 114090d2fb
commit 54b99e8e36
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/applicat.cpp
View File

@ -483,7 +483,7 @@ bool TApplication::test_assistance_year() const
ok = app_year <= dongle_year; ok = app_year <= dongle_year;
if (ok) if (ok)
{ {
Tdninst dninst; Tdninst dninst; //queste 2 righe sono quelle da mettere nei programmi
ok = dninst.can_I_run(); ok = dninst.can_I_run();
} }
} }

8
include/dongle.cpp
View File

@ -1171,11 +1171,11 @@ int Tdninst::test_cmdline(const TString& cmdline, bool key_must_exist, TString&
if (codmod == BAAUT) if (codmod == BAAUT)
return 0; return 0;
if (!don.active(codmod)) /*if (!don.active(codmod))
{ {
msg << TR("Modulo non attivo sulla chiave: ") << strmod; msg << TR("Modulo non attivo sulla chiave: ") << strmod;
return 2; return 2;
} }*/
} }
const TDate oggi(TODAY); const TDate oggi(TODAY);
@ -1268,14 +1268,14 @@ int Tdninst::test_cmdline(const TString& cmdline, bool key_must_exist, TString&
return 0; return 0;
} }
bool Tdninst::can_I_run() const bool Tdninst::can_I_run(const bool is_personal_program) const
{ {
TFilename cmdline = main_app().argv(0); TFilename cmdline = main_app().argv(0);
cmdline = cmdline.name_only(); cmdline = cmdline.name_only();
if (cmdline.starts_with("ba", true)) if (cmdline.starts_with("ba", true))
return true; return true;
const bool me = cmdline.len()>3; const bool me = is_personal_program || cmdline.len()>3;
const char* option = main_app().argc() > 1 ? main_app().argv(1) : ""; const char* option = main_app().argc() > 1 ? main_app().argv(1) : "";
if (*option == '-' && isdigit(*(option+1))) if (*option == '-' && isdigit(*(option+1)))
cmdline << ' ' << option; cmdline << ' ' << option;

2
include/dongle.h
View File

@ -122,7 +122,7 @@ public:
int assist_year() const { return _year_assist; } int assist_year() const { return _year_assist; }
int solar_year() const { return assistance_year2solar(_year_assist); } int solar_year() const { return assistance_year2solar(_year_assist); }
int test_cmdline(const TString& cmdline, bool key_must_exist, TString& msg) const; int test_cmdline(const TString& cmdline, bool key_must_exist, TString& msg) const;
bool can_I_run() const; bool can_I_run(const bool is_personal_program = false) const;
bool find_killed(TToken_string& kill_list) const; bool find_killed(TToken_string& kill_list) const;
Tdninst(); Tdninst();
}; };