Skip to content

Commit 55824eb

Browse files
authored
incorrect value causes SQL errors (#362)
* fix #359 - incorrect value * csfixer
1 parent 9d393f1 commit 55824eb

3 files changed

Lines changed: 15 additions & 5 deletions

File tree

display.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function display_information() {
7676
$autorefresh = read_user_setting('intropage_autorefresh', read_config_option('intropage_autorefresh'));
7777
$important_period = read_user_setting('intropage_important_period', read_config_option('intropage_important_period'));
7878
$timespan = read_user_setting('intropage_timespan', read_config_option('intropage_timespan'));
79-
$number_of_lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'));
79+
$number_of_lines = intropage_get_lines($_SESSION['sess_user_id']);
8080

8181
// number of dashboards
8282
$number_of_dashboards = db_fetch_cell_prepared('SELECT COUNT(*)

include/functions.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ class=VALUES(class),
12501250
function intropage_favourite_graph($fav_graph_id, $fav_graph_timespan) {
12511251
global $config, $graph_timeshifts;
12521252

1253-
$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $_SESSION['sess_user_id']);
1253+
$lines = intropage_get_lines($_SESSION['sess_user_id']);
12541254

12551255
if ($lines == 5) {
12561256
$graph_height = 100;
@@ -1298,7 +1298,7 @@ function intropage_favourite_graph($fav_graph_id, $fav_graph_timespan) {
12981298
function intropage_prepare_graph($dispdata, $user_id) {
12991299
global $config;
13001300

1301-
$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);
1301+
$lines = intropage_get_lines($user_id);
13021302

13031303
if ($lines == 5) {
13041304
$graph_height = 180;
@@ -2096,7 +2096,7 @@ function human_readable($bytes, $decimal = true, $precision = 2) {
20962096
}
20972097

20982098
function get_panel_lines_count($height, $user_id) {
2099-
$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);
2099+
$lines = intropage_get_lines($user_id);
21002100

21012101
if (!is_numeric($lines)) {
21022102
$lines = 5;
@@ -2108,3 +2108,13 @@ function get_panel_lines_count($height, $user_id) {
21082108

21092109
return $lines;
21102110
}
2111+
2112+
function intropage_get_lines($user_id) {
2113+
$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);
2114+
2115+
if (!is_numeric($lines) || $lines <= 0) {
2116+
$lines = 5;
2117+
}
2118+
2119+
return $lines;
2120+
}

panellib/analyze.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function register_analyze() {
132132
function analyse_login($panel, $user_id) {
133133
global $config;
134134

135-
$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);
135+
$lines = intropage_get_lines($user_id);
136136
$important_period = read_user_setting('intropage_important_period', read_config_option('intropage_important_period'), false, $user_id);
137137

138138
if ($important_period == -1) {

0 commit comments

Comments
 (0)