Skip to content

Commit

Permalink
remove extra trailing whitespace, unnecessary blank lines, and unneed…
Browse files Browse the repository at this point in the history
…ed closing PHP tags
  • Loading branch information
TheDigitalOrchard authored and Shadow243 committed Apr 20, 2024
1 parent 8267000 commit 2b0dee6
Show file tree
Hide file tree
Showing 170 changed files with 2,162 additions and 2,329 deletions.
16 changes: 8 additions & 8 deletions config/2fa.php
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?php

return [
/*
/*
| --------------------------------------------------------------------
| Constants used for 2 factor authentication with Google Authenticator
| --------------------------------------------------------------------
|
| Once you edit this file, you must move it to the directory defined by
| app_data_dir in your config/app.php file. No need to re-run the
| config_gen.php script.
|
| SECURITY ALERT ! MAKE SURE THAT THIS FILE IS NOT ACCESSIBLE BY THE BROWSER !
|
|
| SECURITY ALERT ! MAKE SURE THAT THIS FILE IS NOT ACCESSIBLE BY THE BROWSER !
|
| Enter the raw secret value (minimum 10 characters) to be used with the Google
| Authenticator Application (or any TOTP app providing 6 digit pins). Users
| must opt-in for 2fa on the site settings page which provides a QR barcode
| to configure Google Authenticator.
|
|
| In order for 2fa to work, your server MUST have an accurate date and time,
| otherwise the codes won't match up. NTP is the standard way to keep a server's
| time synced: http://www.ntp.org/
|
|
*/
'2fa_secret' => env('APP_2FA_SECRET', ''),
/*

/*
|
| By default the generated secret will be 64 characters before being base32
| encoded. To use a shorter secret that is easier to manually enter, set the
Expand Down
62 changes: 31 additions & 31 deletions config/app.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

return [
/*
/*
|
| -----------------------------------------------------------------------------
| General settings
Expand Down Expand Up @@ -211,7 +211,7 @@
| If user_config_type is set to file, this must be set to an existing directory
| that the webserver software can read and write to. If settings storage is set
| to DB, this is ignored. It should not be inside the webserver document root.
|
|
*/
'user_settings_dir' => env('USER_SETTINGS_DIR', '/var/lib/hm3/users'),

Expand All @@ -223,7 +223,7 @@
| If user_config_type is set to file, this must be set to an existing directory
| that the webserver software can read and write to. If settings storage is set
| to DB, this is ignored. It should not be inside the webserver document root.
|
|
*/
'attachment_dir' => env('ATTACHMENT_DIR', '/var/lib/hm3/attachments'),

Expand All @@ -235,7 +235,7 @@
| Some Cypht module sets have their own ini files that need to be readable by
| the webserver software, but not writable, and definitely not inside the
| webserver document root.
|
|
*/
'app_data_dir' => env('APP_DATA_DIR', '/var/lib/hm3/app_data'),

Expand All @@ -248,7 +248,7 @@
| that the source and target origin domains match. If you are using proxies this
| could create a problem making it impossible to login. Change this to true to
| disable the origin check.
|
|
*/
'disable_origin_check' => env('DISABLE_ORIGIN_CHECK', false),

Expand All @@ -262,7 +262,7 @@
| the account module set that provides a form to create a new account. This is
| only used if the auth_type is set to DB. Leave this blank if you don't want
| to define any admin users, or are using IMAP authentication.
|
|
*/
'admin_users' => env('ADMIN_USERS'),

Expand All @@ -278,7 +278,7 @@
| the special value of "none" to force Cypht to NOT set the cookie domain
| property at all. This is not recommended unless you know what you are
| doing!
|
|
*/
'cookie_domain' => env('COOKIE_DOMAIN'),

Expand All @@ -295,7 +295,7 @@
| determine the path. You can also use the special value of "none" to force
| Cypht to NOT set the cookie path property at all. This is not recommended
| unless you know what you are doing!
|
|
*/
'cookie_path' => env('COOKIE_PATH'),

Expand All @@ -307,7 +307,7 @@
| Default domain used for outbound email addresses when using IMAP auth and
| users don't login with a full email address. Users can customize this with
| the profiles module which will override this default
|
|
*/
'default_email_domain' => env('DEFAULT_EMAIL_DOMAIN'),

Expand All @@ -320,7 +320,7 @@
| no configured profiles - enabling this option will auto-create a profile for
| them. Email and reply-to addresses will use the default_email_domain if
| set, otherwise it will fallback to the domain Cypht is hosted on.
|
|
*/
'autocreate_profile' => env('AUTO_CREATE_PROFILE'),

Expand All @@ -337,7 +337,7 @@
| to the combined unread view you would use:
|
| redirect_after_login="?page=message_list&list_path=unread"
|
|
*/
'redirect_after_login' => env('REDIRECT_AFTER_LOGIN'),

Expand All @@ -348,7 +348,7 @@
|
| This label is used in the UI to reference the program - you can change it to
| "Your awesome webmail" to replace the Cypht name used in various places.
|
|
*/
'app_name' => env('APP_NAME', 'Cypht'),

Expand All @@ -359,7 +359,7 @@
|
| Cypht will detect mobile devices and display a mobile optimized UI. If you want
| to aways use this UI regardless of device, set this to true
|
|
*/
'always_mobile_ui' => env('ALWAYS_MOBILE_UI'),

Expand All @@ -371,7 +371,7 @@
| Users can select from available interface languages on the site settings page.
| This sets the default for a user who has not done so. Valid values are the
| langauge codes that have matching language definitions in the language/ folder.
|
|
*/
'default_language' => env('DEFAULT_LANGUAGE', 'en'),

Expand All @@ -387,7 +387,7 @@
| external compression. Compression software must be able to handle ES6.
| Example:
| js_compress='uglifyjs.terser -c -m --verbose --warn'
|
|
*/
'js_compress' => env('JS_COMPRESS', false),

Expand Down Expand Up @@ -425,8 +425,8 @@
| server, and using the session as a cache is likely to cause race conditions
| and integrity issues. If you are running Cypht in an "embedded" mode with
| only one email source, this option is less likely to be a problem.
|
|
|
|
| 'allow_session_cache' => env('ALLOW_SESSION_CACHE', false),
| 'cache_class' => env('CACHE_CLASS')
*/
Expand Down Expand Up @@ -485,9 +485,9 @@
| or moving to a new network, will cause you to be logged out. This setting
| provides users with a "stay logged in" option during login that will set the
| sesison lifetime to a default of 30 days, and disable the IP address check.
|
|
| USE WITH CAUTION SINCE THIS DISABLES SOME SESSION PROTECTIONS.
|
|
| Specifically:
| - Session cookies stay active after a browser restart making them more
| susceptible to snooping
Expand All @@ -513,7 +513,7 @@
| responses and data stored in browser local storage. Enabling either one of
| these options causes the Forge JavaScript library to be included. This adds
| about 70KB to the page size (when gzipped).
|
|
| Use AES encryption for AJAX responses. Set to true to enable, leave blank or
| set to false to disable.
*/
Expand Down Expand Up @@ -582,25 +582,25 @@
| setting, tweaks PHP ini settings to increase security, and uses a browser
| "fingerprint" to improve session security. You can disable each with the
| following options:
|
|
| Don't empty PHP super globals
*/
'disable_empty_superglobals' => env('DISABLE_EMPTY_SUPERGLOBALS', false),

/*
|
|
| Don't apply open basedir restrictions
*/
'disable_open_basedir' => env('DISABLE_OPEN_BASE_DIR', false),

/*
|
|
| Don't tweak ini settings
*/
'disable_ini_settings' => env('DISABLE_INI_SETTINGS', false),

/*
|
|
| Don't use a browser fingerprint
*/
'disable_fingerprint' => env('DISABLE_FINGERPRINT', false),
Expand Down Expand Up @@ -984,7 +984,7 @@
// | Allows an API based login that returns a JSON response containing the session
// | and hm_id values needed to create a login session. You will need to set the
// | api_login_key value to something unique and include that in the POST request.
// |
// |
// */
// // 'api_login',

Expand All @@ -997,7 +997,7 @@
// | can't decrypt the existing user settings. This module detects that situation
// | and provides a page where a user can enter their old and new passwords to
// | recover their previous settings.
// |
// |
// */
// 'recover_settings',

Expand All @@ -1007,7 +1007,7 @@
// | ------------
// |
// | Example module set with lots of comments
// |
// |
// */
// // 'hello_world',
// ],
Expand All @@ -1026,7 +1026,7 @@
| All of these settings can be changed by users, but you can uncomment and set
| the default behavior using the following options. This will only effect new
| users or ones that have never saved their settings.
|
|
| Per source time limits have valid values of:
| -1 day
| -1 week
Expand All @@ -1036,7 +1036,7 @@
| -6 months
| -1 year
| -5 years
|
|
| -----------------------------------------------------------------------------
| Per source maximums can be from 1 to 1000
| -----------------------------------------------------------------------------
Expand All @@ -1052,7 +1052,7 @@
| Defaults to 20
*/
// 'default_setting_imap_per_page' => env('DEFAULT_SETTING_IMAP_PER_PAGE', 20),

/*
|
| Amount of IMAP message structure detail on the message view page
Expand All @@ -1066,7 +1066,7 @@
| Defaults to full structure
*/
// 'default_setting_pagination_links' => env('DEFAULT_SETTING_PAGINATE_LINKS', true),

/*
|
| Show icons for each IMAP message part type
Expand Down
12 changes: 6 additions & 6 deletions config/carddav.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?php

return [
/*
|
/*
|
| ----------------------------------------
| Constants used for CardDav communication
| ----------------------------------------
|
| Once you edit this file, you must move it to the directory defined by
| app_data_dir in your config/app.php file. No need to re-run the
| config_gen.php script.
|
|
| SECURITY ALERT ! MAKE SURE THAT THIS FILE IS NOT ACCESSIBLE BY THE BROWSER !
|
|
| Create one section for each CardDav backend you want to support. The section
| name will be used in the UI for the name of this addressbook
|
|
|
|
*/
'Personal' => [
'server' => env('CARD_DAV_SERVER', 'http://localhost:5232'),
Expand Down
28 changes: 14 additions & 14 deletions config/database.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

return [
/*
/*
| -----------------------------------------------------------------------------
| DB Support
| -----------------------------------------------------------------------------
Expand All @@ -18,48 +18,48 @@
| connect to a unix socket.
*/
'db_connection_type' => env('DB_CONNECTION_TYPE', 'host'),
/*

/*
|
| Database host name or ip address. If db_connection_type is set to "socket",
| this value is ignored
*/
'db_host' => env('DB_HOST', '127.0.0.1'),
/*

/*
|
| Database port. Only needed if your database is running on a non-standard
| port
*/
'db_port' => env('DB_PORT', 3306),
/*

/*
|
| If db_connection_type is set to "socket", this should be the filesystem
| location of the unix socket file. If db_connection_type is set to "host"
| this value is ignored.
*/
'db_socket' => env('DB_SOCKET','/var/lib/mysqld/mysqld.sock'),
/*

/*
|
| Name of the database with the required tables
*/
'db_name' => env('DB_NAME', 'cypht_db'),
/*

/*
|
| User to connect to the database with
*/
'db_user' => env('DB_USER', 'root'),
/*

/*
|
| Password to connect to the database with
*/
'db_pass' => env('DB_PASS'),

/*
/*
|
| Database type. can be any supported PDO driver ; (http://php.net/manual/en/pdo.drivers.php)
*/
Expand Down
Loading

0 comments on commit 2b0dee6

Please sign in to comment.