Merge pull request #56 from bozhinov/Public

Update a.json.php
This commit is contained in:
Oleg Ginzburg
2022-08-05 13:53:13 +03:00
committed by GitHub

View File

@@ -1,36 +1,36 @@
<?php <?php
$html='';
$db = new Db('base','nodes'); $db = new Db('base','nodes');
$nodes = $db->select('select nodename,ip from nodelist order by nodename desc', []); $nodes = $db->select('select nodename,ip from nodelist order by nodename desc', []);
$nodes[]=array('nodename'=>'local'); $nodes[] = ['nodename'=>'local'];
$nodes = array_reverse($nodes); $nodes = array_reverse($nodes);
$ids=array(); $ids = [];
$nth = 0; $nth = 0;
$hres=$this->getTableChunk('srcslist','tbody'); $html = '';
if(!empty($nodes))foreach($nodes as $node) $html_tpl = '';
{
$db1=new Db('base',$node['nodename']);
if($db1!==false)
{
$bases=$db1->select("SELECT idx,name,platform,ver,rev,date FROM bsdsrc ORDER BY CAST(ver AS int)", []);
$hres = $this->getTableChunk('srcslist','tbody');
$hres_set = ($hres !== false);
foreach($nodes as $node){
$db1 = new Db('base', $node['nodename']);
if($db1->error !== false){
$bases = $db1->select("SELECT idx,name,platform,ver,rev,date FROM bsdsrc ORDER BY CAST(ver AS int)", []);
$num = $nth & 1; $num = $nth & 1;
if(!empty($bases)) foreach($bases as $base)
{ foreach($bases as $base){
$idle = 1; $idle = 1;
//print_r($node);exit; if($node['nodename'] != 'local'){
if($node['nodename']!='local')
{
$idle = $this->check_locktime($node['ip']); $idle = $this->check_locktime($node['ip']);
} }
if($hres!==false) if($hres_set){
{
$html_tpl = $hres[1]; $html_tpl = $hres[1];
$vers = (preg_match('#\.\d#',$base['ver']))?'release':'stable'; $vers = (preg_match('#\.\d#',$base['ver']))?'release':'stable';
$vars=array( $vars = [
'nth-num' => 'nth'.$num, 'nth-num' => 'nth'.$num,
'node' => $node['nodename'], 'node' => $node['nodename'],
'name' => $base['name'], 'name' => $base['name'],
@@ -43,34 +43,24 @@ if(!empty($nodes))foreach($nodes as $node)
'icon' => '', 'icon' => '',
'maintenance' => ($idle==0) ? ' maintenance' : '', 'maintenance' => ($idle==0) ? ' maintenance' : '',
'deltitle' => $this->translate('Delete'), 'deltitle' => $this->translate('Delete'),
'updtitle'=>$this->translate('Update'), 'updtitle' => $this->translate('Update')
); ];
foreach($vars as $var=>$val) foreach($vars as $var => $val){
$html_tpl = str_replace('#'.$var.'#', $val, $html_tpl); $html_tpl = str_replace('#'.$var.'#', $val, $html_tpl);
}
$html .= $html_tpl; $html .= $html_tpl;
} }
$ids[] = '#src'.$base['ver']; $ids[] = '#src'.$base['ver'];
} }
$nth++; $nth++;
} }
} }
$html=str_replace(array("\n","\r","\t"),'',$html); if(!empty($ids)){
$tasks='';
if(!empty($ids))
{
$tasks = $this->getRunningTasks($ids); $tasks = $this->getRunningTasks($ids);
} $html_tpl = str_replace(["\n","\r","\t"], '', $hres[1]);
$vars = [
$html_tpl=str_replace(array("\n","\r","\t"),'',$hres[1]);
if($hres!==false)
{
$vars=array(
'nth-num' => 'nth0', 'nth-num' => 'nth0',
'status' => '', 'status' => '',
'jstatus' => $this->translate('Updating'), 'jstatus' => $this->translate('Updating'),
@@ -78,28 +68,19 @@ if($hres!==false)
'desktop' => ' s-off', 'desktop' => ' s-off',
'maintenance' => ' maintenance busy', 'maintenance' => ' maintenance busy',
'updtitle' => $this->translate('Update'), 'updtitle' => $this->translate('Update'),
'deltitle'=>$this->translate('Delete'), 'deltitle' => $this->translate('Delete')
); ];
foreach($vars as $var=>$val) foreach($vars as $var => $val) {
$html_tpl = str_replace('#'.$var.'#', $val, $html_tpl); $html_tpl = str_replace('#'.$var.'#', $val, $html_tpl);
} }
}
/* $included_result_array = [
echo json_encode(array( 'tbody' => str_replace(["\n","\r","\t"], '', $html),
'tbody'=>$html,
'error' => false, 'error' => false,
'func' => 'fillTable', 'func' => 'fillTable',
'id' => 'srcslist', 'id' => 'srcslist',
'tasks' => $tasks, 'tasks' => $tasks,
'template'=>$html_tpl, 'template' => $html_tpl
)); ];
*/
$included_result_array=array(
'tbody'=>$html,
'error'=>false,
'func'=>'fillTable',
'id'=>'srcslist',
'tasks'=>$tasks,
'template'=>$html_tpl,
);