PHP code formatted + made more readable

This commit is contained in:
Malishev Dima 2011-06-20 18:26:03 +03:00
commit c11a9b3e01
18 changed files with 2328 additions and 1891 deletions

View file

@ -1,49 +1,6 @@
<?php <?php
function error_dumper($errno, $errstr, $errfile, $errline) require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/core/utils/error_logger.php'
{ require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/app.init.php';
if (!(error_reporting() & $errno)) {
return;
}
$log = fopen('/tmp/vesta.php.log', 'a+');
switch ($errno) {
case E_USER_ERROR:
$o = "ERROR: [$errno] $errstr\n";
$o.= " Fatal error on line $errline in file $errfile";
$o.= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
$o.= "Aborting...\n";
fwrite($log, $o);
fclose($log);
exit(1);
break;
case E_USER_WARNING: ?>
$o = "WARNING: [$errno] $errstr\n";
fwrite($log, $o);
fclose($log);
break;
case E_USER_NOTICE:
$o = "NOTICE: [$errno] $errstr\n";
fwrite($log, $o);
fclose($log);
break;
default:
$o = "Unknown error type: [$errno] $errstr\n";
fwrite($log, $o);
fclose($log);
break;
}
/* Don't execute PHP internal error handler */
return true;
}
set_error_handler('error_dumper');
require dirname(__FILE__).DIRECTORY_SEPARATOR.'vesta/app.init.php';
?>

View file

@ -1,12 +1,12 @@
<?php <?php
/** /**
* Ajax Handler * Ajax Handler
* *
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class AjaxHandler { class AjaxHandler
{
static public $instance = null; static public $instance = null;
@ -16,9 +16,10 @@ class AjaxHandler {
/** /**
* Grab current instance or create it * Grab current instance or create it
* *
* @return <type> * @return AjaxHandler
*/ */
static function getInstance($request=null) { static function getInstance($request=null)
{
return null == self::$instance ? self::$instance = new self() : self::$instance; return null == self::$instance ? self::$instance = new self() : self::$instance;
} }
@ -26,13 +27,15 @@ class AjaxHandler {
* Called functions should reply in the following way * Called functions should reply in the following way
* return $this->reply($result, $data, $msg, $extra); * return $this->reply($result, $data, $msg, $extra);
* *
* @param type $request * @param Request $request
* @return type * @return mixed
*/ */
function dispatch($request) { function dispatch($request)
{
$method = Request::parseAjaxMethod($request); $method = Request::parseAjaxMethod($request);
$inc_file = V_ROOT_DIR . 'api' . DIRECTORY_SEPARATOR . $method['namespace'] . '.class.php'; $inc_file = V_ROOT_DIR . 'api' . DIRECTORY_SEPARATOR . $method['namespace'] . '.class.php';
if (!is_readable($inc_file)) { if (!is_readable($inc_file))
{
throw new SystemException(Message::INVALID_METHOD); throw new SystemException(Message::INVALID_METHOD);
} }
@ -41,14 +44,24 @@ class AjaxHandler {
$space = new $method['namespace']; $space = new $method['namespace'];
$method = $method['function'] . 'Execute'; $method = $method['function'] . 'Execute';
if (!method_exists($space, $method)) { if (!method_exists($space, $method))
{
throw new SystemException(Message::INVALID_METHOD); throw new SystemException(Message::INVALID_METHOD);
} }
return $space->$method($request); return $space->$method($request);
} }
function reply($result, $data, $message = '', $extra = array()) { /**
* Prepare the result of method execution into ajax-readable format
*
* @param boolean $result - result of method execution
* @param array $data - data to be replied
* @param string $message - replied message
* @param array $extra - extra data
*/
function reply($result, $data, $message = '', $extra = array())
{
return json_encode(array('result' => $result, return json_encode(array('result' => $result,
'data' => $data, 'data' => $data,
'message' => $message, 'message' => $message,
@ -57,7 +70,12 @@ class AjaxHandler {
)); ));
} }
static function makeReply($reply) { /**
* TODO: delete this method
* @deprecated
*/
static function makeReply($reply)
{
print $reply; print $reply;
} }
@ -65,22 +83,42 @@ class AjaxHandler {
// Error handlers // Error handlers
// //
static function generalError($error) { /**
* Generate general error
* @param Exception $error
*/
static function generalError($error)
{
self::renderGlobalError(Message::ERROR, Message::GENERAL_ERROR, $error); self::renderGlobalError(Message::ERROR, Message::GENERAL_ERROR, $error);
} }
static function protectionError($error) { /**
* Generate protection error
* @param Exception $error
*/
static function protectionError($error)
{
self::renderGlobalError(Message::ERROR, Message::PROTECTION_ERROR, $error); self::renderGlobalError(Message::ERROR, Message::PROTECTION_ERROR, $error);
} }
static function systemError($error) { /**
* Generate system error
* @param Exception $error
*/
static function systemError($error)
{
self::renderGlobalError(Message::ERROR, Message::SYSTEM_ERROR, $error); self::renderGlobalError(Message::ERROR, Message::SYSTEM_ERROR, $error);
} }
static function renderGlobalError($type, $message, $error) { /**
* Prepare and render the error
* @param Exception $error
*/
static function renderGlobalError($type, $message, $error)
{
$trace = $error->getTrace(); $trace = $error->getTrace();
AjaxHandler::makeReply( AjaxHandler::makeReply(
AjaxHandler::getInstance()->reply(false, $type, $message . ': ' . $error->getMessage(), $trace[0]['file'] . ' / ' . $trace[0]['line']) AjaxHandler::getInstance()->reply(false, $type, $message . ': ' . $error->getMessage(), $trace[0]['file'] . ' / ' . $trace[0]['line'])
); );
} }

View file

@ -1,221 +1,271 @@
<?php <?php
/*
* CRON /**
* CRON
* *
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class CRON extends AjaxHandler { class CRON extends AjaxHandler
function getListExecute($request) {
{
$_user = 'vesta';
$reply = array();
$result = Vesta::execute(Vesta::V_LIST_CRON_JOBS, array($_user, Config::get('response_type')));
// echo '<pre>';
// print_r($result);
foreach($result['data'] as $id => $record)
{
$reply[$id] = array(
'CMD' => $record['CMD'],
'MIN' => $record['MIN'],
'HOUR' => $record['HOUR'],
'DAY' => $record['DAY'],
'MONTH' => $record['MONTH'],
'WDAY' => $record['WDAY'],
'SUSPEND' => $record['SUSPEND'],
'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
);
}
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $reply);
}
function addExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array(
'USER' => $_user,
'MIN' => $_s['MIN'],
'HOUR' => $_s['HOUR'],
'DAY' => $_s['DAY'],
'MONTH' => $_s['MONTH'],
'WDAY' => $_s['WDAY'],
'CMD' => $_s['CMD']
);
$result = Vesta::execute(Vesta::V_ADD_CRON_JOB, $params);
if($_s['REPORTS'])
{
$result = array();
$result = Vesta::execute(Vesta::V_ADD_SYS_USER_REPORTS, array('USER' => $_user));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['REPORTS'] = array($result['error_code'] => $result['error_message']);
}
}
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
/**
* List cron entries
*
* @param Request $request
* @return
*/
public function getListExecute($request)
{
$_user = 'vesta';
$reply = array();
$result = Vesta::execute(Vesta::V_LIST_CRON_JOBS,
array($_user, Config::get('response_type')));
foreach ($result['data'] as $id => $record)
{
$reply[$id] = array(
'CMD' => $record['CMD'],
'MIN' => $record['MIN'],
'HOUR' => $record['HOUR'],
'DAY' => $record['DAY'],
'MONTH' => $record['MONTH'],
'WDAY' => $record['WDAY'],
'SUSPEND' => $record['SUSPEND'],
'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
);
}
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $reply);
}
/**
* Add cron entry
*
* @param Request $request
* @return
*/
public function addExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array(
'USER' => $_user,
'MIN' => $_s['MIN'],
'HOUR' => $_s['HOUR'],
'DAY' => $_s['DAY'],
'MONTH' => $_s['MONTH'],
'WDAY' => $_s['WDAY'],
'CMD' => $_s['CMD']
);
$result = Vesta::execute(Vesta::V_ADD_CRON_JOB, $params);
if ($_s['REPORTS'])
{
$result = array();
$result = Vesta::execute(Vesta::V_ADD_SYS_USER_REPORTS,
array('USER' => $_user));
if (!$result['status'])
{
$this->status = FALSE;
$this->errors['REPORTS'] = array($result['error_code'] => $result['error_message']);
}
}
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
/**
* Delete cron entry
*
* @param Request $request
* @return
*/
function delExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array(
'USER' => $_user,
'JOB' => $_s['JOB']
);
$result = Vesta::execute(Vesta::V_DEL_CRON_JOB, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
/**
function delExecute($request) * Change cron entry
{ *
$r = new Request(); * @param Request $request
$_s = $r->getSpell(); * @return
$_user = 'vesta'; */
function changeExecute($request)
$params = array( {
'USER' => $_user, $r = new Request();
'JOB' => $_s['JOB'] $_s = $r->getSpell();
); $_old = $_s['old'];
$_new = $_s['new'];
$result = Vesta::execute(Vesta::V_DEL_CRON_JOB, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
function changeExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_old = $_s['old'];
$_new = $_s['new'];
$_user = 'vesta'; $_user = 'vesta';
$_JOB = $_new['JOB']; $_JOB = $_new['JOB'];
$result = array();
$params = array(
'USER' => $_user,
'JOB' => $_JOB,
'MIN' => $_new['MIN'],
'HOUR' => $_new['HOUR'],
'DAY' => $_new['DAY'],
'MONTH' => $_new['MONTH'],
'WDAY' => $_new['WDAY'],
'CMD' => $_new['CMD']
);
$result = Vesta::execute(Vesta::V_CHANGE_CRON_JOB, $params); $result = array();
$params = array(
'USER' => $_user,
'JOB' => $_JOB,
'MIN' => $_new['MIN'],
'HOUR' => $_new['HOUR'],
'DAY' => $_new['DAY'],
'MONTH' => $_new['MONTH'],
'WDAY' => $_new['WDAY'],
'CMD' => $_new['CMD']
);
$result = Vesta::execute(Vesta::V_CHANGE_CRON_JOB, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
/**
* Suspend cron entry
*
* @param Request $request
* @return
*/
function suspendExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$_JOB = $_s['JOB'];
$params = array(
'USER' => $_user,
'JOB' => $_JOB
);
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
/**
if(!$result['status']) * Unsuspend cron entry
$this->errors[] = array($result['error_code'] => $result['error_message']); *
* @param Request $request
return $this->reply($result['status'], $result['data']); * @return
} */
function unsuspendExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$_JOB = $_s['JOB'];
$params = array(
'USER' => $_user,
'JOB' => $_JOB
);
function suspendExecute($request) $result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, $params);
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta'; if (!$result['status'])
$_JOB = $_s['JOB']; {
$this->errors[] = array($result['error_code'] => $result['error_message']);
$params = array( }
'USER' => $_user,
'JOB' => $_JOB
);
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
return $this->reply($result['status'], $result['data']);
}
/**
* Batch suspend cron entries
*
* @param Request $request
* @return
*/
function suspendAllExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
function unsuspendExecute($request) $_user = 'vesta';
{ $_JOB = $_s['JOB'];
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta'; $params = array(
$_JOB = $_s['JOB']; 'USER' => $_user
);
$params = array(
'USER' => $_user,
'JOB' => $_JOB
);
$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOBS, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
function suspendAllExecute($request) return $this->reply($result['status'], $result['data']);
{ }
$r = new Request();
$_s = $r->getSpell(); /**
* Batch suspend cron entry
*
* @param Request $request
* @return
*/
function unsuspendAllExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta'; $_user = 'vesta';
$_JOB = $_s['JOB'];
$params = array(
'USER' => $_user
);
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOBS, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
$params = array(
'USER' => $_user
);
$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOBS, $params);
function unsuspendAllExecute($request) if (!$result['status'])
{ {
$r = new Request(); $this->errors[] = array($result['error_code'] => $result['error_message']);
$_s = $r->getSpell(); }
$_user = 'vesta'; return $this->reply($result['status'], $result['data']);
}
$params = array(
'USER' => $_user
);
$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOBS, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
} }

View file

@ -3,194 +3,247 @@
/** /**
* DB * DB
* *
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2011 * @copyright vesta 2011
*/ */
class DB extends AjaxHandler { class DB extends AjaxHandler
function getListExecute($request) {
/**
* List entries
*
* @param Request $request
* @return
*/
public function getListExecute($request)
{ {
$_user = 'vesta'; $_user = 'vesta';
$reply = array(); $reply = array();
$result = Vesta::execute(Vesta::V_LIST_DB_BASES, array($_user, Config::get('response_type')));
$result = Vesta::execute(Vesta::V_LIST_DB_BASES, array($_user, Config::get('response_type')));
// echo '<pre>';
// print_r($result);
foreach($result['data'] as $db => $record) foreach ($result['data'] as $db => $record)
{ {
$reply[$db] = array( $reply[$db] = array(
'DB' => $db, 'DB' => $db,
'USER' => $record['USER'], 'USER' => $record['USER'],
'HOST' => $record['HOST'], 'HOST' => $record['HOST'],
'TYPE' => $record['TYPE'], 'TYPE' => $record['TYPE'],
'U_DISK' => $record['U_DISK'], 'U_DISK' => $record['U_DISK'],
'SUSPEND' => $record['SUSPEND'], 'SUSPEND' => $record['SUSPEND'],
'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE']))) 'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
); );
} }
if(!$result['status']) if (!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']); {
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $reply); }
}
return $this->reply($result['status'], $reply);
}
function addExecute($request) /**
{ * Add entry
$r = new Request(); *
$_s = $r->getSpell(); * @param Request $request
$_user = 'vesta'; * @return
*/
public function addExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array( $params = array(
'USER' => $_user, 'USER' => $_user,
'DB' => $_s['DB'], 'DB' => $_s['DB'],
'DB_USER' => $_s['DB_USER'], 'DB_USER' => $_s['DB_USER'],
'DB_PASSWORD' => $_s['DB_PASSWORD'], 'DB_PASSWORD' => $_s['DB_PASSWORD'],
'TYPE' => $_s['TYPE'] 'TYPE' => $_s['TYPE']
); );
if($_s['HOST']) if ($_s['HOST'])
$params['HOST'] = $_s['HOST']; {
$params['HOST'] = $_s['HOST'];
$result = Vesta::execute(Vesta::V_ADD_DB_BASE, $params); }
$result = Vesta::execute(Vesta::V_ADD_DB_BASE, $params);
if(!$result['status']) if (!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']); {
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']); }
}
function delExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array(
'USER' => $_user,
'DB' => $_user.'_'.$_s['DB']
);
$result = Vesta::execute(Vesta::V_DEL_DB_BASE, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
function changePasswordExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta'; return $this->reply($result['status'], $result['data']);
}
$result = array();
$params = array( /**
'USER' => $_user, * Delete entry
'DB' => $_user.'_'.$_s['DB'], *
'PASSWORD' => $_s['DB_PASSWORD'] * @param Request $request
); * @return
*/
public function delExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$result = Vesta::execute(Vesta::V_CHANGE_DB_PASSWORD, $params); $params = array(
'USER' => $_user,
if(!$result['status']) 'DB' => $_user.'_'.$_s['DB']
$this->errors[] = array($result['error_code'] => $result['error_message']); );
return $this->reply($result['status'], $result['data']);
}
$result = Vesta::execute(Vesta::V_DEL_DB_BASE, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
function suspendExecute($request) return $this->reply($result['status'], $result['data']);
{ }
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta'; /**
* Change password
$params = array( *
'USER' => $_user, * @param Request $request
'DB' => $_user.'_'.$_s['DB'] * @return
); */
public function changePasswordExecute($request)
$result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, $params); {
$r = new Request();
if(!$result['status']) $_s = $r->getSpell();
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
$_user = 'vesta';
$result = array();
$params = array(
'USER' => $_user,
'DB' => $_user.'_'.$_s['DB'],
'PASSWORD' => $_s['DB_PASSWORD']
);
function unsuspendExecute($request) $result = Vesta::execute(Vesta::V_CHANGE_DB_PASSWORD, $params);
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta'; if (!$result['status'])
{
$params = array( $this->errors[] = array($result['error_code'] => $result['error_message']);
'USER' => $_user, }
'DB' => $_user.'_'.$_s['DB']
);
$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
return $this->reply($result['status'], $result['data']);
}
/**
* suspend user
*
* @param Request $request
* @return
*/
public function suspendExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
function suspendAllExecute($request) $params = array(
{ 'USER' => $_user,
$r = new Request(); 'DB' => $_user.'_'.$_s['DB']
$_s = $r->getSpell(); );
$_user = 'vesta'; $result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, $params);
$_JOB = $_s['JOB'];
$params = array(
'USER' => $_user
);
$result = Vesta::execute(Vesta::V_SUSPEND_DB_BASES, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
function unsuspendAllExecute($request) /**
{ * unsuspend entry
$r = new Request(); *
$_s = $r->getSpell(); * @param Request $request
* @return
*/
public function unsuspendExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta'; $_user = 'vesta';
$params = array( $params = array(
'USER' => $_user 'USER' => $_user,
); 'DB' => $_user.'_'.$_s['DB']
);
$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASES, $params);
$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']); if (!$result['status'])
{
return $this->reply($result['status'], $result['data']); $this->errors[] = array($result['error_code'] => $result['error_message']);
} }
return $this->reply($result['status'], $result['data']);
}
/**
* Batch suspend entries
*
* @param Request $request
* @return
*/
public function suspendAllExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$_JOB = $_s['JOB'];
$params = array(
'USER' => $_user
);
$result = Vesta::execute(Vesta::V_SUSPEND_DB_BASES, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
/**
* Batch unsuspend entries
*
* @param Request $request
* @return
*/
public function unsuspendAllExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array(
'USER' => $_user
);
$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASES, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
} }

