diff --git a/acl/config-*-linux b/acl/config-*-linux index 6f44dd292..c572bfa88 100644 --- a/acl/config-*-linux +++ b/acl/config-*-linux @@ -1,4 +1,3 @@ ssleay=/usr/bin/openssl -select=0 order=0 display=1 diff --git a/acl/config-freebsd b/acl/config-freebsd index 6f44dd292..c572bfa88 100644 --- a/acl/config-freebsd +++ b/acl/config-freebsd @@ -1,4 +1,3 @@ ssleay=/usr/bin/openssl -select=0 order=0 display=1 diff --git a/acl/config-macos b/acl/config-macos index 6f44dd292..c572bfa88 100644 --- a/acl/config-macos +++ b/acl/config-macos @@ -1,4 +1,3 @@ ssleay=/usr/bin/openssl -select=0 order=0 display=1 diff --git a/acl/config-netbsd b/acl/config-netbsd index 6f44dd292..c572bfa88 100644 --- a/acl/config-netbsd +++ b/acl/config-netbsd @@ -1,4 +1,3 @@ ssleay=/usr/bin/openssl -select=0 order=0 display=1 diff --git a/acl/config-openbsd b/acl/config-openbsd index 6f44dd292..c572bfa88 100644 --- a/acl/config-openbsd +++ b/acl/config-openbsd @@ -1,4 +1,3 @@ ssleay=/usr/bin/openssl -select=0 order=0 display=1 diff --git a/acl/config-solaris-10-* b/acl/config-solaris-10-* index 0f766acfa..7afb56f59 100755 --- a/acl/config-solaris-10-* +++ b/acl/config-solaris-10-* @@ -1,4 +1,3 @@ ssleay=/usr/sfw/bin/openssl -select=0 order=0 display=1 diff --git a/acl/config.info b/acl/config.info index bea5ed5ab..7f29a6beb 100644 --- a/acl/config.info +++ b/acl/config.info @@ -1,6 +1,5 @@ line1=Configurable options,11 display=User and group display mode,1,1-Names only,0-Names and modules -select=Display user modules in,1,0-Table,1-Pulldown menu order=Sort users and groups by,1,0-Order in file,1-Name line2=System configuration,11 ssleay=Path to openssl or ssleay program,3,Automatic diff --git a/acl/config.info.bg b/acl/config.info.bg index 8b8abab36..99b627045 100644 --- a/acl/config.info.bg +++ b/acl/config.info.bg @@ -1,5 +1,4 @@ line1= ,11 -select= ,1,0-,1- order= ,1,0- ,1- line2= ,11 ssleay= openssl ssleay ,0 diff --git a/acl/config.info.ca b/acl/config.info.ca index 3cf131ba5..206597f6b 100644 --- a/acl/config.info.ca +++ b/acl/config.info.ca @@ -1,6 +1,5 @@ line1=Opcions configurables,11 display=Forma de mostrar els usuaris i els grups,1,1-Noms els noms,0-Noms i mduls -select=Mostra els mduls d'usuaris amb,1,0-Taula,1-Men desplegable order=Ordena els usuaris i grups per,1,0-L'ordre del fitxer,1-El nom line2=Configuraci del sistema,11 ssleay=Cam del programa openssl o ssleay,3,Automtic diff --git a/acl/config.info.cz b/acl/config.info.cz index 190681d7a..f730331a7 100644 --- a/acl/config.info.cz +++ b/acl/config.info.cz @@ -1,6 +1,5 @@ line1=Monosti konfigurace,11 display=Md pro zobrazen uivatele a skupiny,1,1-Pouze jmna,0-Jmna a moduly -select=Zobrazit moduly uivatele v,1,0-tabulce,1-rozbalovac nabdce order=Tdit uivatele a skupiny podle,1,0-poad v souboru,1-jmna line2=Konfigurace systmu,11 ssleay=Cesta k programu openssl nebo ssleay,0 diff --git a/acl/config.info.da b/acl/config.info.da index d8aa7d120..2e305c3a2 100644 --- a/acl/config.info.da +++ b/acl/config.info.da @@ -1,6 +1,5 @@ line1=Konfigurerbare indstillinger,11 display=Bruger og gruppe visnings mode,1,1-Kun navne,0-Navne og moduler -select=Vis brugermoduler i,1.0-Tabel,1-Pulldown menu order=Sorter brugere og grupper ved,1.0-Sortering i fil,1-Navn line2=Systemkonfiguration,11 ssleay=Sti til openssl eller ssleay progarm,3,Automatisk diff --git a/acl/config.info.de b/acl/config.info.de index 768ce9984..ea7cb0b46 100644 --- a/acl/config.info.de +++ b/acl/config.info.de @@ -1,6 +1,5 @@ line1=Konfigurierbare Optionen,11 display=Benutzer- und Gruppenanzeige,1,1-Nur Namen,0-Namen und Module -select=Zeige Benutzermodule als,1,0-Tabelle,1-Auswahlliste order=Sortiere Benutzer und Gruppen nach,1,0-Reihenfolge in Datei,1-Name line2=Systemkonfiguration,11 ssleay=Pfad zu openssl oder ssleay,3,Automatisch \ No newline at end of file diff --git a/acl/config.info.es b/acl/config.info.es index 329503705..d2af4e3aa 100644 --- a/acl/config.info.es +++ b/acl/config.info.es @@ -1,6 +1,5 @@ line1=Opciones Configurables,11 display=Modo de mostrar usuario y grupo,1,1-Sólo nombres,0-Nombres y módulos -select=Mostrar módulos de usuario en,1,0-Tabla,1-Menú desplegable order=Clasificar usuarios y grupos por,1,0-Orden en archivo,1-Nombre line2=Configuración de Sistema,11 ssleay=Trayectoria al programa openssl o ssleay,0 diff --git a/acl/config.info.eu b/acl/config.info.eu index dda6ea80b..3b1299f55 100755 --- a/acl/config.info.eu +++ b/acl/config.info.eu @@ -1,6 +1,5 @@ line1=Konfiguragarri diren aukerak, 11 display=Erabiltzaile eta taldea erakusteko modua, 1,1-Izenak soilik, 0-Izenak eta moduluak -select=Erabiltzaile moduluak erakutsi,1,0-Taulan, 1- Display user modules in,1,0-Table,1-Pulldown menu order=Ordenatu erabiltzaile eta taldeak,1,0-Fitxategian ordenatu,1-Izena line2=Sistemaren konfigurazioa,11 diff --git a/acl/config.info.fa b/acl/config.info.fa index 66e8d570c..96ee9e0e1 100644 --- a/acl/config.info.fa +++ b/acl/config.info.fa @@ -1,7 +1,6 @@  line1=گزينه‌هاي پيکربندي,11 display=حالت نمايش کاربران و گروه‌ها,1,1-فقط نامها,0-نامها و پيمانه‌ها -select=نمايش پيمانه‌هاي کاربر در,1,0-جدول,1-گزينگان پايين بر order=مرتب سازي کاربران و گروه‌ها براساس,1,0-ترتيب در پرونده,1-نام line2=پيکربندي سيستم,11 ssleay=مسير براي openssl يا برنامه ssleay,3,خودکار diff --git a/acl/config.info.fr b/acl/config.info.fr index 9c46d0726..5017b928c 100644 --- a/acl/config.info.fr +++ b/acl/config.info.fr @@ -1,6 +1,5 @@ line1=Options configurables,11 display=Mode d'affichage des utilisateurs et des groupes,1,1-Noms seulement,0-Noms et modules -select=Afficher les modules utilisateur par,1,0-Table,1-Menu déroulant order=Trier les utilisateurs et les groupes par,1,0-Ordre dans le fichier,1-Nom line2=Configuration du système,11 ssleay=Chemin d'accès au programme openssl ou ssleay,3,Automatique diff --git a/acl/config.info.hu b/acl/config.info.hu index be5a5539a..338dc6016 100644 --- a/acl/config.info.hu +++ b/acl/config.info.hu @@ -1,6 +1,5 @@ line1=Konfigurlhat belltsok,11 display=Felhasznl s csoport megjelentsi md,1,1-Csak a neveket,0-Neveket s modulokat -select=A modulok megjelentsi mdja,1,0-Tblzat,1-Men order=Felhasznlk s csoportok rendezse,1,0-A fjl rendezse szerint,1-Nv szerint line2=Rendszer konfigurci,11 ssleay=Az openssl vagy ssleay program teljes elrsi tja,0 diff --git a/acl/config.info.it b/acl/config.info.it index 39596fab7..9b9bf4aca 100644 --- a/acl/config.info.it +++ b/acl/config.info.it @@ -1,6 +1,5 @@ line1=Opzioni configurabili,11 display=Modalità di visualizzazione di utenti e gruppi,1,1-Solo i nomi,0-Nomi e moduli -select=Mostra i moduli utente in,1,0-una tabella,1-un menu a tendina order=Ordina gli utenti e i gruppi per,1,0-Ordine nel file,1-Nome line2=Configurazione di sistema,11 ssleay=Percorso al programma openssl o ssleay,3,Automatico diff --git a/acl/config.info.ja_JP.euc b/acl/config.info.ja_JP.euc index 7dbfa0700..5b46399ad 100644 --- a/acl/config.info.ja_JP.euc +++ b/acl/config.info.ja_JP.euc @@ -1,6 +1,5 @@ line1=ǽʥץ,11 display=桼ȥ롼פɽ⡼,1,1-̾Τ,0-̾ȥ⥸塼 -select=桼⥸塼ɽˡ,1,0-ɽ,1-ץ˥塼 order=桼ȥ롼פΥȽ,1,0-ե,1-̾ line2=ƥ,11 ssleay=opensslץޤssleayץΥѥ,3,ư diff --git a/acl/config.info.ko_KR.euc b/acl/config.info.ko_KR.euc index c9f595102..edae09962 100644 --- a/acl/config.info.ko_KR.euc +++ b/acl/config.info.ko_KR.euc @@ -1,6 +1,5 @@ line1= ɼ,11 display= ׷ ,1,1-̸,0-̸ -select= ,1,0-̺,1-Ǯٿ ޴ order= ׷ ,1,0- ,1-̸ line2=ý ,11 ssleay=openssl Ǵ ssleay ,3,Automatic diff --git a/acl/config.info.ms_MY b/acl/config.info.ms_MY index dee148364..449388377 100644 --- a/acl/config.info.ms_MY +++ b/acl/config.info.ms_MY @@ -1,6 +1,5 @@ line1=Pilihan konfigurasi,11 display=Mod paparan pengguna dan grup,1,1-Nama sahaja,0-Nama dan modul -select=Paparkan modul pengguna dalam,1,0-Jadual,1-Menu pull-down order=Tapis pengguna dan grup dengan,1,0-Urutan dalam fail,1-Nama line2=Konfigurasi sistem,11 ssleay=Lokasi program openssl atau ssleay,3,Automatik diff --git a/acl/config.info.nl b/acl/config.info.nl index 1a6b93606..80215f01f 100644 --- a/acl/config.info.nl +++ b/acl/config.info.nl @@ -1,6 +1,5 @@ line1=Instelbare opties,11 display=Gebruiker en groep weergave instelling,1,1-Alleen Namen,0-Namen en modules -select=Geef gebruiker modules weer in,1,0-Tabel,1-Pulldown menu order=Sorteer gebruikers en groepen op,1,0-Volgorde in bestand,1-Naam line2=Systeem configuratie,11 ssleay=Pad naar openssl of ssleay programma,3,Automatisch diff --git a/acl/config.info.no b/acl/config.info.no index da1d2fabb..d7c91a1e6 100644 --- a/acl/config.info.no +++ b/acl/config.info.no @@ -1,6 +1,5 @@ line1=Konfigurerbare innstillinger,11 display=Visningsmodus for bruker og gruppe,1,1-Bare navn,0-Navn og moduler -select=Vis brukermoduler i,1,0-Tabell,1-Nedtrekksmeny order=Sorter brukere og grupper etter,1,0-Rekkefølge i filen,1-Navn line2=System konfigurasjon,11 ssleay=Stien til openssl eller ssleay program,0 diff --git a/acl/config.info.pl b/acl/config.info.pl index 34059a87a..b44b5984c 100755 --- a/acl/config.info.pl +++ b/acl/config.info.pl @@ -1,6 +1,5 @@ line1=Opcje konfiguracyjne,11 display=Tryb wywietlania uytkownikw i grup,1,1-Tylko nazwy,0-Nazwy i moduy -select=Wywietl moduy uytkownika w,1,0-Tabeli,1-Rozwijanym menu order=Porzdkuj uytkownikw i grupy wg,1,0-Kolejnoci w zbiorze,1-Nazwy line2=Konfiguracja systemu,11 ssleay=cieka do programu openssl lub ssleay,0 diff --git a/acl/config.info.pt_BR b/acl/config.info.pt_BR index 50d272614..cdd4cbda8 100644 --- a/acl/config.info.pt_BR +++ b/acl/config.info.pt_BR @@ -1,5 +1,4 @@ line1=Opções configuráveis,11 -select=Exibir módulos de usuários em,1,0-Tabela,1-Menus order=Ordenar usuários e grupos por,1,0-Ordem no arquivo,1-Nome line2=Configuração do sistema,11 ssleay=Caminho para o programa openssl ou ssleay,0 diff --git a/acl/config.info.ru_RU b/acl/config.info.ru_RU index 106820023..16c04c796 100644 --- a/acl/config.info.ru_RU +++ b/acl/config.info.ru_RU @@ -1,4 +1,3 @@ -select= ,1,0-,1- ssleay= openssl ssleay,0 order= ,1,0- ,1- line1= ,11 diff --git a/acl/config.info.ru_SU b/acl/config.info.ru_SU index efbd55085..5b5fcc95a 100644 --- a/acl/config.info.ru_SU +++ b/acl/config.info.ru_SU @@ -1,6 +1,5 @@ line1= ,11 display= ,1,1- ,0- -select= ,1,0-,1- order= ,1,0- ,1- line2= ,11 ssleay= openssl ssleay,0 diff --git a/acl/config.info.sk b/acl/config.info.sk index 717a90376..54d4619bc 100644 --- a/acl/config.info.sk +++ b/acl/config.info.sk @@ -1,6 +1,5 @@ line1=Nastaviten monosti,11 display=Spsob zobrazenia uvateov a skupn,1,1-Iba men,0-Men a moduly -select=Zobraz uvatesk moduly v ,1,0-Tabuke,1-Rozbaovacom menu order=Zora uvateov a skupiny poda,1,0-Poradia v sbore,1-Mena line2=Nastavenie Systmu,11 ssleay=Cesta k programu openssl alebo ssleay,3,Automatick diff --git a/acl/config.info.sv b/acl/config.info.sv index 63dc22827..5a12c3cb0 100644 --- a/acl/config.info.sv +++ b/acl/config.info.sv @@ -1,2 +1 @@ ssleay=Sökväg till openssl- eller ssleay-program,0 -select=Visa moduler i,1,0-Tabell,1-Rullgardinsmeny diff --git a/acl/config.info.tr b/acl/config.info.tr index 412fb7a02..109c33b06 100644 --- a/acl/config.info.tr +++ b/acl/config.info.tr @@ -1,6 +1,5 @@ line1=Yaplandrlabilir seenekler,11 display=Kullanc ve grup grntleme biimi,1,1-Sadece isim,0-sim ve modller -select=Kullanc modllerini bu ekilde grntle,1,0-Tablo,1-Men order=Kullanc ve gruplar bu ekilde srala,1,0-Dosyadaki sras ile,1-sim ile line2=Sistem yaplandrmas,11 ssleay=Openssl ya da ssleay program yolu,3,Otomatik diff --git a/acl/config.info.uk_UA b/acl/config.info.uk_UA index ee1c8b464..c6f2d1263 100644 --- a/acl/config.info.uk_UA +++ b/acl/config.info.uk_UA @@ -1,4 +1,3 @@ -select= ,1,0-, 1- ssleay= openssl ssleay,0 order= ,1,0- ,1- line1= , ,11 diff --git a/acl/config.info.zh_CN b/acl/config.info.zh_CN index 299e8f6cd..794b730ac 100644 --- a/acl/config.info.zh_CN +++ b/acl/config.info.zh_CN @@ -1,2 +1 @@ ssleay=Openssl Ssleay ·,0 -select=ʾûģ,1,0-Table,1-Pulldown ˵ diff --git a/acl/config.info.zh_TW.Big5 b/acl/config.info.zh_TW.Big5 index 164c0be81..789cb2905 100644 --- a/acl/config.info.zh_TW.Big5 +++ b/acl/config.info.zh_TW.Big5 @@ -1,5 +1,4 @@ line1=պAﶵ,11 -select=ܨϥΪ̼Ҳզb,1,0-,1-UԿ order=ƧǨϥΪ̩M ,1,0-ɮפm,1-W line2=tβպA,11 ssleay=opensslssleay{|,0 diff --git a/acl/index.cgi b/acl/index.cgi index 3b3073055..7a4b2a1cb 100755 --- a/acl/index.cgi +++ b/acl/index.cgi @@ -73,11 +73,9 @@ else { # Show usernames and modules print &ui_subheading($text{'index_users'}); my @rowlinks = ( ); - if (!$config{'select'}) { - print &ui_form_start("delete_users.cgi", "post"); - push(@rowlinks, &select_all_link("d", $form), - &select_invert_link("d", $form)); - } + print &ui_form_start("delete_users.cgi", "post"); + push(@rowlinks, &select_all_link("d", $form), + &select_invert_link("d", $form)); push(@rowlinks, ui_link("edit_user.cgi", $text{'index_create'})) if ($access{'create'}); print &ui_links_row(\@rowlinks); @@ -104,10 +102,8 @@ else { } print &ui_columns_end(); print &ui_links_row(\@rowlinks); - if (!$config{'select'}) { - print &ui_form_end([ [ "delete", $text{'index_delete'} ], - @gbut ]); - } + print &ui_form_end([ [ "delete", $text{'index_delete'} ], + @gbut ]); $shown_users = 1; $form++; } @@ -136,11 +132,9 @@ if ($access{'groups'}) { else { # Show table of groups my @rowlinks = ( ); - if (!$config{'select'}) { - print &ui_form_start("delete_groups.cgi", "post"); - push(@rowlinks, &select_all_link("d", $form), - &select_invert_link("d", $form)); - } + print &ui_form_start("delete_groups.cgi", "post"); + push(@rowlinks, &select_all_link("d", $form), + &select_invert_link("d", $form)); push(@rowlinks, ui_link("edit_group.cgi", $text{'index_gcreate'})); print &ui_links_row(\@rowlinks); @@ -168,9 +162,7 @@ if ($access{'groups'}) { } print &ui_columns_end(); print &ui_links_row(\@rowlinks); - if (!$config{'select'}) { - print &ui_form_end([ [ "delete", $text{'index_delete'} ] ]); - } + print &ui_form_end([ [ "delete", $text{'index_delete'} ] ]); $form++; } } @@ -235,44 +227,22 @@ sub show_modules my ($type, $who, $mods, $global, $prefix) = @_; $mods ||= [ ]; my $rv; -if ($config{'select'}) { - # Show as drop-down menu - $rv .= &ui_form_start("edit_acl.cgi"); - $rv .= $prefix."
\n" if ($prefix); - if (@$mods) { - $rv .= &ui_hidden($type, $who); - if ($access{'acl'}) { - $rv .= &ui_submit($text{'index_edit'}); +$rv .= $prefix."
\n" if ($prefix); +my @grid; +foreach my $m (sort { $modname{$a} cmp $modname{$b} } @$mods) { + if ($modname{$m}) { + if ($mcan{$m} && $access{'acl'}) { + push(@grid, ui_link("edit_acl.cgi?mod=" . + &urlize($m)."&$type=".&urlize($who), + $modname{$m})); } - my @opts; - foreach my $m (sort { $modname{$a} cmp $modname{$b} } @$mods) { - if ($modname{$m}) { - push(@opts, [ $m, $modname{$m} ]); - } - } - $rv .= &ui_select("mod", undef, \@opts); - } - $rv .= &ui_form_end(); - } -else { - # Show as table - $rv .= $prefix."
\n" if ($prefix); - my @grid; - foreach my $m (sort { $modname{$a} cmp $modname{$b} } @$mods) { - if ($modname{$m}) { - if ($mcan{$m} && $access{'acl'}) { - push(@grid, ui_link("edit_acl.cgi?mod=" . - &urlize($m)."&$type=".&urlize($who), - $modname{$m})); - } - else { - push(@grid, $modname{$m}); - } + else { + push(@grid, $modname{$m}); } } - $rv .= &ui_grid_table(\@grid, 3, 100, - [ "width=33%", "width=33%", "width=33%" ]); } +$rv .= &ui_grid_table(\@grid, 3, 100, + [ "width=33%", "width=33%", "width=33%" ]); return $rv; } @@ -298,7 +268,7 @@ sub user_link { my $lck = $_[0]->{'pass'} =~ /^\!/ ? 1 : 0; my $ro = $_[0]->{'readonly'}; -return ($config{'select'} ? "" : &ui_checkbox("d", $_[0]->{'name'}, "", 0)). +return &ui_checkbox("d", $_[0]->{'name'}, "", 0). ($lck ? "" : ""). ($ro ? "" : ""). ui_link("$_[1]?$_[2]=".&urlize($_[0]->{'name'}),