diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3ff6fc6b..e0d3579d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,11 +7,11 @@ exclude: | repos: # auto formatters (no work required) ############################################################# - # - repo: https://github.com/pre-commit/pre-commit-hooks - # rev: v5.0.0 - # hooks: - # - id: trailing-whitespace - # - id: end-of-file-fixer + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer - repo: local hooks: - id: phpcbf diff --git a/README.md b/README.md index 6c16abe6..c06c5356 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![UNITY](https://user-images.githubusercontent.com/40907639/137608695-2d914da2-1ecc-480b-a47e-a9e33b2b1b45.png) # Unity Web Portal -Unity Web Portal is a PHP application built in top of MariaDB and LDAP which acts as a central user portal for high-performance-computing clusters. +Unity Web Portal is a PHP application built in top of MariaDB and LDAP which acts as a central user portal for high-performance-computing clusters. Basic Features: * User signs up @@ -113,7 +113,7 @@ rm "$prod" && ln -s "$old" "$prod" ADD `firstname` VARCHAR(768) NOT NULL AFTER `timestamp`, ADD `lastname` VARCHAR(768) NOT NULL AFTER `firstname`, ADD `email` VARCHAR(768) NOT NULL AFTER `lastname`, - ADD `org` VARCHAR(768) NOT NULL AFTER `email`; + ADD `org` VARCHAR(768) NOT NULL AFTER `email`; ``` ### 1.1 -> 1.2 diff --git a/deployment/config/README.md b/deployment/config/README.md index 70ac6ee1..2aeaafac 100644 --- a/deployment/config/README.md +++ b/deployment/config/README.md @@ -2,4 +2,4 @@ In this folder only one file can be created at this time: `config.ini`. -In this file you can override any of the config from the default file in `defaults/config.ini.default`. **Every deployment needs this** \ No newline at end of file +In this file you can override any of the config from the default file in `defaults/config.ini.default`. **Every deployment needs this** diff --git a/deployment/custom_user_mappings/README.md b/deployment/custom_user_mappings/README.md index 7d717a4c..b6d1852b 100644 --- a/deployment/custom_user_mappings/README.md +++ b/deployment/custom_user_mappings/README.md @@ -2,4 +2,4 @@ Put any csv in this folder in the format: , -and the website will auto assign that id (assuming it is available) when that user applies for an account. \ No newline at end of file +and the website will auto assign that id (assuming it is available) when that user applies for an account. diff --git a/deployment/mail_overrides/README.md b/deployment/mail_overrides/README.md index d21a26d4..a007bad6 100644 --- a/deployment/mail_overrides/README.md +++ b/deployment/mail_overrides/README.md @@ -1,3 +1,3 @@ # Mail Overrides -In this location, you can copy any file in the resources/mail folder into here and modify it. **The filename must remain the same** \ No newline at end of file +In this location, you can copy any file in the resources/mail folder into here and modify it. **The filename must remain the same** diff --git a/deployment/overrides/README.md b/deployment/overrides/README.md index f9021a2a..d7457801 100644 --- a/deployment/overrides/README.md +++ b/deployment/overrides/README.md @@ -10,4 +10,4 @@ For example, if the primary virtual host is `example.com`, but you wanted to hos config.ini ``` -Everything else in the deployment folder cannot be overridden. \ No newline at end of file +Everything else in the deployment folder cannot be overridden. diff --git a/resources/mail/account_deletion_request_admin.php b/resources/mail/account_deletion_request_admin.php index 902efdfe..c9170d93 100644 --- a/resources/mail/account_deletion_request_admin.php +++ b/resources/mail/account_deletion_request_admin.php @@ -14,4 +14,4 @@ Name
Email -

\ No newline at end of file +

diff --git a/resources/mail/footer.php b/resources/mail/footer.php index 8048f6f6..83ff615e 100644 --- a/resources/mail/footer.php +++ b/resources/mail/footer.php @@ -1,6 +1,6 @@
- You are receiving this email because you have an account - on the Unity Cluster. - If you would like to stop receiving these emails, + You are receiving this email because you have an account + on the Unity Cluster. + If you would like to stop receiving these emails, you may request to close your account by replying to this email.
diff --git a/resources/mail/group_created.php b/resources/mail/group_created.php index 46d59852..c8ae04d7 100644 --- a/resources/mail/group_created.php +++ b/resources/mail/group_created.php @@ -6,7 +6,7 @@

Hello,

-

Your request for a PI account on the Unity cluster has been approved. You can access the management +

Your request for a PI account on the Unity cluster has been approved. You can access the management page for your group on this page.

-

Do not hesitate to reply if you have any questions!

\ No newline at end of file +

Do not hesitate to reply if you have any questions!

diff --git a/resources/mail/group_denied.php b/resources/mail/group_denied.php index 03e13c99..857e58f4 100644 --- a/resources/mail/group_denied.php +++ b/resources/mail/group_denied.php @@ -6,13 +6,13 @@

Hello,

-

Unfortunately, your request for a PI account on the Unity cluster has not been approved. +

Unfortunately, your request for a PI account on the Unity cluster has not been approved. Usually, this is due to one of the following reasons:

diff --git a/resources/mail/group_disband.php b/resources/mail/group_disband.php index beac2b52..defa3b93 100644 --- a/resources/mail/group_disband.php +++ b/resources/mail/group_disband.php @@ -6,7 +6,7 @@

Hello,

-

Your PI group, , has been disbanded on the Unity +

Your PI group, , has been disbanded on the Unity cluster. Any jobs associated with this PI account have been killed.

