Some ui-lib conversion

diff --git a/htaccess-htpasswd/edit_user.cgi b/htaccess-htpasswd/edit_user.cgi
index db34e5f..00d721d 100755 (executable)
--- a/htaccess-htpasswd/edit_user.cgi
+++ b/htaccess-htpasswd/edit_user.cgi
@@ -20,52 +20,45 @@ else {
        $user = $users->[$in{'idx'}];
        }
 
-print "<form action=save_user.cgi method=post>\n";
-print "<input type=hidden name=idx value='$in{'idx'}'>\n";
-print "<input type=hidden name=new value='$in{'new'}'>\n";
-print "<input type=hidden name=dir value='$in{'dir'}'>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'edit_header'}</b></td> </tr>\n";
-print "<tr $cb> <td><table cellpadding=3>\n";
+print &ui_form_start("save_user.cgi", "post");
+print &ui_hidden("idx", $in{'idx'});
+print &ui_hidden("new", $in{'new'});
+print &ui_hidden("dir", $in{'dir'});
+print &ui_table_start($text{'edit_header'}, undef, 2);
 
 # Username
-print "<tr> <td><b>$text{'edit_user'}</b></td>\n";
-printf "<td><input name=htuser size=20 value='%s'></td> </tr>\n",
-       &html_escape($user->{'user'});
+print &ui_table_row($text{'edit_user'},
+       &ui_textbox("htuser", $user->{'user'}, 40));
 
 # User enabled?
-print "<tr> <td><b>$text{'edit_enabled'}</b></td>\n";
-printf "<td><input type=radio name=enabled value=1 %s> %s\n",
-       $user->{'enabled'} ? "checked" : "", $text{'yes'};
-printf "<input type=radio name=enabled value=0 %s> %s</td> </tr>\n",
-       $user->{'enabled'} ? "" : "checked", $text{'no'};
+print &ui_table_row($text{'edit_enabled'},
+       &ui_yesno_radio("enabled", $user->{'enabled'} ? 1 : 0));
 
 # Password
