diff options
| author | jim-p <jimp@pfsense.org> | 2014-07-02 12:07:33 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-07-02 12:07:33 -0400 |
| commit | 7c8f3711075d9671eda430b86ac59d6013d12cae (patch) | |
| tree | 7a4f6c4e9c01728a68a7bed6bfe7890823d0b40a /usr | |
| parent | 38c7d42e4b47e9c8d968ebf2c7a5b75806d87203 (diff) | |
| download | pfsense-7c8f3711075d9671eda430b86ac59d6013d12cae.zip pfsense-7c8f3711075d9671eda430b86ac59d6013d12cae.tar.gz | |
More refinements to the unofficial package repository warning ( Issue #484 ) -- Now also shows on Dashboard and installed package list. Cleaned up some code and shuffled things around to avoid unnecessary repetition.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/index.php | 5 | ||||
| -rw-r--r-- | usr/local/www/pkg_mgr.php | 10 | ||||
| -rw-r--r-- | usr/local/www/pkg_mgr_installed.php | 7 | ||||
| -rw-r--r-- | usr/local/www/pkg_mgr_settings.php | 17 |
4 files changed, 30 insertions, 9 deletions
diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 6e9e178..4fdcca6 100644 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -53,6 +53,7 @@ ob_start(null, "1000"); require_once('functions.inc'); require_once('guiconfig.inc'); require_once('notices.inc'); +require_once("pkg-utils.inc"); if(isset($_REQUEST['closenotice'])){ close_notice($_REQUEST['closenotice']); @@ -481,6 +482,10 @@ echo $jscriptstr; if(!file_exists("/usr/local/www/themes/{$g['theme']}/no_big_logo")) echo "<center><img src=\"./themes/".$g['theme']."/images/logobig.jpg\" alt=\"big logo\" /></center><br />"; +/* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ +if (!verify_all_package_servers()) + print_info_box(package_server_mismatch_message()); + if ($savemsg) print_info_box($savemsg); diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 454cedd..79e6961 100644 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -74,7 +74,7 @@ function domTT_title($title_msg) { //get_pkg_info only if cache file has more then $g[min_pkg_cache_file_time] seconds $pkg_cache_file_time=($g['min_pkg_cache_file_time'] ? $g['min_pkg_cache_file_time'] : 120); -$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl']; +$xmlrpc_base_url = get_active_xml_rpc_base_url(); if (!file_exists("{$g['tmp_path']}/pkg_info.cache") || (time() - filemtime("{$g['tmp_path']}/pkg_info.cache")) > $pkg_cache_file_time) { $pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "config_file")); //create cache file after get_pkg_info @@ -116,13 +116,9 @@ include("head.inc"); <?php include("fbegin.inc"); + /* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ if (!verify_all_package_servers()) - print_info_box(sprintf(gettext("The package server currently " - . "configured on this firewall (%s) is NOT an official package " - . "server. The contents of such servers cannot be verified and " - . "may contain malicious files. To ensure that you receive " - . "verifiable and trusted packages, return the package server " - . "settings to their default values."), htmlspecialchars($xmlrpc_base_url))); + print_info_box(package_server_mismatch_message()); if ($savemsg) print_info_box($savemsg); diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 01f3089..19b5950 100644 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -89,7 +89,12 @@ include("head.inc"); </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> - <?php include("fbegin.inc"); ?> + <?php include("fbegin.inc"); + + /* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ + if (!verify_all_package_servers()) + print_info_box(package_server_mismatch_message()); ?> + <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="packages installed"> <tr> <td> diff --git a/usr/local/www/pkg_mgr_settings.php b/usr/local/www/pkg_mgr_settings.php index ef655b5..5a8f4ca 100644 --- a/usr/local/www/pkg_mgr_settings.php +++ b/usr/local/www/pkg_mgr_settings.php @@ -77,7 +77,12 @@ function enable_altpkgrepourl(enable_over) { </script> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<?php include("fbegin.inc");?> +<?php include("fbegin.inc"); + + /* Print package server mismatch warning. See https://redmine.pfsense.org/issues/484 */ + if (!verify_all_package_servers()) + print_info_box(package_server_mismatch_message()); ?> + <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="pkg_mgr_settings.php" method="post" name="iform" id="iform"> @@ -98,6 +103,16 @@ function enable_altpkgrepourl(enable_over) { <tr><td><div id="mainarea"> <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <tr> + <td colspan="2" valign="top" class="vncell"> + <?PHP echo gettext("This page allows an alternate package repository to be configured, primarily for temporary use as a testing mechanism."); ?> + <?PHP echo gettext("The contents of unofficial packages servers cannot be verified and may contain malicious files."); ?> + <?PHP echo gettext("The package server settings should remain at their default values to ensure that verifiable and trusted packages are recevied."); ?> + <br/><br/> + <?PHP echo gettext("A warning is printed on the Dashboard and in the package manager when an unofficial package server is in use."); ?> + <br/><br/> + </td> + </tr> + <tr> <td colspan="2" valign="top" class="listtopic"><?=gettext("Package Repository URL");?></td> </tr> <tr> |
