diff --git a/src/admin/controllers/accounts/deactivate.php b/src/admin/controllers/accounts/deactivate.php index 0b391951f36233c3bd52cc8e549aacc7106e236c..59a4c06ce04c9dc95d266fc66ba0c096b49312a2 100755 --- a/src/admin/controllers/accounts/deactivate.php +++ b/src/admin/controllers/accounts/deactivate.php @@ -59,13 +59,13 @@ if ($Result['status'] == 0 && !is_array($Result['message'])) { $sql = $DB->update('account', array('account_status' => '0'), array('account_id' => $account_id)); if ($sql) { // 本地同步成功 - $ClientInfo = $DB->find('clients', 'hosting_client_email, hosting_client_fname', array('hosting_client_id' => $AccountInfo['account_client_id']), null, 1); + $ClientInfo = $DB->find('clients', 'client_email, client_fname', array('client_id' => $AccountInfo['account_client_id']), null, 1); $EmailContent = '
We had a good time with you while you were with us.
'; $EmailDescription = 'Your account(# ' . $account_id . ') have been deactivate successfully and all files and database will be deleted within 30 days.'; - $email_body = email_build_body('Hosting Account Deactivated', $ClientInfo['hosting_client_fname'], $EmailContent, $EmailDescription); + $email_body = email_build_body('Hosting Account Deactivated', $ClientInfo['client_fname'], $EmailContent, $EmailDescription); send_mail(array( - 'to' => $ClientInfo['hosting_client_email'], + 'to' => $ClientInfo['client_email'], 'message' => $email_body, 'subject' => 'Hosting Account Deactivated' )); diff --git a/src/admin/controllers/accounts/edit.php b/src/admin/controllers/accounts/edit.php index 424afda830354fc0b5c0149da37693e4c1e81e1f..a60f3449251f9f29a4beaf9eb3435e8548e70773 100755 --- a/src/admin/controllers/accounts/edit.php +++ b/src/admin/controllers/accounts/edit.php @@ -4,6 +4,6 @@ $account_id = get('account_id'); $AccountInfo = $DB->find('account', '*', array('account_id' => $account_id), null, 1); -$ClientInfo = $DB->find('clients', '*', array('hosting_client_id' => $AccountInfo['account_client_id']), null, 1); +$ClientInfo = $DB->find('clients', '*', array('client_id' => $AccountInfo['account_client_id']), null, 1); $PageInfo['title'] = 'Edit Account #' . $account_id; diff --git a/src/admin/controllers/accounts/reactivate.php b/src/admin/controllers/accounts/reactivate.php index 46eb4ce0f22c50b578a886d1687fa9c6ae7e5480..60970643ad894e2cdff56e55f5acc5942b3c6479 100755 --- a/src/admin/controllers/accounts/reactivate.php +++ b/src/admin/controllers/accounts/reactivate.php @@ -51,13 +51,13 @@ if ($Result['status'] == 0 && !is_array($Result['message'])) { $sql = $DB->update('account', array('account_status' => '1'), array('account_id' => $account_id)); if ($sql) { // 本地同步成功 - $ClientInfo = $DB->find('clients', 'hosting_client_email, hosting_client_fname', array('hosting_client_id' => $AccountInfo['account_client_id']), null, 1); + $ClientInfo = $DB->find('clients', 'client_email, client_fname', array('client_id' => $AccountInfo['account_client_id']), null, 1); $EmailContent = 'Your account(# ' . $account_id . ') have been activated successfully.'; $EmailDescription = ''; - $email_body = email_build_body('Hosting Account Activated', $ClientInfo['hosting_client_fname'], $EmailContent, $EmailDescription); + $email_body = email_build_body('Hosting Account Activated', $ClientInfo['client_fname'], $EmailContent, $EmailDescription); send_mail(array( - "to" => $ClientInfo['hosting_client_email'], + "to" => $ClientInfo['client_email'], "message" => $email_body, "subject" => 'Activate Hosting Account', )); diff --git a/src/admin/controllers/clients/activate.php b/src/admin/controllers/clients/activate.php index 2a55edd223dbc8199f83473c48852cbb9a3672aa..efce17e65dce872c2bd267666360dde1d9e3f58d 100755 --- a/src/admin/controllers/clients/activate.php +++ b/src/admin/controllers/clients/activate.php @@ -8,7 +8,7 @@ if (!$client_id) { exit('Access Denied'); } -$resault = $DB->update('clients', array('hosting_client_status' => 1), array('hosting_client_id' => $client_id)); +$resault = $DB->update('clients', array('client_status' => 1), array('client_id' => $client_id)); if ($resault) { setMessage('Client activated successfully !'); diff --git a/src/admin/controllers/clients/login.php b/src/admin/controllers/clients/login.php index ef715973e6b93f932bb2dba89970776217ebdaa3..6188a65c3c7390a53400ec70ece377c8a20f6982 100755 --- a/src/admin/controllers/clients/login.php +++ b/src/admin/controllers/clients/login.php @@ -8,11 +8,11 @@ if (empty($client_id)) { redirect('admin/clients'); } -$ClientInfo = $DB->find('clients', '*', array('hosting_client_id' => $client_id), null, 1); +$ClientInfo = $DB->find('clients', '*', array('client_id' => $client_id), null, 1); $key = rand(000000, 999999); -$email = $ClientInfo['hosting_client_email']; -$token = hash('sha256', json_encode([$email, $ClientInfo['hosting_client_key'], $key])); +$email = $ClientInfo['client_email']; +$token = hash('sha256', json_encode([$email, $ClientInfo['client_key'], $key])); $times = 1; setcookie('UIISC_MEMBER', base64_encode(gzcompress(json_encode(array('email' => $email, 'token' => $token, 'key' => $key)))), time() + $times * 86400, '/'); diff --git a/src/admin/controllers/clients/suspend.php b/src/admin/controllers/clients/suspend.php index 9cd7d96327168dbc76ab4195dcbfa488d17888a5..175f9ec420055d4c92e8fa2a42173a1056091bb8 100755 --- a/src/admin/controllers/clients/suspend.php +++ b/src/admin/controllers/clients/suspend.php @@ -8,7 +8,7 @@ if (!$client_id) { exit('Access Denied'); } -$resault = $DB->update('clients', array('hosting_client_status' => 2), array('hosting_client_id' => $client_id)); +$resault = $DB->update('clients', array('client_status' => 2), array('client_id' => $client_id)); if ($resault) { setMessage('Client suspended successfully !'); diff --git a/src/admin/controllers/clients/view.php b/src/admin/controllers/clients/view.php index 2c3dde47ed34b9dd276f465a594e1b73bcd6ce99..08248984332ecf6a900d0d94f587ef038ba6550a 100755 --- a/src/admin/controllers/clients/view.php +++ b/src/admin/controllers/clients/view.php @@ -13,17 +13,17 @@ if (empty($client_id)) { $PageInfo['title'] = 'View client (' . $client_id . ')'; -$ClientInfo = $DB->find('clients', '*', array('hosting_client_id' => $client_id), null, 1); +$ClientInfo = $DB->find('clients', '*', array('client_id' => $client_id), null, 1); $CountryName = 'Not Defined'; foreach ($countries as $country) { - if ($ClientInfo['hosting_client_country'] == $country['code']) { + if ($ClientInfo['client_country'] == $country['code']) { $CountryName = $country['name']; break; } } -$count_account = $DB->count('account', array('account_client_id' => $ClientInfo['hosting_client_id'])); -$count_ssl = $DB->count('ssl', array('ssl_for' => $ClientInfo['hosting_client_id'])); -$count_tickets = $DB->count('tickets', array('ticket_for' => $ClientInfo['hosting_client_id'])); +$count_account = $DB->count('account', array('account_client_id' => $ClientInfo['client_id'])); +$count_ssl = $DB->count('ssl', array('ssl_for' => $ClientInfo['client_id'])); +$count_tickets = $DB->count('tickets', array('ticket_for' => $ClientInfo['client_id'])); diff --git a/src/admin/controllers/tickets/close.php b/src/admin/controllers/tickets/close.php index 5486372fc8418df768334be539056844fcd39cdc..8e323bce5f675c36af2a833505a762c45f6d3fb3 100755 --- a/src/admin/controllers/tickets/close.php +++ b/src/admin/controllers/tickets/close.php @@ -9,18 +9,18 @@ if (!$ticket_id) { } // 查找工单信息 -$TicketInfo = $DB->find('tickets', 'ticket_email', array('ticket_id' => $ticket_id)); +$TicketInfo = $DB->find('tickets', 'ticket_email, ticket_for', array('ticket_id' => $ticket_id), null, 1); if (!$TicketInfo) { - setMessage('Not Found !'); + setMessage('Ticket Not Found !'); redirect('admin/tickets'); } // 查找客户信息 -$ClientInfo = $DB->find('clients', 'hosting_client_email, hosting_client_fname', array('hosting_client_id' => $TicketInfo['ticket_for'])); +$ClientInfo = $DB->find('clients', 'client_email, client_fname', array('client_id' => $TicketInfo['ticket_for'])); if (!$ClientInfo) { - setMessage('Not Found !'); + setMessage('Client Not Found !'); redirect('admin/tickets'); } @@ -29,15 +29,15 @@ $resault = $DB->update('tickets', array('ticket_status' => 3), array('ticket_id' if ($resault) { $ticket_url = setURL('admin/tickets', '', array('action' => 'view', 'ticket_id' => $ticket_id)); $email_body = email_build_body('Ticket Closed', - $ClientInfo['hosting_client_fname'], - 'The ticket ("' . $ticket_id . '") had been closed.
', + $ClientInfo['client_fname'], + 'The ticket ("ID: ' . $ticket_id . '") had been closed.
', 'Click here for details.
' ); send_mail(array( 'to' => $TicketInfo['ticket_email'], 'message' => $email_body, - 'subject' => 'Ticket Closed', + 'subject' => 'Ticket Closed ("ID: ' . $ticket_id . '")', )); setMessage('Ticket closed successfully !'); diff --git a/src/admin/views/accounts/edit.php b/src/admin/views/accounts/edit.php index 2f6fdd167b1724d563ca87287d65566a270f1334..9e6906cb611ea3a967cd0f90fee94291af9b92ea 100755 --- a/src/admin/views/accounts/edit.php +++ b/src/admin/views/accounts/edit.php @@ -12,25 +12,25 @@We had a good time with you while you were with us.
'; $EmailDescription = 'Your account(' . $username . ') have been deactivate successfully and all files and database will be deleted within 30 days.
Next,
We had a good time with you while you were with us.
'; $EmailDescription = 'Your account(# ' . $account_id . ') have been deactivate successfully and all files and database will be deleted within 30 days.'; - $email_body = email_build_body('Hosting Account Deactivated', $ClientInfo['hosting_client_fname'], $EmailContent, $EmailDescription); + $email_body = email_build_body('Hosting Account Deactivated', $ClientInfo['client_fname'], $EmailContent, $EmailDescription); send_mail(array( - 'to' => $ClientInfo['hosting_client_email'], + 'to' => $ClientInfo['client_email'], 'message' => $email_body, 'subject' => 'Hosting Account Deactivated' )); diff --git a/src/clientarea/controllers/accounts/edit.php b/src/clientarea/controllers/accounts/edit.php index 25a767f393726534110edd0454b4d7a74c0fc7c3..b5f7024fd0c47f9b54cdda23b937b0a11831a6fe 100755 --- a/src/clientarea/controllers/accounts/edit.php +++ b/src/clientarea/controllers/accounts/edit.php @@ -9,7 +9,7 @@ if (empty($account_id)) { redirect('clientarea/accounts'); } -$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['hosting_client_id']), null, 1); +$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['client_id']), null, 1); if (empty($AccountInfo)) { setMessage('not found', 'danger'); diff --git a/src/clientarea/controllers/accounts/goftp.php b/src/clientarea/controllers/accounts/goftp.php index efc4da56daf5f0877d09bc5dbf7a1eb57980bf2e..6ef01e13613a21be7dd933a3e92ac7e18d006274 100755 --- a/src/clientarea/controllers/accounts/goftp.php +++ b/src/clientarea/controllers/accounts/goftp.php @@ -9,7 +9,7 @@ if (empty($account_id)) { redirect('clientarea/accounts'); } -$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['hosting_client_id']), null, 1); +$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['client_id']), null, 1); if (empty($AccountInfo)) { setMessage('Account not found', 'danger'); diff --git a/src/clientarea/controllers/accounts/list.php b/src/clientarea/controllers/accounts/list.php index 7ce0d4760fc1f24c92c52373fa3a556ae3e0a791..46a17e27dc1187d80f8c71e440106328d68f4195 100755 --- a/src/clientarea/controllers/accounts/list.php +++ b/src/clientarea/controllers/accounts/list.php @@ -8,7 +8,7 @@ require_once __DIR__ . '/../../application.php'; $PageInfo['title'] = $lang->I18N('Hosting Accounts'); -$total_count = $DB->count('account', array('account_client_id' => $ClientInfo['hosting_client_id'])); -$active_count = $DB->count('account', array('account_client_id' => $ClientInfo['hosting_client_id'], 'account_status' => '1')); +$total_count = $DB->count('account', array('account_client_id' => $ClientInfo['client_id'])); +$active_count = $DB->count('account', array('account_client_id' => $ClientInfo['client_id'], 'account_status' => '1')); -$rows = $DB->findAll('account', '*', array('account_client_id' => $ClientInfo['hosting_client_id']), "`account_id` DESC"); +$rows = $DB->findAll('account', '*', array('account_client_id' => $ClientInfo['client_id']), "`account_id` DESC"); diff --git a/src/clientarea/controllers/accounts/login.php b/src/clientarea/controllers/accounts/login.php index 2bb0d3c1ba735f7e328c0509c47fbf5e8e6846ae..9d3af389049522e82a5985ccfbb3813d2f61db72 100755 --- a/src/clientarea/controllers/accounts/login.php +++ b/src/clientarea/controllers/accounts/login.php @@ -9,7 +9,7 @@ if (empty($account_id)) { redirect('clientarea/accounts'); } -$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['hosting_client_id']), null, 1); +$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['client_id']), null, 1); if (empty($AccountInfo)) { setMessage('not found', 'danger'); diff --git a/src/clientarea/controllers/accounts/password.php b/src/clientarea/controllers/accounts/password.php index 877c1e65854b2f0c97367c919482774d575ec80b..6ea2cb7eadff27c373771879e1bb5aa88a393ab1 100755 --- a/src/clientarea/controllers/accounts/password.php +++ b/src/clientarea/controllers/accounts/password.php @@ -13,7 +13,7 @@ if (empty($account_id)) { redirect('clientarea/accounts'); } -$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['hosting_client_id']), null, 1); +$AccountInfo = $DB->find('account', '*', array('account_id' => $account_id, 'account_client_id' => $ClientInfo['client_id']), null, 1); if (empty($AccountInfo)) { setMessage('Account not found', 'danger'); diff --git a/src/clientarea/controllers/accounts/view.php b/src/clientarea/controllers/accounts/view.php index 454f63db77301a9bfab52669e5b45190f5c790fa..ade27c9bf6ede61b456e58dee7aa1d7981028852 100755 --- a/src/clientarea/controllers/accounts/view.php +++ b/src/clientarea/controllers/accounts/view.php @@ -10,7 +10,7 @@ if (empty($account_id)) { $_where = array( 'account_id' => $account_id, - 'account_client_id' => $ClientInfo['hosting_client_id'], + 'account_client_id' => $ClientInfo['client_id'], ); $AccountInfo = $DB->find('account', '*', $_where, null, 1); diff --git a/src/clientarea/controllers/clients/forgetpassword.php b/src/clientarea/controllers/clients/forgetpassword.php index bb97692a36789adaf74cddc511e06c31d07931e9..ddd57ccadffe7a42eb33af07e6eba9aa8d641bb9 100755 --- a/src/clientarea/controllers/clients/forgetpassword.php +++ b/src/clientarea/controllers/clients/forgetpassword.php @@ -14,16 +14,16 @@ if (isset($_POST['reset'])) { redirect('clientarea/forgetpassword'); } - $ClientInfo = $DB->find('clients', 'hosting_client_key, hosting_client_fname', array('hosting_client_email' => $post_mail), null, 1); + $ClientInfo = $DB->find('clients', 'client_key, client_fname', array('client_email' => $post_mail), null, 1); if ($ClientInfo) { - $TokenId = password_hash($ClientInfo['hosting_client_key'], PASSWORD_DEFAULT); + $TokenId = password_hash($ClientInfo['client_key'], PASSWORD_DEFAULT); $TokenData = [['token' => str_replace('$2y$10$', '', $TokenId), 'email' => $post_mail]]; $Token = base64_encode(json_encode($TokenData)); $EmailContent = 'You have requested a password reset. If you have not requested a password reset please let us know by opening a support ticket in the clientarea.
'; $EmailDescription = 'We\'ll like you to be a member of our service. Please copy the code from below in order to verify your account.
'; $EmailDescription = 'Your account password has been reset successfully. Please login to clientarea to use our services again.
'; $EmailDescription = 'Click here to login.
'; - $email_body = email_build_body('Reset Password', $ClientInfo['hosting_client_fname'], $EmailContent, $EmailDescription); + $email_body = email_build_body('Reset Password', $ClientInfo['client_fname'], $EmailContent, $EmailDescription); send_mail(array( 'to' => $ClientEmail, diff --git a/src/clientarea/controllers/clients/signup.php b/src/clientarea/controllers/clients/signup.php index 61c1a32f55f7fc6019a36978932635cf07f956c9..032d438fe93a9d1af9901cd596981a9dd0126e84 100755 --- a/src/clientarea/controllers/clients/signup.php +++ b/src/clientarea/controllers/clients/signup.php @@ -9,39 +9,39 @@ if (isset($_COOKIE['UIISC_MEMBER']) && $_COOKIE['UIISC_MEMBER'] != 'NULL') { if (isset($_POST['signup'])) { $FormData = array( - 'hosting_client_fname' => post('first'), - 'hosting_client_lname' => post('last'), - 'hosting_client_email' => post('email'), - 'hosting_client_company' => '', - 'hosting_client_country' => '', - 'hosting_client_city' => '', - 'hosting_client_address' => '', - 'hosting_client_pcode' => '', - 'hosting_client_phone' => '', - 'hosting_client_state' => '', - 'hosting_client_password' => hash('sha256', post('password')), - 'hosting_client_date' => date('Y-m-d H:i:s'), - 'hosting_client_key' => substr(str_shuffle('qwertyuioplkjhgfdsazxcvbnm012345789QWERTYUIOPLKJHGFDSAZXCVBNM'), 0, 8), - 'hosting_client_status' => 0, + 'client_fname' => post('first'), + 'client_lname' => post('last'), + 'client_email' => post('email'), + 'client_company' => '', + 'client_country' => '', + 'client_city' => '', + 'client_address' => '', + 'client_pcode' => '', + 'client_phone' => '', + 'client_state' => '', + 'client_password' => hash('sha256', post('password')), + 'client_date' => date('Y-m-d H:i:s'), + 'client_key' => substr(str_shuffle('qwertyuioplkjhgfdsazxcvbnm012345789QWERTYUIOPLKJHGFDSAZXCVBNM'), 0, 8), + 'client_status' => 0, ); - $where = "`hosting_client_email`='" . $FormData['hosting_client_email'] . "' OR `hosting_client_key`='" . $FormData['hosting_client_key'] . "'"; + $where = "`client_email`='" . $FormData['client_email'] . "' OR `client_key`='" . $FormData['client_key'] . "'"; - $has = $DB->find('clients', 'hosting_client_id', $where); + $has = $DB->find('clients', 'client_id', $where); if ($has) { setMessage('Account already exsits! or invalid token', 'danger'); redirect('clientarea/login'); } $result = $DB->insert('clients', $FormData); - $Token = str_replace('$2y$10$', '', password_hash($FormData['hosting_client_key'], PASSWORD_DEFAULT)); + $Token = str_replace('$2y$10$', '', password_hash($FormData['client_key'], PASSWORD_DEFAULT)); $EmailContent = 'Your new account has been registered.
Please copy the code below to verify your account.
'; $EmailDescription = '"; +echo ''; print_r($FormData); $SSLApi = $DB->find('ssl_api', '*', array('api_key' => 'FREESSL'), null, 1); @@ -78,7 +78,7 @@ $result = $apiClient->addSSLOrder($FormData); if (count($result) > 4) { $data = array( 'ssl_key' => $result['order_id'], - 'ssl_for' => $ClientInfo['hosting_client_id'], + 'ssl_for' => $ClientInfo['client_id'], ); $res = $DB->insert('ssl', $data); @@ -87,7 +87,7 @@ if (count($result) > 4) { $EmailContent = 'You have successfully created a new ssl and you need to verify your domain using dns record in order to issue an ssl certificate.
'; $EmailDescription = 'View SSL'; - $email_body = email_build_body('New SSL', $ClientInfo['hosting_client_fname'], $EmailContent, $EmailDescription); + $email_body = email_build_body('New SSL', $ClientInfo['client_fname'], $EmailContent, $EmailDescription); send_mail(array( 'to' => $FormData['email'], diff --git a/src/clientarea/controllers/settings/edit.php b/src/clientarea/controllers/settings/edit.php index af13360397aee6f8b40faf42e355fda54a880606..828ef25b1397feca33422bb606f2722549c3819b 100755 --- a/src/clientarea/controllers/settings/edit.php +++ b/src/clientarea/controllers/settings/edit.php @@ -7,18 +7,18 @@ if (!isset($_POST['submit'])) { } $form_data = array( - 'hosting_client_fname' => post('fname'), - 'hosting_client_lname' => post('lname'), - 'hosting_client_phone' => post('phone'), - 'hosting_client_company' => post('company'), - 'hosting_client_address' => post('address'), - 'hosting_client_country' => post('country'), - 'hosting_client_city' => post('city'), - 'hosting_client_pcode' => post('postal'), - 'hosting_client_state' => post('state') + 'client_fname' => post('fname'), + 'client_lname' => post('lname'), + 'client_phone' => post('phone'), + 'client_company' => post('company'), + 'client_address' => post('address'), + 'client_country' => post('country'), + 'client_city' => post('city'), + 'client_pcode' => post('postal'), + 'client_state' => post('state') ); -$where_data = array('hosting_client_key' => $ClientInfo['hosting_client_key']); +$where_data = array('client_id' => $ClientInfo['client_id']); $data = $DB->update('clients', $form_data, $where_data); diff --git a/src/clientarea/controllers/settings/password.php b/src/clientarea/controllers/settings/password.php index 02354d79b8ad1cced8c798972a546a70b962b5b2..0afd4155bc58e4c7b833bcf031a8d22e214ae267 100755 --- a/src/clientarea/controllers/settings/password.php +++ b/src/clientarea/controllers/settings/password.php @@ -6,18 +6,14 @@ if (!isset($_POST['submit'])) { redirect('clientarea/settings'); } -$form_data = array( - 'old_password' => post('old_password'), - 'new_password' => post('new_password'), - 'hashed_password' => hash('sha256', post('new_password')), - 'user_key' => $ClientInfo['hosting_client_key'], - 'user_password' => $ClientInfo['hosting_client_password'], -); +$old_password = post('old_password'); +$old_password = hash('sha256', $old_password); +$new_password = post('new_password'); +$new_password = hash('sha256', $new_password); -if (hash('sha256', $form_data['old_password']) == $form_data['user_password']) { - - $update_data = array('hosting_client_password' => $form_data['hashed_password']); - $where_data = array('hosting_client_key' => $form_data['user_key']); +if ($old_password == $ClientInfo['client_password']) { + $update_data = array('client_password' => $new_password); + $where_data = array('client_id' => $ClientInfo['client_id']); $result = $DB->update('clients', $update_data, $where_data); if ($result) { diff --git a/src/clientarea/controllers/tickets/add.php b/src/clientarea/controllers/tickets/add.php index 7ae24da06f9be50c8f8231c4fa03cfcb3852840c..485d9a0930e5c1a4c98df5e4662f1c952347fd62 100755 --- a/src/clientarea/controllers/tickets/add.php +++ b/src/clientarea/controllers/tickets/add.php @@ -8,7 +8,7 @@ if (isset($_POST['submit'])) { 'ticket_email' => post('email'), 'ticket_content' => post('editor'), 'ticket_department' => post('department'), - 'ticket_for' => $ClientInfo['hosting_client_id'], + 'ticket_for' => $ClientInfo['client_id'], 'ticket_date' => date('Y-m-d H:i:s'), 'ticket_status' => 0, ); @@ -20,9 +20,9 @@ if (isset($_POST['submit'])) { // to customer send_mail(array( 'to' => $FormData['ticket_email'], - 'subject' => 'New Ticket (#' . $ClientInfo['hosting_client_id'] . ')', + 'subject' => 'New Ticket (#' . $ClientInfo['client_id'] . ')', 'message' => email_build_body('New Ticket', - $ClientInfo['hosting_client_fname'], + $ClientInfo['client_fname'], 'You have opened a support ticket which will be processed soon. It can take up to 2 hours.
', 'Click here for details.
' ), @@ -31,7 +31,7 @@ if (isset($_POST['submit'])) { // to Administrator send_mail(array( 'to' => $SiteConfig['site_email'], - 'subject' => 'New Ticket (#' . $ClientInfo['hosting_client_id'] . ')', + 'subject' => 'New Ticket (#' . $ClientInfo['client_id'] . ')', 'message' => email_build_body('New Ticket', 'Administrator', 'We have received a new support ticket request, please handle it in time.
', diff --git a/src/clientarea/controllers/tickets/close.php b/src/clientarea/controllers/tickets/close.php index 8e51a80ab9740de4acc524cdc86a87a4160ae304..15b5934b9730dcbbbe45c6a3201b9ddbf07b2023 100755 --- a/src/clientarea/controllers/tickets/close.php +++ b/src/clientarea/controllers/tickets/close.php @@ -15,7 +15,7 @@ if ($resault) { $TicketUrl = setURL('clientarea/tickets', '', array('action' => 'view', 'ticket_id' => $ticket_id)); $EmailContent = 'You have closed a ticket(' . $ticket_id . ') .
'; $EmailDescription = 'Click here for details.
'; - $email_body = email_build_body('Ticket Closed', $ClientInfo['hosting_client_fname'], $EmailContent, $EmailDescription); + $email_body = email_build_body('Ticket Closed', $ClientInfo['client_fname'], $EmailContent, $EmailDescription); send_mail(array( 'to' => $TicketInfo['ticket_email'], diff --git a/src/clientarea/controllers/tickets/list.php b/src/clientarea/controllers/tickets/list.php index ff6ba95d6ea2b69b7a710192a24bdbfdda38ef10..a7d10ecea2ca7c2b896ca9f9632a2e37ed755220 100755 --- a/src/clientarea/controllers/tickets/list.php +++ b/src/clientarea/controllers/tickets/list.php @@ -4,8 +4,8 @@ $PageInfo['title'] = 'My Tickets'; require_once ROOT . '/core/library/userinfo.class.php'; -$count = $DB->count('tickets', array('ticket_for' => $ClientInfo['hosting_client_id'])); +$count = $DB->count('tickets', array('ticket_for' => $ClientInfo['client_id'])); if ($count > 0) { - $rows = $DB->findAll('tickets', '*', array('ticket_for' => $ClientInfo['hosting_client_id']), "`ticket_id` DESC"); + $rows = $DB->findAll('tickets', '*', array('ticket_for' => $ClientInfo['client_id']), "`ticket_id` DESC"); } diff --git a/src/clientarea/controllers/tickets/reply.php b/src/clientarea/controllers/tickets/reply.php index 51207b21efef65667272d33ada87c3b30f07ca38..bc3f0874effb1598235ee0ca278e6771105e4ac5 100755 --- a/src/clientarea/controllers/tickets/reply.php +++ b/src/clientarea/controllers/tickets/reply.php @@ -18,7 +18,7 @@ $resault = $DB->update('tickets', array('ticket_status' => '2'), array('ticket_i if ($resault) { $FormData = array( 'reply_for' => $ticket_id, - 'reply_from' => $ClientInfo['hosting_client_id'], + 'reply_from' => $ClientInfo['client_id'], 'reply_content' => post('editor'), 'reply_date' => date('Y-m-d H:i:s'), ); @@ -26,7 +26,7 @@ if ($resault) { if ($resault_insert) { $ticket_url = setURL('clientarea/tickets', '', array('action' => 'view', 'ticket_id' => $ticket_id)); - $email_content = 'You have received a reply from ' . $ClientInfo['hosting_client_fname'] . '.
'; + $email_content = 'You have received a reply from ' . $ClientInfo['client_fname'] . '.
'; $email_description = 'View Ticket '; $email_body = email_build_body('Ticket Reply', 'there', $email_content, $email_description); diff --git a/src/clientarea/controllers/tickets/view.php b/src/clientarea/controllers/tickets/view.php index 2cf3d05697c3a637a4756ecb6bc1c636d07643bf..069bd5414c5b5ec0022be63ad664caf76bdc4231 100755 --- a/src/clientarea/controllers/tickets/view.php +++ b/src/clientarea/controllers/tickets/view.php @@ -11,7 +11,7 @@ if (!$ticket_id) { $where = array( 'ticket_id' => $ticket_id, - 'ticket_for' => $ClientInfo['hosting_client_id'], + 'ticket_for' => $ClientInfo['client_id'], ); $TicketInfo = $DB->find('tickets', '*', $where, null, 1); diff --git a/src/clientarea/views/accounts/add.php b/src/clientarea/views/accounts/add.php index b13a1c119cc7d2ce2ce854b58f990589ce24abab..ba7bf7e526e39dfbfb4b9fa633166476776f8f09 100755 --- a/src/clientarea/views/accounts/add.php +++ b/src/clientarea/views/accounts/add.php @@ -11,25 +11,25 @@- +- +- +diff --git a/src/clientarea/views/accounts/edit.php b/src/clientarea/views/accounts/edit.php index 314bb59c000e8d4f9234bdb89f13a529f5b58f63..f579556387a55243ea436b607da6f4df54149f61 100755 --- a/src/clientarea/views/accounts/edit.php +++ b/src/clientarea/views/accounts/edit.php @@ -13,25 +13,25 @@- +- +- +- +diff --git a/src/clientarea/views/clients/profile.php b/src/clientarea/views/clients/profile.php index f5d11dee6d2f6cbeed9068b21bec2603b53db967..71200d2d2af83bcee1319d2a6ea814ec93c2457d 100755 --- a/src/clientarea/views/clients/profile.php +++ b/src/clientarea/views/clients/profile.php @@ -7,31 +7,31 @@- +
-I18N('First Name'); ?>:
+I18N('First Name'); ?>:
-I18N('Last Name'); ?>:
+I18N('Last Name'); ?>:
-I18N('Email Address'); ?>:
+I18N('Email Address'); ?>:
-Phone Number:
+Phone Number:
-I18N('Billing Address'); ?>:
+I18N('Billing Address'); ?>:
-I18N('Company'); ?>:
+I18N('Company'); ?>:
I18N('Country'); ?>:
-I18N('City'); ?>:
+I18N('City'); ?>:
-Postal Code:
+Postal Code:
I18N('IP Address'); ?>:
diff --git a/src/clientarea/views/clients/suspended.php b/src/clientarea/views/clients/suspended.php index cc7fb842da62f266c82b0754470df8f4c1ab5f4d..85867cdb3662a847fc319af89626484014f6df08 100755 --- a/src/clientarea/views/clients/suspended.php +++ b/src/clientarea/views/clients/suspended.php @@ -31,10 +31,10 @@ diff --git a/src/clientarea/views/clients/validate.php b/src/clientarea/views/clients/validate.php index 9538c3f7695777716d948469a074e86c931bb486..aa4ac1cf2e360bead004a9d73f0c98eeb165cdf2 100755 --- a/src/clientarea/views/clients/validate.php +++ b/src/clientarea/views/clients/validate.php @@ -31,7 +31,7 @@ - +I18N('Main Menu'); ?>
@@ -51,7 +51,7 @@I18N('Validate Account'); ?>
-Note: You need to verify this account in order to use our free hosting and ssl services. An email has been sent to your submitted email address() with validation code.
+Note: You need to verify this account in order to use our free hosting and ssl services. An email has been sent to your submitted email address() with validation code.