Skip to content

O
OpnSense
Commit 4f8cea37 authored by Jos Schellevis's avatar Jos Schellevis
Browse files
Options

Firmware update enhancements and System GUI pages cleanup

parent 4a553914
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 58 deletions
src/opnsense/scripts/pkg_updatecheck.sh
View file @ 4f8cea37
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
# download_size: none|<size_of_total_downloads> # download_size: none|<size_of_total_downloads>
# extra_space_required: none|<size_of_total_extra_space_required> # extra_space_required: none|<size_of_total_extra_space_required>
# new_packages: array with { name: <package_name>, version: <package_version> } # new_packages: array with { name: <package_name>, version: <package_version> }
# reinstall_packages: array with { name: <package_name>, version: <package_version> }
# upgrade_packages: array with { name: <package_name>, current_version: <current_version>, new_version: <new_version> } # upgrade_packages: array with { name: <package_name>, current_version: <current_version>, new_version: <new_version> }
# TODO: Add object with items that will be removed or uninstalled # TODO: Add object with items that will be removed or uninstalled
...@@ -149,6 +150,34 @@ if [ "$pkg_running" == "" ]; then ...@@ -149,6 +150,34 @@ if [ "$pkg_running" == "" ]; then
fi fi
done done
# Check if there are packages that need to be reinstalled
for i in $(cat $tmp_pkg_output_file | cut -d '(' -f1); do
#echo $i
if [ "$itemcount" -gt "$linecount" ]; then
#echo $i
if [ `echo $linecount + 1 | bc` -eq "$itemcount" ]; then
if [ "`echo $i | grep '-'`" == "" ]; then
itemcount=0 # This is not a valid item so reset item count
else
name=`echo $i | cut -d '-' -f1`
version=`echo $i | cut -d '-' -f2`
itemcount=`echo $itemcount + 1 | bc` # Get ready for next item
if [ "$packages_reinstall" == "" ]; then
packages_reinstall=$packages_reinstall"{\"name\":\"$name\"," # If it is the first item then we do not want a seperator
packages_reinstall=$packages_reinstall"\"version\":\"$version\"}"
else
packages_reinstall=$packages_reinstall", {\"name\":\"$name\","
packages_reinstall=$packages_reinstall"\"version\":\"$version\"}"
fi
fi
fi
fi
linecount=`echo $linecount + 1 | bc`
if [ "$i" == "REINSTALLED:" ]; then
itemcount=`echo $linecount + 1 | bc`
fi
done
# Now check if there are upgrades to install # Now check if there are upgrades to install
for i in $(cat $tmp_pkg_output_file); do for i in $(cat $tmp_pkg_output_file); do
if [ "$itemcount" -gt "$linecount" ]; then if [ "$itemcount" -gt "$linecount" ]; then
...@@ -201,7 +230,7 @@ if [ "$pkg_running" == "" ]; then ...@@ -201,7 +230,7 @@ if [ "$pkg_running" == "" ]; then
# Get date/timestamp # Get date/timestamp
last_check=`date` last_check=`date`
# Write our json structure to disk # Write our json structure to disk
echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"core_version\":\"$core_version\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"upgrade_packages\":[$packages_upgraded]}" > $package_json_output echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"core_version\":\"$core_version\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"reinstall_packages\":[$packages_reinstall],\"upgrade_packages\":[$packages_upgraded]}" > $package_json_output
else else
# pkg is already running, quitting # pkg is already running, quitting
fi fi
src/www/system_authservers.php
View file @ 4f8cea37
...@@ -457,7 +457,6 @@ function select_clicked() { ...@@ -457,7 +457,6 @@ function select_clicked() {
<?php if ($act == "new" || $act == "edit" || $input_errors): ?> <?php if ($act == "new" || $act == "edit" || $input_errors): ?>
<form id="iform" name="iform" action="system_authservers.php" method="post"> <form id="iform" name="iform" action="system_authservers.php" method="post">
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
...@@ -806,7 +805,7 @@ function select_clicked() { ...@@ -806,7 +805,7 @@ function select_clicked() {
</form> </form>
<?php else: ?> <?php else: ?>
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
...@@ -856,7 +855,7 @@ function select_clicked() { ...@@ -856,7 +855,7 @@ function select_clicked() {
?> ?>
</tbody> </tbody>
</table> </table>
</div>
<?php endif; ?> <?php endif; ?>
</div> </div>
</section> </section>
......
src/www/system_firmware_check.php
View file @ 4f8cea37
...@@ -148,7 +148,7 @@ include("head.inc"); ...@@ -148,7 +148,7 @@ include("head.inc");
<td> <td>
<div id="upgrades"> <div id="upgrades">
<?php <?php
echo '<table>'; echo '<table class="table table-striped">';
echo '<tr>'; echo '<tr>';
echo '<th>Package Name</th>'; echo '<th>Package Name</th>';
echo '<th>Current Version</th>'; echo '<th>Current Version</th>';
...@@ -168,33 +168,35 @@ include("head.inc"); ...@@ -168,33 +168,35 @@ include("head.inc");
echo '</tr>'; echo '</tr>';
} }
echo '</table>';
?>
</div>
</td>
</tr>
<tr>
<th>Required new Installs</th>
</tr>
<tr>
<td>
<div id="new">
<?php
echo '<table>';
echo '<tr>';
echo '<th>Package Name</th>';
echo '</tr>';
echo '<tr>';
foreach ($pkg_status["new_packages"] as $upgrade_new) { foreach ($pkg_status["new_packages"] as $upgrade_new) {
echo '<td>'; echo '<tr>';
echo '<span class="text-info"><b>'.$upgrade_new["name"].'</b></span><br/>'; echo '<td>';
echo '</td>'; echo '<span class="text-info"><b>'.$upgrade_new["name"].'</b></span><br/>';
echo '</td>';
echo '<td>';
echo '<span class="text-info"><b>NEW</b></span><br/>';
echo '</td>';
echo '<td>';
echo '<span class="text-info"><b>'.$upgrade_new["version"].'</b></span><br/>';
echo '</td>';
echo '</tr>';
}
foreach ($pkg_status["reinstall_packages"] as $upgrade_new) {
echo '<tr>';
echo '<td>';
echo '<span class="text-info"><b>'.$upgrade_new["name"].'</b></span><br/>';
echo '</td>';
echo '<td>';
echo '<span class="text-info"><b>'.$upgrade_new["version"].'</b></span><br/>';
echo '</td>';
echo '<td>';
echo '<span class="text-info"><b>REINSTALL</b></span><br/>';
echo '</td>';
echo '</tr>'; echo '</tr>';
} }
echo '</table>'; echo '</table>';
?> ?>
</div> </div>
</td> </td>
</tr> </tr>
</table> </table>
......
src/www/system_gateway_groups_edit.php
View file @ 4f8cea37
...@@ -223,7 +223,6 @@ jQuery(function ($) { ...@@ -223,7 +223,6 @@ jQuery(function ($) {
<div class="content-box-main col-xs-12"> <div class="content-box-main col-xs-12">
<form action="system_gateway_groups_edit.php" method="post" name="iform" id="iform"> <form action="system_gateway_groups_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped" summary="system groups edit"> <table class="table table-striped" summary="system groups edit">
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Group Name"); ?></td> <td width="22%" valign="top" class="vncellreq"><?=gettext("Group Name"); ?></td>
...@@ -265,7 +264,7 @@ jQuery(function ($) { ...@@ -265,7 +264,7 @@ jQuery(function ($) {
echo "<td class='listlr'>"; echo "<td class='listlr'>";
echo "<strong>{$gateway['name']} </strong>"; echo "<strong>{$gateway['name']} </strong>";
echo "</td><td class='listr'>"; echo "</td><td class='listr'>";
echo "<select name='{$gwname}' class='gateway_tier_selector formfldselect' id='{$gwname}'>\n"; echo "<select name='{$gwname}' class='gateway_tier_selector formfldselect selectpicker' data-style='btn-default' data-width='auto' id='{$gwname}'>\n";
echo "<option value='0' $selected[0] >" . gettext("Never") . "</option>\n"; echo "<option value='0' $selected[0] >" . gettext("Never") . "</option>\n";
echo "<option value='1' $selected[1] >" . gettext("Tier 1") . "</option>\n"; echo "<option value='1' $selected[1] >" . gettext("Tier 1") . "</option>\n";
echo "<option value='2' $selected[2] >" . gettext("Tier 2") . "</option>\n"; echo "<option value='2' $selected[2] >" . gettext("Tier 2") . "</option>\n";
...@@ -286,7 +285,7 @@ jQuery(function ($) { ...@@ -286,7 +285,7 @@ jQuery(function ($) {
} }
} }
echo "<td class='listr'>"; echo "<td class='listr'>";
echo "<select name='{$gwname}_vip' class='gateway_vip_selector formfldselect' id='{$gwname}_vip'>\n"; echo "<select name='{$gwname}_vip' class='gateway_vip_selector formfldselect selectpicker' data-style='btn-default' data-width='auto' id='{$gwname}_vip'>\n";
echo "<option value='address' {$selected['address']} >" . gettext("Interface Address") . "</option>\n"; echo "<option value='address' {$selected['address']} >" . gettext("Interface Address") . "</option>\n";
foreach($carplist as $vip => $address) { foreach($carplist as $vip => $address) {
echo "<!-- $vip - $address - $interface -->\n"; echo "<!-- $vip - $address - $interface -->\n";
...@@ -318,7 +317,7 @@ jQuery(function ($) { ...@@ -318,7 +317,7 @@ jQuery(function ($) {
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Trigger Level"); ?></td> <td width="22%" valign="top" class="vncellreq"><?=gettext("Trigger Level"); ?></td>
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<select name='trigger' class='formfldselect trigger_level_selector' id='trigger'> <select name='trigger' class='formfldselect trigger_level_selector selectpicker' id='trigger' data-style='btn-default'>
<?php <?php
foreach ($categories as $category => $categoryd) { foreach ($categories as $category => $categoryd) {
echo "<option value=\"$category\""; echo "<option value=\"$category\"";
...@@ -348,7 +347,6 @@ jQuery(function ($) { ...@@ -348,7 +347,6 @@ jQuery(function ($) {
</td> </td>
</tr> </tr>
</table> </table>
</div>
</form> </form>
</div> </div>
</div> </div>
......
src/www/system_gateways_edit.php
View file @ 4f8cea37
...@@ -643,7 +643,6 @@ function enable_change() { ...@@ -643,7 +643,6 @@ function enable_change() {
echo "<input type='hidden' name='friendlyiface' id='friendlyiface' value=\"" . htmlspecialchars($pconfig['friendlyiface']) . "\" />\n"; echo "<input type='hidden' name='friendlyiface' id='friendlyiface' value=\"" . htmlspecialchars($pconfig['friendlyiface']) . "\" />\n";
?> ?>
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Disabled");?></td> <td width="22%" valign="top" class="vncellreq"><?=gettext("Disabled");?></td>
...@@ -656,7 +655,7 @@ function enable_change() { ...@@ -656,7 +655,7 @@ function enable_change() {
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td> <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td>
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<select name='interface' class='formselect'> <select name='interface' class="selectpicker" data-style="btn-default" data-live-search="true">
<?php <?php
$interfaces = get_configured_interface_with_descr(false, true); $interfaces = get_configured_interface_with_descr(false, true);
foreach ($interfaces as $iface => $ifacename) { foreach ($interfaces as $iface => $ifacename) {
...@@ -673,7 +672,7 @@ function enable_change() { ...@@ -673,7 +672,7 @@ function enable_change() {
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Address Family"); ?></td> <td width="22%" valign="top" class="vncellreq"><?=gettext("Address Family"); ?></td>
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<select name='ipprotocol' class='formselect' > <select name='ipprotocol' class="selectpicker" data-style="btn-default" >
<?php <?php
$options = array("inet" => "IPv4", "inet6" => "IPv6"); $options = array("inet" => "IPv4", "inet6" => "IPv6");
foreach ($options as $name => $string) { foreach ($options as $name => $string) {
...@@ -868,7 +867,6 @@ function enable_change() { ...@@ -868,7 +867,6 @@ function enable_change() {
</td> </td>
</tr> </tr>
</table> </table>
</div>
</form> </form>
</div> </div>
</div> </div>
......
src/www/system_groupmanager.php
View file @ 4f8cea37
...@@ -261,7 +261,6 @@ function presubmit() { ...@@ -261,7 +261,6 @@ function presubmit() {
<input type="hidden" id="groupid" name="groupid" value="<?=(isset($id) ? $id : '');?>" /> <input type="hidden" id="groupid" name="groupid" value="<?=(isset($id) ? $id : '');?>" />
<input type="hidden" id="privid" name="privid" value="" /> <input type="hidden" id="privid" name="privid" value="" />
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<?php <?php
$ro = ""; $ro = "";
...@@ -424,7 +423,6 @@ function presubmit() { ...@@ -424,7 +423,6 @@ function presubmit() {
</td> </td>
</tr> </tr>
</table> </table>
</div>
</form> </form>
<?php <?php
else: else:
...@@ -435,7 +433,6 @@ function presubmit() { ...@@ -435,7 +433,6 @@ function presubmit() {
<input type="hidden" id="groupid" name="groupid" value="<?=(isset($id) ? $id : '');?>" /> <input type="hidden" id="groupid" name="groupid" value="<?=(isset($id) ? $id : '');?>" />
<input type="hidden" id="groupname" name="groupname" value="" /> <input type="hidden" id="groupname" name="groupname" value="" />
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
...@@ -527,7 +524,6 @@ function presubmit() { ...@@ -527,7 +524,6 @@ function presubmit() {
?> ?>
</tbody> </tbody>
</table> </table>
</div>
</form> </form>
<?php <?php
......
src/www/system_usermanager.php
View file @ 4f8cea37
...@@ -322,8 +322,8 @@ if ($_POST['save']) { ...@@ -322,8 +322,8 @@ if ($_POST['save']) {
local_user_set($userent); local_user_set($userent);
write_config(); write_config();
if(is_dir("/usr/local/etc/inc/privhooks")) //if(is_dir("/usr/local/etc/inc/privhooks"))
run_plugins("/usr/local/etc/inc/privhooks"); // run_plugins("/usr/local/etc/inc/privhooks");
conf_mount_ro(); conf_mount_ro();
...@@ -463,7 +463,6 @@ function sshkeyClicked(obj) { ...@@ -463,7 +463,6 @@ function sshkeyClicked(obj) {
<input type="hidden" id="privid" name="privid" value="" /> <input type="hidden" id="privid" name="privid" value="" />
<input type="hidden" id="certid" name="certid" value="" /> <input type="hidden" id="certid" name="certid" value="" />
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<?php <?php
$ro = ""; $ro = "";
...@@ -641,6 +640,7 @@ function sshkeyClicked(obj) { ...@@ -641,6 +640,7 @@ function sshkeyClicked(obj) {
document.getElementById('act').value='<?php echo "delpriv";?>'; document.getElementById('act').value='<?php echo "delpriv";?>';
return confirm('<?=gettext("Do you really want to delete this privilege?");?>');" return confirm('<?=gettext("Do you really want to delete this privilege?");?>');"
title="<?=gettext("delete privilege");?>" data-toggle="tooltip" data-placement="left"><span class="glyphicon glyphicon-remove"></span> title="<?=gettext("delete privilege");?>" data-toggle="tooltip" data-placement="left"><span class="glyphicon glyphicon-remove"></span>
</button>
<?php <?php
endif; endif;
?> ?>
...@@ -855,7 +855,6 @@ function sshkeyClicked(obj) { ...@@ -855,7 +855,6 @@ function sshkeyClicked(obj) {
</td> </td>
</tr> </tr>
</table> </table>
</div>
</form> </form>
<?php <?php
else: else:
...@@ -866,20 +865,18 @@ function sshkeyClicked(obj) { ...@@ -866,20 +865,18 @@ function sshkeyClicked(obj) {
<input type="hidden" id="username" name="username" value="" /> <input type="hidden" id="username" name="username" value="" />
<input type="hidden" id="privid" name="privid" value="" /> <input type="hidden" id="privid" name="privid" value="" />
<input type="hidden" id="certid" name="certid" value="" /> <input type="hidden" id="certid" name="certid" value="" />
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="25%" class="listhdrr"><?=gettext("Username"); ?></th> <th width="25%" class="listhdrr"><?=gettext("Username"); ?></th>
<th width="25%" class="listhdrr"><?=gettext("Full name"); ?></th> <th width="25%" class="listhdrr"><?=gettext("Full name"); ?></th>
<th width="5%" class="listhdrr"><?=gettext("Disabled"); ?></th>
<th width="25%" class="listhdrr"><?=gettext("Groups"); ?></th> <th width="25%" class="listhdrr"><?=gettext("Groups"); ?></th>
<th width="10%" class="list"></th> <th width="15%" class="list"></th>
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>
<tr> <tr>
<td class="list" colspan="4"></td> <td class="list" colspan="3"></td>
<td class="list"> <td class="list">
<button type="submit" name="addcert" <button type="submit" name="addcert"
class="btn btn-default btn-xs" class="btn btn-default btn-xs"
...@@ -889,7 +886,7 @@ function sshkeyClicked(obj) { ...@@ -889,7 +886,7 @@ function sshkeyClicked(obj) {
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="5"> <td colspan="4">
<p class="col-xs-12 col-sm-10"> <p class="col-xs-12 col-sm-10">
<?=gettext("Additional users can be added here. User permissions for accessing " . <?=gettext("Additional users can be added here. User permissions for accessing " .
"the webConfigurator can be assigned directly or inherited from group memberships. " . "the webConfigurator can be assigned directly or inherited from group memberships. " .
...@@ -913,12 +910,15 @@ function sshkeyClicked(obj) { ...@@ -913,12 +910,15 @@ function sshkeyClicked(obj) {
<td class="listlr"> <td class="listlr">
<table border="0" cellpadding="0" cellspacing="0" summary="icons"> <table border="0" cellpadding="0" cellspacing="0" summary="icons">
<tr> <tr>
<td align="left" valign="middle"> <td width="30px" align="left" valign="middle">
<?php <?php
if($userent['scope'] != "user") if($userent['scope'] != "user") {
$usrimg = "glyphicon glyphicon-user text-muted"; $usrimg = "glyphicon glyphicon-user text-danger";
else } elseif (isset($userent['disabled'])) {
$usrimg = "glyphicon glyphicon-user"; $usrimg = "glyphicon glyphicon-user text-muted";
} else {
$usrimg = "glyphicon glyphicon-user text-info";
}
?> ?>
...@@ -931,7 +931,6 @@ function sshkeyClicked(obj) { ...@@ -931,7 +931,6 @@ function sshkeyClicked(obj) {
</table> </table>
</td> </td>
<td class="listr"><?=htmlspecialchars($userent['descr']);?>&nbsp;</td> <td class="listr"><?=htmlspecialchars($userent['descr']);?>&nbsp;</td>
<td class="listr"><?php if(isset($userent['disabled'])) echo "*"; ?></td>
<td class="listbg"> <td class="listbg">
<?=implode(",",local_user_get_groups($userent));?> <?=implode(",",local_user_get_groups($userent));?>
&nbsp; &nbsp;
...@@ -963,7 +962,20 @@ function sshkeyClicked(obj) { ...@@ -963,7 +962,20 @@ function sshkeyClicked(obj) {
?> ?>
</tbody> </tbody>
</table> </table>
</div> <table width="100%" cellspacing="0" celpadding="0" border="0" summary="icons">
<tr>
<td></td>
<td width="20px"></td>
<td width="20px"><span class="glyphicon glyphicon-user text-danger"></span></td>
<td width="200px">System Admininistrator</td>
<td width="20px"><span class="glyphicon glyphicon-user text-muted"></span></td>
<td width="200px">Disabled User</td>
<td width="20px"><span class="glyphicon glyphicon-user text-info"></span></td>
<td width="200px">Normal User</td>
<td></td>
</tr>
</table>
</form> </form>
<?php <?php
endif; endif;
......
src/www/system_usermanager_settings.php
View file @ 4f8cea37
...@@ -118,7 +118,6 @@ include("head.inc"); ...@@ -118,7 +118,6 @@ include("head.inc");
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form id="iform" name="iform" action="system_usermanager_settings.php" method="post"> <form id="iform" name="iform" action="system_usermanager_settings.php" method="post">
<div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Session Timeout"); ?></td> <td width="22%" valign="top" class="vncell"><?=gettext("Session Timeout"); ?></td>
...@@ -132,7 +131,7 @@ include("head.inc"); ...@@ -132,7 +131,7 @@ include("head.inc");
<tr> <tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Authentication Server"); ?></td> <td width="22%" valign="top" class="vncell"><?=gettext("Authentication Server"); ?></td>
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<select name='authmode' id='authmode' class="form-control" > <select name='authmode' id='authmode' class="selectpicker" data-style="btn-default" >
<?php <?php
$auth_servers = auth_get_authserver_list(); $auth_servers = auth_get_authserver_list();
foreach ($auth_servers as $auth_server): foreach ($auth_servers as $auth_server):
...@@ -157,7 +156,6 @@ include("head.inc"); ...@@ -157,7 +156,6 @@ include("head.inc");
</td> </td>
</tr> </tr>
</table> </table>
</div>
</form> </form>
</div> </div>
</section> </section>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023