Reduce perl

src/Makefile.am

@@ -11,6 +11,7 @@ module_DATA = \
   modules/UsersLDAP.pm \
   modules/UsersSimple.pm \
   modules/UsersCache.pm \
+  modules/UsersDialogsFlags.rb \
   modules/UsersPluginLDAPAll.pm \
   modules/UsersPluginLDAPPasswordPolicy.pm \
   modules/UsersPluginKerberos.pm \

src/clients/groups.rb

@@ -33,6 +33,7 @@
 # $Id$
 #
 # Just a shortcut to invoke groups management
+
 module Yast
   class GroupsClient < Client
     def main
@@ -48,6 +49,7 @@ def main
       Yast.import "Mode"
       Yast.import "Users"
       Yast.import "UsersCache"
+      Yast.import "UsersDialogsFlags"
 
       Yast.include self, "users/wizards.rb"
       Yast.include self, "users/cmdline.rb"
@@ -82,7 +84,7 @@ def main
           @start_dialog,
           Mode.test
         )
-        Users.SetStartDialog(@start_dialog)
+        UsersDialogsFlags.assign_start_dialog(@start_dialog)
         @ret = UsersSequence(@start_dialog)
         Builtins.y2milestone("Users module finished with %1", @ret)
         Builtins.y2milestone("----------------------------------------")

src/clients/users.rb

@@ -43,6 +43,7 @@ def main
       Yast.import "Mode"
       Yast.import "Users"
       Yast.import "UsersCache"
+      Yast.import "UsersDialogsFlags"
 
       Yast.include self, "users/wizards.rb"
       Yast.include self, "users/cmdline.rb"
@@ -85,7 +86,7 @@ def main
           @start_dialog,
           Mode.test
         )
-        Users.SetStartDialog(@start_dialog)
+        UsersDialogsFlags.assign_start_dialog(@start_dialog)
         @ret = UsersSequence(@start_dialog)
         Builtins.y2milestone("Users module finished with %1", @ret)
         Builtins.y2milestone("----------------------------------------")

src/include/users/cmdline.rb

@@ -36,6 +36,7 @@ def initialize_users_cmdline(include_target)
       Yast.import "Ldap"
       Yast.import "Users"
       Yast.import "UsersCache"
+      Yast.import "UsersDialogsFlags"
       Yast.import "UsersLDAP"
       Yast.import "UsersSimple"
       Yast.import "Report"
@@ -750,7 +751,7 @@ def UsersWrite
     end
 
     def UsersGUI
-      UsersSequence(Users.GetStartDialog) == :next
+      UsersSequence(UsersDialogsFlags.start_dialog) == :next
     end
   end
 end

src/include/users/complex.rb

@@ -42,6 +42,7 @@ def initialize_users_complex(include_target)
       Yast.import "Stage"
       Yast.import "Users"
       Yast.import "UsersCache"
+      Yast.import "UsersDialogsFlags"
       Yast.import "Wizard"
 
       Yast.include include_target, "users/helps.rb"
@@ -101,7 +102,7 @@ def WriteDialog(useUI)
     # first dialog for single user addition
     # @return [Symbol] for wizard sequencer
     def usersInstStart
-      Users.SetStartDialog("user_add")
+      UsersDialogsFlags.assign_start_dialog("user_add")
       Users.AddUser({})
       :next
     end

src/include/users/dialogs.rb

@@ -46,6 +46,7 @@ def initialize_users_dialogs(include_target)
       Yast.import "String"
       Yast.import "Users"
       Yast.import "UsersCache"
+      Yast.import "UsersDialogsFlags"
       Yast.import "UsersLDAP"
       Yast.import "UsersPlugins"
       Yast.import "UsersRoutines"
@@ -160,9 +161,9 @@ def AskForOldPassword
     # @return [Symbol] for wizard sequencer
     def EditUserDialog(what)
       # user has returned to the "add user dialog" during installation workflow:
