tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '797-infinite-session-time-dev' into 'develop' 

797 infinite session time dev

See merge request !438
This commit is contained in:
vgilc 2017-05-17 17:15:18 +02:00
parent d78058df44 634db70812
commit 7d62f6ff50
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/functions_graph.php
View File

@ -2304,10 +2304,9 @@ function progress_bar($progress, $width, $height, $title = '', $mode = 1, $value
require_once("include_graph_dependencies.php"); require_once("include_graph_dependencies.php");
include_graphs_dependencies($config['homedir'].'/'); include_graphs_dependencies($config['homedir'].'/');
$src = ui_get_full_url( $src = ui_get_full_url(
"/include/graphs/fgraph.php?homeurl=../../&graph_type=progressbar" . "/include/graphs/fgraph.php?homeurl=../../&graph_type=progressbar" .
"&width=".$width."&height=".$height."&progress=".$progress. "&width=".$width."&homedir=".$config['homedir']."&height=".$height."&progress=".$progress.
"&mode=" . $mode . "&out_of_lim_str=".$out_of_lim_str . "&mode=" . $mode . "&out_of_lim_str=".$out_of_lim_str .
"&title=".$title."&font=".$config['fontpath']."&value_text=". $value_text . "&title=".$title."&font=".$config['fontpath']."&value_text=". $value_text .
"&colorRGB=". $colorRGB, false, false, false "&colorRGB=". $colorRGB, false, false, false

5
pandora_console/include/graphs/fgraph.php
View File

@ -40,6 +40,11 @@ else $graph_type = '';
ob_start (); ob_start ();
if (!empty($graph_type)) { if (!empty($graph_type)) {
$homedir = $_GET['homedir'];
if ($homedir != null) {
$config['homedir'] = $homedir;
}
include_once($homeurl . 'include/functions.php'); include_once($homeurl . 'include/functions.php');
include_once($homeurl . 'include/functions_html.php'); include_once($homeurl . 'include/functions_html.php');

2
pandora_console/index.php
View File

@ -453,7 +453,7 @@ if (! isset ($config['id_user'])) {
db_logon ($nick_in_db, $_SERVER['REMOTE_ADDR']); db_logon ($nick_in_db, $_SERVER['REMOTE_ADDR']);
$_SESSION['id_usuario'] = $nick_in_db; $_SESSION['id_usuario'] = $nick_in_db;
$config['id_user'] = $nick_in_db; $config['id_user'] = $nick_in_db;
config_prepare_session();
if (is_user_admin($config['id_user'])) { if (is_user_admin($config['id_user'])) {
// PHP configuration values // PHP configuration values
$PHPupload_max_filesize = config_return_in_bytes(ini_get('upload_max_filesize')); $PHPupload_max_filesize = config_return_in_bytes(ini_get('upload_max_filesize'));