summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/dyndns.class2
-rw-r--r--src/usr/local/www/classes/Form/Input.class.php2
-rw-r--r--src/usr/local/www/diag_sockets.php1
-rw-r--r--src/usr/local/www/diag_tables.php1
-rw-r--r--src/usr/local/www/pkg_mgr.php2
-rw-r--r--src/usr/local/www/pkg_mgr_install.php18
-rw-r--r--src/usr/local/www/pkg_mgr_installed.php2
-rw-r--r--src/usr/local/www/status_rrd_graph.php4
-rw-r--r--src/usr/local/www/system_update_settings.php4
9 files changed, 19 insertions, 17 deletions
diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class
index 58f6dd0..610afad 100644
--- a/src/etc/inc/dyndns.class
+++ b/src/etc/inc/dyndns.class
@@ -1274,7 +1274,7 @@
if ($successful_update == true) {
$status = "phpDynDNS: (Success) IP Address Updated Successfully!";
} else {
- $status = "phpDynDNS: (Error) Result did not match.";
+ $status = "phpDynDNS: (Error) Result did not match. [$data]";
}
break;
case 'cloudflare':
diff --git a/src/usr/local/www/classes/Form/Input.class.php b/src/usr/local/www/classes/Form/Input.class.php
index e1fe31f..af04b82 100644
--- a/src/usr/local/www/classes/Form/Input.class.php
+++ b/src/usr/local/www/classes/Form/Input.class.php
@@ -30,7 +30,7 @@ class Form_Input extends Form_Element
{
public $column;
protected $_tagName = 'input';
- protected $_tagSelfClosing = true;
+ protected $_tagSelfClosing = false;
protected $_attributes = array(
'class' => array('form-control' => true),
'name' => null,
diff --git a/src/usr/local/www/diag_sockets.php b/src/usr/local/www/diag_sockets.php
index 2bfd7cd..3a7d6e1 100644
--- a/src/usr/local/www/diag_sockets.php
+++ b/src/usr/local/www/diag_sockets.php
@@ -104,6 +104,7 @@ $showAllOption = $showAll ? "" : "?showAll";
continue;
$j = 0;
+ print("<tr>\n");
foreach (explode(' ', $line) as $entry) {
if ($entry == '' || $entry == "ADDRESS")
continue;
diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php
index 845d7a7..b75b29b 100644
--- a/src/usr/local/www/diag_tables.php
+++ b/src/usr/local/www/diag_tables.php
@@ -166,6 +166,7 @@ events.push(function(){
<thead>
<tr>
<th><?=gettext("IP Address")?></th>
+ <th></th>
</tr>
</thead>
<tbody>
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index 0f0140d..fb7125d 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -82,7 +82,7 @@ if(is_subsystem_dirty('packagelock')) {
$pkg_info = get_pkg_info();
-$pgtitle = array(gettext("System"),gettext("Package Manager"));
+$pgtitle = array(gettext("System"),gettext("Package Manager"),gettext("Available Packages"));
include("head.inc");
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 04213de..9f7af99 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -247,23 +247,23 @@ if ($_POST) {
if($_GET && $_GET['id'] == "firmware") {
$firmwareupdate = true;
$firmwareversion = get_system_pkg_version();
+ $headline = gettext("System update") ;
}
-$pgtitle = array(gettext("System"),gettext("Package Manager"), $headline);
-include("head.inc");
-
$tab_array = array();
-$tab_array[] = array(gettext("Available packages"), false, "pkg_mgr.php");
-$tab_array[] = array(gettext("Installed packages"), false, "pkg_mgr_installed.php");
+
if($firmwareupdate) {
- $tab_array[] = array(gettext("System update"), true, "");
+ $pgtitle = array(gettext("System"),gettext("Update"), $headline);
+ $tab_array[] = array(gettext("System Update"), true, "");
+ $tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php");
} else {
+ $pgtitle = array(gettext("System"),gettext("Package Manager"), $headline);
+ $tab_array[] = array(gettext("Available Packages"), false, "pkg_mgr.php");
+ $tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.php");
$tab_array[] = array(gettext("Package Installer"), true, "");
}
-if($firmwareupdate) {
- $tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php");
-}
+include("head.inc");
display_top_tabs($tab_array);
if ($input_errors)
diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index bf22439..1ca5d5a 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -77,7 +77,7 @@ if (is_subsystem_dirty('packagelock')) {
$closehead = false;
-$pgtitle = array(gettext("System"), gettext("Package Manager"));
+$pgtitle = array(gettext("System"), gettext("Package Manager"),gettext("Installed Packages"));
include("head.inc");
diff --git a/src/usr/local/www/status_rrd_graph.php b/src/usr/local/www/status_rrd_graph.php
index 3738e72..666c70b 100644
--- a/src/usr/local/www/status_rrd_graph.php
+++ b/src/usr/local/www/status_rrd_graph.php
@@ -612,7 +612,7 @@ if($curcat == 'custom') {
$id = preg_replace('/\./', '_', $id);
?>
<div class="panel panel-default">
- <img align="center" name="<?=$id?>" id="<?=$id?>" alt="<?=$prettydb?> Graph" src="status_rrd_graph_img.php?start=<?=$start?>&amp;end={<?=$end?>&amp;database=<?=$curdatabase?>&amp;style=<?=$curstyle?>&amp;graph=<?=$graph?>" />
+ <img align="center" name="<?=$id?>" id="<?=$id?>" alt="<?=$prettydb?> Graph" src="status_rrd_graph_img.php?start=<?=$start?>&amp;end=<?=$end?>&amp;database=<?=$curdatabase?>&amp;style=<?=$curstyle?>&amp;graph=<?=$graph?>" />
</div>
<?php
@@ -687,7 +687,7 @@ if($curcat == 'custom') {
$end = $dates['end'];
?>
<div class="panel panel-default" align="center">
- <img name="<?=$id?>" id="<?=$id?>" alt="<?=$prettydb?> Graph" src="status_rrd_graph_img.php?start=<?=$start?>&amp;end={<?=$end?>&amp;database=<?=$curdatabase?>&amp;style=<?=$curstyle?>&amp;graph=<?=$graph?>" />
+ <img name="<?=$id?>" id="<?=$id?>" alt="<?=$prettydb?> Graph" src="status_rrd_graph_img.php?start=<?=$start?>&amp;end=<?=$end?>&amp;database=<?=$curdatabase?>&amp;style=<?=$curstyle?>&amp;graph=<?=$graph?>" />
</div>
<?php
}
diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php
index f6d8d52..93d0f56 100644
--- a/src/usr/local/www/system_update_settings.php
+++ b/src/usr/local/www/system_update_settings.php
@@ -107,7 +107,7 @@ if ($_POST) {
$curcfg = $config['system']['firmware'];
$gitcfg = $config['system']['gitsync'];
-$pgtitle = array(gettext("System"), gettext("Firmware"), gettext("Settings"));
+$pgtitle = array(gettext("System"), gettext("Update"), gettext("Update Settings"));
$closehead = false;
exec("/usr/bin/fetch -q -o {$g['tmp_path']}/manifest \"{$g['update_manifest']}\"");
@@ -125,7 +125,7 @@ if ($savemsg)
$tab_array = array();
$tab_array[] = array(gettext("Update Settings"), true, "system_update_settings.php");
-$tab_array[] = array(gettext("System update"), false, "pkg_mgr_install.php?id=firmware");
+$tab_array[] = array(gettext("System Update"), false, "pkg_mgr_install.php?id=firmware");
display_top_tabs($tab_array);
$form = new Form();
OpenPOWER on IntegriCloud