Finished off support for includes

diff --git a/pam/CHANGELOG b/pam/CHANGELOG
new file mode 100644 (file)
index 0000000..dc5b8d6
--- /dev/null
+++ b/pam/CHANGELOG
@@ -0,0 +1,3 @@
+---- Changes since 1.380 ----
+Re-wrote the user interface to use the new UI library functions, for a more consistent look.
+Added support for PAM includes, as used in modern Linux distributions.

diff --git a/pam/edit_inc.cgi b/pam/edit_inc.cgi
index 4f3fa30..80ed82a 100644 (file)
--- a/pam/edit_inc.cgi
+++ b/pam/edit_inc.cgi
@@ -18,7 +18,7 @@ else {
        }
 
 
-print &ui_form_start("save_mod.cgi");
+print &ui_form_start("save_inc.cgi");
 print &ui_hidden("idx", $in{'idx'});
 print &ui_hidden("midx", $in{'midx'});
 print &ui_hidden("_type", $in{'type'});
@@ -35,10 +35,14 @@ print &ui_table_row($text{'mod_type'},
                    $text{'mod_type_'.$type});
 
 # Included service
+@pam = sort { $a->{'name'} cmp $b->{'name'} } @pam;
 print &ui_table_row($text{'inc_inc'},
     &ui_select("inc", $inc,
-       [ map { [ $_->{'name'}, $text{'desc_'.$_->{'name'}} || $_->{'name'} ] }
-             @pam ], 1, 0, $inc ? 1 : 0));
+       [ map { [ $_->{'name'},
+                 $_->{'name'}.($text{'desc_'.$_->{'name'}} ?
+                               " (".$text{'desc_'.$_->{'name'}}.")" : "") ] }
+             grep { $_->{'name'} ne $pam->{'name'} } @pam ],
+       1, 0, $inc ? 1 : 0));
 
 print &ui_table_end();
 

diff --git a/pam/lang/en b/pam/lang/en
index 971012e..ab37535 100644 (file)
--- a/pam/lang/en
+++ b/pam/lang/en
@@ -166,7 +166,7 @@ mod_create=Add PAM Module
 mod_header=PAM module options
 mod_name=Service name
 mod_mod=PAM module
-mod_type=Use in service
+mod_type=Use in step
 mod_type_auth=Authentication
 mod_type_account=Account verification
 mod_type_session=Session setup
@@ -261,6 +261,9 @@ log_mod_modify=Modified PAM module $1 in service $2
 log_mod_delete=Deleted PAM module $1 in service $2
 log_mod_move=Swapped PAM modules in service $3
 log_mod_move_l=Swapped PAM modules $1 and $2 in service $3
+log_inc_create=Added include $1 for service $2
+log_inc_modify=Modified include $1 for service $2
+log_inc_delete=Deleted include $1 for service $2
 
 inc_edit=Edit Included Service
 inc_create=Create Included Service

diff --git a/pam/log_parser.pl b/pam/log_parser.pl
index 5101687..99bc746 100644 (file)
--- a/pam/log_parser.pl
+++ b/pam/log_parser.pl
@@ -22,6 +22,10 @@ elsif ($type eq 'mod') {
                             &html_escape($object));
                }
        }
+elsif ($type eq 'inc') {
+       return &text("log_inc_$action", &html_escape($p->{'module'}),
+                    &html_escape($object));
+       }
 else {
        return undef;
        }

diff --git a/pam/save_inc.cgi b/pam/save_inc.cgi
index b919e7a..f089017 100755 (executable)
--- a/pam/save_inc.cgi
+++ b/pam/save_inc.cgi
@@ -14,21 +14,19 @@ if ($in{'delete'}) {
        &delete_module($pam->{'name'}, $mod);
        }
 else {
-       if ($in{'_module'}) {
+       if ($in{'_type'}) {
                # Adding a new include
                $mod = { 'type' => $in{'_type'},
-                        'module' => $in{'_module'} };
-               $module = $in{'_module'};
+                        'control' => 'include',
+                        'module' => $in{'inc'} };
                }
        else {
                # Existing module entry
-               # XXX
                $mod = $pam->{'mods'}->[$in{'midx'}];
-               $module = $mod->{'module'};
-               $module =~ s/^.*\///;
+               $mod->{'module'} = $in{'inc'};
                }
 
-       if ($in{'_module'}) {
+       if ($in{'_type'}) {
                # Add the PAM include entry
                &create_module($pam->{'name'}, $mod);
                }
@@ -38,7 +36,7 @@ else {
                }
        }
 &unlock_file($pam->{'file'});
-&webmin_log($in{'delete'} ? "delete" : $in{'_module'} ? "create" : "modify",
+&webmin_log($in{'delete'} ? "delete" : $in{'_type'} ? "create" : "modify",
            "inc", $pam->{'name'}, $mod);
 &redirect("edit_pam.cgi?idx=$in{'idx'}");