-print "<tr> <td valign=top><b>$text{'edit_pass'}</b></td> <td>\n";
-if (!$in{'new'}) {
-       print "<input type=radio name=htpass_def value=1 checked> ",
-             "$text{'edit_pass1'}<br>\n";
-       print "<input type=radio name=htpass_def value=0> ",
-             "$text{'edit_pass0'}\n";
+if ($in{'new'}) {
+       print &ui_table_row($text{'edit_pass'},
+               &ui_textbox("htpass", undef, 20));
+       }
+else {
+       print &ui_table_row($text{'edit_pass'},
+               &ui_opt_textbox("htpass", undef, 20, $text{'edit_pass1'},
+                               $text{'edit_pass0'}));
        }
-print "<input type=password name=htpass size=20></td> </tr>\n";
 
 if ($dir->[2] == 3) {
        # Digest realm
-       print "<tr> <td><b>$text{'edit_dom'}</b></td>\n";
-       printf "<td><input name=dom size=20 value='%s'></td> </tr>\n",
-               &html_escape($user->{'dom'});
+       print &ui_table_row($text{'edit_dom'},
+               &ui_textbox("dom", $user->{'dom'}, 40));
        }
 
-print "</table></td></tr></table>\n";
+print &ui_table_end();
 if ($in{'new'}) {
-       print "<input type=submit value='$text{'create'}'>\n";
+       print &ui_form_end([ [ undef, $text{'create'} ] ]);
        }
 else {
-       print "<input type=submit value='$text{'save'}'>\n";
-       print "<input type=submit name=delete value='$text{'delete'}'>\n";
+       print &ui_form_end([ [ undef, $text{'save'} ],
+                            [ "delete", $text{'delete'} ] ]);
        }
-print "</form>\n";
 
 &ui_print_footer("", $text{'index_return'});
 

diff --git a/htaccess-htpasswd/index.cgi b/htaccess-htpasswd/index.cgi
index 1244038..8517a74 100755 (executable)
--- a/htaccess-htpasswd/index.cgi
+++ b/htaccess-htpasswd/index.cgi
@@ -47,6 +47,7 @@ if ($config{'digest'} && !$htdigest_command) {
 
 @dirs = &list_directories();
 @dirs = grep { &can_access_dir($_->[0]) } @dirs;
+@gtds = ( "width=25%", "width=25%", "width=25%", "width=25%" );
 if (@dirs) {
        @tds = ( "width=30% valign=top", "width=70% valign=top" );
        if ($can_create) {
@@ -68,39 +69,34 @@ if (@dirs) {
                        }
 
                # Show the users
-               $utable = "<table width=100%>\n";
                $users = $d->[2] == 3 ? &list_digest_users($d->[1])
                                      : &list_users($d->[1]);
                if ($userconfig{'sort'} == 1 || $config{'sort'} == 1) {
                        $users = [ sort { $a->{'user'} cmp $b->{'user'} }
                                        @$users ];
                        }
+               @grid = ( );
                for($i=0; $i<@$users; $i++) {
                        $u = $users->[$i];
                        $link = "<a href='edit_user.cgi?idx=$u->{'index'}&dir=".
                                &urlize($d->[0])."'>$u->{'user'}</a>";
-                       $utable .= "<tr>\n" if ($i%4 == 0);
                        if ($u->{'enabled'}) {
-                               $utable .= "<td width=25%>$link</td>\n";
+                               push(@grid, $link);
                                }
                        else {
-                               $utable .= "<td width=25%><i>$link</i></td>\n";
+                               push(@grid, "<i>$link</i>");
                                }
-                       $utable .= "</tr>\n" if ($i%4 == 3);
                        }
-               if ($i%4) {
-                       while($i++%4) { $utable .= "<td width=25%></td>\n"; }
-                       $utable .= "</tr>\n";
+               if (@grid) {
+                       $utable = &ui_grid_table(\@grid, 4, 100, \@gtds);
                        }
-               if (!@$users) {
-                       $utable .= "<tr> <td colspan=4><i>".
-                                  "$text{'index_nousers'}</i></td> </tr>\n";
+               else {
+                       $utable = "<i>$text{'index_nousers'}</i><br>\n";
                        }
-               $utable .= "</table>\n";
 
                # Show the groups
                if ($d->[4]) {
-                       $utable .= "<table width=100%>\n";
+                       @grid = ( );
                        $groups = &list_groups($d->[4]);
                        if ($userconfig{'sort'} == 1 || $config{'sort'} == 1) {
                                $groups = [ sort { $a->{'group'} cmp $b->{'group'} }
@@ -111,33 +107,30 @@ if (@dirs) {
                                $link= "<a href='edit_group.cgi?idx=$u->{'index'}&dir=".
                                       &urlize($d->[0])."'>$u->{'group'} (".
                                       scalar(@{$u->{'members'}}).")</a>";
-                               $utable .= "<tr>\n" if ($i%4 == 0);
                                if ($u->{'enabled'}) {
-                                       $utable .= "<td width=25%>$link</td>\n";
+                                       push(@grid, $link);
                                        }
                                else {
-                                       $utable .= "<td width=25%><i>$link</i></td>\n";
+                                       push(@grid, "<i>$link</i>");
                                        }
-                               $utable .= "</tr>\n" if ($i%4 == 3);
                                }
-                       if ($i%4) {
-                               while($i++%4) { $utable .= "<td width=25%></td>\n"; }
-                               $utable .= "</tr>\n";
+                       if (@grid) {
+                               $utable .= &ui_grid_table(\@grid, 4,100,\@gtds);
                                }
-                       if (!@$groups) {
-                               $utable .= "<tr> <td colspan=4><i>$text{'index_nogroups'}</i></td> </tr>\n";
+                       else {
+                               $utable .= "<i>$text{'index_nogroups'}</i><br>\n";
                                }
-                       $utable .= "</table>\n";
                        }
 
                # User / group adder links
-               $utable .= "<a href='edit_user.cgi?new=1&dir=".&urlize($d->[0]).
-                          "'>$text{'index_uadd'}</a>\n";
+               @ulinks = ( );
+               push(@ulinks, "<a href='edit_user.cgi?new=1&dir=".
+                             &urlize($d->[0])."'>$text{'index_uadd'}</a>");
                if ($d->[4]) {
-                       $utable .= "&nbsp;&nbsp;";
-                       $utable .= "<a href='edit_group.cgi?new=1&dir=".
-                                &urlize($d->[0])."'>$text{'index_gadd'}</a>\n";
+                       push(@ulinks, "<a href='edit_group.cgi?new=1&dir=".
+                            &urlize($d->[0])."'>$text{'index_gadd'}</a>");
                        }
+               $utable .= &ui_links_row(\@ulinks);
                push(@cols, $utable);
                if ($can_create) {
                        print &ui_checked_columns_row(\@cols, \@tds,