Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion display.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function display_information() {
$autorefresh = read_user_setting('intropage_autorefresh', read_config_option('intropage_autorefresh'));
$important_period = read_user_setting('intropage_important_period', read_config_option('intropage_important_period'));
$timespan = read_user_setting('intropage_timespan', read_config_option('intropage_timespan'));
$number_of_lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'));
$number_of_lines = intropage_get_lines($_SESSION['sess_user_id']);

// number of dashboards
$number_of_dashboards = db_fetch_cell_prepared('SELECT COUNT(*)
Expand Down
16 changes: 13 additions & 3 deletions include/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ class=VALUES(class),
function intropage_favourite_graph($fav_graph_id, $fav_graph_timespan) {
global $config, $graph_timeshifts;

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

if ($lines == 5) {
$graph_height = 100;
Expand Down Expand Up @@ -1298,7 +1298,7 @@ function intropage_favourite_graph($fav_graph_id, $fav_graph_timespan) {
function intropage_prepare_graph($dispdata, $user_id) {
global $config;

$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);
$lines = intropage_get_lines($user_id);

if ($lines == 5) {
$graph_height = 180;
Expand Down Expand Up @@ -2096,7 +2096,7 @@ function human_readable($bytes, $decimal = true, $precision = 2) {
}

function get_panel_lines_count($height, $user_id) {
$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);
$lines = intropage_get_lines($user_id);

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

return $lines;
}

function intropage_get_lines($user_id) {
$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);

if (!is_numeric($lines) || $lines <= 0) {
$lines = 5;
}

return $lines;
}
2 changes: 1 addition & 1 deletion panellib/analyze.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function register_analyze() {
function analyse_login($panel, $user_id) {
global $config;

$lines = read_user_setting('intropage_number_of_lines', read_config_option('intropage_number_of_lines'), false, $user_id);
$lines = intropage_get_lines($user_id);
$important_period = read_user_setting('intropage_important_period', read_config_option('intropage_important_period'), false, $user_id);

if ($important_period == -1) {
Expand Down