Author: glen Date: Wed Oct 7 09:44:47 2009 GMT Module: packages Tag: HEAD ---- Log message: - match host_name also for action=preview; rel 4
---- Files affected: packages/cacti: cacti.spec (1.113 -> 1.114) , host_name-url.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/cacti/cacti.spec diff -u packages/cacti/cacti.spec:1.113 packages/cacti/cacti.spec:1.114 --- packages/cacti/cacti.spec:1.113 Fri Oct 2 09:32:38 2009 +++ packages/cacti/cacti.spec Wed Oct 7 11:44:41 2009 @@ -4,7 +4,7 @@ Summary(pl.UTF-8): Cacti - frontend w PHP do rrdtoola Name: cacti Version: 0.8.7e -Release: 3 +Release: 4 License: GPL Group: Applications/WWW Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz @@ -251,6 +251,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.114 2009/10/07 09:44:41 glen +- match host_name also for action=preview; rel 4 + Revision 1.113 2009/10/02 07:32:38 glen - understand $host_name in graph_view (map to $host_id); rel 3 ================================================================ Index: packages/cacti/host_name-url.patch diff -u packages/cacti/host_name-url.patch:1.1 packages/cacti/host_name-url.patch:1.2 --- packages/cacti/host_name-url.patch:1.1 Fri Oct 2 09:32:51 2009 +++ packages/cacti/host_name-url.patch Wed Oct 7 11:44:41 2009 @@ -1,6 +1,24 @@ ---- cacti-0.8.7e/graph_view.php~ 2009-06-28 19:07:11.000000000 +0300 -+++ cacti-0.8.7e/graph_view.php 2009-10-02 10:30:43.000000000 +0300 -@@ -550,10 +550,16 @@ +--- cacti-0.8.7e/graph_view.php 2009-10-02 10:30:43.000000000 +0300 ++++ cacti/graph_view.php 2009-10-07 12:42:04.032959475 +0300 +@@ -151,11 +151,17 @@ + define("ROWS_PER_PAGE", read_graph_config_option("preview_graphs_per_page")); + + /* ================= input validation ================= */ ++ input_validate_input_regex(get_request_var_request("host_name"), "^([a-zA-Z0-9_.-]+)$"); + input_validate_input_number(get_request_var_request("host_id")); + input_validate_input_number(get_request_var_request("graph_template_id")); + input_validate_input_number(get_request_var_request("page")); + /* ==================================================== */ + ++ if (empty($_REQUEST['host_id']) && !empty($_REQUEST['host_name'])) { ++ // fill $host_id from $host_name. empty result is ok too, we'll list previous view then ++ $_REQUEST['host_id'] = db_fetch_cell("select id from host where description='{$_REQUEST['host_name']}'"); ++ } ++ + /* clean up search string */ + if (isset($_REQUEST["filter"])) { + $_REQUEST["filter"] = sanitize_search_string(get_request_var_request("filter")); +@@ -550,10 +556,16 @@ } /* ================= input validation ================= */ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti.spec?r1=1.113&r2=1.114&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/host_name-url.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
