\
+ ENTRY: ['
\
\
\
\
@@ -854,8 +935,8 @@ App.Templates.html = {
Help\
\
'],
- ENTRIES_WRAPPER: ['
~!:content~!
'],
- ENTRY: ['
\
+ ENTRIES_WRAPPER: ['
~!:content~!
'],
+ ENTRY: ['
\
\
\
\
@@ -898,9 +979,7 @@ App.Templates.html = {
\
reported to:\
naumov.socolov@gmail.com,\
- vasysualiy.pupkin@gmail.com,\
- na-derevniu-dedushke@dachniy-poselok-za-mkadom.com,\
- vasysualiy.pupkin@gmail.com\
+ naumov.socolov@gmail.com,\
\
\
\
@@ -912,23 +991,23 @@ App.Templates.html = {
// Internals
var Tpl = App.Templates;
-
-var Templator = function(){
- var init = function(){
+var Templator = function()
+{
+ var init = function() {
fb.info('Templator work');
Templator.splitThemAll();
Templator.freezeTplIndexes();
};
-
/**
* Split the tpl strings into arrays
*/
- Templator.splitThemAll = function(){
+ Templator.splitThemAll = function()
+ {
fb.info('splitting tpls');
- $.each(App.Templates.html, function(o){
+ $.each(App.Templates.html, function(o) {
var tpls = App.Templates.html[o];
- $.each(tpls, function(t){
+ $.each(tpls, function(t) {
tpls[t] = tpls[t][0].split('~!');
});
});
@@ -937,7 +1016,8 @@ var Templator = function(){
/**
* Iterates tpls
*/
- Templator.freezeTplIndexes = function(){
+ Templator.freezeTplIndexes = function()
+ {
fb.info('freezing tpl keys');
$.each(App.Templates.html, Templator.cacheTplIndexes);
},
@@ -945,10 +1025,10 @@ var Templator = function(){
/**
* Grab the tpl group key and process it
*/
- Templator.cacheTplIndexes = function(key){
+ Templator.cacheTplIndexes = function(key)
+ {
var tpls = App.Templates.html[key];
-
- $.each(tpls, function(o){
+ $.each(tpls, function(o) {
var tpl = tpls[o];
Templator.catchIndex(key, o, tpl);
});
@@ -957,11 +1037,11 @@ var Templator = function(){
/**
* Set the indexes
*/
- Templator.catchIndex = function(key, ref_key, tpl){
- 'undefined' == typeof App.Templates._indexes[key] ? App.Templates._indexes[key] = {} : false;
+ Templator.catchIndex = function(key, ref_key, tpl)
+ {
+ 'undefined' == typeof App.Templates._indexes[key] ? App.Templates._indexes[key] = {} : false;
'undefined' == typeof App.Templates._indexes[key][ref_key] ? App.Templates._indexes[key][ref_key] = {} : false;
-
- $(tpl).each(function(index, o){
+ $(tpl).each(function(index, o) {
if(':' == o.charAt(0)){
App.Templates._indexes[key][ref_key][o.toString()] = index;
}
@@ -974,15 +1054,16 @@ var Templator = function(){
init();
return Templator;
};
-Templator.getTemplate = function(ns, key){
+Templator.getTemplate = function(ns, key)
+{
return [
- App.Templates._indexes[ns][key],
- App.Templates.html[ns][key].slice(0)
+ App.Templates._indexes[ns][key],
+ App.Templates.html[ns][key].slice(0)
];
}
// init templator
Tpl.Templator = Templator();
-
-Tpl.get = function(key, group){
+Tpl.get = function(key, group)
+{
return Tpl.Templator.getTemplate(group, key);
}
diff --git a/web/js/validators.js b/web/js/validators.js
index 8f9cb243a..cf5bf97e9 100644
--- a/web/js/validators.js
+++ b/web/js/validators.js
@@ -1,21 +1,5 @@
-/*App.Validate.form = function(values){
- if(values.IP_ADDRESS == '') {
- return alert('Not correct ip');
- }
-
- return true;
-}*/
-
-App.Validate.Is = {
- ip: function(object) {
- var ip_regexp = new RegExp(/\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/);
- return ip_regexp.test() ? false : App.i18n.getMessage('incorrect_ip');
- }
-};
-
App.Validate.getFieldName = function(elm)
{
- fb.log(elm);
var txt_label = $(elm).prev('label').text();
if (txt_label.trim() == '') {
txt_label = $(elm).parents('.field-box').select('label:first').text();
@@ -25,9 +9,20 @@ App.Validate.getFieldName = function(elm)
}
App.Validate.Rule = {
+ 'alias' : function(elm) {
+ if (!!$('#stats-auth-enable').attr('checked') == true) {
+ if ($(elm).val().trim() == '' || $(elm).val().search(/[^a-zA-Z\.\-\*\,\ ]+/) != -1) {
+ return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' is invalid'};
+ }
+ if ($(elm).val().trim() != '' && $(elm).val().length > App.Settings.FIELD_MAX_LEN) {
+ return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' too long'};
+ }
+ }
+ return {VALID: true};
+ },
'statslogin' : function(elm) {
if (!!$('#stats-auth-enable').attr('checked') == true) {
- if ($(elm).val().trim() == '' || $(elm).val().search(/[^a-zA-Z_]+/) != -1) {
+ if ($(elm).val().trim() == '' || $(elm).val().search(/[^a-zA-Z_0-9]+/) != -1) {
return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' is invalid'};
}
if ($(elm).val().trim() != '' && $(elm).val().length > App.Settings.FIELD_MAX_LEN) {
@@ -44,11 +39,14 @@ App.Validate.Rule = {
if ($(elm).val().trim() != '' && $(elm).val().length > App.Settings.FIELD_MAX_LEN) {
return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' too long'};
}
+ if ($(elm).val().trim() != '' && $(elm).val().length < App.Settings.PSW_MIN_LEN) {
+ return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' too short'};
+ }
}
return {VALID: true};
},
'username' : function(elm) {
- if ($(elm).val().trim() != '' && $(elm).val().search(/[^a-zA-Z_]+/) != -1) {
+ if ($(elm).val().trim() != '' && $(elm).val().search(/[^a-zA-Z_0-9\.\-]+/) != -1) {
return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' is invalid'};
}
if ($(elm).val().trim() != '' && $(elm).val().length > App.Settings.FIELD_MAX_LEN) {
@@ -100,13 +98,13 @@ App.Validate.Rule = {
return {VALID: true};
},
'domain': function(elm) {
- if ($(elm).val().trim() != '' && (/^([a-z0-9\.])*[a-z0-9][a-z0-9\-]+[a-z0-9](\.[a-z]{2,4})+$/).test($(elm).val()) == false) {
+ if ($(elm).val().trim() != '' && $(elm).val().search(/[^a-zA-Z0-9\.\-\*]+/) != -1) {
return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' not a valid domain name'};
}
return {VALID: true};
},
'ns': function(elm) {
- if ($(elm).val().trim() != '' && (/^([a-z0-9\.])*[a-z0-9][a-z0-9\-]+[a-z0-9](\.[a-z]{2,4})+$/).test($(elm).val()) == false) {
+ if ($(elm).val().trim() != '' && $(elm).val().search(/[^a-zA-Z0-9\.\-\*]+/) != -1) {
return {VALID: false, ERROR: App.Validate.getFieldName(elm) + ' not a valid NS name'};
}
if ($(elm).val().trim() == '' && $(elm).val().length > App.Settings.FIELD_MAX_LEN) {
diff --git a/web/js/view.js b/web/js/view.js
index dfe365b12..2b5d79d13 100644
--- a/web/js/view.js
+++ b/web/js/view.js
@@ -40,61 +40,3 @@ App.View.listItems = function(reply){
App.Ref.CONTENT.html(html);
App.Helpers.updateScreen();
}
-/*App.View.start = function(){
-
-};
-
-App.View.showDatabases = function(databases){
- var tpl = App.HTML.makeDatabases(databases);
- $('#navigation').html(tpl.wrapperize('database_wrap', 'database'));
-}
-
-App.View.openDatabase = function(data, ref, db_name){
- var tpl = App.HTML.makeDbTableList(data);
- $('.databases .tables').remove();
- $('.databases .active').removeClass('active');
- $(ref).after(tpl.wrapperize('database_table_wrap', 'database'));
-
- $(ref).attr('className', 'active do.closeDatabase('+db_name+')"');
-}
-
-App.View.openTable = function(data, ref, table_name){
- var tpl = App.HTML.makeDbFieldsList(data);
- $(ref).next('.fields').remove();
- $(ref).after(tpl.wrapperize('database_field_wrap', 'database'));
-
- $(ref).attr('className', 'active do.closeTable('+table_name+')"');
-
- App.Helpers.updateScreen();
-}
-
-App.View.resultReturned = function(reply){
- if(reply.result){
- $('#results').text(reply.data);
- }else{
- $('#results').text(reply.message);
- }
-}
-
-App.View.Pages.IP.list = function(reply){
- var acc = [];
- $(reply.data).each(function(i, o){
- acc[acc.length++] = App.HTML.Build.ip_entry(o);
- });
-
- var html = acc.done().wrapperize('ENTRIES_WRAPPER', 'ip');
- App.Ref.CONTENT.html(html);
- App.Helpers.updateScreen();
-}
-
-App.View.Pages.DNS.list = function(reply){
- var acc = [];
- $(reply.data).each(function(i, o){
- acc[acc.length++] = App.HTML.Build.dns_entry(o);
- });
-
- var html = acc.done().wrapperize('ENTRIES_WRAPPER', 'dns');
- App.Ref.CONTENT.html(html);
- App.Helpers.updateScreen();
-}
-*/
diff --git a/web/vesta/api/AjaxHandler.php b/web/vesta/api/AjaxHandler.php
index 519786c0e..bafad9be2 100644
--- a/web/vesta/api/AjaxHandler.php
+++ b/web/vesta/api/AjaxHandler.php
@@ -41,10 +41,19 @@ class AjaxHandler {
*/
public function dispatch(Request $request)
{
+ VestaSession::start();
+
+ $allowed_actions = array(
+ 'MAIN.signin',
+ 'MAIN.logout',
+ 'MAIN.requestpassword',
+ 'MAIN.resetpassword',
+ 'MAIN.about');
$method = Request::parseAjaxMethod($request);
- if (!in_array($method['namespace'].'.'.$method['function'], array('MAIN.signin', 'MAIN.logout'))) {
- $user = $this->getLoggedUser();
- }
+
+ if (!in_array($method['namespace'].'.'.$method['function'], $allowed_actions)) {
+ $user = $this->getLoggedUser();
+ }
$inc_file = V_ROOT_DIR . 'api' . DIRECTORY_SEPARATOR . $method['namespace'] . '.class.php';
if (!is_readable($inc_file)) {
@@ -67,7 +76,7 @@ class AjaxHandler {
*/
public function reply($result, $data, $message = '', $extra = array())
{
- return json_encode(array('result' => $result,
+ return json_encode(array('result' => $result,
'data' => $data,
'message' => $message,
'extra' => $extra,
@@ -84,19 +93,23 @@ class AjaxHandler {
// Error handlers
//
- static function generalError($error) {
+ static function generalError($error)
+ {
self::renderGlobalError(Message::ERROR, Message::GENERAL_ERROR, $error);
}
- static function protectionError($error) {
+ static function protectionError($error)
+ {
self::renderGlobalError(Message::ERROR, Message::PROTECTION_ERROR, $error);
}
- static function systemError($error) {
+ static function systemError($error)
+ {
self::renderGlobalError(Message::ERROR, Message::SYSTEM_ERROR, $error);
}
- static function renderGlobalError($type, $message, $error) {
+ static function renderGlobalError($type, $message, $error)
+ {
/*$trace = $error->getTrace();
AjaxHandler::makeReply(
AjaxHandler::getInstance()->reply(false, $type, $message . ': ' . $error->getMessage(), $trace[0]['file'] . ' / ' . $trace[0]['line'])
diff --git a/web/vesta/api/DNS.class.php b/web/vesta/api/DNS.class.php
index a2495006b..64d37a9d2 100644
--- a/web/vesta/api/DNS.class.php
+++ b/web/vesta/api/DNS.class.php
@@ -369,9 +369,14 @@ class DNS extends AjaxHandler
public function getTemplateInfoExecute($request)
{
- $spell = $request->getParameter('spell');
- $result = Vesta::execute('v_list_sys_user_packages', null, self::TEXT);
- return $this->reply(true, $result['data']);
+ $spell = $request->getParameter('spell');
+ $result = Vesta::execute('v_list_sys_user_packages', null, self::JSON);
+ $reply = $result['data'];
+ if (isset($spell['PACKAGE'])) {
+ $reply = $result['data'][$spell['PACKAGE']];
+ }
+
+ return $this->reply(true, $reply);
}
}
diff --git a/web/vesta/api/MAIN.class.php b/web/vesta/api/MAIN.class.php
index ee011daf9..019002c9b 100644
--- a/web/vesta/api/MAIN.class.php
+++ b/web/vesta/api/MAIN.class.php
@@ -19,35 +19,114 @@ class MAIN extends AjaxHandler
protected $templates = null;
- /**
- * Get Version
- *
- * @param Request $request
- * @return string - Ajax Reply
- */
- public function versionExecute(Request $request)
+ public function aboutExecute($request)
{
- $result = array(
- 'version' => '1.0',
- 'author' => 'http://vestacp.com/',
- 'docs' => 'http://vestacp.com/docs'
- );
+ $about = array('version' => '0', 'company_email' => 'support@vestacp.com',
+ 'version_name' => 'OGRE-23-1', 'company_name' => 'vestacp.com');
+ $config = Vesta::execute(Vesta::V_LIST_SYS_CONFIG, 'json');
+ if (!empty($config['data']) && !empty($config['data']['config'])) {
+ $config = $config['data']['config'];
+ $about['version'] = $config['VERSION'];
+ $about['version_name'] = $config['VERSION_NAME'];
+ $about['company_email'] = $config['COMPANY_EMAIL'];
+ $about['company_name'] = $config['COMPANY_NAME'];
+ }
+
+ return $this->reply(true, $about);
+ }
- return $this->reply(true, $result);
+ public function requestPasswordExecute($request)
+ {
+ if (empty($_SESSION['captcha_key'])
+ || $_SESSION['captcha_key'] != $request->getParameter('captcha')) {
+ return $this->reply(false, null, 'Captcha is invalid ');
+ }
+
+ // TODO: captcha
+ $users = Vesta::execute(Vesta::V_LIST_SYS_USERS, 'json');
+ $email_matched_count = array();
+
+ if (!preg_match("/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/",$request->getParameter('email'))) {
+ return $this->reply(false, null, 'Email is invalid');
+ }
+
+ foreach ($users['data'] as $user) {
+ if ($user['CONTACT'] == trim($request->getParameter('email'))) {
+ $email_matched_count[] = $user;
+ }
+ }
+
+ if (empty($email_matched_count)) {
+ return $this->reply(false, null, 'There is no such user.');
+ }
+
+ $secret_key = $this->generateResetPasswordKey();
+ $reset_link = 'https://'.$_SERVER['HTTP_HOST'].'/change_password.php?v='.$secret_key;
+
+ $mail_body = <<
+
+ 
+
+
+
+ Vesta received a request to reset the password for your account {$user['FNAME']} {$user['LNAME']}?
+
+
+ If you want to reset your password, click on the link below (or copy and paste the URL into your browser):
+ {$reset_link}
+
+
+ If you don't want to reset your password, please ignore this message.
+ Your password will not be reset.
+ If you have any concerns, please contact us at support@vestacp.com.
+
+
+ VestaCP
+
+
+ Please do not reply to this message; it was sent from an unmonitored email address.
+
+
+MAIL;
+
+ $headers = 'MIME-Version: 1.0' . "\n";
+ $headers .= 'Content-type: text/html; charset=UTF-8' . "\n";
+ $to = $request->getParameter('email');
+ $subject = 'Reset your Vesta password';
+ $message = $mail_body;
+ mail($to, $subject, $message, $headers);
+
+ return $this->reply(true, array('key_code' => substr($secret_key, 0, 5) . $_SERVER['REQUEST_TIME'] . substr($secret_key, -5)));
+ }
+
+ public function generateResetPasswordKey()
+ {
+ $key = sha1($_SERVER['HTTP_USER_AGENT'].$_SERVER['REMOTE_ADDR']);
+ $key = substr($key, 0, 10) . $_SERVER['REQUEST_TIME'] . substr($key, 10, strlen($key));
+
+ return $key;
}
public function signinExecute($request)
{
- $login = $request->getParameter('login');
- $password = $request->getParameter('password');
+ $login = $request->getParameter('login');
+ $password = $request->getParameter('password');
+ $result = Vesta::execute('v_check_sys_user_password', array('USER' => $login, 'PASSWORD' => $password), self::TEXT);
- $result = Vesta::execute('v_check_sys_user_password', array('USER' => $login, 'PASSWORD' => $password));
- if ($result['status'] == true) {
- return $this->reply(VestaSession::authorize($login));
- }
- else {
- return $this->reply(false, 'Incorrect login / password');
- }
+ if ($result['status'] == true) {
+ return $this->reply(true, array('v_sd' => VestaSession::authorize($login)));
+ }
+ else {
+ return $this->reply(false, array('error_msg' => 'Incorrect login or password'));
+ }
+ }
+
+ public function logoffExecute($request)
+ {
+ VestaSession::logoff();
+ return $this->reply(true);
}
/**
@@ -59,74 +138,75 @@ class MAIN extends AjaxHandler
*/
public function getInitialExecute(Request $request)
{
- $user = VestaSession::getInstance()->getUser();
- $global_data = array();
- $totals = array(
- 'USER' => array('total' => 0, 'blocked' => 0),
+ $user = VestaSession::getInstance()->getUser();
+ $global_data = array();
+ $totals = array(
+ 'USER' => array('total' => 0, 'blocked' => 0),
'WEB_DOMAIN' => array('total' => 0, 'blocked' => 0),
- 'MAIL' => array('total' => 0),
+ 'MAIL' => array('total' => 0),
'DB' => array('total' => 0, 'blocked' => 0),
'DNS' => array('total' => 0, 'blocked' => 0),
'IP' => array('total' => 0, 'blocked' => 0),
'CRON' => array('total' => 0, 'blocked' => 0)
);
- // users
- $rs = Vesta::execute(Vesta::V_LIST_SYS_USERS, null, self::JSON);
- $data_user = $rs['data'];
- $global_data['users'] = array();
- foreach ($data_user as $login_name => $usr) {
- $totals['USER']['total'] += 1;
- if ($usr['SUSPENDED'] != 'yes') {
- $global_data['users'][$login_name] = $login_name;
- }
- else {
- $totals['USER']['blocked'] += 1;
- }
- }
- // web_domains
- $rs = Vesta::execute(Vesta::V_LIST_WEB_DOMAINS, array('USER' => $user['uid']), self::JSON);
- $data_web_domain = $rs['data'];
- foreach ($data_web_domain as $web) {
- $totals['WEB_DOMAIN']['total'] += 1;
- }
- // db
- $rs = Vesta::execute(Vesta::V_LIST_DB_BASES, array('USER' => $user['uid']), self::JSON);
- $data_db = $rs['data'];
- foreach ($data_db as $db) {
- $totals['DB']['total'] += 1;
- //$db['SUSPENDED'] == 'yes' ? $totals['DB']['blocked'] += 1 : false;
- }
- // dns
- $rs = Vesta::execute(Vesta::V_LIST_DNS_DOMAINS, array('USER' => $user['uid']), self::JSON);
- $data_dns = $rs['data'];
- foreach ($data_dns as $dns) {
- $totals['DNS']['total'] += 1;
- }
- // ip
- $global_data['ips'] = array();
- $rs = Vesta::execute(Vesta::V_LIST_SYS_IPS, null, self::JSON);
- $data_ip = $rs['data'];
- foreach ($data_ip as $ip => $obj) {
- $totals['IP']['total'] += 1;
- $global_data['ips'][$ip] = $ip;
- }
- // cron
- $rs = Vesta::execute(Vesta::V_LIST_CRON_JOBS, array('USER' => $user['uid']), self::JSON);
- $data_cron = $rs['data'];
- foreach ($data_cron as $cron) {
- $totals['CRON']['total'] += 1;
- $cron['SUSPEND'] == 'yes' ? $totals['CRON']['blocked'] += 1 : false;
- }
+ // users
+ $rs = Vesta::execute(Vesta::V_LIST_SYS_USERS, null, self::JSON);
+ $data_user = $rs['data'];
+ $global_data['users'] = array();
+ foreach ($data_user as $login_name => $usr) {
+ $totals['USER']['total'] += 1;
+ if ($usr['SUSPENDED'] != 'yes') {
+ $global_data['users'][$login_name] = $login_name;
+ }
+ else {
+ $totals['USER']['blocked'] += 1;
+ }
+ }
+ // web_domains
+ $rs = Vesta::execute(Vesta::V_LIST_WEB_DOMAINS, array('USER' => $user['uid']), self::JSON);
+ $data_web_domain = $rs['data'];
+ foreach ($data_web_domain as $web) {
+ $totals['WEB_DOMAIN']['total'] += 1;
+ }
+ // db
+ $rs = Vesta::execute(Vesta::V_LIST_DB_BASES, array('USER' => $user['uid']), self::JSON);
+ $data_db = $rs['data'];
+ foreach ($data_db as $db) {
+ $totals['DB']['total'] += 1;
+ }
+ // dns
+ $rs = Vesta::execute(Vesta::V_LIST_DNS_DOMAINS, array('USER' => $user['uid']), self::JSON);
+ $data_dns = $rs['data'];
+ foreach ($data_dns as $dns) {
+ $totals['DNS']['total'] += 1;
+ }
+ // ip
+ $global_data['ips'] = array();
+ $rs = Vesta::execute(Vesta::V_LIST_SYS_IPS, null, self::JSON);
+ $data_ip = $rs['data'];
+ foreach ($data_ip as $ip => $obj) {
+ $totals['IP']['total'] += 1;
+ $global_data['ips'][$ip] = $ip;
+ }
+ // cron
+ $rs = Vesta::execute(Vesta::V_LIST_CRON_JOBS, array('USER' => $user['uid']), self::JSON);
+ $data_cron = $rs['data'];
+ foreach ($data_cron as $cron) {
+ $totals['CRON']['total'] += 1;
+ $cron['SUSPEND'] == 'yes' ? $totals['CRON']['blocked'] += 1 : false;
+ }
- $reply = array(
+ $reply = array(
+ 'auth_user' => array('uid' => $this->getLog),
'WEB_DOMAIN' => $this->getWebDomainParams($data_web_domin, $global_data),
'CRON' => $this->getCronParams(),
'IP' => $this->getIpParams($data_ip, $global_data),
'DNS' => $this->getDnsParams(),
'DB' => $this->getDbParams($data_db),
'USERS' => $this->getUsersParams($data_user),
- 'totals' => $totals
+ 'totals' => $totals,
+ 'PROFILE' => $user
);
return $this->reply(true, $reply);
@@ -134,21 +214,20 @@ class MAIN extends AjaxHandler
protected function getTemplates()
{
- if (null != $this->templates) {
- return $this->templates;
- }
- else {
- $user = $this->getLoggedUser();
- $this->templates = array();
- //v_list_web_templates vesta json
- $result = Vesta::execute('v_list_web_templates', array('USER' => $user['uid']), self::JSON);
- // TODO: handle errors!
- foreach ($result['data'] as $tpl => $description) {
- $this->templates[$tpl] = $tpl;
- }
+ if (null != $this->templates) {
+ return $this->templates;
+ }
+ else {
+ $user = $this->getLoggedUser();
+ $this->templates = array();
+ $result = Vesta::execute(Vesta::V_LIST_WEB_TEMPLATES, array('USER' => $user['uid']), self::JSON);
+ // TODO: handle errors!
+ foreach ($result['data'] as $tpl => $description) {
+ $this->templates[$tpl] = $description;
+ }
- return $this->templates;
- }
+ return $this->templates;
+ }
}
/**
@@ -159,16 +238,16 @@ class MAIN extends AjaxHandler
*/
public function getWebDomainParams($data, $global_data)
{
- $user = $this->getLoggedUser();
- $ips = array();
- $result = Vesta::execute(Vesta::V_LIST_SYS_USER_IPS, array('USER' => $user['uid']), self::JSON);
- foreach ($result['data'] as $sys_ip => $ip_data) {
- $ips[$sys_ip] = $sys_ip;
- }
+ $user = $this->getLoggedUser();
+ $ips = array();
+ $result = Vesta::execute(Vesta::V_LIST_SYS_USER_IPS, array('USER' => $user['uid']), self::JSON);
+ foreach ($result['data'] as $sys_ip => $ip_data) {
+ $ips[$sys_ip] = $sys_ip;
+ }
- if (empty($ips)) {
- $ips['No available IP'] = 'No available IP';
- }
+ if (empty($ips)) {
+ $ips['No available IP'] = 'No available IP';
+ }
return array(
'TPL' => $this->getTemplates(),
@@ -201,7 +280,7 @@ class MAIN extends AjaxHandler
*/
public function getIpParams($data = array(), $global_data = array())
{
- $ifaces = array();
+ $ifaces = array();
$result = Vesta::execute(Vesta::V_LIST_SYS_INTERFACES, array(Config::get('response_type')));
foreach ($result['data'] as $iface) {
@@ -215,7 +294,7 @@ class MAIN extends AjaxHandler
'exclusive' => 'exclusive'
),
'INTERFACES' => $ifaces,
- 'OWNER' => $global_data['users'],
+ 'OWNER' => $global_data['users'],
'MASK' => array(
'255.255.255.0' => '255.255.255.0',
'255.255.255.128' => '255.255.255.128',
@@ -237,9 +316,18 @@ class MAIN extends AjaxHandler
*/
public function getDnsParams($data = array())
{
+ $dns_templates = array();
+ $user = $this->getLoggedUser();
+ $this->templates = array();
+ $result = Vesta::execute(Vesta::V_LIST_DNS_TEMPLATES, null, self::JSON);
+ // TODO: handle errors!
+ foreach ($result['data'] as $tpl => $description) {
+ $dns_templates[$tpl] = $description;
+ }
+
return array(
'IP' => @$data['ips'],
- 'TPL' => $this->getTemplates(),
+ 'TPL' => $dns_templates,
'EXP' => array(),
'SOA' => array(),
'TTL' => array(),
@@ -277,14 +365,14 @@ class MAIN extends AjaxHandler
* @params array $data
* @return array
*/
- public function getUsersParams($data = array())
- {
- $pckg = array();
- // json
- $result = Vesta::execute('v_list_sys_user_packages', null, self::JSON);
- foreach ($result['data'] as $pckg_name => $pckg_data) {
- $pckg[$pckg_name] = $pckg_name;
- }
+ public function getUsersParams($data = array(), $global_data)
+ {
+ $pckg = array();
+ // json
+ $result = Vesta::execute('v_list_sys_user_packages', null, self::JSON);
+ foreach ($result['data'] as $pckg_name => $pckg_data) {
+ $pckg[$pckg_name] = $pckg_name;
+ }
return array(
'ROLE' => array('user' => 'user'),
'OWNER' => $data['user_names'],
diff --git a/web/vesta/api/USER.class.php b/web/vesta/api/USER.class.php
index aa69218cb..672af0e11 100644
--- a/web/vesta/api/USER.class.php
+++ b/web/vesta/api/USER.class.php
@@ -23,14 +23,14 @@ class USER extends AjaxHandler
$result = Vesta::execute(Vesta::V_LIST_SYS_USERS, array(Config::get('response_type')));
foreach ($result['data'] as $user => $details) {
- // get reports attribute
- $result_report = Vesta::execute(Vesta::V_GET_SYS_USER_VALUE, array('USER' => $user, 'VALUE' => 'reports'), self::TEXT);
- if ($result_report['status'] != true) {
- $report = null;
- }
- else {
- $report = $result_report['data'];
- }
+ // get reports attribute
+ $result_report = Vesta::execute(Vesta::V_GET_SYS_USER_VALUE, array('USER' => $user, 'VALUE' => 'reports'), self::TEXT);
+ if ($result_report['status'] != true) {
+ $report = null;
+ }
+ else {
+ $report = $result_report['data'];
+ }
$fullname_id = rand(0, count($users)-1);
$fullname = implode('', array($details['FNAME'], ' ', $details['LNAME']));
@@ -72,7 +72,7 @@ class USER extends AjaxHandler
"U_MAIL_BOXES" => rand(1, 10), // TODO: skid
"U_MAIL_FORWARDERS" => rand(1, 10), // TODO: skid
"REPORTS_ENABLED" => $report,
- "U_WEB_DOMAINS" => $details['U_WEB_DOMAINS']
+ "U_WEB_DOMAINS" => $details['U_WEB_DOMAINS']
);
$reply[$user] = array_merge($user_details, $nses);
}
@@ -104,11 +104,9 @@ class USER extends AjaxHandler
$result = Vesta::execute(Vesta::V_ADD_SYS_USER, $params);
// Reports
$enable_reports = Utils::getCheckboxBooleanValue($spell['REPORTS_ENABLED']);
- $reports_result = $this->setUserReports($spell['LOGIN_NAME'], $spell['REPORTS_ENABLED']);
- // NS
- //$ns_result = $this->setNSentries($spell['LOGIN_NAME'], $spell);
- // Set SHELL
- $this->setShell($spell['LOGIN_NAME'], $spell['SHELL']);
+ $reports_result = $this->setUserReports($spell['LOGIN_NAME'], $spell['REPORTS_ENABLED']);
+ // Set SHELL
+ $this->setShell($spell['LOGIN_NAME'], $spell['SHELL']);
if (!$result['status']) {
$this->errors[] = array($result['error_code'] => $result['error_message']);
@@ -180,8 +178,8 @@ class USER extends AjaxHandler
}
}
- // Set SHELL
- $this->setShell($_USER, $_new['SHELL']);
+ // Set SHELL
+ $this->setShell($_USER, $_new['SHELL']);
$this->setNSentries($_USER, $_new);
@@ -195,16 +193,7 @@ class USER extends AjaxHandler
if (!$result['status']) {
$this->status = FALSE;
$this->errors['NAMES'] = 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']));
@@ -233,14 +222,14 @@ class USER extends AjaxHandler
{
$ns = array();
$ns['USER'] = $user;
- $ns['NS1'] = $data['NS1'];
- $ns['NS2'] = $data['NS2'];
- $ns['NS3'] = isset($data['NS3']) ? $data['NS3'] : '';
- $ns['NS4'] = isset($data['NS4']) ? $data['NS4'] : '';
- $ns['NS5'] = isset($data['NS5']) ? $data['NS5'] : '';
- $ns['NS6'] = isset($data['NS6']) ? $data['NS6'] : '';
- $ns['NS7'] = isset($data['NS7']) ? $data['NS7'] : '';
- $ns['NS8'] = isset($data['NS8']) ? $data['NS8'] : '';
+ $ns['NS1'] = $data['NS1'];
+ $ns['NS2'] = $data['NS2'];
+ $ns['NS3'] = isset($data['NS3']) ? $data['NS3'] : '';
+ $ns['NS4'] = isset($data['NS4']) ? $data['NS4'] : '';
+ $ns['NS5'] = isset($data['NS5']) ? $data['NS5'] : '';
+ $ns['NS6'] = isset($data['NS6']) ? $data['NS6'] : '';
+ $ns['NS7'] = isset($data['NS7']) ? $data['NS7'] : '';
+ $ns['NS8'] = isset($data['NS8']) ? $data['NS8'] : '';
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_NS, $ns);
@@ -265,6 +254,6 @@ class USER extends AjaxHandler
*/
protected function setShell($user, $shell)
{
- $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_SHELL, array('USER' => $user, 'SHELL' => $shell));
+ $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_SHELL, array('USER' => $user, 'SHELL' => $shell));
}
}
diff --git a/web/vesta/api/WEB_DOMAIN.class.php b/web/vesta/api/WEB_DOMAIN.class.php
index 1caa96c2f..8d5157267 100644
--- a/web/vesta/api/WEB_DOMAIN.class.php
+++ b/web/vesta/api/WEB_DOMAIN.class.php
@@ -26,24 +26,24 @@ class WEB_DOMAIN extends AjaxHandler
foreach($result['data'] as $web_domain => $record)
{
$web_details = array(
- 'IP' => $record['IP'],
- 'U_DISK' => $record['U_DISK'],
- 'U_BANDWIDTH' => $record['U_BANDWIDTH'],
- 'TPL' => $record['TPL'],
- 'ALIAS' => $record['ALIAS'],
- 'PHP' => $record['PHP'],
- 'CGI' => $record['CGI'],
- 'ELOG' => $record['ELOG'],
- 'STAT' => $record['STATS'],
- 'STATS_LOGIN' => $record['STATS_AUTH'],
- 'SSL' => $record['SSL'],
- 'SSL_HOME' => $record['SSL_HOME'],
- 'SSL_CERT' => $record['SSL_CERT'],
- 'NGINX' => $record['NGINX'],
- 'NGINX_EXT' => $record['NGINX_EXT'],
- 'SUSPEND' => $record['SUSPEND'],
- 'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
- );
+ 'IP' => $record['IP'],
+ 'U_DISK' => $record['U_DISK'],
+ 'U_BANDWIDTH' => $record['U_BANDWIDTH'],
+ 'TPL' => $record['TPL'],
+ 'ALIAS' => $record['ALIAS'],
+ 'PHP' => $record['PHP'],
+ 'CGI' => $record['CGI'],
+ 'ELOG' => $record['ELOG'],
+ 'STAT' => $record['STATS'],
+ 'STATS_LOGIN' => $record['STATS_AUTH'],
+ 'SSL' => $record['SSL'],
+ 'SSL_HOME' => $record['SSL_HOME'],
+ 'SSL_CERT' => $record['SSL_CERT'],
+ 'NGINX' => $record['NGINX'],
+ 'NGINX_EXT' => $record['NGINX_EXT'],
+ 'SUSPEND' => $record['SUSPEND'],
+ 'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
+ );
$web_details['STAT'] == '' ? $web_details['STAT'] = 'none' : true;
$reply[$web_domain] = $web_details;
}
@@ -135,7 +135,7 @@ class WEB_DOMAIN extends AjaxHandler
$this->errors['STAT_AUTH'] = array($result['error_code'] => $result['error_message']);
}
- if (!empty($_new['CGI'])) {
+ if (!empty($_new['CGI'])) {
if (Utils::getCheckboxBooleanValue($_new['CGI'])) {
$result = array();
$result = Vesta::execute(Vesta::V_ADD_WEB_DOMAIN_CGI, array('USER' => $user['uid'], 'DOMAIN' => $_DOMAIN));
@@ -248,10 +248,10 @@ class WEB_DOMAIN extends AjaxHandler
$_old = $request->getParameter('old');
$_new = $request->getParameter('new');
- $_old['ELOG'] = $_old['ELOG'] == 'yes' ? 'on' : 'off';
- $_old['CGI'] = $_old['CGI'] == 'yes' ? 'on' : 'off';
- $_old['AUTH'] = $_old['AUTH'] == 'yes' ? 'on' : 'off';
- $_old['SSL'] = $_old['SSL'] == 'yes' ? 'on' : 'off';
+ $_old['ELOG'] = $_old['ELOG'] == 'yes' ? 'on' : 'off';
+ $_old['CGI'] = $_old['CGI'] == 'yes' ? 'on' : 'off';
+ $_old['AUTH'] = $_old['AUTH'] == 'yes' ? 'on' : 'off';
+ $_old['SSL'] = $_old['SSL'] == 'yes' ? 'on' : 'off';
$user = $this->getLoggedUser();
$_DOMAIN = $_new['DOMAIN'];
@@ -301,7 +301,7 @@ class WEB_DOMAIN extends AjaxHandler
}
- if (($_old['STATH_AUTH'] != $_new['STAT_AUTH']) && !empty($_s['STAT_AUTH']) && @Utils::getCheckboxBooleanValue($_s['STATS_AUTH'])) {
+ if (($_old['STATH_AUTH'] != $_new['STAT_AUTH']) && !empty($_s['STAT_AUTH']) && @Utils::getCheckboxBooleanValue($_s['STATS_AUTH'])) {
$params = array(
'USER' => $user['uid'],
'DOMAIN' => $_DOMAIN,
@@ -314,7 +314,7 @@ class WEB_DOMAIN extends AjaxHandler
if(!$result['status']) {
$this->errors['STAT_AUTH'] = array($result['error_code'] => $result['error_message']);
}
- }
+ }
if (($_old['STAT'] != $_new['STAT'])) {
if ($_new['STAT'] != 'none') {
diff --git a/web/vesta/app.init.php b/web/vesta/app.init.php
index 030820304..bbbfefa5d 100644
--- a/web/vesta/app.init.php
+++ b/web/vesta/app.init.php
@@ -1,5 +1,6 @@
hasParameter('v_sd')) {
+ session_id($request->getParameter('v_sd'));
+ }*/
+ }
+
+ static function initSessionPath()
+ {
+ $sessions_dir = '/tmp/'.Config::get('session_dirname');
+ if (!is_readable($sessions_dir)) {
+ mkdir($sessions_dir);
+ }
+ session_save_path($sessions_dir);
}
/**
@@ -22,19 +35,26 @@ class VestaSession
static function authorize($username)
{
- $_SESSION['user'] = $username;
- return true;
+ $_SESSION['user'] = $username;
+ return session_id();
+ }
+
+ static function logoff()
+ {
+ session_destroy();
}
public function getUser()
- {
- //var_dump($_SESSION);die();
- if (isset($_SESSION['user'])) {
- return array('uid' => $_SESSION['user']);
- }
+ {
+ if (isset($_SESSION['user'])) {
+ $user = array('uid' => $_SESSION['user']);
+ $user['DISK'] = 10000;
+ $user['BANDWIDTH'] = 10000;
+ return $user;
+ }
- print '{"result": "NOT_AUTHORISED"}';
- exit;
+ print json_encode(array('result' => "NOT_AUTHORISED"));
+ exit;
}
}
+')