diff --git a/public/pages/sources/a.json.php b/public/pages/sources/a.json.php index fbbac912..3738ca92 100644 --- a/public/pages/sources/a.json.php +++ b/public/pages/sources/a.json.php @@ -1,105 +1,86 @@ select('select nodename,ip from nodelist order by nodename desc', []); -$nodes[]=array('nodename'=>'local'); -$nodes=array_reverse($nodes); +$db = new Db('base','nodes'); +$nodes = $db->select('select nodename,ip from nodelist order by nodename desc', []); +$nodes[] = ['nodename'=>'local']; +$nodes = array_reverse($nodes); -$ids=array(); -$nth=0; -$hres=$this->getTableChunk('srcslist','tbody'); -if(!empty($nodes))foreach($nodes as $node) -{ - $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)", []); - - $num=$nth & 1; - if(!empty($bases)) foreach($bases as $base) - { - $idle=1; - //print_r($node);exit; - if($node['nodename']!='local') - { - $idle=$this->check_locktime($node['ip']); +$ids = []; +$nth = 0; +$html = ''; +$html_tpl = ''; + +$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; + + foreach($bases as $base){ + $idle = 1; + if($node['nodename'] != 'local'){ + $idle = $this->check_locktime($node['ip']); } - - if($hres!==false) - { - $html_tpl=$hres[1]; - $vers=(preg_match('#\.\d#',$base['ver']))?'release':'stable'; - $vars=array( - 'nth-num'=>'nth'.$num, - 'node'=>$node['nodename'], - 'name'=>$base['name'], - 'platform'=>$base['platform'], - 'version'=>$base['ver'], - 'version1'=>$vers, - 'rev'=>$base['rev'], - 'date'=>$base['date'], - 'jstatus'=>'', - 'icon'=>'', - 'maintenance'=>($idle==0)?' maintenance':'', - 'deltitle'=>$this->translate('Delete'), - 'updtitle'=>$this->translate('Update'), - ); - - foreach($vars as $var=>$val) - $html_tpl=str_replace('#'.$var.'#',$val,$html_tpl); - - $html.=$html_tpl; + + if($hres_set){ + $html_tpl = $hres[1]; + $vers = (preg_match('#\.\d#',$base['ver']))?'release':'stable'; + $vars = [ + 'nth-num' => 'nth'.$num, + 'node' => $node['nodename'], + 'name' => $base['name'], + 'platform' => $base['platform'], + 'version' => $base['ver'], + 'version1' => $vers, + 'rev' => $base['rev'], + 'date' => $base['date'], + 'jstatus' => '', + 'icon' => '', + 'maintenance' => ($idle==0) ? ' maintenance' : '', + 'deltitle' => $this->translate('Delete'), + 'updtitle' => $this->translate('Update') + ]; + + foreach($vars as $var => $val){ + $html_tpl = str_replace('#'.$var.'#', $val, $html_tpl); + } + $html .= $html_tpl; } - $ids[]='#src'.$base['ver']; - + $ids[] = '#src'.$base['ver']; } - $nth++; } } -$html=str_replace(array("\n","\r","\t"),'',$html); +if(!empty($ids)){ + $tasks = $this->getRunningTasks($ids); + $html_tpl = str_replace(["\n","\r","\t"], '', $hres[1]); + $vars = [ + 'nth-num' => 'nth0', + 'status' => '', + 'jstatus' => $this->translate('Updating'), + //'icon' => 'spin6 animate-spin', + 'desktop' => ' s-off', + 'maintenance' => ' maintenance busy', + 'updtitle' => $this->translate('Update'), + 'deltitle' => $this->translate('Delete') + ]; -$tasks=''; -if(!empty($ids)) -{ - $tasks=$this->getRunningTasks($ids); + foreach($vars as $var => $val) { + $html_tpl = str_replace('#'.$var.'#', $val, $html_tpl); + } } -$html_tpl=str_replace(array("\n","\r","\t"),'',$hres[1]); -if($hres!==false) -{ - $vars=array( - 'nth-num'=>'nth0', - 'status'=>'', - 'jstatus'=>$this->translate('Updating'), - //'icon'=>'spin6 animate-spin', - 'desktop'=>' s-off', - 'maintenance'=>' maintenance busy', - 'updtitle'=>$this->translate('Update'), - 'deltitle'=>$this->translate('Delete'), - ); - - foreach($vars as $var=>$val) - $html_tpl=str_replace('#'.$var.'#',$val,$html_tpl); -} - -/* -echo json_encode(array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'srcslist', - 'tasks'=>$tasks, - 'template'=>$html_tpl, -)); -*/ -$included_result_array=array( - 'tbody'=>$html, - 'error'=>false, - 'func'=>'fillTable', - 'id'=>'srcslist', - 'tasks'=>$tasks, - 'template'=>$html_tpl, -); \ No newline at end of file +$included_result_array = [ + 'tbody' => str_replace(["\n","\r","\t"], '', $html), + 'error' => false, + 'func' => 'fillTable', + 'id' => 'srcslist', + 'tasks' => $tasks, + 'template' => $html_tpl +]; \ No newline at end of file