-      if Users.StartDialog("user_add") && installation && Users.UseNextTime
+      if user_add_dialog? && installation && UsersDialogsFlags.use_next_time
         Users.RestoreCurrentUser
-        Users.SetUseNextTime(false)
+        UsersDialogsFlags.assign_use_next_time(false)
       end
 
       display_info = UI.GetDisplayInfo
@@ -256,7 +257,7 @@ def EditUserDialog(what)
         (user_type == "ldap" && Ldap.file_server ||
           user_type == "local" || user_type == "system")
 
-      complex_layout = installation && Users.StartDialog("user_add")
+      complex_layout = installation && user_add_dialog?
       groups = Ops.get_map(user, "grouplist", {})
 
       available_shells = Users.AllShells
@@ -1104,7 +1105,7 @@ def EditUserDialog(what)
           username = Convert.to_string(UI.QueryWidget(Id(:username), :Value))
 
           # empty username during installation (-> go to next module)
-          if username == "" && ret == :next && Users.StartDialog("user_add")
+          if username == "" && ret == :next && user_add_dialog?
             # The user login field is empty, this is allowed if the
             # system is part of a network with (e.g.) NIS user management.
             # yes-no popup headline
@@ -1363,7 +1364,7 @@ def EditUserDialog(what)
             end
           end
           # --------------------------------- autologin (during installation)
-          if Users.StartDialog("user_add") && installation
+          if user_add_dialog? && installation
             if Autologin.available
               Autologin.user = Convert.to_boolean(
                 UI.QueryWidget(Id(:autologin), :Value)
@@ -2036,7 +2037,7 @@ def EditUserDialog(what)
         # during installation, store the data of first user
         # (to show it when clicking `back from Summary dialog)
         Users.SaveCurrentUser
-        Users.SetStartDialog("users")
+        UsersDialogsFlags.assign_start_dialog("users")
       end
       ret
     end
@@ -2633,7 +2634,7 @@ def EditGroupDialog(what)
     def UserSave
       Users.CommitUser
       # adding only one user during install
-      if installation && Users.StartDialog("user_add")
+      if installation && user_add_dialog?
         return :save
       else
         return :next
@@ -2655,5 +2656,9 @@ def GroupSave
       Users.CommitGroup
       :next
     end
+
+    def user_add_dialog?
+      UsersDialogsFlags.start_dialog == "user_add"
+    end
   end
 end

src/include/users/helps.rb

@@ -40,6 +40,7 @@ def initialize_users_helps(include_target)
       Yast.import "UsersCache"
       Yast.import "UsersLDAP"
       Yast.import "UsersRoutines"
+      Yast.import "UsersSimple"
     end
 
     # Password help text.
@@ -77,12 +78,12 @@ def help_password(type)
               "</p>"
           ),
           Ops.get_string(enc_to_string, method, method),
-          Users.GetMinPasswordLength(type),
-          Users.GetMaxPasswordLength(type)
+          UsersSimple.GetMinPasswordLength(type),
+          UsersSimple.GetMaxPasswordLength(type)
         )
       )
 
-      help_text = Ops.add(help_text, Users.ValidPasswordHelptext)
+      help_text = Ops.add(help_text, UsersSimple.ValidPasswordHelptext)
 
       #help text 4/4
       help_text = Ops.add(

src/include/users/wizards.rb

@@ -42,6 +42,7 @@ def initialize_users_wizards(include_target)
       Yast.import "Sequencer"
       Yast.import "Stage"
       Yast.import "UsersCache"
+      Yast.import "UsersDialogsFlags"
       Yast.import "Users"
       Yast.import "Wizard"
 
@@ -125,8 +126,8 @@ def SummaryDialog
       end
 
       if Stage.cont && (ret == :back || ret == :abort)
-        Users.SetStartDialog("user_add")
-        Users.SetUseNextTime(true)
+        UsersDialogsFlags.assign_start_dialog("user_add")
+        UsersDialogsFlags.assign_use_next_time(true)
         old_gui = Users.GetGUI
         Users.SetGUI(false)
         Users.Read