-

If you believe this to be a mistake, please reply to this email

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email

diff --git a/resources/mail/group_request.php b/resources/mail/group_request.php index 36f742ab..da6882b9 100644 --- a/resources/mail/group_request.php +++ b/resources/mail/group_request.php @@ -6,7 +6,7 @@

Hello,

-

You have requested a PI account on the Unity Cluster. +

You have requested a PI account on the Unity Cluster. The admin team is reviewing this request, and you will receive an email soon with more details.

-

Do not hesitate to reply if you have any questions!

\ No newline at end of file +

Do not hesitate to reply if you have any questions!

diff --git a/resources/mail/group_request_admin.php b/resources/mail/group_request_admin.php index ab987a03..32fa82b4 100644 --- a/resources/mail/group_request_admin.php +++ b/resources/mail/group_request_admin.php @@ -18,4 +18,4 @@ Email

-

You can approve this account here.

\ No newline at end of file +

You can approve this account here.

diff --git a/resources/mail/group_user_added.php b/resources/mail/group_user_added.php index a6d10262..be11dde3 100644 --- a/resources/mail/group_user_added.php +++ b/resources/mail/group_user_added.php @@ -6,8 +6,8 @@

Hello,

-

You have been approved to join the PI group . -Navigate to the my groups +

You have been approved to join the PI group . +Navigate to the my groups page to see your PI groups.

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/group_user_added_owner.php b/resources/mail/group_user_added_owner.php index 6b079446..63988232 100644 --- a/resources/mail/group_user_added_owner.php +++ b/resources/mail/group_user_added_owner.php @@ -18,4 +18,4 @@ Email

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/group_user_denied.php b/resources/mail/group_user_denied.php index f7d93a59..7c5a864e 100644 --- a/resources/mail/group_user_denied.php +++ b/resources/mail/group_user_denied.php @@ -8,4 +8,4 @@

You have been denied from joining the PI group .

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/group_user_denied_owner.php b/resources/mail/group_user_denied_owner.php index 430aa0c7..e2cffbb9 100644 --- a/resources/mail/group_user_denied_owner.php +++ b/resources/mail/group_user_denied_owner.php @@ -6,7 +6,7 @@

Hello,

-

A user has been denied from joining your PI group, . +

A user has been denied from joining your PI group, . The details of the denied user are below:

@@ -19,4 +19,4 @@ Email

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/group_user_removed.php b/resources/mail/group_user_removed.php index fcc35abf..bfde1f18 100644 --- a/resources/mail/group_user_removed.php +++ b/resources/mail/group_user_removed.php @@ -8,4 +8,4 @@

You have been removed from the PI group .

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/group_user_removed_owner.php b/resources/mail/group_user_removed_owner.php index 665ff094..61ac91b0 100644 --- a/resources/mail/group_user_removed_owner.php +++ b/resources/mail/group_user_removed_owner.php @@ -18,4 +18,4 @@ Email

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/group_user_request.php b/resources/mail/group_user_request.php index a2953d7c..ea88e1e1 100644 --- a/resources/mail/group_user_request.php +++ b/resources/mail/group_user_request.php @@ -8,4 +8,4 @@

You have requested to join the group .

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/group_user_request_owner.php b/resources/mail/group_user_request_owner.php index a6bc53b8..bb8f369e 100644 --- a/resources/mail/group_user_request_owner.php +++ b/resources/mail/group_user_request_owner.php @@ -18,5 +18,5 @@ Email

-

You can approve or deny this user on the - my users page

\ No newline at end of file +

You can approve or deny this user on the + my users page

diff --git a/resources/mail/user_created.php b/resources/mail/user_created.php index d1194d31..172a048c 100644 --- a/resources/mail/user_created.php +++ b/resources/mail/user_created.php @@ -14,8 +14,8 @@ Organization

-

Please login to the web portal to access Unity. - If you need console access, you will need to set your SSH keys in the +

Please login to the web portal to access Unity. + If you need console access, you will need to set your SSH keys in the account settings page.

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/user_loginshell.php b/resources/mail/user_loginshell.php index e4639ea3..f70eba2e 100644 --- a/resources/mail/user_loginshell.php +++ b/resources/mail/user_loginshell.php @@ -6,8 +6,8 @@

Hello,

-

You have updated your login shell on the Unity cluster to . -You can view the login shell settings on the +

You have updated your login shell on the Unity cluster to . +You can view the login shell settings on the account settings page

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/mail/user_sshkey.php b/resources/mail/user_sshkey.php index 95df8559..83f39e02 100644 --- a/resources/mail/user_sshkey.php +++ b/resources/mail/user_sshkey.php @@ -14,7 +14,7 @@ } ?> -

You can view the SSH public keys attached to your account on +

You can view the SSH public keys attached to your account on the account settings page.

-

If you believe this to be a mistake, please reply to this email as soon as possible.

\ No newline at end of file +

If you believe this to be a mistake, please reply to this email as soon as possible.

diff --git a/resources/templates/footer.php b/resources/templates/footer.php index 228c2e79..06a5bb87 100644 --- a/resources/templates/footer.php +++ b/resources/templates/footer.php @@ -10,7 +10,7 @@ for ($i = 0; $i < count($footer_logos); $i++) { echo " - "; } ?> diff --git a/resources/templates/header.php b/resources/templates/header.php index 58c2a8f5..fbb4e312 100644 --- a/resources/templates/header.php +++ b/resources/templates/header.php @@ -60,7 +60,7 @@
- /assets/">