From fb139b95cba99ae4bd227139e36818331ceead46 Mon Sep 17 00:00:00 2001 From: olevole Date: Mon, 27 Feb 2023 02:17:33 +0300 Subject: [PATCH] wip --- public/pages/instance_jail/helpers.php | 5 +++-- public/vnc.php | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/pages/instance_jail/helpers.php b/public/pages/instance_jail/helpers.php index c3b4cf0f..f0521011 100644 --- a/public/pages/instance_jail/helpers.php +++ b/public/pages/instance_jail/helpers.php @@ -44,7 +44,7 @@ $html=<<generate(); -$res_html='test'; +//$res_html='test'; $html.='

Helper: '.$hash.'

'.$res_html; @@ -52,7 +52,7 @@ $html.='

Helper: '.$hash.'

'.$res_html; // olevole: why return here? // Undefined property: ClonOS::$html in /usr/local/www/clonos/public/pages/instance_jail/helpers.php on line 49 //return array('html'=>$this->html); -echo json_encode(array('html'=>$html,'func'=>'fillTab')); +echo json_encode(array('html'=>$html,'func'=>'fillTab'));exit; /* $included_result_array=array( @@ -63,3 +63,4 @@ $included_result_array=array( ); */ + diff --git a/public/vnc.php b/public/vnc.php index 8b6978bb..ccf8cc0b 100644 --- a/public/vnc.php +++ b/public/vnc.php @@ -41,6 +41,8 @@ function runVNC($jname) if(isset($_SERVER['SERVER_NAME']) && !empty(trim($_SERVER['SERVER_NAME'])) && (strcmp($_SERVER['SERVER_NAME'], "_") != 0)){ $nodeip = $_SERVER['SERVER_NAME']; } + } else { + $nodeip = $_SERVER['SERVER_ADDR']; } # TODO: This will send the pass in clear text