View file

@ -3,308 +3,358 @@
/** /**
* DNS * DNS
* *
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class DNS extends AjaxHandler
{
/**
* list entries
*
* @param Request $request
* @return
*/
public function getListExecute($request) {
$_user = 'vesta';
$reply = array();
class DNS extends AjaxHandler { $result = Vesta::execute(Vesta::V_LIST_DNS_DOMAINS, array($_user, Config::get('response_type')));
function getListExecute($request) { foreach ($result['data'] as $dns_domain => $details)
$_user = 'vesta'; {
$reply = array(); $reply[] = array(
'DNS_DOMAIN' => $dns_domain,
$result = Vesta::execute(Vesta::V_LIST_DNS_DOMAINS, array($_user, Config::get('response_type'))); 'IP' => $details['IP'],
foreach($result['data'] as $dns_domain => $details){ 'TPL' => $details['TPL'],
$reply[] = array( 'TTL' => $details['TTL'],
'DNS_DOMAIN' => $dns_domain, 'EXP' => $details['EXP'],
'IP' => $details['IP'], 'SOA' => $details['SOA'],
'TPL' => $details['TPL'], 'SUSPEND' => $details['SUSPEND'],
'TTL' => $details['TTL'], 'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
'EXP' => $details['EXP'], );
'SOA' => $details['SOA'], }
'SUSPEND' => $details['SUSPEND'], if (!$result['status'])
// 'OWNER' => $details['OWNER'], {
'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE']))) $this->errors[] = array($result['error_code'] => $result['error_message']);
); }
}
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $reply);
}
function getListRecordsExecute($request) { return $this->reply($result['status'], $reply);
$r = new Request(); }
$_s = $r->getSpell();
$_user = 'vesta';
$reply = array(); /**
* List records of entries
$result = Vesta::execute(Vesta::V_LIST_DNS_DOMAIN_RECORDS, array($_user, $_s['DNS_DOMAIN'], Config::get('response_type'))); *
foreach($result['data'] as $record_id => $details){ * @param Request $request
$reply[$record_id] = array( * @return
'RECORD_ID' => $record_id, */
'RECORD' => $details['RECORD'], public function getListRecordsExecute($request)
'RECORD_TYPE' => $details['TYPE'],
'RECORD_VALUE' => $details['VALUE'],
'SUSPEND' => $details['SUSPEND'],
'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
);
}
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $reply);
}
// v_add_dns_domain user domain ip [template] [exp] [soa] [ttl]
// http://95.163.16.160:8083/dispatch.php?jedi_method=DNS.add&USER=vesta&DOMAIN=dev.vestacp.com&IP_ADDRESS=95.163.16.160&TEMPLATE=default&EXP=01-01-12&SOA=ns1.vestacp.com&TTL=3600
function addExecute($_spell = false)
{ {
$r = new Request(); $r = new Request();
if($_spell) $_s = $r->getSpell();
$_s = $_spell; $_user = 'vesta';
else
$_s = $r->getSpell();
$_user = 'vesta'; $reply = array();
$params = array( $result = Vesta::execute(Vesta::V_LIST_DNS_DOMAIN_RECORDS, array($_user, $_s['DNS_DOMAIN'], Config::get('response_type')));
'USER' => $_user, /// OWNER ??? foreach ($result['data'] as $record_id => $details)
'DNS_DOMAIN' => $_s['DNS_DOMAIN'], {
'IP' => $_s['IP']); $reply[$record_id] = array(
if($_s['TPL']) $params['TPL'] = $_s['TPL']; 'RECORD_ID' => $record_id,
if($_s['EXP']) $params['EXP'] = $_s['EXP']; 'RECORD' => $details['RECORD'],
if($_s['SOA']) $params['SOA'] = $_s['SOA']; 'RECORD_TYPE' => $details['TYPE'],
if($_s['TTL']) $params['TTL'] = $_s['TTL']; 'RECORD_VALUE' => $details['VALUE'],
'SUSPEND' => $details['SUSPEND'],
$result = Vesta::execute(Vesta::V_ADD_DNS_DOMAIN, $params); 'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
if(!$result['status']) );
$this->errors[] = array($result['error_code'] => $result['error_message']); }
return $this->reply($result['status'], $result['data']); if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $reply);
} }
// v_add_dns_domain_record user domain record type value [id] /**
// http://95.163.16.160:8083/dispatch.php?jedi_method=DNS.addRecord&USER=vesta&DOMAIN=dev.vestacp.com&RECORD=ftp&TYPE=a&VALUE=87.248.190.222 * Add entry
function addRecordExecute($request) { *
$r = new Request(); * v_add_dns_domain user domain ip [template] [exp] [soa] [ttl]
$_s = $r->getSpell(); * http://95.163.16.160:8083/dispatch.php?jedi_method=DNS.add&USER=vesta&DOMAIN=dev.vestacp.com&IP_ADDRESS=95.163.16.160&TEMPLATE=default&EXP=01-01-12&SOA=ns1.vestacp.com&TTL=3600
$_user = 'vesta'; *
* @param Request $request
* @return
*/
public function addExecute($_spell = false)
{
$r = new Request();
if ($_spell)
{
$_s = $_spell;
}
else
{
$_s = $r->getSpell();
}
$params = array( $_user = 'vesta';
'USER' => $_s['USER'], /// OWNER ??? $params = array(
'USER' => $_user, // TODO: examine if OWNER ???
'DNS_DOMAIN' => $_s['DNS_DOMAIN'],
'IP' => $_s['IP']
);
($_s['TPL']) ? $params['TPL'] = $_s['TPL'] : -1;
($_s['EXP']) ? $params['EXP'] = $_s['EXP'] : -1;
($_s['SOA']) ? $params['SOA'] = $_s['SOA'] : -1;
($_s['TTL']) ? $params['TTL'] = $_s['TTL'] : -1;
$result = Vesta::execute(Vesta::V_ADD_DNS_DOMAIN, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
}
/**
* Add record
*
* @param Request $request
* @return
*/
public function addRecordExecute($request)
{
$r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array(
'USER' => $_s['USER'], // TODO: find out if it's OWNER ???
'DOMAIN' => $_s['DOMAIN'], 'DOMAIN' => $_s['DOMAIN'],
'RECORD' => $_s['RECORD'], 'RECORD' => $_s['RECORD'],
'RECORD_TYPE' => $_s['TYPE'], 'RECORD_TYPE' => $_s['TYPE'],
'RECORD_VALUE' => $_s['VALUE'], 'RECORD_VALUE' => $_s['VALUE'],
'RECORD_ID' => $_s['RECORD_ID'] 'RECORD_ID' => $_s['RECORD_ID']
); );
// print_r($params);
$result = Vesta::execute(Vesta::V_ADD_DNS_DOMAIN_RECORD, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']); $result = Vesta::execute(Vesta::V_ADD_DNS_DOMAIN_RECORD, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
} }
// v_del_dns_domain user domain /**
// http://95.163.16.160:8083/dispatch.php?jedi_method=DNS.del&USER=vesta&DOMAIN=dev.vestacp.com * Delete entry
function delExecute($_spell = false) *
* @param mixed $_spell
* @return
*/
public function delExecute($_spell = false)
{ {
$r = new Request(); $r = new Request();
if($_spell) if ($_spell)
$_s = $_spell; {
else $_s = $_spell;
$_s = $r->getSpell(); }
else
$_user = 'vesta'; {
$_s = $r->getSpell();
$params = array( }
'USER' => $_user, /// OWNER ???
$_user = 'vesta';
$params = array(
'USER' => $_user, // TODO: find out -> OWNER ???
'DOMAIN' => $_s['DNS_DOMAIN'], 'DOMAIN' => $_s['DNS_DOMAIN'],
); );
$result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN, $params);
if(!$result['status']) $result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN, $params);
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']); if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
} }
// v_del_dns_domain_record user domain id /**
// http://95.163.16.160:8083/dispatch.php?jedi_method=DNS.delRecord&USER=vesta&DOMAIN=dev.vestacp.com&RECORD_ID=9 * Delete record
function delRecordExecute($request) { *
$r = new Request(); * @param Request $request
$_s = $r->getSpell(); * @return
$_user = 'vesta'; */
function delRecordExecute($request)
$params = array( {
'USER' => $_user, /// OWNER ??? $r = new Request();
$_s = $r->getSpell();
$_user = 'vesta';
$params = array(
'USER' => $_user, // TODO: find out if -> OWNER ???
'DOMAIN' => $_s['DOMAIN'], 'DOMAIN' => $_s['DOMAIN'],
'RECORD_ID' => $_s['RECORD_ID'] 'RECORD_ID' => $_s['RECORD_ID']
); );
$result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN_RECORD, $params);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']); $result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN_RECORD, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
} }
/**
* Change entry
// DNS.change&spell={"old":{"DNS_DOMAIN": "dev.vestacp.com","IP": "95.163.16.160","TPL": "default","TTL": "3377","EXP": "12-12-12","SOA": "ns2.vestacp.com"},"new":{"DNS_DOMAIN": "dev.vestacp.com","IP": "95.163.16.160","TPL": "default","TTL": "3600","EXP": "02-02-12","SOA": "ns1.vestacp.com"}} *
* @param Request $request
function changeExecute($request) * @return
*/
public function changeExecute($request)
{ {
$r = new Request(); $r = new Request();
$_s = $r->getSpell(); $_s = $r->getSpell();
$_old = $_s['old']; $_old = $_s['old'];
$_new = $_s['new']; $_new = $_s['new'];
$_user = 'vesta'; $_user = 'vesta';
$_DNS_DOMAIN = $_new['DNS_DOMAIN']; $_DNS_DOMAIN = $_new['DNS_DOMAIN'];
if($_old['IP'] != $_new['IP'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_IP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['IP']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['IP_ADDRESS'] = array($result['error_code'] => $result['error_message']);
}
}
if($_old['TPL'] != $_new['TPL'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TPL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['TPL']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['TPL'] = array($result['error_code'] => $result['error_message']);
}
}
if($_old['TTL'] != $_new['TTL'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TTL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['TTL']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['TTL'] = array($result['error_code'] => $result['error_message']);
}
}
if($_old['EXP'] != $_new['EXP']) if ($_old['IP'] != $_new['IP'])
{ {
$result = array(); $result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_EXP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['EXP'])); $result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_IP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['IP']));
if(!$result['status']) if(!$result['status'])
{ {
$this->status = FALSE; $this->status = FALSE;
$this->errors['EXP'] = array($result['error_code'] => $result['error_message']); $this->errors['IP_ADDRESS'] = array($result['error_code'] => $result['error_message']);
} }
} }
if($_old['SOA'] != $_new['SOA'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_SOA, array('USER' => $_user, 'DNS_DOMAIN' => $_new['DNS_DOMAIN'], 'IP' => $_new['SOA']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['SOA'] = array($result['error_code'] => $result['error_message']);
}
}
if(!$this->status) if ($_old['TPL'] != $_new['TPL'])
{ {
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_IP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['IP'])); $result = array();
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TPL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['TPL'])); $result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TPL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['TPL']));
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TTL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['TTL'])); if(!$result['status'])
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_EXP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['EXP'])); {
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_SOA, array('USER' => $_user, 'DNS_DOMAIN' => $_new['DNS_DOMAIN'], 'IP' => $_old['SOA'])); $this->status = FALSE;
} $this->errors['TPL'] = array($result['error_code'] => $result['error_message']);
}
}
return $this->reply($this->status, ''); if ($_old['TTL'] != $_new['TTL'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TTL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['TTL']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['TTL'] = array($result['error_code'] => $result['error_message']);
}
}
if ($_old['EXP'] != $_new['EXP'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_EXP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_new['EXP']));
if (!$result['status'])
{
$this->status = FALSE;
$this->errors['EXP'] = array($result['error_code'] => $result['error_message']);
}
}
if ($_old['SOA'] != $_new['SOA'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_SOA, array('USER' => $_user, 'DNS_DOMAIN' => $_new['DNS_DOMAIN'], 'IP' => $_new['SOA']));
if (!$result['status'])
{
$this->status = FALSE;
$this->errors['SOA'] = array($result['error_code'] => $result['error_message']);
}
}
if (!$this->status)
{
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_IP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['IP']));
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TPL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['TPL']));
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TTL, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['TTL']));
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_EXP, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['EXP']));
Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_SOA, array('USER' => $_user, 'DNS_DOMAIN' => $_new['DNS_DOMAIN'], 'IP' => $_old['SOA']));
}
return $this->reply($this->status, '');
} }
/**
* Change record
function changeRecordsExecute($request) *
* @param Request $request
* @return
*/
public function changeRecordsExecute($request)
{ {
$r = new Request(); $r = new Request();
$_s = $r->getSpell(); $_s = $r->getSpell();
$_old = $_s['old']; $_old = $_s['old'];
$_new = $_s['new']; $_new = $_s['new'];
$_user = 'vesta';
$_DNS_DOMAIN = $_s['DNS_DOMAIN'];
// echo '<pre>'; foreach ($_new as $record_id => $record_data)
// print_r($_new); {
// print_r($_old); // checking if record existed - update
if(is_array($_old[$record_id]))
{
// TODO: Remove this. is it necessary??!
echo '<br> updating'.$record_id;
$_user = 'vesta'; $result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_RECORD, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'ID' => $record_id, 'RECORD' => $record_data['RECORD'], 'TYPE' => $record_data['RECORD_TYPE'], 'VALUE' => $record_data['RECORD_VALUE']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors[$record_id] = array($result['error_code'] => $result['error_message']);
}
}
else
{
// record is new - add
// TODO: Remove this. is it necessary??!
echo '<br> adding'.$record_id;
$_DNS_DOMAIN = $_s['DNS_DOMAIN']; $result = Vesta::execute(Vesta::V_ADD_DNS_DOMAIN_RECORD, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'RECORD' => $record_data['RECORD'], 'TYPE' => $record_data['RECORD_TYPE'], 'VALUE' => $record_data['RECORD_VALUE'], 'ID' => $record_id));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors[$record_id] = array($result['error_code'] => $result['error_message']);
}
}
foreach($_new as $record_id => $record_data) unset($_old[$record_id]);
{ }
// checking if record existed - update
if(is_array($_old[$record_id]))
{
echo '<br> updating'.$record_id;
$result = Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_RECORD, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'ID' => $record_id, 'RECORD' => $record_data['RECORD'], 'TYPE' => $record_data['RECORD_TYPE'], 'VALUE' => $record_data['RECORD_VALUE']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors[$record_id] = array($result['error_code'] => $result['error_message']);
}
}
else
{
// record is new - add
echo '<br> adding'.$record_id;
$result = Vesta::execute(Vesta::V_ADD_DNS_DOMAIN_RECORD, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'RECORD' => $record_data['RECORD'], 'TYPE' => $record_data['RECORD_TYPE'], 'VALUE' => $record_data['RECORD_VALUE'], 'ID' => $record_id)); // in $_old have remained only record that do not present in new - so they have to be deleted
if(!$result['status']) foreach ($_old as $record_id => $record_data)
{ {
$this->status = FALSE; echo '<br> deleting'.$record_id;
$this->errors[$record_id] = array($result['error_code'] => $result['error_message']); }
}
}
return $this->reply($this->status, '');
unset($_old[$record_id]);
}
// in $_old have remained only record that do not present in new - so they have to be deleted
foreach($_old as $record_id => $record_data)
{
echo '<br> deleting'.$record_id;
/*
$result = Vesta::execute(Vesta::V_DEL_DNS_DOMAIN_RECORD, array('USER' => $_user, 'DNS_DOMAIN' => $_DNS_DOMAIN, 'ID' => $record_id,));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors[$record_id] = array($result['error_code'] => $result['error_message']);
}
*/
}
return $this->reply($this->status, '');
} }
} }

