diff --git a/web/vesta/config/Config.class.php b/web/vesta/config/Config.class.php index 4f193431..b64b1113 100644 --- a/web/vesta/config/Config.class.php +++ b/web/vesta/config/Config.class.php @@ -5,8 +5,8 @@ * * Reads, manipulate configs * - * @author Malishev Dima * @author vesta, http://vestacp.com/ + * @author Dmitry Malishev * @copyright vesta 2010-2011 */ class Config diff --git a/web/vesta/core/Vesta.class.php b/web/vesta/core/Vesta.class.php index 8b0c50e2..825fbfb6 100644 --- a/web/vesta/core/Vesta.class.php +++ b/web/vesta/core/Vesta.class.php @@ -4,106 +4,106 @@ * Api Main class * Calls / Executes native vesta methods * - * @author Malishev Dima - * @author Naumov-Socolov * @author vesta, http://vestacp.com/ + * @author Dmitry Malishev + * @author Dmitry Naumov-Socolov * @copyright vesta 2010-2011 */ class Vesta { // IP - const V_LIST_SYS_IPS = 'v_list_sys_ips'; - const V_ADD_SYS_IP = 'v_add_sys_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'; - const V_CHANGE_SYS_IP_STATUS = 'v_change_sys_ip_status'; - const V_DEL_SYS_IP = 'v_del_sys_ip'; - const V_UPD_SYS_IP = 'v_upd_sys_ip'; - const V_LIST_SYS_INTERFACES = 'v_list_sys_interfaces'; + const V_LIST_SYS_IPS = 'v_list_sys_ips'; + const V_ADD_SYS_IP = 'v_add_sys_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'; + const V_CHANGE_SYS_IP_STATUS = 'v_change_sys_ip_status'; + const V_DEL_SYS_IP = 'v_del_sys_ip'; + const V_UPD_SYS_IP = 'v_upd_sys_ip'; + const V_LIST_SYS_INTERFACES = 'v_list_sys_interfaces'; // DNS - const V_LIST_DNS_DOMAINS = 'v_list_dns_domains'; - const V_LIST_DNS_DOMAIN_RECORDS = 'v_list_dns_domain'; - const V_ADD_DNS_DOMAIN = 'v_add_dns_domain'; - const V_ADD_DNS_DOMAIN_RECORD = 'v_add_dns_domain_record'; - const V_CHANGE_DNS_DOMAIN_IP = 'v_change_dns_domain_ip'; - const V_CHANGE_DNS_DOMAIN_SOA = 'v_change_dns_domain_soa'; - const V_CHANGE_DNS_DOMAIN_TPL = 'v_change_dns_domain_tpl'; - const V_CHANGE_DNS_DOMAIN_TTL = 'v_change_dns_domain_ttl'; - const V_CHANGE_DNS_DOMAIN_EXP = 'v_change_dns_domain_exp'; - const V_CHANGE_DNS_DOMAIN_RECORD = 'v_change_dns_domain_record'; - const V_DEL_DNS_DOMAIN = 'v_del_dns_domain'; - const V_DEL_DNS_DOMAIN_RECORD = 'v_del_dns_domain_record'; + const V_LIST_DNS_DOMAINS = 'v_list_dns_domains'; + const V_LIST_DNS_DOMAIN_RECORDS = 'v_list_dns_domain'; + const V_ADD_DNS_DOMAIN = 'v_add_dns_domain'; + const V_ADD_DNS_DOMAIN_RECORD = 'v_add_dns_domain_record'; + const V_CHANGE_DNS_DOMAIN_IP = 'v_change_dns_domain_ip'; + const V_CHANGE_DNS_DOMAIN_SOA = 'v_change_dns_domain_soa'; + const V_CHANGE_DNS_DOMAIN_TPL = 'v_change_dns_domain_tpl'; + const V_CHANGE_DNS_DOMAIN_TTL = 'v_change_dns_domain_ttl'; + const V_CHANGE_DNS_DOMAIN_EXP = 'v_change_dns_domain_exp'; + const V_CHANGE_DNS_DOMAIN_RECORD = 'v_change_dns_domain_record'; + const V_DEL_DNS_DOMAIN = 'v_del_dns_domain'; + const V_DEL_DNS_DOMAIN_RECORD = 'v_del_dns_domain_record'; // CRON - const V_LIST_CRON_JOBS = 'v_list_sys_cron'; - const V_ADD_CRON_JOB = 'v_add_sys_cron'; - const V_ADD_SYS_USER_REPORTS = 'v_add_sys_user_reports'; - const V_CHANGE_CRON_JOB = 'v_change_sys_cron_job'; - const V_SUSPEND_CRON_JOB = 'v_suspend_sys_cron_job'; - const V_SUSPEND_CRON_JOBS = 'v_suspend_sys_cron_jobs'; - const V_UNSUSPEND_CRON_JOB = 'v_unsuspend_sys_cron_job'; - const V_UNSUSPEND_CRON_JOBS = 'v_unsuspend_sys_cron_jobs'; - const V_DEL_CRON_JOB = 'v_del_sys_cron'; - const V_DEL_SYS_USER_REPORTS = 'v_del_sys_user_reports'; + const V_LIST_CRON_JOBS = 'v_list_sys_cron'; + const V_ADD_CRON_JOB = 'v_add_sys_cron'; + const V_ADD_SYS_USER_REPORTS = 'v_add_sys_user_reports'; + const V_CHANGE_CRON_JOB = 'v_change_sys_cron_job'; + const V_SUSPEND_CRON_JOB = 'v_suspend_sys_cron_job'; + const V_SUSPEND_CRON_JOBS = 'v_suspend_sys_cron_jobs'; + const V_UNSUSPEND_CRON_JOB = 'v_unsuspend_sys_cron_job'; + const V_UNSUSPEND_CRON_JOBS = 'v_unsuspend_sys_cron_jobs'; + const V_DEL_CRON_JOB = 'v_del_sys_cron'; + const V_DEL_SYS_USER_REPORTS = 'v_del_sys_user_reports'; // USER - 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'; - const V_CHANGE_SYS_USER_PACKAGE = 'v_change_sys_user_package'; - const V_CHANGE_SYS_USER_PASSWORD = 'v_change_sys_user_password'; - const V_CHANGE_SYS_USER_SHELL = 'v_change_sys_user_shell'; - const V_CHANGE_SYS_USER_ROLE = 'v_change_sys_user_role'; - const V_DEL_SYS_USER = 'v_del_sys_user'; + 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'; + const V_CHANGE_SYS_USER_PACKAGE = 'v_change_sys_user_package'; + const V_CHANGE_SYS_USER_PASSWORD = 'v_change_sys_user_password'; + const V_CHANGE_SYS_USER_SHELL = 'v_change_sys_user_shell'; + const V_CHANGE_SYS_USER_ROLE = 'v_change_sys_user_role'; + const V_DEL_SYS_USER = 'v_del_sys_user'; // WEB_DOMAIN - const V_LIST_WEB_DOMAINS = 'v_list_web_domains'; - const V_LIST_WEB_DOMAINS_ALIAS = 'v_list_web_domains_alias'; - const V_LIST_WEB_DOMAINS_ELOG = 'v_list_web_domains_elog'; - const V_LIST_WEB_DOMAINS_PROXY = 'v_list_web_domains_proxy'; - const V_LIST_WEB_DOMAINS_SSL = 'v_list_web_domains_ssl'; - const V_LIST_WEB_DOMAINS_STATS = 'v_list_web_domains_stats'; - const V_LIST_WEB_TEMPLATES = 'v_list_web_templates'; - const V_ADD_WEB_DOMAIN = 'v_add_web_domain'; - const V_ADD_WEB_DOMAIN_ALIAS = 'v_add_web_domain_alias'; - const V_ADD_WEB_DOMAIN_STAT = 'v_add_web_domain_stat'; - 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'; - const V_DEL_WEB_DOMAIN = 'v_del_web_domain'; + const V_LIST_WEB_DOMAINS = 'v_list_web_domains'; + const V_LIST_WEB_DOMAINS_ALIAS = 'v_list_web_domains_alias'; + const V_LIST_WEB_DOMAINS_ELOG = 'v_list_web_domains_elog'; + const V_LIST_WEB_DOMAINS_PROXY = 'v_list_web_domains_proxy'; + const V_LIST_WEB_DOMAINS_SSL = 'v_list_web_domains_ssl'; + const V_LIST_WEB_DOMAINS_STATS = 'v_list_web_domains_stats'; + const V_LIST_WEB_TEMPLATES = 'v_list_web_templates'; + const V_ADD_WEB_DOMAIN = 'v_add_web_domain'; + const V_ADD_WEB_DOMAIN_ALIAS = 'v_add_web_domain_alias'; + const V_ADD_WEB_DOMAIN_STAT = 'v_add_web_domain_stat'; + 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'; + const V_DEL_WEB_DOMAIN = 'v_del_web_domain'; // DB - const V_LIST_DB_BASES = 'v_list_db_bases'; - const V_LIST_DB_HOSTS = 'v_list_db_hosts'; - const V_ADD_DB_BASE = 'v_add_db_base'; - const V_ADD_DB_HOST = 'v_add_db_host'; - 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'; - const V_DEL_DB_BASE = 'v_del_db_base'; - const V_DEL_DB_HOST = 'v_del_db_host'; - 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 = ' '; + const V_LIST_DB_BASES = 'v_list_db_bases'; + const V_LIST_DB_HOSTS = 'v_list_db_hosts'; + const V_ADD_DB_BASE = 'v_add_db_base'; + const V_ADD_DB_HOST = 'v_add_db_host'; + 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'; + const V_DEL_DB_BASE = 'v_del_db_base'; + const V_DEL_DB_HOST = 'v_del_db_host'; + 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 @@ -117,16 +117,15 @@ class Vesta $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:: } $params = array( - 'sudo' => Config::get('sudo_path'), - 'functions' => Config::get('vesta_functions_path'), - 'parameters' => implode("' '", $parameters), - ); + 'sudo' => Config::get('sudo_path'), + 'functions' => Config::get('vesta_functions_path'), + 'parameters' => implode("' '", $parameters), + ); // 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']}"; @@ -134,22 +133,21 @@ class Vesta exec($cmd, $output, $return); $result = 0; - $result = array('status' => TRUE, + $result = array( + 'status' => TRUE, 'data' => '', 'error_code' => '', 'error_message' => '' - ); + ); // TODO: please remove this later :) - if ($_DEBUG) - { + if ($_DEBUG) { $result['debug'] = array( "cmd" => $cmd, "output" => $output, "return" => $return ); - if ($debug == 2) - { + if ($debug == 2) { echo '

