Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/adapt-it/adaptit
Browse files Browse the repository at this point in the history
  • Loading branch information
@pngbill
pngbill committed Mar 31, 2024
2 parents 1b71246 + 678f8d7 commit dbb1cce
Show file tree
Hide file tree
Showing 13 changed files with 1,217 additions and 1,189 deletions.
1,717 changes: 882 additions & 835 deletions source/Adapt_It.cpp
View file

Large diffs are not rendered by default.

31 changes: 24 additions & 7 deletions source/Adapt_It.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2720,7 +2720,7 @@ class CAdapt_ItApp : public wxApp

// Next ones are independent of the adaptation versus glossing choice
// not speed critical, so make these always 0 (zero), to use move up way
int m_nAddUsersCount;
//int m_nAddUsersCount; BEW removed 26Mar24, it's only set to 0 in 3 places, and never incremented
int m_nLookupUserCount;
int m_nListUsersCount;

Expand Down Expand Up @@ -3917,7 +3917,7 @@ class CAdapt_ItApp : public wxApp
// initialise to _T("gates") and _T("rs46nha#BZ") at end of OnInit()
wxString m_strDBusername;
wxString m_strDBpassword;
wxString m_strDBfullname;
KBSharingMgrTabbedDlg* m_pKBSharingMgrTabbedDlg;
KBSharingMgrTabbedDlg* GetKBSharingMgrTabbedDlg();
// Next three are set when authenticating with the bool '...ForManager' 2nd param of the
Expand Down Expand Up @@ -3970,11 +3970,28 @@ class CAdapt_ItApp : public wxApp
wxString m_newUserDlg_newusername;
wxString m_newUserDlg_newfullname;
wxString m_newUserDlg_newpassword;
int m_newUserDlg_newuserpermission;
int m_newUserDlg_grant_permissions;
int m_newUserDlg_newuseradmin; // RHSide checkbox
int m_newUserDlg_grant_permissions; // LHSide checkbox
// BEW 13Feb24 added next two, in support of newer NewUserCredentialsDlg
bool m_bCreateUserByMenuItem; // TRUE when the NewUserCredentialsDlg is active
//bool m_bCreateUserByMenuItem; // TRUE when the NewUserCredentialsDlg is active BEW 22Mar24 value-less, so remove
bool m_bGrantSomePermissions; // TRUE if the user clicked the checkbox for granting (some) user permissions
bool m_bChangedSelectedUser; // TRUE while handler for changing to a different user in user list is active, FALSE when
// the handler finishes, or at all times when a change is not active, or no user selected.

// BEW 22Mar24 added next boolean, because currently both do_add_kbusers.py (6 fields, supporting Mgr's Add User
// button), and do_create_user_granting_all.py (10 fields, supporting the menu choice "Add Users To KBserver" on
// the Administrator menu, each unilaterally does granting of all permissions. (The grants item is not not yet
// instantiated in the user table schema). So the boolean m_bGrantSomePermissions cannot distinguish between
// accessing MariaDB to add by the menu choice, versus adding by the KB Sharing Manager's "Add User" button.
// It matters, because the menu choice must test that the proposed new user does not already have full permissions,
// and requires more fields in the input .dat function than the input .dat for do_add_kbusers.py.
//
// NOTE: do_create_user_granting_all.py has two extra fields after the 3 creditials ones (ipAddr, DB_user_name,
// DB_user_password) so that the first of the extra fields, user_name, can be tested for equality with DB_user_name.
// DB_user_name has all permissions already, because it's able to gain entry to MariaDB. So if user_name matches,
// then user_name must ALREADY have full permissions, in which case the attempt to grant all permissions must fail
// and so the .py function fails.
bool m_bAddUser2UserTable; // TRUE when Add Users To KBserver is clicked, FALSE when Mgr's Add User button is clicked

/*
// Don't use an enum, int values are simpler
Expand All @@ -3995,12 +4012,12 @@ class CAdapt_ItApp : public wxApp
const int blanksEnd = 13; // this one changes as we add more above
*/