View file

@ -2,160 +2,205 @@
/** /**
* IP * IP
* *
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*
*/ */
class IP extends AjaxHandler class IP extends AjaxHandler
{ {
function getListExecute($request) /**
* List entries
*
* @param Request $request
* @return
*/
public function getListExecute($request)
{ {
$reply = array(); $reply = array();
$result = Vesta::execute(Vesta::V_LIST_SYS_IPS, array(Config::get('response_type'))); $result = Vesta::execute(Vesta::V_LIST_SYS_IPS, array(Config::get('response_type')));
foreach ($result['data'] as $ip => $details) { foreach ($result['data'] as $ip => $details)
$reply[] = array_merge( {
array( $reply[] = array_merge(array(
'IP_ADDRESS' => $ip, 'IP_ADDRESS' => $ip,
'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE']))) 'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
), $details); ), $details);
} }
if(!$result['status']) if (!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']); {
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $reply); return $this->reply($result['status'], $reply);
} }
/**
function getListUserIpsExecute($request) * List user ips entries
*
* @param Request $request
* @return
*/
public function getListUserIpsExecute($request)
{ {
$reply = array(); $reply = array();
$result = Vesta::execute(Vesta::V_LIST_SYS_IPS, array(Config::get('response_type'))); $result = Vesta::execute(Vesta::V_LIST_SYS_IPS, array(Config::get('response_type')));
foreach ($result['data'] as $ip => $details) { foreach ($result['data'] as $ip => $details)
$reply[] = array_merge( {
array( $reply[] = array_merge(array(
'IP_ADDRESS' => $ip, 'IP_ADDRESS' => $ip,
'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE']))) 'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
), $details); ), $details);
} }
if(!$result['status']) if (!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']); {
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $reply); return $this->reply($result['status'], $reply);
} }
/**
function addExecute($request) * Add entry
*
* @param Request $request
* @return
*/
public function addExecute($request)
{ {
$r = new Request(); $r = new Request();
$_s = $r->getSpell(); $_s = $r->getSpell();
$_user = 'vesta'; $_user = 'vesta';
$params = array(
'IP_ADDRESS' => $_s['IP_ADDRESS'],
'MASK' => $_s['MASK'],
'INTERFACE' => $_s['INTERFACE'],
'OWNER' => $_s['OWNER'],
'IP_STATUS' => $_s['IP_STATUS'],
'IP_NAME' => $_s['IP_NAME']
);
$result = Vesta::execute(Vesta::V_ADD_SYS_IP, $params);
if(!$result['status']) $params = array(
$this->errors[] = array($result['error_code'] => $result['error_message']); 'IP_ADDRESS' => $_s['IP_ADDRESS'],
'MASK' => $_s['MASK'],
return $this->reply($result['status'], $result['data']); 'INTERFACE' => $_s['INTERFACE'],
'OWNER' => $_s['OWNER'],
'IP_STATUS' => $_s['IP_STATUS'],
'IP_NAME' => $_s['IP_NAME']
);
$result = Vesta::execute(Vesta::V_ADD_SYS_IP, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $result['data']);
} }
function delExecute($request) /**
* Delete entry
*
* @param Request $request
* @return
*/
public function delExecute($request)
{ {
$r = new Request(); $r = new Request();
$_s = $r->getSpell(); $_s = $r->getSpell();
$_user = 'vesta'; $_user = 'vesta';
$params = array( $params = array(
'IP_ADDRESS' => $_s['IP_ADDRESS'] 'IP_ADDRESS' => $_s['IP_ADDRESS']
); );
$result = Vesta::execute(Vesta::V_DEL_SYS_IP, $params); $result = Vesta::execute(Vesta::V_DEL_SYS_IP, $params);
if(!$result['status']) if (!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']); {
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']); }
return $this->reply($result['status'], $result['data']);
} }
/**
* Change entry
function changeExecute($request) *
* @param Request $request
* @return
*/
public function changeExecute($request)
{ {
$r = new Request(); $r = new Request();
$_s = $r->getSpell(); $_s = $r->getSpell();
$_old = $_s['old']; $_old = $_s['old'];
$_new = $_s['new']; $_new = $_s['new'];
$_user = 'vesta';
$_user = 'vesta';
if($_old['OWNER'] != $_new['OWNER'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_OWNER, array('OWNER' => $_new['OWNER'], 'IP' => $_new['IP_ADDRESS']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['OWNER'] = array($result['error_code'] => $result['error_message']);
}
}
if($_old['NAME'] != $_new['NAME']) if ($_old['OWNER'] != $_new['OWNER'])
{ {
$result = array(); $result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_NAME, array('IP' => $_new['IP_ADDRESS'], 'NAME' => $_new['NAME'])); $result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_OWNER, array('OWNER' => $_new['OWNER'], 'IP' => $_new['IP_ADDRESS']));
if(!$result['status']) if(!$result['status'])
{ {
$this->status = FALSE; $this->status = FALSE;
$this->errors['NAME'] = array($result['error_code'] => $result['error_message']); $this->errors['OWNER'] = array($result['error_code'] => $result['error_message']);
} }
} }
if($_old['IP_STATUS'] != $_new['IP_STATUS']) if ($_old['NAME'] != $_new['NAME'])
{ {
$result = array(); $result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_STATUS, array('IP' => $_new['IP_ADDRESS'], 'IP_STATUS' => $_new['IP_STATUS'])); $result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_NAME, array('IP' => $_new['IP_ADDRESS'], 'NAME' => $_new['NAME']));
if(!$result['status']) if (!$result['status'])
{ {
$this->status = FALSE; $this->status = FALSE;
$this->errors['IP_STATUS'] = array($result['error_code'] => $result['error_message']); $this->errors['NAME'] = array($result['error_code'] => $result['error_message']);
} }
} }
if ($_old['IP_STATUS'] != $_new['IP_STATUS'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_STATUS, array('IP' => $_new['IP_ADDRESS'], 'IP_STATUS' => $_new['IP_STATUS']));
if (!$result['status'])
{
$this->status = FALSE;
$this->errors['IP_STATUS'] = array($result['error_code'] => $result['error_message']);
}
}
if(!$result['status']) if (!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']); {
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']); }
return $this->reply($result['status'], $result['data']);
} }
/**
function getSysInterfacesExecute($request) * Get sys interfaces
*
* @param Request $request
* @return
*/
public function getSysInterfacesExecute($request)
{ {
$reply = array(); $reply = array();
$result = Vesta::execute(Vesta::V_LIST_SYS_INTERFACES, array(Config::get('response_type')));
foreach ($result['data'] as $iface) $result = Vesta::execute(Vesta::V_LIST_SYS_INTERFACES, array(Config::get('response_type')));
$reply[$iface] = $iface;
foreach ($result['data'] as $iface)
if(!$result['status']) {
$this->errors[] = array($result['error_code'] => $result['error_message']); $reply[$iface] = $iface;
}
return $this->reply($result['status'], $reply);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
return $this->reply($result['status'], $reply);
} }
} }

