github-personal/control-pane
1
0
Fork 0
mirror of https://github.com/outbackdingo/control-pane.git synced 2026-02-06 01:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* fixes all around

Browse Source
This commit is contained in:
Momchil Bozhinov
2021-02-16 13:03:16 +02:00
parent dbf44b32fa
commit 2d989cdff1
20 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
php/clonos.php
View File

@@ -91,7 +91,7 @@ class ClonOS {
}
$this->config=new Config();
/* determine lang */
if(!array_key_exists($this->language, $this->config->languages)) $this->language='en';
include($this->realpath_public.'/lang/'.$this->language.'.php');
@@ -1564,7 +1564,7 @@ class ClonOS {
$res=$db->selectOne('SELECT * FROM media WHERE idx=?', array([(int)$this->form['media_id'], PDO::PARAM_INT]));
if($res===false || empty($res)) return array('error'=>true,'res'=>print_r($res,true));
//if($res['jname']=='-') // если медиа отвязана, то проÑ
//if($res['jname']=='-') // еÑ<EFBFBD>ли медиа отвÑ<EFBFBD>зана, то проÑ
$res=CBSD::run(
'media mode=remove name="%s" path="%s" jname="%s" type="%s"', //.$res['name']
@@ -1664,7 +1664,7 @@ class ClonOS {
$stable_arr=array('release','stable');
$stable_num=strlen(intval($ver))<strlen($ver)?0:1;
$stable=$stable_arr[$stable_num];
$bid=$ver.'-amd64-'.$stable_num; // !!! КОСТЫЛЬ
$bid=$ver.'-amd64-'.$stable_num; // !!! КОСТЫЛЬ
$res=$this->fillRepoTr($id);
$html=$res['html'];
@@ -1696,12 +1696,12 @@ class ClonOS {
if($db->isConnected()){
if($bsdsrc){
$res=$db->selectOne("SELECT idx,platform,ver FROM bsdsrc WHERE idx=?", array([(int)$id, PDO::PARAM_INT]));
$res['name']='—';
$res['arch']='—';
$res['targetarch']='—';
$res['name']='—';
$res['arch']='—';
$res['targetarch']='—';
$res['stable']=strlen(intval($res['ver']))<strlen($res['ver'])?0:1;
$res['elf']='—';
$res['date']='—';
$res['elf']='—';
$res['date']='—';
}else{
$res=$db->selectOne("SELECT idx,platform,name,arch,targetarch,ver,stable,elf,date FROM bsdbase WHERE ver=?", array([(int)$id, PDO::PARAM_INT]));
}
@@ -1753,7 +1753,7 @@ class ClonOS {
$stable_num=strlen(intval($ver))<strlen($ver)?0:1; //'release':'stable';
$stable=$stable_arr[$stable_num];
$bid=$ver.'-amd64-'.$stable_num; // !!! КОСТЫЛЬ
$bid=$ver.'-amd64-'.$stable_num; // !!! КОСТЫЛЬ
$vars=array(
'nth-num'=>'nth0',
@@ -1761,12 +1761,12 @@ class ClonOS {
'node'=>'local',
'ver'=>$ver,
'name'=>'base',
'platform'=>'—',
'arch'=>'—',
'targetarch'=>'—',
'platform'=>'—',
'arch'=>'—',
'targetarch'=>'—',
'stable'=>$stable,
'elf'=>'—',
'date'=>'—',
'elf'=>'—',
'date'=>'—',
'maintenance'=>' busy',
'protitle'=>$this->translate('Delete'),
);
@@ -2021,11 +2021,9 @@ class ClonOS {
return $arr;
}
function ccmd_getFreeCname()
{
function ccmd_getFreeCname(){
$arr=array();
$add_cmd=' default_jailname=kube';
$res=$this->cbsd_cmd("freejname".$add_cmd);
$res=$this->CBSD::run("freejname default_jailname=kube", []);
if($res['error']){
$arr['error']=true;
$arr['error_message']=$err['error_message'];
@@ -2036,8 +2034,7 @@ class ClonOS {
return $arr;
}
function ccmd_k8sCreate()
{
function ccmd_k8sCreate(){
$form=$this->form;
$res=array();
$ass_arr=array(
@@ -2075,6 +2072,7 @@ class ClonOS {
{
if($form['pv_enable']=='on') $res['pv_enable']="1";
}
$res['kubelet_master']="0";
if(isset($form['kubelet_master']))
{
@@ -2100,14 +2098,15 @@ class ClonOS {
return array('error'=>'true','errorMessage'=>'something wrong...');
}
}
function postCurl($url,$vars=false)
{
if($vars===false) return array('error'=>true,'errorMessage'=>'something wrong...');
$txt_vars=json_encode($vars);
//$txt_vars=http_build_query($vars);
$ch = curl_init($url);
// curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -2664,7 +2663,7 @@ class ClonOS {
function ccmd_imageExport(){
// cbsd jexport jname=XXX dstdir=<path_to_imported_dir>
$jname=$this->form['id'];
if(empty($jname)) $this->messageError('Jname is incorrect in export command! Is «'.$jname.'».');
if(empty($jname)) $this->messageError('Jname is incorrect in export command! Is «'.$jname.'».');
return CBSD::run(
'task owner=%s mode=new {cbsd_loc} jexport gensize=1 jname=%s dstdir=%s',

2
php/config.php
View File

@@ -1,5 +1,7 @@
<?php
require_once("cbsd.php");
class Config
{
/* Список языков, используемых в проекте */

3
php/db.php
View File

@@ -13,7 +13,7 @@ class Db {
*/
function __construct($place='base', $database='', $connect = null){
if (!is_null($connect)){
if (is_null($connect)){
list($file_name, $connect) = $this->prep_connect($place, $database);
if(is_null($file_name) || !file_exists($file_name)){
@@ -38,6 +38,7 @@ class Db {
$this->error=true;
$this->error_message=$e->getMessage(); //'DB Error';
}
}
private function prep_connect($place, $database){

2
public/pages/authkey/a.json.php
View File

@@ -1,7 +1,7 @@
<?php
$db=new Db('base','authkey');
$res=$db->select('SELECT idx,name,authkey FROM authkey;');
$res=$db->select('SELECT idx,name,authkey FROM authkey;', []);
$html='';
if($res!==false)

4
public/pages/bases/a.json.php
View File

@@ -2,7 +2,7 @@
$html='';
$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=array_reverse($nodes);
@@ -14,7 +14,7 @@ if(!empty($nodes))foreach($nodes as $node)
$db1=new Db('base',$node['nodename']);
if($db1!==false)
{
$bases=$db1->select("SELECT idx,platform,name,arch,targetarch,ver,stable,elf,date FROM bsdbase order by cast(ver AS int)");
$bases=$db1->select("SELECT idx,platform,name,arch,targetarch,ver,stable,elf,date FROM bsdbase order by cast(ver AS int)", []);
$num=$nth & 1;
if(!empty($bases)) foreach($bases as $base)

4
public/pages/bhyvevms/a.json.php
View File

@@ -4,7 +4,7 @@ $html='';
//if($hres!==false) $thead=$hres[1];
$db=new Db('base','nodes');
$res=$db->select('select nodename from nodelist');
$res=$db->select('select nodename from nodelist', []);
$nodes=array('local');
if(!empty($res))foreach($res as $val) $nodes[]=$val['nodename'];
@@ -19,7 +19,7 @@ if(!empty($nodes))foreach($nodes as $node)
$db1=new Db('base',$node);
if($db1!==false)
{
$bhyves=$db1->select("SELECT jname,vm_ram,vm_cpus,vm_os_type,hidden,protected,bhyve_vnc_tcp_bind FROM bhyve where hidden!=1 order by jname asc;");
$bhyves=$db1->select("SELECT jname,vm_ram,vm_cpus,vm_os_type,hidden,protected,bhyve_vnc_tcp_bind FROM bhyve where hidden!=1 order by jname asc;", []);
//$allnodes[$node]=$bhyves;
$num=$nth & 1;

2
public/pages/imported/a.json.php
View File

@@ -57,7 +57,7 @@ if(!empty($images)) foreach($images as $item)
$filesize=$this->fileSizeConvert($size,1024,true);
$query="select count(*) as busy from taskd where status<2 and jname='${item['jname']}'";
$busy=$this->_db_tasks->selectAssoc($query);
$busy=$this->_db_tasks->selectOne($query, []);
$jstatus='';
$jbusy='';
if($busy['busy']==1)

10
public/pages/instance_jail/a.json.php
View File

@@ -5,6 +5,8 @@ if(!empty($this->_vars['hash']))
return;
}
require_once("../php/cbsd.php");
$sys_helpers=array();
// 'network','cbsd','bhyvenet','general','zfsinstall','userspw','natcfg','jconstruct',
//);
@@ -15,7 +17,7 @@ if($db!==false)
$query="select module from sys_helpers_list";
if(!$db->error)
{
$res=$db->select($query);
$res=$db->select($query, []);
if(!empty($res))
{
foreach($res as $r) $sys_helpers[]=$r['module'];
@@ -26,7 +28,7 @@ if($db!==false)
$html='';
$arr=array();
$res=$this->cbsd_cmd('forms header=0');
$res=CBSD::run('forms header=0', []);
if($res['retval']==0)
{
$empty_logo='/images/logo/empty.png';
@@ -46,14 +48,14 @@ if($res['retval']==0)
$file_name=$db->getFileName();
if(!file_exists($file_name))
{
$res=$this->cbsd_cmd('forms module='.$item.' inter=0');
$res=CBSD::run('forms module=%s inter=0',[$item]);
if($res['retval']==0)
{
$db=new Db('helper',$item);
}
}
}
if($db!==false && !$db->error) $res=$db->selectAssoc("select longdesc from system limit 1");
if($db!==false && !$db->error) $res=$db->selectOne("select longdesc from system", []);
if(isset($res['longdesc'])) $description=$res['longdesc']; else $description=$this->translate('no data').'&hellip; ('.$file_name.')';
}else{

4
public/pages/instance_jail/helpers.php
View File

@@ -1,12 +1,14 @@
<?php
require_once("../php/cbsd.php");
$hash=$this->url_hash; //=preg_replace('/^#/','',$this->_vars['hash']);
$db_path=false;
if(!isset($this->_vars['db_path']))
{
//$db_path=$this->_vars['db_path'];
$res=$this->cbsd_cmd('make_tmp_helper module='.$hash);
$res=CBSD::run('make_tmp_helper module=%s', [$hash]);
if($res['retval']==0)
{
$db_path=$res['message'];

4
public/pages/jailscontainers/a.json.php
View File

@@ -13,7 +13,7 @@ $html='';
//if($hres!==false) $thead=$hres[1];
$db=new Db('base','nodes');
$res=$db->select('select nodename from nodelist');
$res=$db->select('select nodename from nodelist', []);
$nodes=array('local');
if(!empty($res))foreach($res as $val) $nodes[]=$val['nodename'];
@@ -28,7 +28,7 @@ if(!empty($nodes))foreach($nodes as $node)
$db1=new Db('base',$node);
if($db1!==false)
{
$jails=$db1->select("SELECT jname,ip4_addr,status,protected FROM jails WHERE emulator!='bhyve' and hidden!=1 order by jname asc;");
$jails=$db1->select("SELECT jname,ip4_addr,status,protected FROM jails WHERE emulator!='bhyve' and hidden!=1 order by jname asc;", []);
$allnodes[$node]=$jails;
$num=$nth & 1;

4
public/pages/jailscontainers/helpers.json.php
View File

@@ -10,7 +10,7 @@ if(empty($hash))
$query="select module from jails_helpers_list";
if(!$db->error)
{
$res=$db->select($query);
$res=$db->select($query, []);
if(!empty($res))
{
foreach($res as $r) $jails_helpers[]=$r['module'];
@@ -24,7 +24,7 @@ if(empty($hash))
$db=new Db('helper',array('jname'=>$jail_name,'helper'=>$helper));
if(!$db->error) // !error — значит хелпер установлен
{
$res=$db->selectAssoc("select longdesc from system limit 1");
$res=$db->selectOne("select longdesc from system", []);
if(isset($res['longdesc'])) $description=$res['longdesc']; else $description=$this->translate('no data').'&hellip; ('.$file_name.')';
$lst[]=array('helper'=>$helper,'description'=>$description);
}else{

2
public/pages/media/a.json.php
View File

@@ -1,7 +1,7 @@
<?php
$db=new Db('base','storage_media');
$res=$db->select('SELECT idx,name,path,jname FROM media where type="iso"');
$res=$db->select('SELECT idx,name,path,jname FROM media where type="iso"', []);
$html='';
if($res!==false)

2
public/pages/nodes/a.json.php
View File

@@ -1,4 +1,4 @@
<?php
//echo '{}';
//$ips=$db1->select("select group_concat(ip,'; ') from nodelist"); // ïåðåíåñòè â nodes.php
//$ips=$db1->select("select group_concat(ip,'; ') from nodelist", []); // ïåðåíåñòè â nodes.php
$included_result_array=array();

6
public/pages/overview/a.json.php
View File

@@ -14,7 +14,7 @@ $res_array=array(
$nodenames=array('local');
$db=new Db('base','nodes');
$nodes=$db->select('select nodename,ip from nodelist');
$nodes=$db->select('select nodename,ip from nodelist', []);
if(!empty($nodes))foreach($nodes as $node)
{
$idle=$this->check_locktime($node['ip']);
@@ -39,10 +39,10 @@ if(!empty($nodenames))foreach($nodenames as $name)
exit;
}
$jcounts=$ndb->selectAssoc('SELECT COUNT(*) as count FROM jails;');
$jcounts=$ndb->selectOne('SELECT COUNT(*) as count FROM jails;', []);
$res_array['num-jails']+=$jcounts['count'];
$counts=$ndb->select('SELECT ncpu,physmem,cpufreq FROM local;');
$counts=$ndb->select('SELECT ncpu,physmem,cpufreq FROM local;', []);
if(!empty($counts))foreach($counts as $cel)
{
$res_array['num-cores']+=$cel['ncpu'];

4
public/pages/sources/a.json.php
View File

@@ -2,7 +2,7 @@
$html='';
$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=array_reverse($nodes);
@@ -14,7 +14,7 @@ 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)");
$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)

2
public/pages/tasklog/a.json.php
View File

@@ -3,7 +3,7 @@
$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='${username}' ORDER BY id DESC");
$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)

2
public/pages/users/a.json.php
View File

@@ -16,7 +16,7 @@ $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");
$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;

2
public/pages/vm_packages/a.json.php
View File

@@ -4,7 +4,7 @@ $html='';
$db=new Db('base','local');
if($db!==false)
{
$res=$db->select("select id,name,description,pkg_vm_ram,pkg_vm_disk,pkg_vm_cpus,owner from vmpackages order by name asc");
$res=$db->select("select id,name,description,pkg_vm_ram,pkg_vm_disk,pkg_vm_cpus,owner from vmpackages order by name asc", []);
}
$nth=0;

2
public/pages/vpnet/a.json.php
View File

@@ -1,7 +1,7 @@
<?php
$db=new Db('base','vpnet');
$res=$db->select('SELECT idx,name,vpnet FROM vpnet');
$res=$db->select('SELECT idx,name,vpnet FROM vpnet', []);
$html='';
if($res!==false)

6
public/upload.php
View File

@@ -1,6 +1,8 @@
<?php
header('Content-Type: application/json');
require_once("../php/cbsd.php");
$cmd='';
if($_SERVER['REQUEST_METHOD'] === 'POST')
@@ -41,9 +43,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST')
$status = 'ok'; //'Successfully uploaded!';
if($cmd=='import')
{
$username=$clonos->getUserName();
$command='task owner='.$username.' mode=new /usr/local/bin/cbsd jimport jname='.$filename.' inter=0';
$res=$clonos->cbsd_cmd($command);
$res=CBSD::run('task owner=%s mode=new /usr/local/bin/cbsd jimport jname=%s' inter=0', [$clonos->getUserName(), $filename]);
}
}else{
$status = 'Upload Fail: Unknown error occurred!';