From 06c7b4220454e08414bca568a541a5410f7e1dd5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 31 Jul 2012 15:09:21 +0300 Subject: [PATCH] edit user package --- bin/v_change_user_package | 12 +- bin/v_update_user_package | 47 +++++ web/add/package/index.php | 2 +- web/edit/package/index.php | 191 +++++++++++++++++++++ web/templates/admin/add_package.html | 27 +-- web/templates/admin/edit_package.html | 87 ++++++++++ web/templates/admin/menu_edit_package.html | 15 ++ 7 files changed, 364 insertions(+), 17 deletions(-) create mode 100755 bin/v_update_user_package create mode 100644 web/edit/package/index.php create mode 100644 web/templates/admin/edit_package.html create mode 100644 web/templates/admin/menu_edit_package.html diff --git a/bin/v_change_user_package b/bin/v_change_user_package index 70069a165..60668f345 100755 --- a/bin/v_change_user_package +++ b/bin/v_change_user_package @@ -1,6 +1,6 @@ #!/bin/bash # info: change user package -# options: user package +# options: user package [force] # # The function changes user's hosting package. @@ -12,6 +12,7 @@ # Argument defenition user=$1 package=$2 +force=$3 # Includes source $VESTA/conf/vesta.conf @@ -54,7 +55,8 @@ change_user_package() { usr_data=$(cat $USER_DATA/user.conf) eval $usr_data - pkg_data=$(cat $VESTA/data/packages/$package.pkg) + pkg_data=$(cat $VESTA/data/packages/$package.pkg |grep -v TIME |\ + grep -v DATE) eval $pkg_data echo "FNAME='$FNAME' @@ -114,11 +116,13 @@ DATE='$DATE'" > $USER_DATA/user.conf # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user package' +check_args '2' "$#" 'user package [force]' validate_format 'user' 'package' is_object_valid 'user' 'USER' "$user" is_package_valid -is_package_avalable +if [ "$force" != 'yes' ];then + is_package_avalable +fi #----------------------------------------------------------# diff --git a/bin/v_update_user_package b/bin/v_update_user_package new file mode 100755 index 000000000..b7773d176 --- /dev/null +++ b/bin/v_update_user_package @@ -0,0 +1,47 @@ +#!/bin/bash +# info: update user package +# options: pacakge +# +# The function propogates package to connected users. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +package=$1 + +# Includes +source $VESTA/conf/vesta.conf +source $VESTA/func/main.sh + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '1' "$#" 'package' +validate_format 'package' +is_package_valid + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +for user in $(ls $VESTA/data/users); do + check_package=$(grep "PACKAGE='$package'" $USER_DATA/$user/user.conf) + if [ ! -z "$check_package" ]; then + $BIN/v_change_user_package $user $package 'yes' + fi +done + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +log_event "$OK" "$EVENT" + +exit diff --git a/web/add/package/index.php b/web/add/package/index.php index ff4fd86e6..0235d05bb 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -114,7 +114,7 @@ if ($_SESSION['user'] == 'admin') { } // Remove tmpdir - exec ('rm -rf '.$tmdir, $output, $return_var); + exec ('rm -rf '.$tmpdir, $output, $return_var); unset($output); // Check output diff --git a/web/edit/package/index.php b/web/edit/package/index.php new file mode 100644 index 000000000..5455e8539 --- /dev/null +++ b/web/edit/package/index.php @@ -0,0 +1,191 @@ +', $output); + if (empty($error)) $error = 'Error: vesta did not return any output.'; + $_SESSION['error_msg'] = $error; + } else { + $data = json_decode(implode('', $output), true); + unset($output); + + $v_package = $_GET['package']; + $v_template = $data[$v_package]['TEMPLATE']; + $v_web_domains = $data[$v_package]['WEB_DOMAINS']; + $v_web_aliases = $data[$v_package]['WEB_ALIASES']; + $v_dns_domains = $data[$v_package]['DNS_DOMAINS']; + $v_dns_records = $data[$v_package]['DNS_RECORDS']; + $v_mail_domains = $data[$v_package]['MAIL_DOMAINS']; + $v_mail_accounts = $data[$v_package]['MAIL_ACCOUNTS']; + $v_databases = $data[$v_package]['DATABASES']; + $v_cron_jobs = $data[$v_package]['CRON_JOBS']; + $v_disk_quota = $data[$v_package]['DISK_QUOTA']; + $v_bandwidth = $data[$v_package]['BANDWIDTH']; + $v_shell = $data[$v_package]['SHELL']; + $v_ns = $data[$v_package]['NS']; + $nameservers = explode(", ", $v_ns); + $v_ns1 = $nameservers[0]; + $v_ns2 = $nameservers[1]; + $v_ns3 = $nameservers[2]; + $v_ns4 = $nameservers[3]; + $v_backups = $data[$v_package]['BACKUPS']; + $v_date = $data[$v_package]['DATE']; + $v_time = $data[$v_package]['TIME']; + $v_status = 'active'; + + + exec (VESTA_CMD."v_list_web_templates json", $output, $return_var); + check_error($return_var); + $templates = json_decode(implode('', $output), true); + unset($output); + + exec (VESTA_CMD."v_list_sys_shells json", $output, $return_var); + check_error($return_var); + $shells = json_decode(implode('', $output), true); + unset($output); + + // Action + if (!empty($_POST['save'])) { + // Check input + if (empty($_POST['v_package'])) $errors[] = 'package'; + if (empty($_POST['v_template'])) $errors[] = 'template'; + if (empty($_POST['v_shell'])) $errrors[] = 'shell'; + if (!isset($_POST['v_web_domains'])) $errors[] = 'web domains'; + if (!isset($_POST['v_web_aliases'])) $errors[] = 'web aliases'; + if (!isset($_POST['v_dns_domains'])) $errors[] = 'dns domains'; + if (!isset($_POST['v_dns_records'])) $errors[] = 'dns records'; + if (!isset($_POST['v_mail_domains'])) $errors[] = 'mail domains'; + if (!isset($_POST['v_mail_accounts'])) $errors[] = 'mail accounts'; + if (!isset($_POST['v_databases'])) $errors[] = 'databases'; + if (!isset($_POST['v_cron_jobs'])) $errors[] = 'cron jobs'; + if (!isset($_POST['v_backups'])) $errors[] = 'backups'; + if (!isset($_POST['v_disk_quota'])) $errors[] = 'quota'; + if (!isset($_POST['v_bandwidth'])) $errors[] = 'bandwidth'; + if (empty($_POST['v_ns1'])) $errors[] = 'ns1'; + if (empty($_POST['v_ns2'])) $errors[] = 'ns2'; + + // Protect input + $v_package = escapeshellarg($_POST['v_package']); + $v_template = escapeshellarg($_POST['v_template']); + $v_shell = escapeshellarg($_POST['v_shell']); + $v_web_domains = escapeshellarg($_POST['v_web_domains']); + $v_web_aliases = escapeshellarg($_POST['v_web_aliases']); + $v_dns_domains = escapeshellarg($_POST['v_dns_domains']); + $v_dns_records = escapeshellarg($_POST['v_dns_records']); + $v_mail_domains = escapeshellarg($_POST['v_mail_domains']); + $v_mail_accounts = escapeshellarg($_POST['v_mail_accounts']); + $v_databases = escapeshellarg($_POST['v_databases']); + $v_cron_jobs = escapeshellarg($_POST['v_cron_jobs']); + $v_backups = escapeshellarg($_POST['v_backups']); + $v_disk_quota = escapeshellarg($_POST['v_disk_quota']); + $v_bandwidth = escapeshellarg($_POST['v_bandwidth']); + $v_ns1 = trim($_POST['v_ns1'], '.'); + $v_ns2 = trim($_POST['v_ns2'], '.'); + $v_ns3 = trim($_POST['v_ns3'], '.'); + $v_ns4 = trim($_POST['v_ns4'], '.'); + $v_ns = $v_ns1.",".$v_ns2; + if (!empty($v_ns3)) $v_ns .= ",".$v_ns3; + if (!empty($v_ns4)) $v_ns .= ",".$v_ns4; + $v_ns = escapeshellarg($v_ns); + $v_time = escapeshellarg(date('H:i:s')); + $v_date = escapeshellarg(date('Y-m-d')); + + // Check for errors + if (!empty($errors[0])) { + foreach ($errors as $i => $error) { + if ( $i == 0 ) { + $error_msg = $error; + } else { + $error_msg = $error_msg.", ".$error; + } + } + $_SESSION['error_msg'] = "Error: field ".$error_msg." can not be blank."; + } else { + exec ('mktemp -d', $output, $return_var); + $tmpdir = $output[0]; + unset($output); + + // Create package + $pkg = "TEMPLATE=".$v_template."\n"; + $pkg .= "WEB_DOMAINS=".$v_web_domains."\n"; + $pkg .= "WEB_ALIASES=".$v_web_aliases."\n"; + $pkg .= "DNS_DOMAINS=".$v_dns_domains."\n"; + $pkg .= "DNS_RECORDS=".$v_dns_records."\n"; + $pkg .= "MAIL_DOMAINS=".$v_mail_domains."\n"; + $pkg .= "MAIL_ACCOUNTS=".$v_mail_accounts."\n"; + $pkg .= "DATABASES=".$v_databases."\n"; + $pkg .= "CRON_JOBS=".$v_cron_jobs."\n"; + $pkg .= "DISK_QUOTA=".$v_disk_quota."\n"; + $pkg .= "BANDWIDTH=".$v_bandwidth."\n"; + $pkg .= "NS=".$v_ns."\n"; + $pkg .= "SHELL=".$v_shell."\n"; + $pkg .= "BACKUPS=".$v_backups."\n"; + $pkg .= "TIME=".$v_time."\n"; + $pkg .= "DATE=".$v_date."\n"; + + // Write package + $fp = fopen($tmpdir."/".$_POST['v_package'].".pkg", 'w'); + fwrite($fp, $pkg); + fclose($fp); + + // Rewrite package + if (empty($_SESSION['error_msg'])) { + exec (VESTA_CMD."v_add_user_package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var); + if ($return_var != 0) { + $error = implode('
', $output); + if (empty($error)) $error = 'Error: vesta did not return any output.'; + $_SESSION['error_msg'] = $error; + } + unset($output); + } + + // Remove tmpdir + exec ('rm -rf '.$tmpdir, $output, $return_var); + unset($output); + + // Propogate new package + exec (VESTA_CMD."v_update_user_package ".$v_package." 'json'", $output, $return_var); + if ($return_var != 0) { + $error = implode('
', $output); + if (empty($error)) $error = 'Error: vesta did not return any output.'; + $_SESSION['error_msg'] = $error; + } + + if (empty($_SESSION['error_msg'])) { + $_SESSION['ok_msg'] = "OK: changes has been saved."; + } + } + } + } + + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_package.html'); + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_package.html'); + unset($_SESSION['error_msg']); + unset($_SESSION['ok_msg']); +} + +// Footer +include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index 3d4fd539f..bdb611234 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -19,6 +19,9 @@ $value) { echo "\t\t\t\t