View file

@ -9,102 +9,123 @@
* - methods, used for ajax executions must be postfixed with execute keyword * - methods, used for ajax executions must be postfixed with execute keyword
* Eg.: getDnsInformationExecute() * Eg.: getDnsInformationExecute()
* *
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class MAIN extends AjaxHandler { class MAIN extends AjaxHandler
{
function versionExecute($request) {
$result = array('version' => '1.0', /**
'author' => 'http://vestacp.com/', * Get version
'docs' => 'http://vestacp.com/docs'); *
* @param Request $request
* @return
*/
public function versionExecute($request)
{
$result = array(
'version' => '1.0',
'author' => 'http://vestacp.com/',
'docs' => 'http://vestacp.com/docs'
);
return $this->reply(true, $result); return $this->reply(true, $result);
} }
function getInitialExecute($request) /**
* Get initial params
*
* @param Request $request
* @return
*/
public function getInitialExecute($request)
{ {
require_once V_ROOT_DIR . 'api/IP.class.php'; require_once V_ROOT_DIR . 'api/IP.class.php';
$ip_obj = new IP(); require_once V_ROOT_DIR . 'api/USER.class.php';
$user_ips = json_decode($ip_obj->getListUserIpsExecute(), TRUE);
foreach($user_ips['data'] as $ip) $ip_obj = new IP();
$ips[$ip['IP_ADDRESS']] = $ip['IP_ADDRESS']; $user_obj = new USER();
$user_ips = json_decode($ip_obj->getListUserIpsExecute(), TRUE);
foreach ($user_ips['data'] as $ip)
{
$ips[$ip['IP_ADDRESS']] = $ip['IP_ADDRESS'];
}
require_once V_ROOT_DIR . 'api/USER.class.php'; $users = json_decode($user_obj->getListExecute(), TRUE);
$user_obj = new USER(); $user_names = array_keys($users['data']['data']);
$users = json_decode($user_obj->getListExecute(), TRUE); $db_types = array(
$user_names = array_keys($users['data']['data']); 'mysql' => 'mysql',
'postgress' => 'postgress'
);
$db_types = array('mysql' => 'mysql', 'postgress' => 'postgress'); $interfaces_arr = json_decode($ip_obj->getSysInterfacesExecute(), TRUE);
$interfaces = $interfaces_arr['data'];
$interfaces_arr = json_decode($ip_obj->getSysInterfacesExecute(), TRUE);
$interfaces = $interfaces_arr['data'];
$reply = array( $reply = array(
'WEB_DOMAIN' => array( 'WEB_DOMAIN' => array(
'TPL' => array('default' => 'default'), 'TPL' => array('default' => 'default'),
'ALIAS' => array(), 'ALIAS' => array(),
'STAT' => array( 'STAT' => array(
'webalizer' => 'webalizer', 'webalizer' => 'webalizer',
'awstats' => 'awstats'), 'awstats' => 'awstats'),
'IP' => $ips 'IP' => $ips
), ),
'CRON' => array(),
'CRON' => array(), 'IP' => array(
'SYS_USERS' => $user_names,
'IP' => array( 'STATUSES' => array(
'SYS_USERS' => $user_names, 'shared' => 'shared',
'STATUSES' => array( 'exclusive' => 'exclusive'
'shared' => 'shared', ),
'exclusive' => 'exclusive' 'INTERFACES' => $interfaces,
), 'MASK' => array(
'INTERFACES' => $interfaces, '255.255.255.0' => '255.255.255.0',
'MASK' => array( '255.255.255.128' => '255.255.255.128',
'255.255.255.0' => '255.255.255.0', '255.255.255.192' => '255.255.255.192',
'255.255.255.128' => '255.255.255.128', '255.255.255.224' => '255.255.255.224',
'255.255.255.192' => '255.255.255.192', '255.255.255.240' => '255.255.255.240',
'255.255.255.224' => '255.255.255.224', '255.255.255.248' => '255.255.255.248',
'255.255.255.240' => '255.255.255.240', '255.255.255.252' => '255.255.255.252',
'255.255.255.248' => '255.255.255.248', '255.255.255.255' => '255.255.255.255'
'255.255.255.252' => '255.255.255.252', ),
'255.255.255.255' => '255.255.255.255' 'OWNER' => array()
), ),
'OWNER' => array() 'DNS' => array(
), 'IP' => $ips,
'TPL' => array(
'DNS' => array( 'default' => 'default'
'IP' => $ips, ),
'TPL' => array('default' => 'default'), 'EXP' => array(),
'EXP' => array(), 'SOA' => array(),
'SOA' => array(), 'TTL' => array(),
'TTL' => array(), 'record' => array(
'record' => array( 'RECORD' => array(),
'RECORD' => array(), 'RECORD_TYPE' => array('a' => 'a', 'reverse' => 'reverse'),
'RECORD_TYPE' => array('a' => 'a', 'reverse' => 'reverse'), 'RECORD_VALUE' => array()
'RECORD_VALUE' => array() )
) ),
), 'DB' => array(
'TYPE' => $db_types
'DB' => array( ),
'TYPE' => $db_types 'USERS' => array(
), 'ROLE' => array('user' => 'user'),
'OWNER' => $user_names,
'USERS' => array( 'PACKAGE' => array('default' => 'default'),
'ROLE' => array('user' => 'user'), 'NS1' => array('' => ''),
'OWNER' => $user_names, 'NS2' => array('' => ''),
'PACKAGE' => array('default' => 'default'), 'SHELL' => array(
'NS1' => array('' => ''), '/bin/sh' => '/bin/sh',
'NS2' => array('' => ''), '/bin/bash' => '/bin/bash',
'SHELL' => array( '/sbin/nologin' => '/sbin/nologin',
'/bin/sh' => '/bin/sh', '/bin/tcsh' => '/bin/tcsh',
'/bin/bash' => '/bin/bash', '/bin/csh' => '/bin/csh')
'/sbin/nologin' => '/sbin/nologin', )
'/bin/tcsh' => '/bin/tcsh', );
'/bin/csh' => '/bin/csh')
)
);
return $this->reply(true, $reply); return $this->reply(true, $reply);
} }
} }

View file

@ -1,94 +1,107 @@
<?php <?php
/** /**
* PARAMS * PARAMS
* *
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2011 * @copyright vesta 2010-2011
*/ */
class PARAMS extends AjaxHandler { class PARAMS extends AjaxHandler
function getInitialExecute($request) {
/**
* Get initial params
*
* @param Request $request
* @return
*/
public function getInitialExecute($request)
{ {
require_once V_ROOT_DIR . 'api/IP.class.php'; require_once V_ROOT_DIR . 'api/IP.class.php';
require_once V_ROOT_DIR . 'api/USER.class.php';
$ip_obj = new IP(); $ip_obj = new IP();
$user_ips = json_decode($ip_obj->getListUserIpsExecute(), TRUE);
foreach($user_ips['data'] as $ip)
$ips[$ip['IP_ADDRESS']] = $ip['IP_ADDRESS'];
require_once V_ROOT_DIR . 'api/USER.class.php';
$user_obj = new USER(); $user_obj = new USER();
$user_ips = json_decode($ip_obj->getListUserIpsExecute(), TRUE);
foreach ($user_ips['data'] as $ip)
{
$ips[$ip['IP_ADDRESS']] = $ip['IP_ADDRESS'];
}
$users = json_decode($user_obj->getListExecute(), TRUE); $users = json_decode($user_obj->getListExecute(), TRUE);
$user_names = array_keys($users['data']['data']); $user_names = array_keys($users['data']['data']);
$db_types = array('mysql' => 'mysql', 'postgress' => 'postgress'); $db_types = array(
'mysql' => 'mysql',
$interfaces_arr = json_decode($ip_obj->getSysInterfacesExecute(), TRUE); 'postgress' => 'postgress'
$interfaces = $interfaces_arr['data']; );
$interfaces_arr = json_decode($ip_obj->getSysInterfacesExecute(), TRUE);
$interfaces = $interfaces_arr['data'];
$reply = array( $reply = array(
'WEB_DOMAIN' => array( 'WEB_DOMAIN' => array(
'TPL' => array('default' => 'default'), 'TPL' => array('default' => 'default'),
'ALIAS' => array(), 'ALIAS' => array(),
'STAT' => array( 'STAT' => array(
'webalizer' => 'webalizer', 'webalizer' => 'webalizer',
'awstats' => 'awstats'), 'awstats' => 'awstats'),
'IP' => $ips 'IP' => $ips
), ),
'CRON' => array(),
'CRON' => array(), 'IP' => array(
'SYS_USERS' => $user_names,
'IP' => array( 'STATUSES' => array(
'SYS_USERS' => $user_names, 'shared' => 'shared',
'STATUSES' => array( 'exclusive' => 'exclusive'
'shared' => 'shared', ),
'exclusive' => 'exclusive' 'INTERFACES' => $interfaces,
), 'MASK' => array(
'INTERFACES' => $interfaces, '255.255.255.0' => '255.255.255.0',
'MASK' => array( '255.255.255.128' => '255.255.255.128',
'255.255.255.0' => '255.255.255.0', '255.255.255.192' => '255.255.255.192',
'255.255.255.128' => '255.255.255.128', '255.255.255.224' => '255.255.255.224',
'255.255.255.192' => '255.255.255.192', '255.255.255.240' => '255.255.255.240',
'255.255.255.224' => '255.255.255.224', '255.255.255.248' => '255.255.255.248',
'255.255.255.240' => '255.255.255.240', '255.255.255.252' => '255.255.255.252',
'255.255.255.248' => '255.255.255.248', '255.255.255.255' => '255.255.255.255'
'255.255.255.252' => '255.255.255.252', ),
'255.255.255.255' => '255.255.255.255' 'OWNER' => array()
), ),
'OWNER' => array() 'DNS' => array(
), 'IP' => $ips,
'TPL' => array(
'DNS' => array( 'default' => 'default'
'IP' => $ips, ),
'TPL' => array('default' => 'default'), 'EXP' => array(),
'EXP' => array(), 'SOA' => array(),
'SOA' => array(), 'TTL' => array(),
'TTL' => array(), 'record' => array(
'record' => array( 'RECORD' => array(),
'RECORD' => array(), 'RECORD_TYPE' => array('a' => 'a', 'reverse' => 'reverse'),
'RECORD_TYPE' => array('a' => 'a', 'reverce' => 'reverce'), 'RECORD_VALUE' => array()
'RECORD_VALUE' => array() )
) ),
), 'DB' => array(
'TYPE' => $db_types
'DB' => array( ),
'TYPE' => $db_types 'USERS' => array(
), 'ROLE' => array('user' => 'user'),
'OWNER' => $user_names,
'USERS' => array( 'PACKAGE' => array('default' => 'default'),
'ROLE' => array('user' => 'user'), 'NS1' => array('' => ''),
'OWNER' => $user_names, 'NS2' => array('' => ''),
'PACKAGE' => array('default' => 'default'), 'SHELL' => array(
'NS1' => array('' => ''), '/bin/sh' => '/bin/sh',
'NS2' => array('' => ''), '/bin/bash' => '/bin/bash',
'SHELL' => array( '/sbin/nologin' => '/sbin/nologin',
'/bin/sh' => '/bin/sh', '/bin/tcsh' => '/bin/tcsh',
'/bin/bash' => '/bin/bash', '/bin/csh' => '/bin/csh')
'/sbin/nologin' => '/sbin/nologin', )
'/bin/tcsh' => '/bin/tcsh', );
'/bin/csh' => '/bin/csh')
)
);
return $this->reply(true, $reply); return $this->reply(true, $reply);
} }
} }

View file

@ -2,17 +2,27 @@
/** /**
* USERS * USERS
* *
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*
*/ */
class USER extends AjaxHandler { class USER extends AjaxHandler
function getListExecute($request) { {
$reply = array();
/**
* Get list
*
* @param Request $request
* @return
*/
public function getListExecute($request)
{
$reply = array();
$result = Vesta::execute(Vesta::V_LIST_SYS_USERS, array(Config::get('response_type'))); $result = Vesta::execute(Vesta::V_LIST_SYS_USERS, array(Config::get('response_type')));
foreach($result as $ip => $details){ foreach ($result as $ip => $details)
{
$reply[] = array( $reply[] = array(
'interface' => $details['INTERFACE'], 'interface' => $details['INTERFACE'],
'sys_users' => $details['U_SYS_USERS'], 'sys_users' => $details['U_SYS_USERS'],
@ -23,222 +33,183 @@ class USER extends AjaxHandler {
'name' => $details['NAME'], 'name' => $details['NAME'],
'owner' => $details['OWNER'], 'owner' => $details['OWNER'],
'created_at' => date(Config::get('ui_date_format', strtotime($details['DATE']))) 'created_at' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
);
/*
"PACKAGE": "default",
"WEB_DOMAINS": "10",
"WEB_SSL": "10",
"WEB_ALIASES": "10",
"DATABASES": "10",
"MAIL_DOMAINS": "10",
"MAIL_BOXES": "30",
"MAIL_FORWARDERS": "30",
"DNS_DOMAINS": "10",
"DISK_QUOTA": "10000",
"BANDWIDTH": "10000",
"NS1": "ns1.localhost",
"NS2": "ns2.localhost",
"SHELL": "bash",
"BACKUPS": "3",
"TEMPLATES": "default, phpcgi, unlim",
"MAX_CHILDS": "300",
"SUSPENDED": "no",
"OWNER": "vesta",
"ROLE": "admin",
"IP_OWNED": "1",
"U_CHILDS": "0",
"U_DISK": "1",
"U_BANDWIDTH": "0",
"U_WEB_DOMAINS": "1",
"U_WEB_SSL": "0",
"U_DNS_DOMAINS": "3",
"U_DATABASES": "0",
"U_MAIL_DOMAINS": "0",
"CONTACT": "vesta@localhost",
"DATE": "01-04-11"
*/
);
} }
return $this->reply(true, $result); return $this->reply(true, $result);
} }
/**
* Add action
*
* @param Request $request
* @return
*/
public function addExecute($_spell = false)
{
$r = new Request();
if ($_spell)
{
$_s = $_spell;
}
else
{
$_s = $r->getSpell();
}
$_user = 'vesta';
$params = array(
'USER' => $_s['USER'],
'PASSWORD' => $_s['PASSWORD'],
'EMAIL' => $_s['EMAIL'],
'ROLE' => $_s['ROLE'],
'OWNER' => $_user,
'PACKAGE' => $_s['PACKAGE'],
'NS1' => $_s['NS1'],
'NS2' => $_s['NS2']
);
$result = Vesta::execute(Vesta::V_ADD_SYS_USER, $params);
if (!$result['status'])
{
$this->errors[] = array($result['error_code'] => $result['error_message']);
}
function addExecute($_spell = false) return $this->reply($result['status'], $result['data']);
{ }
$r = new Request();
if($_spell)
$_s = $_spell;
else
$_s = $r->getSpell();
/**
* Delete action
*
* @param Request $request
* @return
*/
public function delExecute($_spell = false)
{
$r = new Request();
if ($_spell)
{
$_s = $_spell;
}
else
{
$_s = $r->getSpell();
}
$_user = 'vesta';
$params = array(
'USER' => $_s['USER']
);
$result = Vesta::execute(Vesta::V_DEL_SYS_USER, $params);
$_user = 'vesta'; if (!$result['status'])
{
// $_s['ROLE'] = 'user'; $this->errors[] = array($result['error_code'] => $result['error_message']);
// reseller }
// admin
// package: default return $this->reply($result['status'], $result['data']);
}
$params = array( /**
'USER' => $_s['USER'], * Change action
'PASSWORD' => $_s['PASSWORD'], *
'EMAIL' => $_s['EMAIL'], * @param Request $request
'ROLE' => $_s['ROLE'], * @return
'OWNER' => $_user, */
'PACKAGE' => $_s['PACKAGE'], public function changeExecute($request)
'NS1' => $_s['NS1'], {
'NS2' => $_s['NS2'] $r = new Request();
); $_s = $r->getSpell();
$_old = $_s['old'];
$result = Vesta::execute(Vesta::V_ADD_SYS_USER, $params); $_new = $_s['new'];
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
function delExecute($_spell = false)
{
$r = new Request();
if($_spell)
$_s = $_spell;
else
$_s = $r->getSpell();
$_user = 'vesta'; $_USER = $_new['USER'];
$params = array( if($_old['USER'] != $_new['USER'])
'USER' => $_s['USER'] {
); $result = array();
// creating new user
$result = Vesta::execute(Vesta::V_DEL_SYS_USER, $params); $result = $this->addExecute($_new);
if(!$result['status'])
$this->errors[] = array($result['error_code'] => $result['error_message']);
return $this->reply($result['status'], $result['data']);
}
// deleting old
if ($result['status'])
{
$result = array();
$result = $this->delExecute($_old);
return $this->reply($this->status, '');
}
}
if ($_old['PASSWORD'] != $_new['PASSWORD'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_PASSWORD,
array('USER' => $_USER, 'PASSWORD' => $_new['PASSWORD']));
if (!$result['status'])
{
$this->status = FALSE;
$this->errors['PASSWORD'] = array($result['error_code'] => $result['error_message']);
}
}
function changeExecute($request) if ($_old['PACKAGE'] != $_new['PACKAGE'])
{ {
$r = new Request(); $result = array();
$_s = $r->getSpell(); $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_PACKAGE,
$_old = $_s['old']; array('USER' => $_USER, 'PACKAGE' => $_new['PACKAGE']));
$_new = $_s['new']; if (!$result['status'])
{
$this->status = FALSE;
$this->errors['PACKAGE'] = array($result['error_code'] => $result['error_message']);
}
}
$_USER = $_new['USER']; if ($_old['EMAIL'] != $_new['EMAIL'])
{
if($_old['USER'] != $_new['USER']) $result = array();
{ $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_CONTACT,
array('USER' => $_USER, 'EMAIL' => $_new['EMAIL']));
$result = array(); if (!$result['status'])
// creating new user {
$result = $this->addExecute($_new); $this->status = FALSE;
$this->errors['EMAIL'] = array($result['error_code'] => $result['error_message']);
// deleting old }
if($result['status']) }
{
$result = array();
$result = $this->delExecute($_old);
return $this->reply($this->status, '');
}
}
if($_old['PASSWORD'] != $_new['PASSWORD']) if ($_old['NS1'] != $_new['NS1'] || $_old['NS2'] != $_new['NS2'])
{ {
$result = array(); $result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_PASSWORD, array('USER' => $_USER, 'PASSWORD' => $_new['PASSWORD'])); $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_NS,
if(!$result['status']) array('USER' => $_USER, 'NS1' => $_new['NS1'], 'NS2' => $_new['NS2']));
{ if (!$result['status'])
$this->status = FALSE; {
$this->errors['PASSWORD'] = array($result['error_code'] => $result['error_message']); $this->status = FALSE;
} $this->errors['NS'] = array($result['error_code'] => $result['error_message']);
} }
}
if($_old['PACKAGE'] != $_new['PACKAGE']) if ($_old['SHELL'] != $_new['SHELL'])
{ {
$result = array(); $result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_PACKAGE, array('USER' => $_USER, 'PACKAGE' => $_new['PACKAGE'])); $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_SHELL,
if(!$result['status']) array('USER' => $_USER, 'SHELL' => $_new['SHELL']));
{ if (!$result['status'])
$this->status = FALSE; {
$this->errors['PACKAGE'] = array($result['error_code'] => $result['error_message']); $this->status = FALSE;
} $this->errors['SHELL'] = array($result['error_code'] => $result['error_message']);
} }
}
/*
if($_old['ROLE'] != $_new['ROLE'])
{
echo '<br> role';
$result = array(); if (!$this->status)
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_ROLE, array('USER' => $_USER, 'ROLE' => $_new['ROLE'])); {
if(!$result['status']) Vesta::execute(Vesta::V_CHANGE_SYS_USER_PASSWORD, array('USER' => $_USER, 'PASSWORD' => $_old['PASSWORD']));
{ Vesta::execute(Vesta::V_CHANGE_SYS_USER_PACKAGE, array('USER' => $_USER, 'PACKAGE' => $_old['PACKAGE']));
$this->status = FALSE; Vesta::execute(Vesta::V_CHANGE_SYS_USER_CONTACT, array('USER' => $_USER, 'EMAIL' => $_old['EMAIL']));
$this->errors['ROLE'] = array($result['error_code'] => $result['error_message']); // change role // $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_PACKAGE, array('USER' => $_USER, 'PACKAGE' => $_new['PACKAGE']));
} Vesta::execute(Vesta::V_CHANGE_SYS_USER_NS, array('USER' => $_USER, 'NS1' => $_old['NS1'], 'NS2' => $_old['NS2']));
} Vesta::execute(Vesta::V_CHANGE_SYS_USER_SHELL, array('USER' => $_USER, 'SHELL' => $_old['SHELL']));
*/ }
if($_old['EMAIL'] != $_new['EMAIL']) return $this->reply($this->status, '');
{ }
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_CONTACT, array('USER' => $_USER, 'EMAIL' => $_new['EMAIL']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['EMAIL'] = array($result['error_code'] => $result['error_message']);
}
}
if($_old['NS1'] != $_new['NS1'] || $_old['NS2'] != $_new['NS2']) }
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_NS, array('USER' => $_USER, 'NS1' => $_new['NS1'], 'NS2' => $_new['NS2']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['NS'] = array($result['error_code'] => $result['error_message']);
}
}
if($_old['SHELL'] != $_new['SHELL'])
{
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_SHELL, array('USER' => $_USER, 'SHELL' => $_new['SHELL']));
if(!$result['status'])
{
$this->status = FALSE;
$this->errors['SHELL'] = array($result['error_code'] => $result['error_message']);
}
}
if(!$this->status)
{
Vesta::execute(Vesta::V_CHANGE_SYS_USER_PASSWORD, array('USER' => $_USER, 'PASSWORD' => $_old['PASSWORD']));
Vesta::execute(Vesta::V_CHANGE_SYS_USER_PACKAGE, array('USER' => $_USER, 'PACKAGE' => $_old['PACKAGE']));
Vesta::execute(Vesta::V_CHANGE_SYS_USER_CONTACT, array('USER' => $_USER, 'EMAIL' => $_old['EMAIL']));
// change role // $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_PACKAGE, array('USER' => $_USER, 'PACKAGE' => $_new['PACKAGE']));
Vesta::execute(Vesta::V_CHANGE_SYS_USER_NS, array('USER' => $_USER, 'NS1' => $_old['NS1'], 'NS2' => $_old['NS2']));
Vesta::execute(Vesta::V_CHANGE_SYS_USER_SHELL, array('USER' => $_USER, 'SHELL' => $_old['SHELL']));
}
return $this->reply($this->status, '');
}
}