'.$cmd; echo '
output: '; print_r($output); echo '
return: '.$return; @@ -157,14 +155,12 @@ class Vesta } } - if (!!(int)$return) - { + if (!!(int)$return) { $result['status'] = FALSE; $result['error_code'] = (int)$return; $result['error_message'] = implode('', $output); } - else - { + else { $result['data'] = json_decode(implode('', $output), true); } diff --git a/web/vesta/core/exceptions/ProtectionException.class.php b/web/vesta/core/exceptions/ProtectionException.class.php index b8ea308c..a9e383f1 100644 --- a/web/vesta/core/exceptions/ProtectionException.class.php +++ b/web/vesta/core/exceptions/ProtectionException.class.php @@ -5,8 +5,8 @@ * * Thrown if unexpected action or behaviour detected * - * @author Malishev Dima * @author vesta, http://vestacp.com/ + * @author Dmitry Malishev * @copyright vesta 2010-2011 */ class ProtectionException extends Exception diff --git a/web/vesta/core/exceptions/SystemException.class.php b/web/vesta/core/exceptions/SystemException.class.php index 6db36cdc..9265e320 100644 --- a/web/vesta/core/exceptions/SystemException.class.php +++ b/web/vesta/core/exceptions/SystemException.class.php @@ -7,8 +7,8 @@ * - system error occured * - unpredictable scenarios * - * @author Malishev Dima * @author vesta, http://vestacp.com/ + * @author Dmitry Malishev * @copyright vesta 2010-2011 */ class SystemException extends Exception { diff --git a/web/vesta/core/utils/Message.class.php b/web/vesta/core/utils/Message.class.php index e1a91dae..2bfa4bce 100644 --- a/web/vesta/core/utils/Message.class.php +++ b/web/vesta/core/utils/Message.class.php @@ -5,8 +5,8 @@ * * Contains messages, that are used in the code. * - * @author Malishev Dima * @author vesta, http://vestacp.com/ + * @author Dmitry Malishev * @copyright vesta 2010-2011 */ class Message