bool m_bAddUser2UserTable; // BEW 24Dec21, defaul FALSE, but True in app's OnAddUsersToKBserver() handler

wxString m_strCommandLine_ForAddUserWithGrants; // BEW 26Feb2024 when the commandLine is built
// in context where m_bGrantSomePermissions (above) is TRUE, avoid having to create the commandLine
// contents twice. Instead, store it here, and grab it in ConfigureMovedDatFile() just before
// control enters CreateInputDatFile_AndCopyEXE(const int funcNumber, wxString commandLine)
wxString m_strCommandLine_ForAddUserWithNoGrants; // BEW 26Mar24 like above, but for _T("add_foreign_KBUsers.dat")

void CheckForDefinedGlossLangName();

Expand Down
Binary file modified source/Adapt_It.wdr
View file
Binary file not shown.
139 changes: 71 additions & 68 deletions source/Adapt_It_wdr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7767,113 +7767,116 @@ wxSizer *SharedKBManagerUsersPageFunc2( wxWindow *parent, bool call_fit, bool se
wxListBox *item6 = new wxListBox( parent, ID_LISTBOX_CUR_USERS, wxDefaultPosition, wxSize(220,-1), 0, strs6, wxLB_SINGLE );
item4->Add( item6, 1, wxALIGN_CENTER|wxALL, 0 );

wxCheckBox *item7 = new wxCheckBox( parent, ID_CHECKBOX_GRANT_PERMISSIONS, _("Grant Permissions"), wxDefaultPosition, wxDefaultSize, 0 );
item4->Add( item7, 0, wxALIGN_CENTER|wxALL, 5 );

item3->Add( item4, 0, wxGROW|wxALL, 5 );

wxStaticBox *item8 = new wxStaticBox( parent, -1, _("Change Permission, Password, or Fullname") );
wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );
wxStaticBox *item9 = new wxStaticBox( parent, -1, _("Change Permission, Password, or Fullname") );
wxStaticBoxSizer *item8 = new wxStaticBoxSizer( item9, wxVERTICAL );

wxStaticText *item9 = new wxStaticText( parent, ID_TEXT, _("Username (should be unique):"), wxDefaultPosition, wxDefaultSize, 0 );
item9->SetToolTip( _("Each user name must be unique on this server") );
item7->Add( item9, 0, wxALL, 5 );
wxStaticText *item10 = new wxStaticText( parent, ID_TEXT, _("Username (should be unique):"), wxDefaultPosition, wxDefaultSize, 0 );
item10->SetToolTip( _("Each user name must be unique on this server") );
item8->Add( item10, 0, wxALL, 5 );