File diff suppressed because it is too large Load diff

View file

@ -13,8 +13,9 @@ require_once V_ROOT_DIR . 'api/AjaxHandler.php';
/** /**
* App execution * App execution
* *
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
try { try {
// Execution // Execution

View file

@ -1,31 +1,61 @@
<?php <?php
class Config { /**
* Config class
*
* Reads, manipulate configs
*
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/
* @copyright vesta 2010-2011
*/
class Config
{
protected $_config = array(); protected $_config = array();
static public $instance = null; static public $instance = null;
public function __construct() { /**
* Config constructor
*
*/
public function __construct()
{
$this->_config = parse_ini_file(V_ROOT_DIR.'config'.DIRECTORY_SEPARATOR.'vesta_config.ini'); $this->_config = parse_ini_file(V_ROOT_DIR.'config'.DIRECTORY_SEPARATOR.'vesta_config.ini');
} }
public function getParameter($key){ /**
* get config parameter
*
* @param string $key
* @return mixed
*/
public function getParameter($key)
{
return isset($this->_config[$key]) ? $this->_config[$key] : false; return isset($this->_config[$key]) ? $this->_config[$key] : false;
} }
/** /**
* Grab current instance or create it * Grab current instance or create it
* *
* @return <type> * @return Config
*/ */
static function getInstance($request=null) { static public function getInstance($request = null)
{
return null == self::$instance ? self::$instance = new self() : self::$instance; return null == self::$instance ? self::$instance = new self() : self::$instance;
} }
static function get($key){ /**
* Shortcut method: get config parameter
*
* @param string $key
* @return mixed
*/
static public function get($key)
{
$ref = self::getInstance(); $ref = self::getInstance();
return $ref->getParameter($key); return $ref->getParameter($key);
} }
} }

