Skip to content

O
OpnSense
Commit 042cbf2c authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

pkg: apply whitespace cleanups

parent c84c5817
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 167 deletions
src/www/pkg.php
View file @ 042cbf2c
...@@ -77,17 +77,17 @@ $section = $pkg['menu'][0]['section']; ...@@ -77,17 +77,17 @@ $section = $pkg['menu'][0]['section'];
$config_path = $pkg['configpath']; $config_path = $pkg['configpath'];
$title = $pkg['title']; $title = $pkg['title'];
if($_REQUEST['startdisplayingat']) if($_REQUEST['startdisplayingat'])
$startdisplayingat = $_REQUEST['startdisplayingat']; $startdisplayingat = $_REQUEST['startdisplayingat'];
if($_REQUEST['display_maximum_rows']) if($_REQUEST['display_maximum_rows'])
if($_REQUEST['display_maximum_rows']) if($_REQUEST['display_maximum_rows'])
$display_maximum_rows = $_REQUEST['display_maximum_rows']; $display_maximum_rows = $_REQUEST['display_maximum_rows'];
$evaledvar = $config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']; $evaledvar = $config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'];
if ($_GET['act'] == "update") { if ($_GET['act'] == "update") {
if(is_array($config['installedpackages'][$pkg['name']]) && $pkg['name'] != "" && $_REQUEST['ids'] !=""){ if(is_array($config['installedpackages'][$pkg['name']]) && $pkg['name'] != "" && $_REQUEST['ids'] !=""){
#get current values #get current values
$current_values=$config['installedpackages'][$pkg['name']]['config']; $current_values=$config['installedpackages'][$pkg['name']]['config'];
...@@ -128,7 +128,7 @@ if ($_GET['act'] == "del") { ...@@ -128,7 +128,7 @@ if ($_GET['act'] == "del") {
if($pkg['custom_delete_php_command'] <> "") { if($pkg['custom_delete_php_command'] <> "") {
if($pkg['custom_php_command_before_form'] <> "") if($pkg['custom_php_command_before_form'] <> "")
eval($pkg['custom_php_command_before_form']); eval($pkg['custom_php_command_before_form']);
eval($pkg['custom_delete_php_command']); eval($pkg['custom_delete_php_command']);
} }
header("Location: pkg.php?xml=" . $xml); header("Location: pkg.php?xml=" . $xml);
exit; exit;
...@@ -173,11 +173,11 @@ include("head.inc"); ...@@ -173,11 +173,11 @@ include("head.inc");
cursor: 'move', cursor: 'move',
distance: 10, distance: 10,
opacity: 0.8, opacity: 0.8,
helper: function(e,ui){ helper: function(e,ui){
ui.children().each(function(){ ui.children().each(function(){
jQuery(this).width(jQuery(this).width()); jQuery(this).width(jQuery(this).width());
}); });
return ui; return ui;
}, },
}); });
}); });
...@@ -194,15 +194,15 @@ include("head.inc"); ...@@ -194,15 +194,15 @@ include("head.inc");
jQuery('#savemsg').empty().html(strloading); jQuery('#savemsg').empty().html(strloading);
}, },
error: function(data){ error: function(data){
jQuery('#savemsg').empty().html('Error:' + data); jQuery('#savemsg').empty().html('Error:' + data);
}, },
success: function(data){ success: function(data){
jQuery('#savemsg').empty().html(data); jQuery('#savemsg').empty().html(data);
} }
}); });
} }
} }
<?php <?php
} }
?> ?>
//]]> //]]>
...@@ -263,26 +263,26 @@ if ($pkg['tabs'] <> "") { ...@@ -263,26 +263,26 @@ if ($pkg['tabs'] <> "") {
<td class="tabcont"> <td class="tabcont">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="tabs"> <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="tabs">
<?php <?php
/* Handle filtering bar A-Z */ /* Handle filtering bar A-Z */
$include_filtering_inputbox = false; $include_filtering_inputbox = false;
$colspan = 0; $colspan = 0;
if($pkg['adddeleteeditpagefields']['columnitem'] <> "") if($pkg['adddeleteeditpagefields']['columnitem'] <> "")
foreach ($pkg['adddeleteeditpagefields']['columnitem'] as $column) foreach ($pkg['adddeleteeditpagefields']['columnitem'] as $column)
$colspan++; $colspan++;
if($pkg['fields']['field']) { if($pkg['fields']['field']) {
// First find the sorting type field if it exists // First find the sorting type field if it exists
foreach($pkg['fields']['field'] as $field) { foreach($pkg['fields']['field'] as $field) {
if($field['type'] == "sorting") { if($field['type'] == "sorting") {
if(isset($field['include_filtering_inputbox'])) if(isset($field['include_filtering_inputbox']))
$include_filtering_inputbox = true; $include_filtering_inputbox = true;
if($display_maximum_rows < 1) if($display_maximum_rows < 1)
if($field['display_maximum_rows']) if($field['display_maximum_rows'])
$display_maximum_rows = $field['display_maximum_rows']; $display_maximum_rows = $field['display_maximum_rows'];
echo "<tr><td class='listhdrr' colspan='$colspan' align='center'>"; echo "<tr><td class='listhdrr' colspan='$colspan' align='center'>";
echo "Filter by: "; echo "Filter by: ";
$isfirst = true; $isfirst = true;
for($char = 65; $char < 91; $char++) { for($char = 65; $char < 91; $char++) {
if(!$isfirst) if(!$isfirst)
echo " | "; echo " | ";
echo "<a href=\"#\" onclick=\"setFilter('" . chr($char) . "');\">" . chr($char) . "</a>"; echo "<a href=\"#\" onclick=\"setFilter('" . chr($char) . "');\">" . chr($char) . "</a>";
$isfirst = false; $isfirst = false;
...@@ -292,15 +292,15 @@ if ($pkg['tabs'] <> "") { ...@@ -292,15 +292,15 @@ if ($pkg['tabs'] <> "") {
if($field['sortablefields']) { if($field['sortablefields']) {
echo "Filter field: <select name='pkg_filter_type'>"; echo "Filter field: <select name='pkg_filter_type'>";
foreach($field['sortablefields']['item'] as $si) { foreach($field['sortablefields']['item'] as $si) {
if($si['name'] == $_REQUEST['pkg_filter_type']) if($si['name'] == $_REQUEST['pkg_filter_type'])
$SELECTED = "selected=\"selected\""; $SELECTED = "selected=\"selected\"";
else else
$SELECTED = ""; $SELECTED = "";
echo "<option value='{$si['name']}' {$SELECTED}>{$si['name']}</option>"; echo "<option value='{$si['name']}' {$SELECTED}>{$si['name']}</option>";
} }
echo "</select>"; echo "</select>";
} }
if($include_filtering_inputbox) if($include_filtering_inputbox)
echo "&nbsp;&nbsp;Filter text: <input id='pkg_filter' name='pkg_filter' value='" . $_REQUEST['pkg_filter'] . "' /> <input type='submit' value='Filter' />"; echo "&nbsp;&nbsp;Filter text: <input id='pkg_filter' name='pkg_filter' value='" . $_REQUEST['pkg_filter'] . "' /> <input type='submit' value='Filter' />";
echo "</td></tr><tr><td><font size='-3'>&nbsp;</font></td></tr>"; echo "</td></tr><tr><td><font size='-3'>&nbsp;</font></td></tr>";
} }
...@@ -321,7 +321,7 @@ if ($pkg['tabs'] <> "") { ...@@ -321,7 +321,7 @@ if ($pkg['tabs'] <> "") {
$tmpcount = 0; $tmpcount = 0;
} }
if($tmppp == $startdisplayingat) if($tmppp == $startdisplayingat)
break; break;
$tmpcount++; $tmpcount++;
$tmppp++; $tmppp++;
} }
...@@ -334,7 +334,7 @@ if ($pkg['tabs'] <> "") { ...@@ -334,7 +334,7 @@ if ($pkg['tabs'] <> "") {
for($x=0; $x<250; $x++) { for($x=0; $x<250; $x++) {
if($x == $display_maximum_rows) if($x == $display_maximum_rows)
$SELECTED = "selected=\"selected\""; $SELECTED = "selected=\"selected\"";
else else
$SELECTED = ""; $SELECTED = "";
echo "<option value='$x' $SELECTED>$x</option>\n"; echo "<option value='$x' $SELECTED>$x</option>\n";
$x=$x+4; $x=$x+4;
...@@ -419,22 +419,22 @@ if ($pkg['tabs'] <> "") { ...@@ -419,22 +419,22 @@ if ($pkg['tabs'] <> "") {
#Check if columnitem has a type field declared #Check if columnitem has a type field declared
if($column['type'] == "checkbox") { if($column['type'] == "checkbox") {
if($fieldname == "") { if($fieldname == "") {
echo gettext("No"); echo gettext("No");
} else { } else {
echo gettext("Yes"); echo gettext("Yes");
} }
} else if ($column['type'] == "interface") { } else if ($column['type'] == "interface") {
echo $column['prefix'] . $iflist[$fieldname] . $column['suffix']; echo $column['prefix'] . $iflist[$fieldname] . $column['suffix'];
} else { } else {
#Check if columnitem has an encoding field declared #Check if columnitem has an encoding field declared
if ($column['encoding'] == "base64") if ($column['encoding'] == "base64")
echo $column['prefix'] . base64_decode($fieldname) . $column['suffix']; echo $column['prefix'] . base64_decode($fieldname) . $column['suffix'];
#Check if there is a custom info to show when $fieldname is not empty #Check if there is a custom info to show when $fieldname is not empty
else if($column['listmodeon'] && $fieldname != "") else if($column['listmodeon'] && $fieldname != "")
echo $column['prefix'] . gettext($column['listmodeon']). $column['suffix']; echo $column['prefix'] . gettext($column['listmodeon']). $column['suffix'];
#Check if there is a custom info to show when $fieldname is empty #Check if there is a custom info to show when $fieldname is empty
else if($column['listmodeoff'] && $fieldname == "") else if($column['listmodeoff'] && $fieldname == "")
echo $column['prefix'] .gettext($column['listmodeoff']). $column['suffix']; echo $column['prefix'] .gettext($column['listmodeoff']). $column['suffix'];
else else
echo $column['prefix'] . $fieldname ." ". $column['suffix']; echo $column['prefix'] . $fieldname ." ". $column['suffix'];
} }
...@@ -461,7 +461,7 @@ if ($pkg['tabs'] <> "") { ...@@ -461,7 +461,7 @@ if ($pkg['tabs'] <> "") {
echo "</tr>\n"; echo "</tr>\n";
// Handle pagination and display_maximum_rows // Handle pagination and display_maximum_rows
if($display_maximum_rows) { if($display_maximum_rows) {
if($pagination_counter == ($display_maximum_rows-1) or if($pagination_counter == ($display_maximum_rows-1) or
$i == (count($evaledvar)-1)) { $i == (count($evaledvar)-1)) {
$colcount = count($pkg['adddeleteeditpagefields']['columnitem']); $colcount = count($pkg['adddeleteeditpagefields']['columnitem']);
$final_footer = ""; $final_footer = "";
...@@ -472,13 +472,13 @@ if ($pkg['tabs'] <> "") { ...@@ -472,13 +472,13 @@ if ($pkg['tabs'] <> "") {
if($startingat > -1) { if($startingat > -1) {
$final_footer .= "<a href='pkg.php?xml=" . $_REQUEST['xml'] . "&amp;startdisplayingat={$startingat}&amp;display_maximum_rows={$display_maximum_rows}'>"; $final_footer .= "<a href='pkg.php?xml=" . $_REQUEST['xml'] . "&amp;startdisplayingat={$startingat}&amp;display_maximum_rows={$display_maximum_rows}'>";
} else { } else {
if($startingnat > 1) if($startingnat > 1)
$final_footer .= "<a href='pkg.php?xml=" . $_REQUEST['xml'] . "&amp;startdisplayingat=0&amp;display_maximum_rows={$display_maximum_rows}'>"; $final_footer .= "<a href='pkg.php?xml=" . $_REQUEST['xml'] . "&amp;startdisplayingat=0&amp;display_maximum_rows={$display_maximum_rows}'>";
} }
$final_footer .= "<font size='2'><< Previous page</font></a>"; $final_footer .= "<font size='2'><< Previous page</font></a>";
if($tmppp + $display_maximum_rows > count($evaledvar)) if($tmppp + $display_maximum_rows > count($evaledvar))
$endingrecord = count($evaledvar); $endingrecord = count($evaledvar);
else else
$endingrecord = $tmppp + $display_maximum_rows; $endingrecord = $tmppp + $display_maximum_rows;
$final_footer .= "</td><td align='center'>"; $final_footer .= "</td><td align='center'>";
$tmppp++; $tmppp++;
...@@ -486,7 +486,7 @@ if ($pkg['tabs'] <> "") { ...@@ -486,7 +486,7 @@ if ($pkg['tabs'] <> "") {
$final_footer .= "</font></td><td align='right'>&nbsp;"; $final_footer .= "</font></td><td align='right'>&nbsp;";
if(($i+1) < count($evaledvar)) if(($i+1) < count($evaledvar))
$final_footer .= "<a href='pkg.php?xml=" . $_REQUEST['xml'] . "&amp;startdisplayingat=" . ($startdisplayingat + $display_maximum_rows) . "&amp;display_maximum_rows={$display_maximum_rows}'>"; $final_footer .= "<a href='pkg.php?xml=" . $_REQUEST['xml'] . "&amp;startdisplayingat=" . ($startdisplayingat + $display_maximum_rows) . "&amp;display_maximum_rows={$display_maximum_rows}'>";
$final_footer .= "<font size='2'>Next page >></font></a>"; $final_footer .= "<font size='2'>Next page >></font></a>";
$final_footer .= "</td></tr></table></td></tr>"; $final_footer .= "</td></tr></table></td></tr>";
$i = count($evaledvar); $i = count($evaledvar);
break; break;
......
src/www/pkg_edit.php
View file @ 042cbf2c
...@@ -113,7 +113,7 @@ if($config['installedpackages'] && !is_array($config['installedpackages'][xml_sa ...@@ -113,7 +113,7 @@ if($config['installedpackages'] && !is_array($config['installedpackages'][xml_sa
$config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'] = array(); $config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'] = array();
// If the first entry in the array is an empty <config/> tag, kill it. // If the first entry in the array is an empty <config/> tag, kill it.
if ($config['installedpackages'] && (count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0) if ($config['installedpackages'] && (count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0)
&& ($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'][0] == "")) && ($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'][0] == ""))
array_shift($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']); array_shift($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']);
...@@ -285,21 +285,21 @@ else ...@@ -285,21 +285,21 @@ else
//<![CDATA[ //<![CDATA[
//Everything inside it will load as soon as the DOM is loaded and before the page contents are loaded //Everything inside it will load as soon as the DOM is loaded and before the page contents are loaded
jQuery(document).ready(function() { jQuery(document).ready(function() {
//Sortable function //Sortable function
jQuery('#mainarea table tbody').sortable({ jQuery('#mainarea table tbody').sortable({
items: 'tr.sortable', items: 'tr.sortable',
cursor: 'move', cursor: 'move',
distance: 10, distance: 10,
opacity: 0.8, opacity: 0.8,
helper: function(e,ui){ helper: function(e,ui){
ui.children().each(function(){ ui.children().each(function(){
jQuery(this).width(jQuery(this).width()); jQuery(this).width(jQuery(this).width());
}); });
return ui; return ui;
}, },
}); });
//delete current line jQuery function //delete current line jQuery function
jQuery('#maintable td .delete').live('click', function() { jQuery('#maintable td .delete').live('click', function() {
//do not remove first line //do not remove first line
...@@ -308,7 +308,7 @@ else ...@@ -308,7 +308,7 @@ else
return false; return false;
} }
}); });
//add new line jQuery function //add new line jQuery function
jQuery('#mainarea table .add').click(function() { jQuery('#mainarea table .add').click(function() {
//get table size and assign as new id //get table size and assign as new id
...@@ -380,21 +380,21 @@ else ...@@ -380,21 +380,21 @@ else
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if (!empty($input_errors)) print_input_errors($input_errors); ?> <?php if (!empty($input_errors)) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?> <?php if ($savemsg) print_info_box($savemsg); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<form name="iform" action="pkg_edit.php" method="post"> <form name="iform" action="pkg_edit.php" method="post">
<input type="hidden" name="xml" value="<?= htmlspecialchars($xml) ?>" /> <input type="hidden" name="xml" value="<?= htmlspecialchars($xml) ?>" />
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<?php <?php
if ($pkg['tabs'] <> "") { if ($pkg['tabs'] <> "") {
$tab_array = array(); $tab_array = array();
...@@ -414,7 +414,7 @@ if ($pkg['tabs'] <> "") { ...@@ -414,7 +414,7 @@ if ($pkg['tabs'] <> "") {
if($tab['url'] <> "") $urltmp = $tab['url']; if($tab['url'] <> "") $urltmp = $tab['url'];
if($tab['xml'] <> "") $urltmp = "pkg_edit.php?xml=" . $tab['xml']; if($tab['xml'] <> "") $urltmp = "pkg_edit.php?xml=" . $tab['xml'];
$addresswithport = getenv("HTTP_HOST"); $addresswithport = getenv("HTTP_HOST");
$colonpos = strpos($addresswithport, ":"); $colonpos = strpos($addresswithport, ":");
if ($colonpos !== False) { if ($colonpos !== False) {
//my url is actually just the IP address of the pfsense box //my url is actually just the IP address of the pfsense box
...@@ -430,7 +430,7 @@ if ($pkg['tabs'] <> "") { ...@@ -430,7 +430,7 @@ if ($pkg['tabs'] <> "") {
$active, $active,
$url $url
); );
} }
ksort($tab_array); ksort($tab_array);
foreach($tab_array as $tabid => $tab) { foreach($tab_array as $tabid => $tab) {
...@@ -443,12 +443,12 @@ echo '<tr><td>'; ...@@ -443,12 +443,12 @@ echo '<tr><td>';
} }
?> ?>
<?php <?php
$cols = 0; $cols = 0;
$savevalue = gettext("Save"); $savevalue = gettext("Save");
if($pkg['savetext'] <> "") $savevalue = $pkg['savetext']; if($pkg['savetext'] <> "") $savevalue = $pkg['savetext'];
/* If a package's XML has <advanced_options/> configured, then setup /* If a package's XML has <advanced_options/> configured, then setup
* the table rows for the fields that have <advancedfield/> set. * the table rows for the fields that have <advancedfield/> set.
* These fields will be placed below other fields in a seprate area titled 'Advanced Features'. * These fields will be placed below other fields in a seprate area titled 'Advanced Features'.
* These advanced fields are not normally configured and generally left to default to 'default settings'. * These advanced fields are not normally configured and generally left to default to 'default settings'.
...@@ -458,9 +458,9 @@ echo '<tr><td>'; ...@@ -458,9 +458,9 @@ echo '<tr><td>';
$adv_filed_count = 0; $adv_filed_count = 0;
$advanced = "<td>&nbsp;</td>"; $advanced = "<td>&nbsp;</td>";
$advanced .= "<tr><td colspan=\"2\" class=\"listtopic\">". gettext("Advanced features") . "<br /></td></tr>\n"; $advanced .= "<tr><td colspan=\"2\" class=\"listtopic\">". gettext("Advanced features") . "<br /></td></tr>\n";
} }
foreach ($pkg['fields']['field'] as $pkga) { foreach ($pkg['fields']['field'] as $pkga) {
if ($pkga['type'] == "sorting") if ($pkga['type'] == "sorting")
continue; continue;
if ($pkga['type'] == "listtopic") { if ($pkga['type'] == "listtopic") {
...@@ -480,7 +480,7 @@ echo '<tr><td>'; ...@@ -480,7 +480,7 @@ echo '<tr><td>';
if(isset($pkga['advancedfield']) && isset($adv_filed_count)) if(isset($pkga['advancedfield']) && isset($adv_filed_count))
$advanced .= $input; $advanced .= $input;
else else
echo $input; echo $input;
} }
$size = ""; $size = "";
...@@ -510,7 +510,7 @@ echo '<tr><td>'; ...@@ -510,7 +510,7 @@ echo '<tr><td>';
$advanced .= $input; $advanced .= $input;
$adv_filed_count++; $adv_filed_count++;
} }
else else
echo $input; echo $input;
} }
if($pkga['combinefields']=="begin"){ if($pkga['combinefields']=="begin"){
...@@ -518,7 +518,7 @@ echo '<tr><td>'; ...@@ -518,7 +518,7 @@ echo '<tr><td>';
if(isset($pkga['advancedfield']) && isset($adv_filed_count)) if(isset($pkga['advancedfield']) && isset($adv_filed_count))
$advanced .= $input; $advanced .= $input;
else else
echo $input; echo $input;
} }
$class=(isset($pkga['combinefields']) ? '' : 'class="vtable"'); $class=(isset($pkga['combinefields']) ? '' : 'class="vtable"');
...@@ -688,7 +688,7 @@ echo '<tr><td>'; ...@@ -688,7 +688,7 @@ echo '<tr><td>';
$cols = " cols='{$pkga['cols']}' "; $cols = " cols='{$pkga['cols']}' ";
if (($pkga['encoding'] == 'base64') && !$get_from_post && !empty($value)) if (($pkga['encoding'] == 'base64') && !$get_from_post && !empty($value))
$value = base64_decode($value); $value = base64_decode($value);
$wrap =($pkga['wrap'] == "off" ? 'wrap="off" style="white-space:nowrap;"' : ''); $wrap =($pkga['wrap'] == "off" ? 'wrap="off" style="white-space:nowrap;"' : '');
$input = "<textarea {$rows} {$cols} name='{$pkga['fieldname']}'{$wrap}>{$value}</textarea>\n"; $input = "<textarea {$rows} {$cols} name='{$pkga['fieldname']}'{$wrap}>{$value}</textarea>\n";
$input .= "<br />" . fixup_string($pkga['description']) . "\n"; $input .= "<br />" . fixup_string($pkga['description']) . "\n";
if(isset($pkga['advancedfield']) && isset($adv_filed_count)) { if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
...@@ -873,7 +873,7 @@ echo '<tr><td>'; ...@@ -873,7 +873,7 @@ echo '<tr><td>';
$fieldname = $rowhelper['fieldname']; $fieldname = $rowhelper['fieldname'];
if($type == "option") if($type == "option")
$options = &$rowhelper['options']['option']; $options = &$rowhelper['options']['option'];
if($rowhelper['size']) if($rowhelper['size'])
$size = $rowhelper['size']; $size = $rowhelper['size'];
else if ($pkga['size']) else if ($pkga['size'])
$size = $pkga['size']; $size = $pkga['size'];
...@@ -894,7 +894,7 @@ echo '<tr><td>'; ...@@ -894,7 +894,7 @@ echo '<tr><td>';
</tr> </tr>
<tbody></tbody> <tbody></tbody>
</table> </table>
<!-- <br /><a onclick="javascript:addRowTo('maintable'); return false;" href="#"><img border="0" src="./themes/<?#= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>--> <!-- <br /><a onclick="javascript:addRowTo('maintable'); return false;" href="#"><img border="0" src="./themes/<?#= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>-->
<br /><a class="add" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a> <br /><a class="add" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>
<br /><?php if($pkga['description'] != "") echo $pkga['description']; ?> <br /><?php if($pkga['description'] != "") echo $pkga['description']; ?>
...@@ -907,36 +907,36 @@ echo '<tr><td>'; ...@@ -907,36 +907,36 @@ echo '<tr><td>';
//typesel_change(); //typesel_change();
//]]> //]]>
</script> </script>
<?php <?php
break; break;
} }
#check typehint value #check typehint value
if($pkga['typehint']) if($pkga['typehint'])
echo " " . $pkga['typehint']; echo " " . $pkga['typehint'];
#check combinefields options #check combinefields options
if (isset($pkga['combinefields'])){ if (isset($pkga['combinefields'])){
$input="</td>"; $input="</td>";
if ($pkga['combinefields']=="end") if ($pkga['combinefields']=="end")
$input.="</table></td></tr>"; $input.="</table></td></tr>";
} }
else{ else{
$input= "</td></tr>"; $input= "</td></tr>";
if($pkga['usecolspan2']) if($pkga['usecolspan2'])
$input.= "</tr><br />"; $input.= "</tr><br />";
} }
if(isset($pkga['advancedfield']) && isset($adv_filed_count)) if(isset($pkga['advancedfield']) && isset($adv_filed_count))
$advanced .= "{$input}\n"; $advanced .= "{$input}\n";
else else
echo "{$input}\n"; echo "{$input}\n";
#increment counter #increment counter
$i++; $i++;
} }
#print advanced settings if any after reading all fields #print advanced settings if any after reading all fields
if (isset($advanced) && $adv_filed_count > 0) if (isset($advanced) && $adv_filed_count > 0)
echo $advanced; echo $advanced;
?> ?>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
...@@ -962,8 +962,8 @@ echo '<tr><td>'; ...@@ -962,8 +962,8 @@ echo '<tr><td>';
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
...@@ -1053,7 +1053,7 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) { ...@@ -1053,7 +1053,7 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) {
echo "<option value='{$source_value}'".($source_value == $value?" selected=\"selected\"":"").">{$source_name}</option>\n"; echo "<option value='{$source_value}'".($source_value == $value?" selected=\"selected\"":"").">{$source_name}</option>\n";
} }
echo "</select>\n"; echo "</select>\n";
break; break;
} }
echo "</td>\n"; echo "</td>\n";
} }
...@@ -1113,8 +1113,8 @@ function parse_package_templates() { ...@@ -1113,8 +1113,8 @@ function parse_package_templates() {
ereg($rowhelperfield['fieldname'] . "_fieldvalue\[(.*)\]", $template_text, $sep); ereg($rowhelperfield['fieldname'] . "_fieldvalue\[(.*)\]", $template_text, $sep);
foreach ($sep as $se) $separator = $se; foreach ($sep as $se) $separator = $se;
if($separator <> "") { if($separator <> "") {
$row_helper_data = ereg_replace(" ", $separator, $row_helper_data); $row_helper_data = ereg_replace(" ", $separator, $row_helper_data);
$template_text = ereg_replace("\[{$separator}\]", "", $template_text); $template_text = ereg_replace("\[{$separator}\]", "", $template_text);
} }
$template_text = str_replace($rowhelperfield['fieldname'] . "_fieldvalue", $row_helper_data, $template_text); $template_text = str_replace($rowhelperfield['fieldname'] . "_fieldvalue", $row_helper_data, $template_text);
} }
......
src/www/pkg_mgr.php
View file @ 042cbf2c
...@@ -114,44 +114,44 @@ include("head.inc"); ...@@ -114,44 +114,44 @@ include("head.inc");
?> ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php <?php
/* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */
if (!verify_all_package_servers()) if (!verify_all_package_servers())
print_info_box(package_server_mismatch_message()); print_info_box(package_server_mismatch_message());
/* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */
if (check_package_server_ssl() === false) if (check_package_server_ssl() === false)
print_info_box(package_server_ssl_failure_message()); print_info_box(package_server_ssl_failure_message());
if ($savemsg) if ($savemsg)
print_info_box($savemsg); print_info_box($savemsg);
?> ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$version = rtrim(file_get_contents("/usr/local/etc/version")); $version = rtrim(file_get_contents("/usr/local/etc/version"));
$tab_array = array(); $tab_array = array();
$tab_array[] = array(gettext("Available Packages"), $requested_version <> "" ? false : true, "pkg_mgr.php"); $tab_array[] = array(gettext("Available Packages"), $requested_version <> "" ? false : true, "pkg_mgr.php");
$tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.php"); $tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.php");
display_top_tabs($tab_array); display_top_tabs($tab_array);
?> ?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<div class="container-fluid"> <div class="container-fluid">
<?php <?php
$version = rtrim(file_get_contents("/usr/local/etc/version")); $version = rtrim(file_get_contents("/usr/local/etc/version"));
if($pkg_info) { if($pkg_info) {
$pkg_keys = array_keys($pkg_info); $pkg_keys = array_keys($pkg_info);
natcasesort($pkg_keys); natcasesort($pkg_keys);
//Check categories //Check categories
$categories=array(); $categories=array();
if(is_array($pkg_keys)) { if(is_array($pkg_keys)) {
...@@ -166,7 +166,7 @@ include("head.inc"); ...@@ -166,7 +166,7 @@ include("head.inc");
$visible_categories=array(); $visible_categories=array();
$categories_min_count=($g['pkg_categories_min_count'] ? $g['pkg_categories_min_count'] : 3); $categories_min_count=($g['pkg_categories_min_count'] ? $g['pkg_categories_min_count'] : 3);
$categories_max_display=($g['pkg_categories_max_display'] ? $g['pkg_categories_max_display'] : 6); $categories_max_display=($g['pkg_categories_max_display'] ? $g['pkg_categories_max_display'] : 6);
/* check selected category or define default category to show */ /* check selected category or define default category to show */
if (isset($_REQUEST['category'])) if (isset($_REQUEST['category']))
$menu_category = $_REQUEST['category']; $menu_category = $_REQUEST['category'];
...@@ -174,10 +174,10 @@ include("head.inc"); ...@@ -174,10 +174,10 @@ include("head.inc");
$menu_category = $g['pkg_default_category']; $menu_category = $g['pkg_default_category'];
else else
$menu_category = "All"; $menu_category = "All";
$menu_category = (isset($_REQUEST['category']) ? $_REQUEST['category'] : "All"); $menu_category = (isset($_REQUEST['category']) ? $_REQUEST['category'] : "All");
$show_category = ($menu_category == "Other" || $menu_category == "All"); $show_category = ($menu_category == "Other" || $menu_category == "All");
$tab_array[] = array(gettext("All"), $menu_category=="All" ? true : false, "pkg_mgr.php?category=All"); $tab_array[] = array(gettext("All"), $menu_category=="All" ? true : false, "pkg_mgr.php?category=All");
foreach ($categories as $category => $c_count) { foreach ($categories as $category => $c_count) {
if ($c_count >= $categories_min_count && $cm_count <= $categories_max_display) { if ($c_count >= $categories_min_count && $cm_count <= $categories_max_display) {
...@@ -187,26 +187,26 @@ include("head.inc"); ...@@ -187,26 +187,26 @@ include("head.inc");
} }
} }
$tab_array[] = array(gettext("Other Categories"), $menu_category=="Other" ? true : false, "pkg_mgr.php?category=Other"); $tab_array[] = array(gettext("Other Categories"), $menu_category=="Other" ? true : false, "pkg_mgr.php?category=Other");
} }
?> ?>
<? if (count($categories) > 0): ?> <? if (count($categories) > 0): ?>
<ul class="nav nav-pills" role="tablist"><? foreach ($tab_array as $tab): ?> <ul class="nav nav-pills" role="tablist"><? foreach ($tab_array as $tab): ?>
<li role="presentation" <? if ($tab[1]):?>class="active"<? endif; ?>><a href="<?=$tab[2];?>"><?=$tab[0];?></a></li> <li role="presentation" <? if ($tab[1]):?>class="active"<? endif; ?>><a href="<?=$tab[2];?>"><?=$tab[0];?></a></li>
<? endforeach; ?></ul><br /> <? endforeach; ?></ul><br />
<? endif; ?> <? endif; ?>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="10%"><?=gettext("Name"); ?></th> <th width="10%"><?=gettext("Name"); ?></th>
<?php <?php
if ($show_category) if ($show_category)
print '<th width="18%">'.gettext("Category").'</th>'."\n"; print '<th width="18%">'.gettext("Category").'</th>'."\n";
?> ?>
...@@ -215,8 +215,8 @@ include("head.inc"); ...@@ -215,8 +215,8 @@ include("head.inc");
<th width="17">&nbsp;</th> <th width="17">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
if(!$pkg_info) { if(!$pkg_info) {
...@@ -227,10 +227,10 @@ include("head.inc"); ...@@ -227,10 +227,10 @@ include("head.inc");
$index = &$pkg_info[$key]; $index = &$pkg_info[$key];
if(get_pkg_id($index['name']) >= 0 ) if(get_pkg_id($index['name']) >= 0 )
continue; continue;
if (package_skip_tests($index,$requested_version)) if (package_skip_tests($index,$requested_version))
continue; continue;
/* get history/changelog git dir */ /* get history/changelog git dir */
$commit_dir=explode("/",$index['config_file']); $commit_dir=explode("/",$index['config_file']);
$changeloglink = "https://github.com/pfsense/pfsense-packages/commits/master/config/"; $changeloglink = "https://github.com/pfsense/pfsense-packages/commits/master/config/";
...@@ -238,7 +238,7 @@ include("head.inc"); ...@@ -238,7 +238,7 @@ include("head.inc");
$changeloglink .= $commit_dir[(count($commit_dir)-1)]; $changeloglink .= $commit_dir[(count($commit_dir)-1)];
else else
$changeloglink .= $commit_dir[(count($commit_dir)-2)]; $changeloglink .= $commit_dir[(count($commit_dir)-2)];
/* Check package info link */ /* Check package info link */
if($index['pkginfolink']) { if($index['pkginfolink']) {
$pkginfolink = $index['pkginfolink']; $pkginfolink = $index['pkginfolink'];
...@@ -247,7 +247,7 @@ include("head.inc"); ...@@ -247,7 +247,7 @@ include("head.inc");
$pkginfolink = "https://forum.pfsense.org/index.php/board,15.0.html"; $pkginfolink = "https://forum.pfsense.org/index.php/board,15.0.html";
$pkginfo=gettext("No package info, check the forum"); $pkginfo=gettext("No package info, check the forum");
} }
if ($menu_category == "All" || $index['category'] == $menu_category || ($menu_category == "Other" && !in_array($index['category'],$visible_categories)) ): if ($menu_category == "All" || $index['category'] == $menu_category || ($menu_category == "Other" && !in_array($index['category'],$visible_categories)) ):
?> ?>
<tr valign="top" class="<?= $index['category'] ?>"> <tr valign="top" class="<?= $index['category'] ?>">
...@@ -257,16 +257,16 @@ include("head.inc"); ...@@ -257,16 +257,16 @@ include("head.inc");
<?php <?php
if ($show_category) if ($show_category)
print '<td class="listr">'.gettext($index['category']).'</td>'."\n"; print '<td class="listr">'.gettext($index['category']).'</td>'."\n";
if ($g['disablepackagehistory']) { if ($g['disablepackagehistory']) {
print '<td class="listr">'."\n"; print '<td class="listr">'."\n";
} else { } else {
print '<td class="listr" data-container="body" data-toggle="tooltip" data-placement="left" title="'.gettext("Click ").ucfirst($index['name']).gettext(" version to check its change log.").'" '; print '<td class="listr" data-container="body" data-toggle="tooltip" data-placement="left" title="'.gettext("Click ").ucfirst($index['name']).gettext(" version to check its change log.").'" ';
print ">\n"; print ">\n";
} }
print "{$index['status']} <br />\n"; print "{$index['status']} <br />\n";
if ($g['disablepackagehistory']) if ($g['disablepackagehistory'])
echo"<a>{$index['version']}</a>"; echo"<a>{$index['version']}</a>";
else else
......
src/www/pkg_mgr_install.php
View file @ 042cbf2c
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
pkg_mgr_install.php pkg_mgr_install.php
part of pfSense (https://www.pfsense.org) part of pfSense (https://www.pfsense.org)
Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com> Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com>
Copyright (C) 2005 Colin Smith Copyright (C) 2005 Colin Smith
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
...@@ -91,21 +91,21 @@ if ($_POST) { ...@@ -91,21 +91,21 @@ if ($_POST) {
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php <?php
/* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */
if (!verify_all_package_servers()) if (!verify_all_package_servers())
print_info_box(package_server_mismatch_message()); print_info_box(package_server_mismatch_message());
/* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */
if (check_package_server_ssl() === false) if (check_package_server_ssl() === false)
print_info_box(package_server_ssl_failure_message()); ?> print_info_box(package_server_ssl_failure_message()); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[] = array(gettext("Available packages"), false, "pkg_mgr.php"); $tab_array[] = array(gettext("Available packages"), false, "pkg_mgr.php");
...@@ -113,15 +113,15 @@ if ($_POST) { ...@@ -113,15 +113,15 @@ if ($_POST) {
$tab_array[] = array(gettext("Package Installer"), true, ""); $tab_array[] = array(gettext("Package Installer"), true, "");
display_top_tabs($tab_array); display_top_tabs($tab_array);
?> ?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<div class="container-fluid"> <div class="container-fluid">
<form action="pkg_mgr_install.php" method="post" name="iform"> <form action="pkg_mgr_install.php" method="post" name="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<?php if ((empty($_GET['mode']) && $_GET['id']) || (!empty($_GET['mode']) && (!empty($_GET['pkg']) || $_GET['mode'] == 'reinstallall') && ($_GET['mode'] != 'installedinfo' && $_GET['mode'] != 'showlog'))): <?php if ((empty($_GET['mode']) && $_GET['id']) || (!empty($_GET['mode']) && (!empty($_GET['pkg']) || $_GET['mode'] == 'reinstallall') && ($_GET['mode'] != 'installedinfo' && $_GET['mode'] != 'showlog'))):
if (empty($_GET['mode']) && $_GET['id']) { if (empty($_GET['mode']) && $_GET['id']) {
$pkgname = str_replace(array("<", ">", ";", "&", "'", '"', '.', '/'), "", htmlspecialchars_decode($_GET['id'], ENT_QUOTES | ENT_HTML401)); $pkgname = str_replace(array("<", ">", ";", "&", "'", '"', '.', '/'), "", htmlspecialchars_decode($_GET['id'], ENT_QUOTES | ENT_HTML401));
...@@ -169,14 +169,14 @@ if ($_POST) { ...@@ -169,14 +169,14 @@ if ($_POST) {
<?php endif; if (!empty($_POST['id']) || $_GET['mode'] == 'showlog' || ($_GET['mode'] == 'installedinfo' && !empty($_GET['pkg']))): ?> <?php endif; if (!empty($_POST['id']) || $_GET['mode'] == 'showlog' || ($_GET['mode'] == 'installedinfo' && !empty($_GET['pkg']))): ?>
<tr> <tr>
<td class="tabcont" align="center"> <td class="tabcont" align="center">
<div class="progress"> <div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 5%;"> <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 5%;">
<span class="sr-only">5% Complete</span> <span class="sr-only">5% Complete</span>
</div> </div>
</div> </div>
<br /> <br />
<!-- status box --> <!-- status box -->
<textarea cols="80" rows="1" name="status" id="status" wrap="hard"><?=gettext("Beginning package installation.");?></textarea> <textarea cols="80" rows="1" name="status" id="status" wrap="hard"><?=gettext("Beginning package installation.");?></textarea>
...@@ -188,8 +188,8 @@ if ($_POST) { ...@@ -188,8 +188,8 @@ if ($_POST) {
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
...@@ -289,7 +289,7 @@ if ($_GET) { ...@@ -289,7 +289,7 @@ if ($_GET) {
$status_a = gettext(sprintf("Installation of %s completed.", $pkgid)); $status_a = gettext(sprintf("Installation of %s completed.", $pkgid));
update_status($status_a); update_status($status_a);
$status = get_after_install_info($pkgid); $status = get_after_install_info($pkgid);
if($status) if($status)
$static_output .= "\n" . gettext("Installation completed.") . "\n{$pkgid} " . gettext("setup instructions") . ":\n{$status}"; $static_output .= "\n" . gettext("Installation completed.") . "\n{$pkgid} " . gettext("setup instructions") . ":\n{$status}";
else else
$static_output .= "\n" . gettext("Installation completed. Please check to make sure that the package is configured from the respective menu then start the package."); $static_output .= "\n" . gettext("Installation completed. Please check to make sure that the package is configured from the respective menu then start the package.");
...@@ -315,4 +315,4 @@ if ($_GET) { ...@@ -315,4 +315,4 @@ if ($_GET) {
?> ?>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
src/www/pkg_mgr_installed.php
View file @ 042cbf2c
...@@ -67,7 +67,7 @@ function domTT_title($title_msg, $return="echo"){ ...@@ -67,7 +67,7 @@ function domTT_title($title_msg, $return="echo"){
if ($return =="echo") if ($return =="echo")
echo $title; echo $title;
else else
return $title; return $title;
} }
} }
if(is_array($config['installedpackages']['package'])) { if(is_array($config['installedpackages']['package'])) {
...@@ -90,25 +90,25 @@ include("head.inc"); ...@@ -90,25 +90,25 @@ include("head.inc");
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php <?php
/* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */
if (!verify_all_package_servers()) if (!verify_all_package_servers())
print_info_box(package_server_mismatch_message()); print_info_box(package_server_mismatch_message());
/* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */
if (check_package_server_ssl() === false) if (check_package_server_ssl() === false)
print_info_box(package_server_ssl_failure_message()); ?> print_info_box(package_server_ssl_failure_message()); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$version = file_get_contents("/usr/local/etc/version"); $version = file_get_contents("/usr/local/etc/version");
$tab_array = array(); $tab_array = array();
$tab_array[] = array(gettext("Available Packages"), false, "pkg_mgr.php"); $tab_array[] = array(gettext("Available Packages"), false, "pkg_mgr.php");
...@@ -118,9 +118,9 @@ include("head.inc"); ...@@ -118,9 +118,9 @@ include("head.inc");
$tab_array[] = array(gettext("Installed Packages"), true, "pkg_mgr_installed.php"); $tab_array[] = array(gettext("Installed Packages"), true, "pkg_mgr_installed.php");
display_top_tabs($tab_array); display_top_tabs($tab_array);
?> ?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -132,22 +132,22 @@ include("head.inc"); ...@@ -132,22 +132,22 @@ include("head.inc");
</tr> </tr>
<?php <?php
if(is_array($config['installedpackages']['package'])): if(is_array($config['installedpackages']['package'])):
$instpkgs = array(); $instpkgs = array();
foreach($config['installedpackages']['package'] as $instpkg) { foreach($config['installedpackages']['package'] as $instpkg) {
$instpkgs[] = $instpkg['name']; $instpkgs[] = $instpkg['name'];
} }
natcasesort($instpkgs); natcasesort($instpkgs);
foreach ($instpkgs as $index => $pkgname): foreach ($instpkgs as $index => $pkgname):
$pkg = $config['installedpackages']['package'][$index]; $pkg = $config['installedpackages']['package'][$index];
if(!$pkg['name']) if(!$pkg['name'])
continue; continue;
// get history/changelog git dir // get history/changelog git dir
$commit_dir=explode("/",$pkg['config_file']); $commit_dir=explode("/",$pkg['config_file']);
$changeloglink ="https://github.com/pfsense/pfsense-packages/commits/master/config/".$commit_dir[(count($commit_dir)-2)]; $changeloglink ="https://github.com/pfsense/pfsense-packages/commits/master/config/".$commit_dir[(count($commit_dir)-2)];
#check package version #check package version
$latest_package = $currentvers[$pkg['name']]['version']; $latest_package = $currentvers[$pkg['name']]['version'];
if ($latest_package) { if ($latest_package) {
...@@ -197,7 +197,7 @@ include("head.inc"); ...@@ -197,7 +197,7 @@ include("head.inc");
$pkginfolink = "https://forum.pfsense.org/index.php/board,15.0.html"; $pkginfolink = "https://forum.pfsense.org/index.php/board,15.0.html";
$pkginfo=gettext("No package info, check the forum"); $pkginfo=gettext("No package info, check the forum");
} }
?> ?>
<tr valign="top"> <tr valign="top">
<td class="listlr"> <td class="listlr">
...@@ -206,7 +206,7 @@ include("head.inc"); ...@@ -206,7 +206,7 @@ include("head.inc");
<td class="listr"> <td class="listr">
<?=$pkg['category'];?> <?=$pkg['category'];?>
</td> </td>
<?php <?php
if (isset($g['disablepackagehistory'])) if (isset($g['disablepackagehistory']))
echo "<td class='{$tdclass}'>{$pkgver}</td>"; echo "<td class='{$tdclass}'>{$pkgver}</td>";
else else
...@@ -240,11 +240,11 @@ include("head.inc"); ...@@ -240,11 +240,11 @@ include("head.inc");
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
src/www/pkg_mgr_settings.php
View file @ 042cbf2c
...@@ -81,7 +81,7 @@ function enable_altpkgrepourl(enable_over) { ...@@ -81,7 +81,7 @@ function enable_altpkgrepourl(enable_over) {
/* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */
if (!verify_all_package_servers()) if (!verify_all_package_servers())
print_info_box(package_server_mismatch_message()); print_info_box(package_server_mismatch_message());
/* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */ /* Print package server SSL warning. See https://redmine.pfsense.org/issues/484 */
if (check_package_server_ssl() === false) if (check_package_server_ssl() === false)
......
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