AutoCorrectTextCtrl *item10 = new AutoCorrectTextCtrl( parent, ID_THE_USERNAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
item10->SetToolTip( _("Type or edit the username here") );
item7->Add( item10, 0, wxGROW|wxALL, 5 );
AutoCorrectTextCtrl *item11 = new AutoCorrectTextCtrl( parent, ID_THE_USERNAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
item11->SetToolTip( _("Type or edit the username here") );
item8->Add( item11, 0, wxGROW|wxALL, 5 );

wxStaticText *item11 = new wxStaticText( parent, ID_TEXT, _("Informal username (Fullname):"), wxDefaultPosition, wxDefaultSize, 0 );
item11->SetToolTip( _("The informal username can be a real or a false name") );
item7->Add( item11, 0, wxALL, 5 );
wxStaticText *item12 = new wxStaticText( parent, ID_TEXT, _("Informal username (Fullname):"), wxDefaultPosition, wxDefaultSize, 0 );
item12->SetToolTip( _("The informal username can be a real or a false name") );
item8->Add( item12, 0, wxALL, 5 );

AutoCorrectTextCtrl *item12 = new AutoCorrectTextCtrl( parent, ID_TEXTCTRL_INFORMAL_NAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
item12->SetToolTip( _("Type the user's common name here, for example, Joe Bloggs") );
item7->Add( item12, 0, wxGROW|wxALL, 5 );
AutoCorrectTextCtrl *item13 = new AutoCorrectTextCtrl( parent, ID_TEXTCTRL_INFORMAL_NAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
item13->SetToolTip( _("Type the user's common name here, for example, Joe Bloggs") );
item8->Add( item13, 0, wxGROW|wxALL, 5 );

wxStaticText *item13 = new wxStaticText( parent, ID_TEXT, _("A password for this user:"), wxDefaultPosition, wxDefaultSize, 0 );
item13->SetToolTip( _("If you forget a password, you can type a new password for any user. An existing password is retained if you leave the password text boxes blank") );
item7->Add( item13, 0, wxALL, 5 );
wxStaticText *item14 = new wxStaticText( parent, ID_TEXT, _("A password for this user:"), wxDefaultPosition, wxDefaultSize, 0 );
item14->SetToolTip( _("If you forget a password, you can type a new password for any user. An existing password is retained if you leave the password text boxes blank") );
item8->Add( item14, 0, wxALL, 5 );

wxTextCtrl *item14 = new wxTextCtrl( parent, ID_TEXTCTRL_PASSWORD, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
item14->SetToolTip( _("Type in the password. You can type a new one if unknown. Make sure the user knows the password.") );
item7->Add( item14, 0, wxGROW|wxALL, 5 );
wxTextCtrl *item15 = new wxTextCtrl( parent, ID_TEXTCTRL_PASSWORD, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
item15->SetToolTip( _("Type in the password. You can type a new one if unknown. Make sure the user knows the password.") );
item8->Add( item15, 0, wxGROW|wxALL, 5 );

wxStaticText *item15 = new wxStaticText( parent, ID_TEXT, _("Type the password again:"), wxDefaultPosition, wxDefaultSize, 0 );
item7->Add( item15, 0, wxALL, 5 );
wxStaticText *item16 = new wxStaticText( parent, ID_TEXT, _("Type the password again:"), wxDefaultPosition, wxDefaultSize, 0 );
item8->Add( item16, 0, wxALL, 5 );

wxTextCtrl *item16 = new wxTextCtrl( parent, ID_TEXTCTRL_PASSWORD_TWO, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
item16->SetToolTip( _("Verify the spelling is the same as the first time") );
item7->Add( item16, 0, wxGROW|wxALL, 5 );
wxTextCtrl *item17 = new wxTextCtrl( parent, ID_TEXTCTRL_PASSWORD_TWO, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
item17->SetToolTip( _("Verify the spelling is the same as the first time") );
item8->Add( item17, 0, wxGROW|wxALL, 5 );

item3->Add( item7, 1, wxALL, 5 );
item3->Add( item8, 1, wxALL, 5 );

wxStaticBox *item18 = new wxStaticBox( parent, -1, _("Change Permission or Fullname, or View Password") );
wxStaticBoxSizer *item17 = new wxStaticBoxSizer( item18, wxVERTICAL );
wxStaticBox *item19 = new wxStaticBox( parent, -1, _("Change Permission or Fullname, or View Password") );
wxStaticBoxSizer *item18 = new wxStaticBoxSizer( item19, wxVERTICAL );

item17->Add( 20, 3, 0, wxALIGN_CENTER, 5 );
item18->Add( 20, 3, 0, wxALIGN_CENTER, 5 );

wxCheckBox *item19 = new wxCheckBox( parent, ID_CHECKBOX_USERADMIN, _("User administrator"), wxDefaultPosition, wxSize(140,-1), 0 );
item19->SetToolTip( _("Tick this box to allow this user the permission to add, remove, or edit other users of this server") );
item17->Add( item19, 0, wxALL, 5 );
wxCheckBox *item20 = new wxCheckBox( parent, ID_CHECKBOX_USERADMIN, _("User administrator"), wxDefaultPosition, wxSize(140,-1), 0 );
item20->SetToolTip( _("Tick this box to allow this user the permission to add, remove, or edit other users of this server") );
item18->Add( item20, 0, wxALL, 5 );

wxStaticText *item20 = new wxStaticText( parent, ID_TEXT, _("(can add users, or edit some user options)"), wxDefaultPosition, wxDefaultSize, 0 );
item17->Add( item20, 0, wxLEFT, 15 );
wxStaticText *item21 = new wxStaticText( parent, ID_TEXT, _("(can add users, or edit some user options)"), wxDefaultPosition, wxDefaultSize, 0 );
item18->Add( item21, 0, wxLEFT, 15 );

item17->Add( 20, 4, 0, wxALIGN_CENTER, 5 );
item18->Add( 20, 4, 0, wxALIGN_CENTER, 5 );

wxButton *item21 = new wxButton( parent, ID_BUTTON_CHANGE_PERMISSION, _("Change Permission"), wxDefaultPosition, wxDefaultSize, 0 );
item17->Add( item21, 0, wxALIGN_CENTER|wxALL, 5 );
wxButton *item22 = new wxButton( parent, ID_BUTTON_CHANGE_PERMISSION, _("Change Useradmin"), wxDefaultPosition, wxDefaultSize, 0 );
item18->Add( item22, 0, wxALIGN_CENTER|wxALL, 5 );

item17->Add( 20, 3, 0, wxALIGN_CENTER, 5 );
item18->Add( 20, 3, 0, wxALIGN_CENTER, 5 );

wxStaticBox *item23 = new wxStaticBox( parent, -1, _("Selected User's Password") );
wxStaticBoxSizer *item22 = new wxStaticBoxSizer( item23, wxVERTICAL );
wxStaticBox *item24 = new wxStaticBox( parent, -1, _("Selected User's Password") );
wxStaticBoxSizer *item23 = new wxStaticBoxSizer( item24, wxVERTICAL );

wxTextCtrl *item24 = new wxTextCtrl( parent, ID_TEXTCTRL_SEL_USER_PWD, wxT(""), wxDefaultPosition, wxSize(220,-1), 0 );
item22->Add( item24, 0, wxALIGN_CENTER|wxALL, 5 );
wxTextCtrl *item25 = new wxTextCtrl( parent, ID_TEXTCTRL_SEL_USER_PWD, wxT(""), wxDefaultPosition, wxSize(220,-1), 0 );
item23->Add( item25, 0, wxALIGN_CENTER|wxALL, 5 );

wxBoxSizer *item25 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer *item26 = new wxBoxSizer( wxHORIZONTAL );

item25->Add( 12, 16, 0, wxALIGN_CENTER|wxALL, 5 );
item26->Add( 12, 16, 0, wxALIGN_CENTER|wxALL, 5 );

wxButton *item26 = new wxButton( parent, ID_BUTTON_CHANGE_PASSWORD, _("Change Password"), wxDefaultPosition, wxDefaultSize, 0 );
item25->Add( item26, 0, wxALIGN_CENTER|wxALL, 5 );
wxButton *item27 = new wxButton( parent, ID_BUTTON_CHANGE_PASSWORD, _("Change Password"), wxDefaultPosition, wxDefaultSize, 0 );
item26->Add( item27, 0, wxALIGN_CENTER|wxALL, 5 );

item22->Add( item25, 0, wxALIGN_CENTER|wxALL, 5 );
item23->Add( item26, 0, wxALIGN_CENTER|wxALL, 5 );

item17->Add( item22, 0, wxALL, 5 );
item18->Add( item23, 0, wxALL, 5 );

wxButton *item27 = new wxButton( parent, ID_BUTTON_CHANGE_FULLNAME, _("Change Fullname"), wxDefaultPosition, wxDefaultSize, 0 );
item17->Add( item27, 0, wxALIGN_CENTER|wxRIGHT|wxTOP|wxBOTTOM, 5 );
wxButton *item28 = new wxButton( parent, ID_BUTTON_CHANGE_FULLNAME, _("Change Fullname"), wxDefaultPosition, wxDefaultSize, 0 );
item18->Add( item28, 0, wxALIGN_CENTER|wxRIGHT|wxTOP|wxBOTTOM, 5 );

item3->Add( item17, 0, wxALL, 5 );
item3->Add( item18, 0, wxALL, 5 );

item2->Add( item3, 1, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 0 );

wxBoxSizer *item28 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer *item29 = new wxBoxSizer( wxHORIZONTAL );

item28->Add( 30, 20, 0, wxALIGN_CENTER|wxALL, 5 );
item29->Add( 30, 20, 0, wxALIGN_CENTER|wxALL, 5 );

wxButton *item29 = new wxButton( parent, ID_BUTTON_CLEAR_CONTROLS, _("Clear Controls"), wxDefaultPosition, wxDefaultSize, 0 );
item29->SetToolTip( _("Empty all the text box controls, clear the checkboxes, remove the selection from the list box") );
item28->Add( item29, 0, wxALIGN_CENTER|wxALL, 5 );
wxButton *item30 = new wxButton( parent, ID_BUTTON_CLEAR_CONTROLS, _("Clear Controls"), wxDefaultPosition, wxDefaultSize, 0 );
item30->SetToolTip( _("Empty all the text box controls, clear the checkboxes, remove the selection from the list box") );
item29->Add( item30, 0, wxALIGN_CENTER|wxALL, 5 );

item28->Add( 15, 20, 0, wxALIGN_CENTER|wxALL, 5 );
item29->Add( 15, 20, 0, wxALIGN_CENTER|wxALL, 5 );

wxButton *item30 = new wxButton( parent, ID_BUTTON_ADD_USER, _("Add User"), wxDefaultPosition, wxDefaultSize, 0 );
item30->SetToolTip( _("Add a new user to the list box using the details typed in the controls") );
item28->Add( item30, 0, wxALIGN_CENTER|wxALL, 5 );
wxButton *item31 = new wxButton( parent, ID_BUTTON_ADD_USER, _("Add User"), wxDefaultPosition, wxDefaultSize, 0 );
item31->SetToolTip( _("Add a new user to the list box using the details typed in the controls") );
item29->Add( item31, 0, wxALIGN_CENTER|wxALL, 5 );

item28->Add( 15, 20, 0, wxALIGN_CENTER|wxALL, 5 );
item29->Add( 15, 20, 0, wxALIGN_CENTER|wxALL, 5 );

wxButton *item31 = new wxButton( parent, ID_BUTTON_SHOW_PASSWORD, _("Show Password"), wxDefaultPosition, wxDefaultSize, 0 );
item31->SetToolTip( _("View the password for the selected user; it can be changed") );
item28->Add( item31, 0, wxALIGN_CENTER|wxALL, 5 );
wxButton *item32 = new wxButton( parent, ID_BUTTON_SHOW_PASSWORD, _("Show Password"), wxDefaultPosition, wxDefaultSize, 0 );
item32->SetToolTip( _("View the password for the selected user; it can be changed") );
item29->Add( item32, 0, wxALIGN_CENTER|wxALL, 5 );

item28->Add( 40, 20, 0, wxALIGN_CENTER, 5 );
item29->Add( 40, 20, 0, wxALIGN_CENTER, 5 );

wxStaticText *item32 = new wxStaticText( parent, ID_TEXT, _("Note: Removing a listed user is not permitted"), wxDefaultPosition, wxDefaultSize, 0 );
item28->Add( item32, 0, wxALIGN_CENTER|wxALL, 5 );
wxStaticText *item33 = new wxStaticText( parent, ID_TEXT, _("Note: Removing a listed user is not permitted"), wxDefaultPosition, wxDefaultSize, 0 );
item29->Add( item33, 0, wxALIGN_CENTER|wxALL, 5 );

item2->Add( item28, 0, wxALL, 0 );
item2->Add( item29, 0, wxALL, 0 );

item0->Add( item2, 1, wxGROW|wxLEFT|wxBOTTOM, 5 );

Expand Down
Loading

0 comments on commit dbb1cce

Please sign in to comment.