View file

@ -5,10 +5,12 @@
* *
* Holds parameters, decorating them and providing easy access * Holds parameters, decorating them and providing easy access
* *
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class Request { class Request
{
protected $server = array(); protected $server = array();
protected $post = array(); protected $post = array();
@ -20,7 +22,8 @@ class Request {
/** /**
* *
*/ */
public function __construct() { public function __construct()
{
$this->post = $_POST; $this->post = $_POST;
$this->get = $_GET; $this->get = $_GET;
$this->server = $_SERVER; $this->server = $_SERVER;
@ -31,29 +34,47 @@ class Request {
/** /**
* Merge holders into single holder * Merge holders into single holder
*/ */
function mergeContainers() { public function mergeContainers()
$this->_merged = array_merge($this->server, $this->post, $this->get, $this->global); {
$this->_spell = json_decode($this->_merged['spell'], true); $this->_merged = array_merge($this->server,
$this->post,
$this->get,
$this->global);
$this->_spell = json_decode($this->_merged['spell'], true);
} }
/** /**
* Get parameter * Get parameter
* *
* @param <string> $key * @param string $key
* @param <mixed> $default * @param mixed $default
* @return <mixed> * @return mixed
*
*/ */
function getParameter($key, $default=false) { public function getParameter($key, $default=false)
return isset($this->_merged[$key]) ? $this->_merged[$key] : $default; {
// return isset($this->_spell[$key]) ? $this->_spell[$key] : $default; return isset($this->_merged[$key]) ? $this->_merged[$key] : $default;
} }
function getSpell() { /**
* Get spell variable from parameters
*
* @return array
*/
public function getSpell()
{
return $this->_spell; return $this->_spell;
} }
function hasParameter($key, $default=false) { /**
* Check if parameter is set
*
* @param string $key
* @param mixed $default
* @return mixed
*
*/
public function hasParameter($key, $default=false)
{
return isset($this->_merged[$key]); return isset($this->_merged[$key]);
} }
@ -62,20 +83,32 @@ class Request {
* *
* TODO: write the method * TODO: write the method
* *
* @return <boolean> * @return boolean
*/ */
function isPost() { public function isPost()
{
return true; return true;
} }
static function parseAjaxMethod($request) { /**
if (!$request->hasParameter('jedi_method')) { * Dissassemble ajax method
* Breaks ajax requested method param into "ENTITY"."ACTION"
* for instance DNS.getList into "namespase" => DNS, "function" => "getList"
* for triggering ($DNS->getListExecuty();)
*
* TODO: write the method
*
* @return array
*/
static public function parseAjaxMethod($request)
{
if (!$request->hasParameter('jedi_method'))
{
throw new ProtectionException(Message::INVALID_METHOD); throw new ProtectionException(Message::INVALID_METHOD);
} }
$method = explode('.', $request->getParameter('jedi_method')); $method = explode('.', $request->getParameter('jedi_method'));
if (count($method) != 2)
if (count($method) != 2) { {
throw new ProtectionException(Message::INVALID_METHOD); throw new ProtectionException(Message::INVALID_METHOD);
} }

View file

@ -1,220 +1,173 @@
<?php <?php
/** /**
* Api Main class
* Calls / Executes native vesta methods
* *
* @author Malishev Dima <dima.malishev@gmail.com>
* @author Naumov-Socolov <naumov.socolov@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class Vesta { class Vesta
// ====================== IP =========================== {
const V_LIST_SYS_IPS = 'v_list_sys_ips'; // IP
const V_LIST_SYS_IPS = 'v_list_sys_ips';
// adding const V_ADD_SYS_IP = 'v_add_sys_ip';
const V_ADD_SYS_IP = 'v_add_sys_ip'; const V_ADD_SYS_USER_IP = 'v_add_sys_user_ip';
const V_ADD_SYS_USER_IP = 'v_add_sys_user_ip'; const V_CHANGE_SYS_IP_OWNER = 'v_change_sys_ip_owner';
const V_CHANGE_SYS_IP_NAME = 'v_change_sys_ip_name';
// changing const V_CHANGE_SYS_IP_STATUS = 'v_change_sys_ip_status';
const V_CHANGE_SYS_IP_OWNER = 'v_change_sys_ip_owner'; const V_DEL_SYS_IP = 'v_del_sys_ip';
const V_CHANGE_SYS_IP_NAME = 'v_change_sys_ip_name'; const V_UPD_SYS_IP = 'v_upd_sys_ip';
const V_CHANGE_SYS_IP_STATUS = 'v_change_sys_ip_status'; const V_LIST_SYS_INTERFACES = 'v_list_sys_interfaces';
// deleting // DNS
const V_DEL_SYS_IP = 'v_del_sys_ip'; const V_LIST_DNS_DOMAINS = 'v_list_dns_domains';
const V_LIST_DNS_DOMAIN_RECORDS = 'v_list_dns_domain';
// service const V_ADD_DNS_DOMAIN = 'v_add_dns_domain';
const V_UPD_SYS_IP = 'v_upd_sys_ip'; const V_ADD_DNS_DOMAIN_RECORD = 'v_add_dns_domain_record';
const V_LIST_SYS_INTERFACES = 'v_list_sys_interfaces'; const V_CHANGE_DNS_DOMAIN_IP = 'v_change_dns_domain_ip';
const V_CHANGE_DNS_DOMAIN_SOA = 'v_change_dns_domain_soa';
// ======================= DNS ========================= const V_CHANGE_DNS_DOMAIN_TPL = 'v_change_dns_domain_tpl';
const V_LIST_DNS_DOMAINS = 'v_list_dns_domains'; const V_CHANGE_DNS_DOMAIN_TTL = 'v_change_dns_domain_ttl';
const V_LIST_DNS_DOMAIN_RECORDS = 'v_list_dns_domain'; const V_CHANGE_DNS_DOMAIN_EXP = 'v_change_dns_domain_exp';
const V_CHANGE_DNS_DOMAIN_RECORD = 'v_change_dns_domain_record';
// adding const V_DEL_DNS_DOMAIN = 'v_del_dns_domain';
const V_ADD_DNS_DOMAIN = 'v_add_dns_domain'; const V_DEL_DNS_DOMAIN_RECORD = 'v_del_dns_domain_record';
const V_ADD_DNS_DOMAIN_RECORD = 'v_add_dns_domain_record'; // CRON
const V_LIST_CRON_JOBS = 'v_list_sys_cron';
// changing const V_ADD_CRON_JOB = 'v_add_sys_cron';
const V_CHANGE_DNS_DOMAIN_IP = 'v_change_dns_domain_ip'; const V_ADD_SYS_USER_REPORTS = 'v_add_sys_user_reports';
const V_CHANGE_DNS_DOMAIN_SOA = 'v_change_dns_domain_soa'; const V_CHANGE_CRON_JOB = 'v_change_sys_cron_job';
const V_CHANGE_DNS_DOMAIN_TPL = 'v_change_dns_domain_tpl'; const V_SUSPEND_CRON_JOB = 'v_suspend_sys_cron_job';
const V_CHANGE_DNS_DOMAIN_TTL = 'v_change_dns_domain_ttl'; const V_SUSPEND_CRON_JOBS = 'v_suspend_sys_cron_jobs';
const V_CHANGE_DNS_DOMAIN_EXP = 'v_change_dns_domain_exp'; const V_UNSUSPEND_CRON_JOB = 'v_unsuspend_sys_cron_job';
const V_CHANGE_DNS_DOMAIN_RECORD = 'v_change_dns_domain_record'; const V_UNSUSPEND_CRON_JOBS = 'v_unsuspend_sys_cron_jobs';
const V_DEL_CRON_JOB = 'v_del_sys_cron';
// deleting const V_DEL_SYS_USER_REPORTS = 'v_del_sys_user_reports';
const V_DEL_DNS_DOMAIN = 'v_del_dns_domain'; // USER
const V_DEL_DNS_DOMAIN_RECORD = 'v_del_dns_domain_record'; const V_LIST_SYS_USERS = 'v_list_sys_users';
const V_ADD_SYS_USER = 'v_add_sys_user';
const V_CHANGE_SYS_USER_CONTACT = 'v_change_sys_user_contact';
const V_CHANGE_SYS_USER_NS = 'v_change_sys_user_ns';
// ======================= CRON ========================= const V_CHANGE_SYS_USER_PACKAGE = 'v_change_sys_user_package';
const V_LIST_CRON_JOBS = 'v_list_sys_cron'; const V_CHANGE_SYS_USER_PASSWORD = 'v_change_sys_user_password';
const V_CHANGE_SYS_USER_SHELL = 'v_change_sys_user_shell';
// adding const V_CHANGE_SYS_USER_ROLE = 'v_change_sys_user_role';
const V_ADD_CRON_JOB = 'v_add_sys_cron'; const V_DEL_SYS_USER = 'v_del_sys_user';
const V_ADD_SYS_USER_REPORTS = 'v_add_sys_user_reports'; // WEB_DOMAIN
const V_LIST_WEB_DOMAINS = 'v_list_web_domains';
// changing const V_LIST_WEB_DOMAINS_ALIAS = 'v_list_web_domains_alias';
const V_CHANGE_CRON_JOB = 'v_change_sys_cron_job'; const V_LIST_WEB_DOMAINS_ELOG = 'v_list_web_domains_elog';
const V_SUSPEND_CRON_JOB = 'v_suspend_sys_cron_job'; const V_LIST_WEB_DOMAINS_PROXY = 'v_list_web_domains_proxy';
const V_SUSPEND_CRON_JOBS = 'v_suspend_sys_cron_jobs'; const V_LIST_WEB_DOMAINS_SSL = 'v_list_web_domains_ssl';
const V_UNSUSPEND_CRON_JOB = 'v_unsuspend_sys_cron_job'; const V_LIST_WEB_DOMAINS_STATS = 'v_list_web_domains_stats';
const V_UNSUSPEND_CRON_JOBS = 'v_unsuspend_sys_cron_jobs'; const V_LIST_WEB_TEMPLATES = 'v_list_web_templates';
const V_ADD_WEB_DOMAIN = 'v_add_web_domain';
// deleting const V_ADD_WEB_DOMAIN_ALIAS = 'v_add_web_domain_alias';
const V_DEL_CRON_JOB = 'v_del_sys_cron'; const V_ADD_WEB_DOMAIN_STAT = 'v_add_web_domain_stat';
const V_DEL_SYS_USER_REPORTS = 'v_del_sys_user_reports'; const V_ADD_WEB_DOMAIN_STAT_AUTH = 'v_add_web_domain_stat_auth';
const V_ADD_WEB_DOMAIN_SSL = 'v_add_web_domain_ssl';
const V_ADD_WEB_DOMAIN_ELOG = 'v_add_web_domain_elog';
const V_ADD_WEB_DOMAIN_CGI = 'v_add_web_domain_cgi';
// ======================= USER ========================= const V_CHANGE_WEB_DOMAIN_IP = 'v_change_web_domain_ip';
const V_LIST_SYS_USERS = 'v_list_sys_users'; const V_CHANGE_WEB_DOMAIN_SSLCERT = 'v_change_web_domain_sslcert';
const V_CHANGE_WEB_DOMAIN_SSLHOME = 'v_change_web_domain_sslhome';
// adding const V_CHANGE_WEB_DOMAIN_TPL = 'v_change_web_domain_tpl';
const V_ADD_SYS_USER = 'v_add_sys_user'; const V_DEL_WEB_DOMAIN_CGI = 'v_del_web_domain_cgi';
const V_DEL_WEB_DOMAIN_ELOG = 'v_del_web_domain_elog';
// changing const V_DEL_WEB_DOMAIN_SSL = 'v_del_web_domain_ssl';
const V_CHANGE_SYS_USER_CONTACT = 'v_change_sys_user_contact'; const V_DEL_WEB_DOMAIN_STAT = 'v_del_web_domain_stat';
const V_CHANGE_SYS_USER_NS = 'v_change_sys_user_ns'; const V_DEL_WEB_DOMAIN_STAT_AUTH = 'v_del_web_domain_stat_auth';
const V_CHANGE_SYS_USER_PACKAGE = 'v_change_sys_user_package'; const V_DEL_WEB_DOMAIN_ALIAS = 'v_del_web_domain_alias';
const V_CHANGE_SYS_USER_PASSWORD = 'v_change_sys_user_password'; const V_SUSPEND_WEB_DOMAIN = 'v_suspend_web_domain';
const V_CHANGE_SYS_USER_SHELL = 'v_change_sys_user_shell'; const V_SUSPEND_WEB_DOMAINS = 'v_suspend_web_domains';
const V_CHANGE_SYS_USER_ROLE = 'v_change_sys_user_role'; const V_UNSUSPEND_WEB_DOMAIN = 'v_unsuspend_web_domain';
const V_UNSUSPEND_WEB_DOMAINS = 'v_unsuspend_web_domains';
// deleting const V_UPD_WEB_DOMAIN_DISK = 'v_upd_web_domain_disk';
const V_DEL_SYS_USER = 'v_del_sys_user'; const V_UPD_WEB_DOMAINS_DISK = 'v_upd_web_domains_disk';
const V_UPD_WEB_DOMAIN_TRAFF = 'v_upd_web_domain_traff';
const V_UPD_WEB_DOMAINS_TRAFF = 'v_upd_web_domains_traff';
// ======================= WEB_DOMAIN ========================= const V_DEL_WEB_DOMAIN = 'v_del_web_domain';
const V_LIST_WEB_DOMAINS = 'v_list_web_domains'; // DB
const V_LIST_DB_BASES = 'v_list_db_bases';
const V_LIST_WEB_DOMAINS_ALIAS = 'v_list_web_domains_alias'; const V_LIST_DB_HOSTS = 'v_list_db_hosts';
const V_LIST_WEB_DOMAINS_ELOG = 'v_list_web_domains_elog'; const V_ADD_DB_BASE = 'v_add_db_base';
const V_LIST_WEB_DOMAINS_PROXY = 'v_list_web_domains_proxy'; const V_ADD_DB_HOST = 'v_add_db_host';
const V_LIST_WEB_DOMAINS_SSL = 'v_list_web_domains_ssl'; const V_SUSPEND_DB_BASE = 'v_suspend_db_base';
const V_LIST_WEB_DOMAINS_STATS = 'v_list_web_domains_stats'; const V_SUSPEND_DB_BASES = 'v_suspend_db_bases';
const V_LIST_WEB_TEMPLATES = 'v_list_web_templates'; const V_UNSUSPEND_DB_BASE = 'v_unsuspend_db_base';
const V_UNSUSPEND_DB_BASES = 'v_unsuspend_db_bases';
// adding const V_CHANGE_DB_PASSWORD = 'v_change_db_password';
const V_ADD_WEB_DOMAIN = 'v_add_web_domain'; const V_DEL_DB_BASE = 'v_del_db_base';
const V_ADD_WEB_DOMAIN_ALIAS = 'v_add_web_domain_alias'; const V_DEL_DB_HOST = 'v_del_db_host';
const V_UPD_DB_BASE_DISK = 'v_upd_db_base_disk';
// changing const V_UPD_DB_BASES_DISK = 'v_upd_db_bases_disk';
const V_ADD_WEB_DOMAIN_STAT = 'v_add_web_domain_stat'; const PARAM_DELIMETER = ' ';
const V_ADD_WEB_DOMAIN_STAT_AUTH = 'v_add_web_domain_stat_auth';
const V_ADD_WEB_DOMAIN_SSL = 'v_add_web_domain_ssl';
const V_ADD_WEB_DOMAIN_ELOG = 'v_add_web_domain_elog';
const V_ADD_WEB_DOMAIN_CGI = 'v_add_web_domain_cgi';
const V_CHANGE_WEB_DOMAIN_IP = 'v_change_web_domain_ip';
const V_CHANGE_WEB_DOMAIN_SSLCERT = 'v_change_web_domain_sslcert';
const V_CHANGE_WEB_DOMAIN_SSLHOME = 'v_change_web_domain_sslhome';
const V_CHANGE_WEB_DOMAIN_TPL = 'v_change_web_domain_tpl';
const V_DEL_WEB_DOMAIN_CGI = 'v_del_web_domain_cgi';
const V_DEL_WEB_DOMAIN_ELOG = 'v_del_web_domain_elog';
const V_DEL_WEB_DOMAIN_SSL = 'v_del_web_domain_ssl';
const V_DEL_WEB_DOMAIN_STAT = 'v_del_web_domain_stat';
const V_DEL_WEB_DOMAIN_STAT_AUTH = 'v_del_web_domain_stat_auth';
const V_DEL_WEB_DOMAIN_ALIAS = 'v_del_web_domain_alias';
const V_SUSPEND_WEB_DOMAIN = 'v_suspend_web_domain';
const V_SUSPEND_WEB_DOMAINS = 'v_suspend_web_domains';
const V_UNSUSPEND_WEB_DOMAIN = 'v_unsuspend_web_domain';
const V_UNSUSPEND_WEB_DOMAINS = 'v_unsuspend_web_domains';
const V_UPD_WEB_DOMAIN_DISK = 'v_upd_web_domain_disk';
const V_UPD_WEB_DOMAINS_DISK = 'v_upd_web_domains_disk';
const V_UPD_WEB_DOMAIN_TRAFF = 'v_upd_web_domain_traff';
const V_UPD_WEB_DOMAINS_TRAFF = 'v_upd_web_domains_traff';
// deleting
const V_DEL_WEB_DOMAIN = 'v_del_web_domain';
// ======================= DB =========================
// list
const V_LIST_DB_BASES = 'v_list_db_bases';
const V_LIST_DB_HOSTS = 'v_list_db_hosts';
// adding
const V_ADD_DB_BASE = 'v_add_db_base';
const V_ADD_DB_HOST = 'v_add_db_host';
// changing
const V_SUSPEND_DB_BASE = 'v_suspend_db_base';
const V_SUSPEND_DB_BASES = 'v_suspend_db_bases';
const V_UNSUSPEND_DB_BASE = 'v_unsuspend_db_base';
const V_UNSUSPEND_DB_BASES = 'v_unsuspend_db_bases';
const V_CHANGE_DB_PASSWORD = 'v_change_db_password';
// deleting
const V_DEL_DB_BASE = 'v_del_db_base';
const V_DEL_DB_HOST = 'v_del_db_host';
// service
const V_UPD_DB_BASE_DISK = 'v_upd_db_base_disk';
const V_UPD_DB_BASES_DISK = 'v_upd_db_bases_disk';
// ======================================================
const PARAM_DELIMETER = ' ';
/** /**
* Execute vesta command
* *
* @param string $cms_command
* @param array $parameters
* @return string
*/ */
static function execute($cmd_command, $parameters=array()) { static function execute($cmd_command, $parameters=array())
$r = new Request(); {
$debug = $r->getParameter("debug", FALSE); $r = new Request();
$_DEBUG = $r->getParameter("debug", FALSE);
if (!isset($cmd_command)) { if (!isset($cmd_command))
{
throw new ProtectionException('No function name passed into Vesta::execute'); // TODO: move msg to Messages:: throw new ProtectionException('No function name passed into Vesta::execute'); // TODO: move msg to Messages::
} }
$params = array( $params = array(
'sudo' => Config::get('sudo_path'), 'sudo' => Config::get('sudo_path'),
'functions' => Config::get('vesta_functions_path'), 'functions' => Config::get('vesta_functions_path'),
'parameters' => implode("' '", $parameters), 'parameters' => implode("' '", $parameters),
// 'reply' => Config::get('response_type')
); );
// e.g.: /usr/bin/sudo /usr/local/vesta/bin/v_list_sys_users vesta json
$cmd = "{$params['sudo']} {$params['functions']}{$cmd_command} '{$params['parameters']}' {$params['reply']}"; $cmd = "{$params['sudo']} {$params['functions']}{$cmd_command} '{$params['parameters']}' {$params['reply']}";
// /usr/bin/sudo /usr/local/vesta/bin/v_list_sys_users vesta json
exec($cmd, $output, $return); exec($cmd, $output, $return);
$result = 0; $result = 0;
$result = array('status' => TRUE, $result = array('status' => TRUE,
'data' => '', 'data' => '',
'error_code' => '', 'error_code' => '',
'error_message' => '' 'error_message' => ''
); );
if($debug) // TODO: please remove this later :)
{ if ($_DEBUG)
$result['debug'] = array( {
"cmd" => $cmd, $result['debug'] = array(
"output" => $output, "cmd" => $cmd,
"return" => $return "output" => $output,
); "return" => $return
if($debug == 2) );
{ if ($debug == 2)
echo '<p>'.$cmd; {
echo '<br> output: '; print_r($output); echo '<p>'.$cmd;
echo '<br> return: '.$return; echo '<br> output: '; print_r($output);
echo '</p>'; echo '<br> return: '.$return;
} echo '</p>';
} }
}
if(!!(int)$return) if (!!(int)$return)
{ {
$result['status'] = FALSE; $result['status'] = FALSE;
$result['error_code'] = (int)$return; $result['error_code'] = (int)$return;
$result['error_message'] = implode('', $output); $result['error_message'] = implode('', $output);
} }
else else
{ {
$result['data'] = json_decode(implode('', $output), true); $result['data'] = json_decode(implode('', $output), true);
} }
return $result; return $result;
} }
} }

View file

@ -5,17 +5,27 @@
* *
* Thrown if unexpected action or behaviour detected * Thrown if unexpected action or behaviour detected
* *
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class ProtectionException extends Exception { class ProtectionException extends Exception
{
const CODE_GENERAL = 0; const CODE_GENERAL = 0;
public function __construct($message, $code=self::CODE_GENERAL, $previous=null) { /**
* Protection exception
*/
public function __construct($message, $code=self::CODE_GENERAL, $previous=null)
{
parent::__construct($message, $code, $previous); parent::__construct($message, $code, $previous);
} }
public function __toString() { /**
* Renders error message
*/
public function __toString()
{
print $this->message; print $this->message;
} }

View file

@ -7,8 +7,9 @@
* - system error occured * - system error occured
* - unpredictable scenarios * - unpredictable scenarios
* *
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class SystemException extends Exception { class SystemException extends Exception {
const CODE_GENERAL = 0; const CODE_GENERAL = 0;

View file

@ -4,20 +4,23 @@
* Messages container * Messages container
* *
* Contains messages, that are used in the code. * Contains messages, that are used in the code.
* *
* @author Malishev Dima <dima.malishev@gmail.com>
* @author vesta, http://vestacp.com/ * @author vesta, http://vestacp.com/
* @copyright vesta 2010 * @copyright vesta 2010-2011
*/ */
class Message { class Message
const REQUEST_INVALID = 'Malformed request'; {
const GENERAL_ERROR = 'General protection fault';
const REQUEST_IS_NOT_POST = 'Request is not POST'; const ERROR = 'error';
const METHOD_NOT_EXIST = 'Message not exist'; const REQUEST_INVALID = 'Malformed request';
const INVALID_METHOD = 'Method Invalid'; const REQUEST_IS_NOT_POST = 'Request is not POST';
const SYSTEM_ERROR = 'System Error'; const GENERAL_ERROR = 'General protection fault';
const PROTECTION_ERROR = 'Protection error'; const METHOD_NOT_EXIST = 'Message not exist';
const INVALID_METHOD = 'Method Invalid';
const ERROR = 'error'; const SYSTEM_ERROR = 'System Error';
const PROTECTION_ERROR = 'Protection error';
} }
?> ?>

View file

@ -0,0 +1,47 @@
<?php
function error_dumper($errno, $errstr, $errfile, $errline)
{
if (!(error_reporting() & $errno)) {
return;
}
$log = fopen('/tmp/vesta.php.log', 'a+');
switch ($errno) {
case E_USER_ERROR:
$o = "ERROR: [$errno] $errstr\n";
$o.= " Fatal error on line $errline in file $errfile";
$o.= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
$o.= "Aborting...\n";
fwrite($log, $o);
fclose($log);
exit(1);
break;
case E_USER_WARNING:
$o = "WARNING: [$errno] $errstr\n";
fwrite($log, $o);
fclose($log);
break;
case E_USER_NOTICE:
$o = "NOTICE: [$errno] $errstr\n";
fwrite($log, $o);
fclose($log);
break;
default:
$o = "Unknown error type: [$errno] $errstr\n";
fwrite($log, $o);
fclose($log);
break;
}
/* Don't execute PHP internal error handler */
return true;
}
set_error_handler('error_dumper');
?>