Skip to content

Commit a9c4e44

Browse files
committed
Correct spelling and grammar issues
I commited the following changes: * Updated README, correcting some spelling and/or grammar mistakes, and adding some information. * Updated project files, correcting typos, and other spelling and grammar mistakes. I also changed the URL to correctly point to the documentation section.
1 parent 58b69d4 commit a9c4e44

13 files changed

+61
-60
lines changed

README.md

+21-20
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
<img src="assets/img/xera.png">
33
</div>
44

5-
## Consumer Warning
5+
## ❗ Warning
66

7-
While Xera is safer and more secure than its predecessor, MOFHY-Lite, it has not yet been fully cleared by the community, and is not yet recomended to be used in a production or public envirement. If you do decided to use this software publically, you claim full responsability, and release mahtab2003 and all maintainers from any legal action.
7+
While Xera is more safe and secure than its predecessor, [MOFHY-Lite](https://github.com/NXTS-Developers/MOFHY-Lite), it has not yet been fully cleared by the community, and is not yet recommended to be used in a production or public environment. If you do decide to use this software publicly, you claim full responsibility, and release mahtab2003 and all maintainers, contributors and any entity involved with the project from any liability and legal action.
88

9-
We invite you to search for vulnerabilities amd report them (Or better yet, fix them and make a pull request), so we can have a safe and secure MOFH client area for all!
9+
We invite you to search for vulnerabilities and report them (or better yet, fix them and make a pull request), so we can have a safe and secure MOFH client area for all!
1010

1111
## 👀 What is Xera ?
12-
Xera is a hosting account and support management system especially designed to work with MOFH (MyOwnFreeHost). Xera currently has a limited number of feature which are listed below
12+
Xera is a hosting account and support management system especially designed to work with MOFH (MyOwnFreeHost). Xera currently has a limited number of features which are listed below:
1313

1414
### 🎮 Features
1515
- User Management
1616
- Theme Management
1717
- Support Management
18-
- Administative Access
18+
- Administrative Access
1919
- Integration With:
2020
- MOFH (MyOwnFreeHost)
21-
- Google Recaptcha
21+
- Google reCAPTCHA
2222
- CryptoLoot
2323
- hCaptcha
2424
- GoGetSSL
@@ -29,32 +29,33 @@ Xera is a hosting account and support management system especially designed to w
2929
## 🤸 Getting Started
3030

3131
### 🚅 Requirements
32-
Your server needs to meet the following minimal requirements to run Xera:
32+
Your server needs to meet the following minimum requirements to run Xera:
3333
- PHP v7.2 or above.
3434
- MySQL v5.7 or above.
35-
- Valid Trusted SSL Certificate.
35+
- A valid, trusted SSL certificate.
3636

3737
### 💾 Installation
38-
Installation of Xera is much eaiser then you think!
38+
The installation of Xera is much easier than you think!
3939
- Download the latest Xera installation file [here](https://github.com/mahtab2003/Xera/releases/latest).
40-
- Extract the .zip file and upload the contents to your web hosting account.
41-
- Create an new database for Xera.
42-
- Go to ```https://{your.domain}/{xera-directory}/install.php``` and click on 'Get Started' button.
43-
- Set your website ```Website URL```، ```Cookie Prefix``` and enable ```CSRF Protection``` and click 'Next Step' button.
44-
- Edit database credentials and click on 'Next Step' button (This will automatically import tables and records to the database).
40+
- Extract the file and upload the contents to your web hosting account.
41+
- Create a new database for Xera.
42+
- Go to ```https://{your.domain}/{xera-directory}/install.php``` and click on the 'Get Started' button.
43+
- Set your website's ```Website URL```, ```Cookie Prefix```, enable ```CSRF Protection``` and hit the 'Next Step' button.
44+
- Edit the database credentials and click on the 'Next Step' button (this will automatically import tables and records to the database).
4545
- Register an admin account and login to your admin panel.
4646
- Replace the logo and favicon located in ```assets/img/``` with your own.
47-
- Setup SMTP (See Below)
47+
- Setup SMTP (see below for some services you can use).
4848
- All done!
4949

5050
### 📧 SMTP
51-
Here are some widely used SMTP services. They have a free plan with some limitations, though most importantly, they are compatible with Xera.
52-
- [Mailgun](https://www.mailgun.com/).
51+
Here are some widely used SMTP services. They have free plans with some limitations, most importantly though, they are compatible with Xera.
52+
- [Mailgun](https://www.mailgun.com/). (**Important Note**: Mailgun seems to offer only a trial plan for a month, and without adding a credit card you are only authorized to send emails to 5 recipients. As such, you may want to choose another service.)
5353
- [Mailjet](https://mailjet.com/).
5454
- [SendGrid](https://sendgrid.com/free/).
5555

5656
### 🤔 Help
57-
If you require assistance, please proceed to https://fourm.xera.eu.org/
57+
If you require assistance, please proceed to [our forum](https://fourm.xera.eu.org/), where you can find the answers to many questions and also ask your own.
58+
You can also [open an issue here](https://github.com/mahtab2003/Xera/issues/new) if you have discovered a bug or have an issue, although the forum is still the preferred way, especially for feature requests. In any way, please ensure your topic has not been previously discussed, and if it has contribute to that discussion instead of making a new one when you can.
5859

59-
### ©️ Copyright
60-
This build is created and maintaned by [Mehtab Hassan](https://github.com/mahtab2003). Code released under the GPL-2.0 license.
60+
## ©️ Copyright
61+
This build is created and maintained by [Mehtab Hassan](https://github.com/mahtab2003). Code released under [the GPL-2.0 license](LICENSE).

db.sql

+7-7
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ INSERT INTO `is_email` (
179179
'new_user',
180180
'Verification required',
181181
'Hi {user_name}!<br>
182-
Your account need to be verified in order to use our services.<br>
182+
Your account needs to be verified in order to use our services.<br>
183183
<a href="{activation_link}">click here</a><br>
184184
Regards {site_name}',
185185
'user',
@@ -240,7 +240,7 @@ INSERT INTO `is_email` (
240240
'new_ticket',
241241
'Ticket Created',
242242
'Hi {site_name}!<br>
243-
A new ticket had been opened by {user_name}<br>
243+
A new ticket has been opened by {user_name}<br>
244244
<a href="{ticket_url}">View Ticket</a>
245245
Regards {site_name}',
246246
'admin',
@@ -261,7 +261,7 @@ INSERT INTO `is_email` (
261261
'reply_ticket',
262262
'Ticket Reply Received',
263263
'Hi {user_name}!<br>
264-
A new ticket reply had been received on ticket id {ticket_id}<br>
264+
A new ticket reply has been received on ticket ID {ticket_id}<br>
265265
<a href="{ticket_url}">View Ticket</a>
266266
Regards {site_name}',
267267
'user',
@@ -280,7 +280,7 @@ INSERT INTO `is_email` (
280280
'reply_ticket',
281281
'Ticket Reply Received',
282282
'Hi {admin_name}!<br>
283-
A new ticket reply had been received on ticket id {ticket_id}<br>
283+
A new ticket reply has been received on ticket ID {ticket_id}<br>
284284
<a href="{ticket_url}">View Ticket</a>
285285
Regards {site_name}',
286286
'admin',
@@ -318,7 +318,7 @@ INSERT INTO `is_email` (
318318
'account_suspended',
319319
'Account Suspended',
320320
'Hi {user_name}!<br>
321-
Account with the username {account_username} had been suspended due to {some_reason}. Please visit our clientarea for further inquiry.<br>
321+
The account with the username {account_username} has been suspended due to {some_reason}. Please visit our client area for further inquiry.<br>
322322
Regards {site_name}',
323323
'user',
324324
'{site_name}, {site_url}, {account_username}, {user_name}, {user_email}, {some_reason}'
@@ -336,7 +336,7 @@ INSERT INTO `is_email` (
336336
'account_reactivated',
337337
'Account Reactivated',
338338
'Hi {user_name}!<br>
339-
Account with the username {account_username} had been recativated. Please visit our clientarea for further inquiry.<br>
339+
The account with the username {account_username} has been reactivated. Please visit our client area for further inquiry.<br>
340340
Regards {site_name}',
341341
'user',
342342
'{site_name}, {site_url}, {account_username}, {user_name}, {user_email}'
@@ -354,7 +354,7 @@ INSERT INTO `is_email` (
354354
'delete_account',
355355
'Account Deleted',
356356
'Hi {user_name}!<br>
357-
Account with the username {account_username} had been deleted. Please visit our clientarea for creating new account.<br>
357+
The account with the username {account_username} has been deleted. Please visit our client area to create a new account.<br>
358358
Regards {site_name}',
359359
'user',
360360
'{site_name}, {site_url}, {account_username}, {user_name}, {user_email}'

install.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@
103103
<?php elseif(isset($_GET['step']) AND $_GET['step'] == 3): ?>
104104
<div class="card-body">
105105
<h2 class="card-title text-center mb-3">Welcome to Xera!</h2>
106-
<p class="text-muted mb-3">Xera had been installed successfuully once you click on the button below you will be redirected to admin registration page and install.php file will be deleted automatically.</p>
106+
<p class="text-muted mb-3">Xera has been installed successfully! Once you click on the button below, you will be redirected to the admin registration page and the install.php file will be deleted automatically.</p>
107107
<div class="form-footer mt-1">
108108
<a href="<?= $base_url ?>a/register" class="btn btn-primary w-100">Redirect</a>
109109
</div>
110110
</div>
111111
<?php else: ?>
112112
<div class="card-body">
113113
<h2 class="card-title text-center mb-3">Welcome to Xera!</h2>
114-
<p class="text-muted mb-3">Xera is a hosting account and support management system especially designed to work with MyOwnFreeHost and GoGetSSL Api. Please click on the button below to continue installation.</p>
114+
<p class="text-muted mb-3">Xera is a hosting account and support management system especially designed to work with MyOwnFreeHost and the GoGetSSL API. Please click on the button below to continue the installation.</p>
115115
<div class="form-footer mt-1">
116116
<a href="<?= $base_url ?>install.php?step=1" class="btn btn-primary w-100">Get Started</a>
117117
</div>
@@ -232,7 +232,7 @@
232232
);");
233233

234234
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
235-
) VALUES ('new_user','Verification required','Hi {user_name}!<br> Your account need to be verified in order to use our services.<br> <a href=\"{activation_link}\">click here</a><br> Regards {site_name}', 'user','{user_name} {user_email} {activation_link} {site_name} {site_url}'
235+
) VALUES ('new_user','Verification required','Hi {user_name}!<br> Your account needs to be verified in order to use our services.<br> <a href=\"{activation_link}\">click here</a><br> Regards {site_name}', 'user','{user_name} {user_email} {activation_link} {site_name} {site_url}'
236236
);");
237237

238238
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
@@ -244,31 +244,31 @@
244244
); ");
245245

246246
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
247-
) VALUES ('new_ticket','Ticket Created','Hi {site_name}!<br> A new ticket had been opened by {user_name}<br> <a href=\"{ticket_url}\">View Ticket</a> Regards {site_name}', 'admin','{site_name}, {site_url}, {ticket_url}, {ticket_id}, {user_name}'
247+
) VALUES ('new_ticket','Ticket Created','Hi {site_name}!<br> A new ticket has been opened by {user_name}<br> <a href=\"{ticket_url}\">View Ticket</a> Regards {site_name}', 'admin','{site_name}, {site_url}, {ticket_url}, {ticket_id}, {user_name}'
248248
);");
249249

250250
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
251-
) VALUES ('reply_ticket','Ticket Reply Received','Hi {user_name}!<br> A new ticket reply had been received on ticket id {ticket_id}<br> <a href=\"{ticket_url}\">View Ticket</a> Regards {site_name}', 'user','{site_name}, {site_url}, {ticket_url}, {ticket_id}, {user_name}'
251+
) VALUES ('reply_ticket','Ticket Reply Received','Hi {user_name}!<br> A new ticket reply has been received on ticket ID {ticket_id}<br> <a href=\"{ticket_url}\">View Ticket</a> Regards {site_name}', 'user','{site_name}, {site_url}, {ticket_url}, {ticket_id}, {user_name}'
252252
);");
253253

254254
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
255-
) VALUES ('reply_ticket','Ticket Reply Received','Hi {admin_name}!<br> A new ticket reply had been received on ticket id {ticket_id}<br> <a href=\"{ticket_url}\">View Ticket</a> Regards {site_name}', 'admin','{site_name}, {site_url}, {ticket_url}, {ticket_id}, {admin_name}'
255+
) VALUES ('reply_ticket','Ticket Reply Received','Hi {admin_name}!<br> A new ticket reply has been received on ticket ID {ticket_id}<br> <a href=\"{ticket_url}\">View Ticket</a> Regards {site_name}', 'admin','{site_name}, {site_url}, {ticket_url}, {ticket_id}, {admin_name}'
256256
);");
257257

258258
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
259259
) VALUES ('account_created','Account Created','Hi {user_name}!<br> Account created successfully.<br> Regards {site_name}', 'user','{site_name}, {site_url}, {account_username}, {account_password}, {account_domain}, {main_domain}, {cpanel_domain}, {sql_server}, {nameserver_1}, {nameserver_2}, {account_label}, {user_name}, {user_email}'
260260
); ");
261261

262262
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
263-
) VALUES ('account_suspended','Account Suspended','Hi {user_name}!<br> Account with the username {account_username} had been suspended due to {some_reason}. Please visit our clientarea for further inquiry.<br> Regards {site_name}', 'user','{site_name}, {site_url}, {account_username}, {user_name}, {user_email}, {some_reason}'
263+
) VALUES ('account_suspended','Account Suspended','Hi {user_name}!<br> The account with the username {account_username} has been suspended due to {some_reason}. Please visit our client area for further inquiry.<br> Regards {site_name}', 'user','{site_name}, {site_url}, {account_username}, {user_name}, {user_email}, {some_reason}'
264264
); ");
265265

266266
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
267-
) VALUES ('account_reactivated','Account Reactivated','Hi {user_name}!<br> Account with the username {account_username} had been recativated. Please visit our clientarea for further inquiry.<br> Regards {site_name}', 'user','{site_name}, {site_url}, {account_username}, {user_name}, {user_email}'
267+
) VALUES ('account_reactivated','Account Reactivated','Hi {user_name}!<br> The account with the username {account_username} has been reactivated. Please visit our client area for further inquiry.<br> Regards {site_name}', 'user','{site_name}, {site_url}, {account_username}, {user_name}, {user_email}'
268268
); ");
269269

270270
$sql = mysqli_query($mysqli, "INSERT INTO `is_email` (`email_id`,`email_subject`,`email_content`,`email_for`,`email_doc`
271-
) VALUES ('delete_account','Account Deleted','Hi {user_name}!<br> Account with the username {account_username} had been deleted. Please visit our clientarea for creating new account.<br> Regards {site_name}', 'user','{site_name}, {site_url}, {account_username}, {user_name}, {user_email}'
271+
) VALUES ('delete_account','Account Deleted','Hi {user_name}!<br> The account with the username {account_username} has been deleted. Please visit our client area to create a new account.<br> Regards {site_name}', 'user','{site_name}, {site_url}, {account_username}, {user_name}, {user_email}'
272272
); ");
273273

274274
$sql = mysqli_query($mysqli, "DROP TABLE IF EXISTS `is_ticket`;");
@@ -330,7 +330,7 @@
330330
}
331331
else
332332
{
333-
$_SESSION['msg'] = json_encode(['danger', 'An error occured. try again later.']);
333+
$_SESSION['msg'] = json_encode(['danger', 'An error occured. Try again later.']);
334334
header('location: '.$base_url.'install.php?step=2');
335335
}
336336
}

template/errors/custom/tos.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="utf-8"/>
5-
<title>Term of Services - <?= $this->base->get_hostname() ?></title>
5+
<title>Terms of Service - <?= $this->base->get_hostname() ?></title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<link rel="icon" type="image/png" href="<?= base_url()?>assets/img/fav.png">
88
<link rel="stylesheet" type="text/css" href="<?= base_url()?>assets/css/tabler.min.css">

template/form/admin/forget.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?= form_open('a/forget', ['class' => 'card card-md']) ?>
22
<div class="card-body">
3-
<h2 class="card-title text-center mb-3">Forget password</h2>
3+
<h2 class="card-title text-center mb-3">Forgot password</h2>
44
<p class="text-muted mb-3">Enter your email address and your password will be reset and emailed to you.</p>
55
<div class="mb-3">
66
<label class="form-label">Email address</label>
77
<input type="email" name="email" class="form-control" placeholder="Enter email">
88
</div>
99
<div class="form-footer mt-1">
10-
<input type="submit" class="btn btn-primary w-100" name="forget" value="Send me new password">
10+
<input type="submit" class="btn btn-primary w-100" name="forget" value="Send me a new password">
1111
</div>
1212
</div>
1313
</form>

template/page/admin/account_settings.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<div class="row">
4848
<div class="col-sm-12">
4949
<div class="alert alert-danger">
50-
Please remove all domains and subdomains before deactivating your account otherwise all domains and subdomains un this account will be locked forever.
50+
Please remove all domains and subdomains before deactivating your account otherwise all domains and subdomains on this account will be locked forever.
5151
</div>
5252
<label class="form-label">Reason</label>
53-
<textarea name="reason" class="form-control mb-2" placeholder="Reason for account deaxtivation..." value="Deactivate"></textarea>
53+
<textarea name="reason" class="form-control mb-2" placeholder="Reason for account deactivation..." value="Deactivate"></textarea>
5454
<input type="submit" name="deactivate" class="btn btn-danger btn-pill">
5555
</div>
5656
</div>

template/page/admin/api_settings.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<input type="text" name="email" class="form-control mb-2" value="<?= $this->base->get_email() ?>">
2121
</div>
2222
<div class="col-sm-6">
23-
<label class="form-label">Fourm URL</label>
23+
<label class="form-label">Forum URL</label>
2424
<input type="text" name="fourm" class="form-control mb-2" value="<?= $this->base->get_fourm() ?>">
2525
</div>
2626
<div class="col-sm-6">
@@ -72,7 +72,7 @@
7272
<input type="text" name="ns_1" class="form-control mb-2" value="<?= $this->mofh->get_ns_1() ?>">
7373
</div>
7474
<div class="col-sm-6">
75-
<label class="form-label">Namserver 2</label>
75+
<label class="form-label">Nameserver 2</label>
7676
<input type="text" name="ns_2" class="form-control mb-2" value="<?= $this->mofh->get_ns_2() ?>">
7777
</div>
7878
<div class="col-sm-6">
@@ -166,22 +166,22 @@
166166
<?= form_open('a/api_settings') ?>
167167
<div class="row">
168168
<div class="col-sm-6">
169-
<label class="form-label">Recaptcha Type</label>
169+
<label class="form-label">Captcha Type</label>
170170
<select class="form-control mb-2" name="type">
171171
<?php
172172
if($this->grc->get_type() === 'google'):
173173
?>
174-
<option value="google" selected="true">Google Recaptcha</option>
174+
<option value="google" selected="true">Google reCAPTCHA</option>
175175
<option value="human">hCaptcha</option>
176176
<option value="crypto">CryptoLoot</option>
177177
<?php
178178
elseif($this->grc->get_type() === 'human'):
179179
?>
180-
<option value="google">Google Recaptcha</option>
180+
<option value="google">Google reCAPTCHA</option>
181181
<option value="human" selected="true">hCaptcha</option>
182182
<option value="crypto">CryptoLoot</option>
183183
<?php else: ?>
184-
<option value="google">Google Recaptcha</option>
184+
<option value="google">Google reCAPTCHA</option>
185185
<option value="human">hCaptcha</option>
186186
<option value="crypto" selected="true">CryptoLoot</option>
187187
<?php

0 commit comments

Comments
 (0)