';print_r($tasks);exit;
-$html_tpl_1=str_replace(array("\n","\r","\t"),'',$hres[1]);
-if($hres!==false)
-{
- $vars=array(
- 'nth-num'=>'nth0',
- 'status'=>'',
- 'jstatus'=>$this->translate('Creating'),
- 'icon'=>'spin6 animate-spin',
- 'desktop'=>' s-off',
- 'maintenance'=>' maintenance busy',
- 'protected'=>'icon-cancel',
- 'protitle'=>'',
- 'vnc_title'=>$this->translate('Open VNC'),
- 'reboot_title'=>$this->translate('Restart jail'),
- );
-
- foreach($vars as $var=>$val)
- $html_tpl_1=str_replace('#'.$var.'#',$val,$html_tpl_1);
+if($hres !== false){
+ $html_tpl_1 = str_replace(["\n","\r","\t"], '', $hres[1]);
+ $vars = [
+ 'nth-num' => 'nth0',
+ 'status' => '',
+ 'jstatus' => $this->translate('Creating'),
+ 'icon' => 'spin6 animate-spin',
+ 'desktop' => ' s-off',
+ 'maintenance' => ' maintenance busy',
+ 'protected' => 'icon-cancel',
+ 'protitle' => '',
+ 'vnc_title' => $this->translate('Open VNC'),
+ 'reboot_title' => $this->translate('Restart jail')
+ ];
+
+ foreach($vars as $var => $val){
+ $html_tpl_1 = str_replace('#'.$var.'#', $val, $html_tpl_1);
+ }
}
-$protected=array(
- 0=>array(
- 'icon'=>'icon-cancel',
- 'title'=>$this->translate('Delete')
- ),
- 1=>array(
- 'icon'=>'icon-lock',
- 'title'=>$this->translate('Protected jail')
- )
-);
+$protected = [
+ 0 => [
+ 'icon' => 'icon-cancel',
+ 'title' => $this->translate('Delete')
+ ],
+ 1 => [
+ 'icon' => 'icon-lock',
+ 'title' => $this->translate('Protected jail')
+ ]
+];
-/*
-echo json_encode(array(
-// 'thead'=>$thead,
- 'tbody'=>$html,
- 'error'=>false,
- 'func'=>'fillTable',
- 'id'=>'jailslist',
- 'tasks'=>$tasks,
- 'template'=>$html_tpl_1,
- 'protected'=>$protected,
-));
-*/
-$included_result_array=array(
- 'tbody'=>$html,
- 'error'=>false,
- 'func'=>'fillTable',
- 'id'=>'jailslist',
- 'tasks'=>$tasks,
- 'template'=>$html_tpl_1,
- 'protected'=>$protected,
-);
\ No newline at end of file
+$included_result_array = [
+ 'tbody' => str_replace(["\n","\r","\t"], '', $html),
+ 'error' => false,
+ 'func' => 'fillTable',
+ 'id' => 'jailslist',
+ 'tasks' => $tasks,
+ 'template' => $html_tpl_1,
+ 'protected' => $protected
+];
\ No newline at end of file
diff --git a/public/pages/jailscontainers/en.index.php b/public/pages/jailscontainers/en.index.php
index b482eecb..86e05f9d 100644
--- a/public/pages/jailscontainers/en.index.php
+++ b/public/pages/jailscontainers/en.index.php
@@ -1,19 +1,17 @@
uri_chunks[1]))
-{
+if(isset($clonos->uri_chunks[1])){
include('helpers.php');
return;
}
-
-$clonos->useDialogs(array(
+$clonos->useDialogs([
'vnc',
'jail-settings',
'jail-settings-config-menu',
'jail-import',
'jail-clone',
'jail-rename',
-));
+]);
?>
Jail containers:
diff --git a/public/pages/jailscontainers/helpers.json.php b/public/pages/jailscontainers/helpers.json.php
index d1b654ac..748c1ffe 100644
--- a/public/pages/jailscontainers/helpers.json.php
+++ b/public/pages/jailscontainers/helpers.json.php
@@ -1,113 +1,95 @@
url_hash;
-if(empty($hash))
-{
+$hash = $this->url_hash;
+if(empty($hash)){
# Узнаём список хелперов
- $jails_helpers=array();
- $db=new Db('clonos');
- if($db!==false)
- {
- $query="select module from jails_helpers_list";
- if(!$db->error)
- {
- $res=$db->select($query, []);
- if(!empty($res))
- {
- foreach($res as $r) $jails_helpers[]=$r['module'];
+ $jails_helpers = [];
+ $db = new Db('clonos');
+ if (!$db->error){
+ $res = $db->select("select module from jails_helpers_list", []);
+ if(!empty($res)){
+ foreach($res as $r){
+ $jails_helpers[] = $r['module'];
}
}
}
-
- $lst=array();
- if(!empty($jails_helpers)) foreach($jails_helpers as $helper)
- {
- $db=new Db('helper',array('jname'=>$jail_name,'helper'=>$helper));
+ $lst = [];
+ foreach($jails_helpers as $helper){
+ $db = new Db('helper', ['jname' => $jail_name, 'helper' => $helper]);
if(!$db->error) // !error — значит хелпер установлен
{
- $res=$db->selectOne("select longdesc from system", []);
- if(isset($res['longdesc'])) $description=$res['longdesc']; else $description=$this->translate('no data').'… ('.$file_name.')';
- $lst[]=array('helper'=>$helper,'description'=>$description);
- }else{
- $hlst[]=$helper;
+ $res = $db->selectOne("select longdesc from system", []);
+ if(isset($res['longdesc'])){
+ $description = $res['longdesc'];
+ } else {
+ $description = $this->translate('no data').'… ('.$file_name.')';
+ }
+ $lst[] = ['helper' => $helper, 'description' => $description];
+ } else {
+ $hlst[] = $helper;
}
}
-
- $html='';
- $html_tpl='';
- $empty_logo='/images/logo/empty.png';
- $hres=$this->getTableChunk('helpers','tbody');
- if($hres!==false) $html_tpl=$hres[1];
-
- if(!empty($lst) && !empty($html_tpl))
- {
- foreach($lst as $item)
- {
- $tpl=$html_tpl;
- $logo_file='images/logo/'.$item['helper'].'.png';
- $logo=file_exists($this->realpath_public.$logo_file)?'/'.$logo_file:$empty_logo;
- $vars=array(
- 'nth-num'=>'nth0',
- 'logo'=>$logo,
- 'name'=>$item['helper'],
- 'description'=>$item['description'],
- 'opentitle'=>$this->translate('Open'),
- );
-
- foreach($vars as $var=>$val)
- $tpl=str_replace('#'.$var.'#',$val,$tpl);
-
- $html.=$tpl;
- }
- }else{
- $html=''.$this->translate('No installed helpers').' diff --git a/public/pages/jailscontainers/ru.index.php b/public/pages/jailscontainers/ru.index.php index 8c53ca55..781592ab 100644 --- a/public/pages/jailscontainers/ru.index.php +++ b/public/pages/jailscontainers/ru.index.php @@ -1,19 +1,17 @@ uri_chunks[1])) -{ +if(isset($clonos->uri_chunks[1])){ include('helpers.php'); return; } - -$clonos->useDialogs(array( +$clonos->useDialogs([ 'vnc', 'jail-settings', 'jail-settings-config-menu', 'jail-import', 'jail-clone', - 'jail-rename', -)); + 'jail-rename' +]); ?>
diff --git a/public/pages/k8s/ru.index.php b/public/pages/k8s/ru.index.php index feb708ed..4dc26601 100644 --- a/public/pages/k8s/ru.index.php +++ b/public/pages/k8s/ru.index.php @@ -1,15 +1,5 @@ uri_chunks[1])) -{ - include('helpers.php'); - return; -} -*/ - -$clonos->useDialogs(array( - 'k8s-new', -)); +$clonos->useDialogs(['k8s-new']); /* Модуль kubernetes использует в работе преднастроенный образ Linux, который не входит в базовую установку ClonOS. diff --git a/public/pages/media/a.json.php b/public/pages/media/a.json.php index 0b235fa0..cb18f946 100644 --- a/public/pages/media/a.json.php +++ b/public/pages/media/a.json.php @@ -1,48 +1,37 @@ select('SELECT idx,name,path,jname FROM media where type="iso"', []); +$db = new Db('base', 'storage_media'); +$res = $db->select('SELECT idx,name,path,jname FROM media where type="iso"', []); -$html=''; -if($res!==false) -{ - $nth=0; - $num=$nth & 1; +$html = ''; +if($res !== false){ + $nth = 0; + $num = $nth & 1; - if(!empty($res)) foreach($res as $item) - { - $hres=$this->getTableChunk('mediaslist','tbody'); - if($hres!==false) - { - $html_tmp=$hres[1]; - $vars=array( - 'nth-num'=>'nth'.$num, - 'mediaid'=>$item['idx'], - 'medianame'=>$item['name'], - 'mediapath'=>$item['path'], - 'jname'=>$item['jname'], - 'deltitle'=>' title="'.$this->translate('Delete').'"', - ); - - foreach($vars as $var=>$val) - $html_tmp=str_replace('#'.$var.'#',$val,$html_tmp); - - $html.=$html_tmp; + foreach($res as $item){ + $hres = $this->getTableChunk('mediaslist','tbody'); + if($hres !== false){ + $html_tmp = $hres[1]; + $vars = [ + 'nth-num' => 'nth'.$num, + 'mediaid' => $item['idx'], + 'medianame' => $item['name'], + 'mediapath' => $item['path'], + 'jname' => $item['jname'], + 'deltitle' => ' title="'.$this->translate('Delete').'"' + ]; + + foreach($vars as $var => $val){ + $html_tmp = str_replace('#'.$var.'#', $val, $html_tmp); + } + $html .= $html_tmp; } } - - /* - echo json_encode(array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'mediaslist', - )); - */ - $included_result_array=array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'mediaslist', - ); + + $included_result_array = [ + 'tbody' => $html, + 'error' => false, + 'func' => 'fillTable', + 'id' => 'mediaslist' + ]; } \ No newline at end of file diff --git a/public/pages/nodes/a.json.php b/public/pages/nodes/a.json.php index e712f53e..8ecf7359 100644 --- a/public/pages/nodes/a.json.php +++ b/public/pages/nodes/a.json.php @@ -1,4 +1,4 @@ select("select group_concat(ip,'; ') from nodelist", []); // nodes.php -$included_result_array=array(); \ No newline at end of file +$included_result_array = []; \ No newline at end of file diff --git a/public/pages/overview/a.json.php b/public/pages/overview/a.json.php index bdaa53c6..9853e88b 100644 --- a/public/pages/overview/a.json.php +++ b/public/pages/overview/a.json.php @@ -1,62 +1,57 @@ 1, - 'online-nodes'=>1, - 'offline-nodes'=>0, - 'num-jails'=>0, - 'num-cores'=>0, - 'average'=>0, - 'sum-ram'=>0, - 'sum-storage'=>'Unknown', - 'error'=>false, - 'error_message'=>'', -); +$res_array = [ + 'num-nodes' => 1, + 'online-nodes' => 1, + 'offline-nodes' => 0, + 'num-jails' => 0, + 'num-cores' => 0, + 'average' => 0, + 'sum-ram' => 0, + 'sum-storage' => 'Unknown', + 'error' => false, + 'error_message' => '' +]; -$nodenames=array('local'); -$db=new Db('base','nodes'); -$nodes=$db->select('select nodename,ip from nodelist', []); -if(!empty($nodes))foreach($nodes as $node) -{ - $idle=$this->check_locktime($node['ip']); - if($idle==0) $res_array['offline-nodes']++; else $res_array['online-nodes']++; - - $nodenames[]=$node['nodename']; +$nodenames = ['local']; +$db = new Db('base','nodes'); +$nodes = $db->select('select nodename,ip from nodelist', []); +foreach($nodes as $node){ + $idle = $this->check_locktime($node['ip']); + if($idle == 0){ + $res_array['offline-nodes']++; + } else { + $res_array['online-nodes']++; + } + $nodenames[] = $node['nodename']; } - // extra+1: мы предполагаем, что сервер с WEB интерфейсом // также играет роль ноды - ее можно использовать полноценно со // всеми ресурсами -$res_array['num-nodes']=count($nodes)+1; +$res_array['num-nodes'] = count($nodes) + 1; -if(!empty($nodenames))foreach($nodenames as $name) -{ - $ndb=new Db('base',trim($name)); - if($ndb===false) - { - //echo json_encode(array('error'=>true,'error_message'=>$ndb->error_message)); - $included_result_array=array('error'=>true,'error_message'=>$ndb->error_message); +foreach($nodenames as $name){ + $ndb = new Db('base', trim($name)); + if($ndb->error){ + $included_result_array = ['error' => true, 'error_message' => $ndb->error_message]; exit; } - - $jcounts=$ndb->selectOne('SELECT COUNT(*) as count FROM jails;', []); - $res_array['num-jails']+=$jcounts['count']; - - $counts=$ndb->select('SELECT ncpu,physmem,cpufreq FROM local;', []); - if(!empty($counts))foreach($counts as $cel) - { - $res_array['num-cores']+=$cel['ncpu']; - $res_array['sum-ram']+=$cel['physmem']; - $res_array['average']+=$cel['cpufreq']; + + $jcounts = $ndb->selectOne('SELECT COUNT(*) as count FROM jails;', []); + $res_array['num-jails'] += $jcounts['count']; + + $counts = $ndb->select('SELECT ncpu,physmem,cpufreq FROM local;', []); + foreach($counts as $cel){ + $res_array['num-cores'] += $cel['ncpu']; + $res_array['sum-ram'] += $cel['physmem']; + $res_array['average'] += $cel['cpufreq']; } } -if($res_array['average']>0) -{ - $res_array['average']=$this->GhzConvert($res_array['average']/($res_array['num-nodes']?:1)); +if($res_array['average'] > 0){ + $res_array['average'] = $this->GhzConvert($res_array['average']/($res_array['num-nodes']?:1)); } -$res_array['sum-ram']=$this->fileSizeConvert((int) $res_array['sum-ram'],1024,true); +$res_array['sum-ram'] = $this->fileSizeConvert((int) $res_array['sum-ram'], 1024, true); -//echo json_encode($res_array); -$included_result_array=$res_array; \ No newline at end of file +$included_result_array = $res_array; \ No newline at end of file diff --git a/public/pages/sources/a.json.php b/public/pages/sources/a.json.php index 3738ca92..3290ab85 100644 --- a/public/pages/sources/a.json.php +++ b/public/pages/sources/a.json.php @@ -16,7 +16,7 @@ $hres_set = ($hres !== false); foreach($nodes as $node){ $db1 = new Db('base', $node['nodename']); - if($db1->error !== false){ + if(!$db1->error){ $bases = $db1->select("SELECT idx,name,platform,ver,rev,date FROM bsdsrc ORDER BY CAST(ver AS int)", []); $num = $nth & 1; diff --git a/public/pages/tasklog/a.json.php b/public/pages/tasklog/a.json.php index 5bdeb874..046e57ec 100644 --- a/public/pages/tasklog/a.json.php +++ b/public/pages/tasklog/a.json.php @@ -1,84 +1,67 @@ _user_info['username']; - -$db=new Db('base','cbsdtaskd'); - -$res=$db->select("SELECT id,st_time,end_time,cmd,status,errcode,logfile FROM taskd WHERE owner=? ORDER BY id DESC", array([$username])); - +$username = $this->_user_info['username']; +$db = new Db('base','cbsdtaskd'); +$res = $db->select("SELECT id,st_time,end_time,cmd,status,errcode,logfile FROM taskd WHERE owner=? ORDER BY id DESC", array([$username])); $html=''; -if($res!==false) -{ - $nth=0; - $num=$nth & 1; - if(!empty($res)) foreach($res as $item) - { +if(!$db->error){ + $nth = 0; + $num = $nth & 1; + + foreach($res as $item){ //Utils::clonos_syslog("tasklog: HTML"); - $hres=$this->getTableChunk('tasklog','tbody'); - if($hres!==false) - { - $html_tmp=$hres[1]; - $vars=array( - 'nth-num'=>'nth'.$num, - 'logid'=>$item['id'], - 'logcmd'=>$this->colorizeCmd($item['cmd']), - 'logstarttime'=>date("d.m.Y H:i",strtotime($item['st_time'])), - 'logendtime'=>date("d.m.Y H:i",strtotime($item['end_time'])), - 'logstatus'=>$item['status'], - 'logerrcode'=>$item['errcode'], - 'logsize'=>'0 B', - ); - - $logsize=0; - $logfile=$item['logfile']; - if(file_exists($logfile)) - { - $logsize=filesize($logfile); - $vars['logsize']=$this->fileSizeConvert($logsize,1024,true); + $hres = $this->getTableChunk('tasklog','tbody'); + if($hres !== false){ + $html_tmp = $hres[1]; + $vars = [ + 'nth-num' => 'nth'.$num, + 'logid' => $item['id'], + 'logcmd' => $this->colorizeCmd($item['cmd']), + 'logstarttime' => date("d.m.Y H:i", strtotime($item['st_time'])), + 'logendtime' => date("d.m.Y H:i", strtotime($item['end_time'])), + 'logstatus' => $item['status'], + 'logerrcode' => $item['errcode'], + 'logsize'=>'0 B' + ]; + + $logsize = 0; + $logfile = $item['logfile']; + if(file_exists($logfile)){ + $logsize = filesize($logfile); + $vars['logsize'] = $this->fileSizeConvert($logsize,1024,true); } - //if($logsize>0) $vars['logfile']=''.$vars['logfile'].''; - - $vars['buttvalue']=$this->translate('Open'); - - $disabled='disabled'; + $vars['buttvalue'] = $this->translate('Open'); + $disabled = 'disabled'; if($logsize>0) // && $logsize<204800 { $disabled=''; } - $vars['disabled']=$disabled; - - $status=''; - if($item['status']==1) $status=' progress'; - if($item['status']==2 && $item['errcode']==0) $status=' ok'; - if($item['status']==2 && $item['errcode']!=0) $status=' error'; - $vars['status']=$status; - - foreach($vars as $var=>$val) - $html_tmp=str_replace('#'.$var.'#',$val,$html_tmp); - - $html.=$html_tmp; + $vars['disabled'] = $disabled; + $status = ''; + if($item['status'] == 1) $status=' progress'; + if($item['status'] == 2 && $item['errcode'] == 0) $status=' ok'; + if($item['status'] == 2 && $item['errcode'] != 0) $status=' error'; + $vars['status'] = $status; + + foreach($vars as $var => $val){ + $html_tmp = str_replace('#'.$var.'#', $val, $html_tmp); + } + $html .= $html_tmp; //Utils::clonos_syslog("tasklog: HTML: ". $html); } - } else { - Utils::clonos_syslog("tasklog: \$res query empty result:". "SELECT id,st_time,end_time,cmd,status,errcode,logfile FROM taskd WHERE owner='". $username."' ORDER BY id DESC;"); - } - /* - echo json_encode(array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'taskloglist', - )); - */ - $included_result_array=array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'taskloglist', - ); -} else { - Utils::clonos_syslog("tasklog: \$res query failed:". "SELECT id,st_time,end_time,cmd,status,errcode,logfile FROM taskd WHERE owner='". $username."' ORDER BY id DESC;"); -} + } //else { + // Utils::clonos_syslog("tasklog: \$res query empty result:". "SELECT id,st_time,end_time,cmd,status,errcode,logfile FROM taskd WHERE owner='". $username."' ORDER BY id DESC;"); + //} + + $included_result_array = [ + 'tbody' => $html, + 'error' => false, + 'func' => 'fillTable', + 'id' => 'taskloglist' + ]; +}// else { +// Utils::clonos_syslog("tasklog: \$res query failed:". "SELECT id,st_time,end_time,cmd,status,errcode,logfile FROM taskd WHERE owner='". $username."' ORDER BY id DESC;"); +//} diff --git a/public/pages/users/a.json.php b/public/pages/users/a.json.php index fd653c32..96db6ec1 100644 --- a/public/pages/users/a.json.php +++ b/public/pages/users/a.json.php @@ -12,53 +12,36 @@ date_joined TIMESTAMP DATE DEFAULT (datetime('now','localtime')) ); */ -$html=''; -$db=new Db('clonos'); -if($db!==false) -{ - $res=$db->select("select id,username,first_name,last_name,date_joined,last_login,is_active from auth_user order by date_joined desc", []); +$db = new Db('clonos'); +if(!$db->error){ + $res = $db->select("select id,username,first_name,last_name,date_joined,last_login,is_active from auth_user order by date_joined desc", []); } -$nth=0; -$hres=$this->getTableChunk('users','tbody'); +$html = ''; +$hres = $this->getTableChunk('users','tbody'); -$html_tpl=$hres[1]; -if(!empty($res))foreach($res as $r) -{ - $html_tpl1=$html_tpl; - $vars=array( - 'id'=>$r['id'], - 'login'=>$r['username'], - 'first_name'=>$r['first_name'], - 'last_name'=>$r['last_name'], - 'date_joined'=>$r['date_joined'], - 'last_login'=>$r['last_login'], - 'is_active'=>($r['is_active']==1)?'icon-ok':'', - 'edit_title'=>$this->translate('edit_title'), - 'delete_title'=>$this->translate('delete_title'), - ); - foreach($vars as $var=>$val) - $html_tpl1=str_replace('#'.$var.'#',$val,$html_tpl1); - $html.=$html_tpl1; +foreach($res as $r){ + $html_tpl1 = $hres[1]; + $vars = [ + 'id' => $r['id'], + 'login' => $r['username'], + 'first_name' => $r['first_name'], + 'last_name' => $r['last_name'], + 'date_joined' => $r['date_joined'], + 'last_login' => $r['last_login'], + 'is_active' => ($r['is_active']==1) ? 'icon-ok' : '', + 'edit_title' => $this->translate('edit_title'), + 'delete_title' => $this->translate('delete_title'), + ]; + foreach($vars as $var => $val){ + $html_tpl1 = str_replace('#'.$var.'#', $val, $html_tpl1); + } + $html .= $html_tpl1; } - -$html=str_replace(array("\n","\r","\t"),'',$html); - -/* -echo json_encode(array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'userslist', - //'tasks'=>$tasks, - //'template'=>$html_tpl_1, - //'protected'=>$protected, -)); -*/ -$included_result_array=array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'userslist', -); \ No newline at end of file +$included_result_array = [ + 'tbody' => str_replace(["\n","\r","\t"], '', $html), + 'error' => false, + 'func' => 'fillTable', + 'id' => 'userslist' +]; \ No newline at end of file diff --git a/public/pages/users/en.index.php b/public/pages/users/en.index.php index 3d40d19a..7644a604 100644 --- a/public/pages/users/en.index.php +++ b/public/pages/users/en.index.php @@ -1,7 +1,5 @@ useDialogs(array( - 'users-new', -)); +$clonos->useDialogs(['users-new']); ?>