remote.cgi: Fix splitting output from ssh-keygen.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / wirelessclient.cgi

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index d8637ccd2aec092dccf1debbb7653470730f15e7..7cd23aed4671bbae4b4ef288a4cb0ea22a764010 100644 (file)
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -43,7 +43,7 @@ our $datafile = "${General::swroot}/ethernet/wireless";
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 our %settings = ();
 our %netsettings = ();
@@ -604,11 +604,11 @@ sub showEditBox() {
                                        </td>
                                        <td width='40%'>
                                                <select name='PRIO'>
-                                                       <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option>
+                                                       <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'least preferred'})</option>
                                                        <option value="1" $selected{'PRIO'}{'1'}>1</option>
                                                        <option value="2" $selected{'PRIO'}{'2'}>2</option>
                                                        <option value="3" $selected{'PRIO'}{'3'}>3</option>
-                                                       <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option>
+                                                       <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'most preferred'})</option>
                                                </select>
                                        </td>
                                        <td colspan="2" width='40%'></td>
@@ -796,7 +796,7 @@ END
 }
 
 sub BuildConfiguration() {
-       system("/usr/local/bin/wirelessclient restart");
+       &General::system("/usr/local/bin/wirelessclient", "restart");
 }
 
 sub NextID() {