Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream updates #57

Open
wants to merge 278 commits into
base: production
Choose a base branch
from
Open
Changes from 7 commits
Commits
Show all changes
278 commits
Select commit Hold shift + click to select a range
163536f
set values to be non-null #425
chris18890 Apr 4, 2019
7b87a67
minor spacing & readability tweaks
chris18890 Apr 8, 2019
f9ca019
change permissions
chris18890 Apr 8, 2019
8e0f3cd
make row into a link to email list
chris18890 Apr 8, 2019
775b1bc
display subscribers table
chris18890 Apr 9, 2019
9ec432a
Merge pull request #430 from chris18890/issue_412
chris18890 Apr 16, 2019
bc802a9
Merge pull request #427 from chris18890/issue_425
chris18890 Apr 16, 2019
f680af6
remove blank line
chris18890 Apr 19, 2019
a3bb7e2
Merge pull request #431 from chris18890/dev
chris18890 Apr 19, 2019
3009157
minor spacing & sppech mark corrections
chris18890 Apr 20, 2019
9c8a13f
Merge pull request #432 from chris18890/dev
chris18890 Apr 20, 2019
4edf5ac
fix param comment
chris18890 Jun 15, 2019
f7b7364
Merge pull request #433 from chris18890/dev
chris18890 Jul 1, 2019
7fcdc33
get correct data type #434
chris18890 Nov 11, 2019
e1b9f0c
Merge pull request #435 from chris18890/issue_434
chris18890 Nov 11, 2019
85ba201
get correct data type #434
chris18890 Nov 15, 2019
d442099
Add user type to description title
chris18890 Nov 15, 2019
b68397e
Merge pull request #436 from chris18890/dev
chris18890 Nov 15, 2019
26ad637
update email address & alphabetise list
chris18890 Jan 13, 2020
9adf960
Update copyright year #437
chris18890 Jan 13, 2020
d2305c5
Merge pull request #438 from chris18890/issue_437
chris18890 Jan 17, 2020
40a3cbb
set IPN to use HTTPS
chris18890 Mar 4, 2020
79dafdd
update readme to match version in crm.inc.php
chris18890 Mar 7, 2020
b938014
spacing/syntax fixes #429
chris18890 Mar 7, 2020
16e212a
didn't mean to remove this one
chris18890 Mar 7, 2020
a322b72
Merge pull request #439 from chris18890/dev
chris18890 Mar 18, 2020
b1ff55f
Merge pull request #440 from elplatt/dev
chris18890 May 13, 2020
e7e335b
variablise protocol
chris18890 May 14, 2020
f6569b9
add missing html tags
chris18890 May 14, 2020
04f002d
Merge pull request #441 from chris18890/dev
chris18890 May 14, 2020
56312f3
Merge pull request #442 from elplatt/dev
chris18890 May 14, 2020
950a675
add email header
chris18890 May 16, 2020
f79be94
Merge branch 'dev' of https://github.com/elplatt/seltzer into dev
chris18890 May 16, 2020
b90d7b3
add MIME header
chris18890 May 17, 2020
490d221
fix email headers
chris18890 May 17, 2020
a20bef1
fix URL protocol
chris18890 May 17, 2020
1187dd8
bumping version number
chris18890 May 18, 2020
92015e9
Merge pull request #443 from chris18890/dev
chris18890 May 18, 2020
c003f4c
spacing
chris18890 May 18, 2020
82c59a8
Merge pull request #444 from chris18890/dev
chris18890 May 18, 2020
15e4599
spacing
chris18890 May 18, 2020
4f41b72
Merge pull request #445 from chris18890/dev
chris18890 May 18, 2020
10327de
remove unneeded table/theme/data
chris18890 May 23, 2020
e94caf9
spacing
chris18890 May 23, 2020
5711655
fix function call
chris18890 May 23, 2020
01a4c0a
Merge pull request #446 from chris18890/issue-357
chris18890 May 24, 2020
e0466a4
fix function call
chris18890 May 24, 2020
97ff9e1
Merge pull request #447 from chris18890/dev
chris18890 May 24, 2020
e637717
bump readme version
chris18890 May 24, 2020
17c08c6
Merge pull request #448 from chris18890/dev
chris18890 May 24, 2020
4f95cc8
add createdBy attribute
chris18890 May 30, 2020
69c7f19
add createdeDate & createdTime attributes
chris18890 May 30, 2020
d676d11
remove extraneous theme functions
chris18890 May 30, 2020
786aae1
Merge pull request #451 from chris18890/dev
chris18890 Jun 1, 2020
7c223be
field fix & version bump
chris18890 Jun 5, 2020
c9561db
Merge pull request #449 from elplatt/dev
chris18890 Jun 5, 2020
cee77b4
Merge pull request #450 from chris18890/issue-357
chris18890 Jun 5, 2020
64a4fb4
install bugfix #357
chris18890 Jun 6, 2020
bda973b
Merge pull request #453 from chris18890/dev
chris18890 Jun 6, 2020
6646053
install/upgrade bugfix #357
chris18890 Jun 6, 2020
ab60e3f
Merge branch 'dev' of https://github.com/elplatt/seltzer into dev
chris18890 Jun 6, 2020
1342520
spacing
chris18890 Jun 6, 2020
b762ac6
Merge pull request #454 from chris18890/dev
chris18890 Jun 6, 2020
11cbc2d
spacing & capitalisation
chris18890 Jun 7, 2020
c04e4ad
Merge pull request #455 from chris18890/dev
chris18890 Jun 7, 2020
0451abd
document function
chris18890 Jun 7, 2020
f237ebd
Merge pull request #456 from chris18890/dev
chris18890 Jun 7, 2020
75f0db3
Merge pull request #452 from elplatt/dev
chris18890 Jun 11, 2020
e35983c
spacing
chris18890 Jun 17, 2020
4857559
variable typo
chris18890 Jun 17, 2020
36cdbb4
Merge pull request #457 from chris18890/dev
chris18890 Jun 17, 2020
8ff1e49
Merge pull request #458 from elplatt/dev
chris18890 Jul 8, 2020
aaaf5a1
Update user.inc.php
chris18890 Aug 6, 2020
8953721
version bump
chris18890 Aug 6, 2020
a9c8fba
Merge pull request #460 from chris18890/contact_list-fix
chris18890 Sep 8, 2020
ea130b1
Merge pull request #461 from elplatt/dev
chris18890 Sep 8, 2020
944dd01
Update mentor.inc.php
chris18890 Dec 30, 2020
be298d3
add mentor permissioins to webAdmin role #462
chris18890 Dec 30, 2020
88fc7ef
Merge pull request #464 from chris18890/issue_462
chris18890 Dec 31, 2020
1b6487d
fix tabs loading incorrectly for other users
chris18890 Dec 31, 2020
1ca6f99
minor formatting & comments
chris18890 Dec 31, 2020
5c13ca3
remove unnecessary restriction on user details
chris18890 Dec 31, 2020
0b61006
Merge pull request #465 from chris18890/dev
chris18890 Jan 1, 2021
23e9d84
Merge pull request #466 from elplatt/dev
chris18890 Jan 2, 2021
a23e1a5
show role in member table
chris18890 Jan 5, 2021
2c53b17
Merge pull request #468 from chris18890/show_role
chris18890 Jan 14, 2021
3b7918b
Merge branch 'dev' of https://github.com/elplatt/seltzer into dev
chris18890 Jan 15, 2021
9406dfa
2021 year update
chris18890 Jan 15, 2021
b6ff595
Merge pull request #471 from chris18890/year_update
chris18890 Jan 15, 2021
41b061e
show role in contact table
chris18890 Jan 16, 2021
1ad122a
move creating admin user
chris18890 Jan 17, 2021
46a3937
add new functions
chris18890 Jan 17, 2021
919d0ca
minor tidy up
chris18890 Jan 17, 2021
9a7168c
use functions instead of global variables
chris18890 Jan 17, 2021
d46b1a8
Merge pull request #473 from chris18890/show_role_contact
chris18890 Jan 17, 2021
d751b3f
Merge branch 'dev' into functions
chris18890 Jan 17, 2021
27e3f1c
Merge pull request #475 from chris18890/functions
chris18890 Jan 17, 2021
9882537
set variables during install
chris18890 Jan 18, 2021
c989bb8
return variables from DB but use global values from config as fallback
chris18890 Jan 18, 2021
bb6b1c4
add options page, form, command, & permissions
chris18890 Jan 18, 2021
a86299d
Update key.inc.php
chris18890 Jan 18, 2021
7554809
Merge pull request #476 from chris18890/options
chris18890 Jan 19, 2021
2a3084c
spacing
chris18890 Jan 20, 2021
047c9a0
Merge pull request #478 from chris18890/spacing
chris18890 Jan 20, 2021
f9f0819
streamline useage of KID
chris18890 Feb 1, 2021
3ee2668
update other modules that are based on key
chris18890 Feb 1, 2021
9cdfe0b
version bump
chris18890 Feb 1, 2021
e3d50a7
Merge pull request #479 from chris18890/key_save
chris18890 Feb 13, 2021
eb892ac
refactor members
chris18890 Oct 23, 2021
03be6ae
Merge pull request #480 from chris18890/refactor_members
chris18890 Oct 26, 2021
789a613
spacing/layout/typo fixes
chris18890 Nov 8, 2021
dbc779c
add sanity check for array
chris18890 Nov 8, 2021
f959e67
remove unneeded variable
chris18890 Nov 8, 2021
8e93297
split out edit & delete ops with different permissions required
chris18890 Nov 8, 2021
dfadbc2
change permission needed for user role edit
chris18890 Nov 8, 2021
1219a5a
version bump
chris18890 Nov 8, 2021
50a1750
remove hard-coded role assignment & change to standardised method fro…
chris18890 Nov 8, 2021
b55857b
rearrange modules to be a more standard layout like key & _meta modules
chris18890 Nov 8, 2021
d9d84c8
add permission messages
chris18890 Nov 11, 2021
63eef68
fix return URL
chris18890 Nov 11, 2021
09cd6a4
fix display of table & form
chris18890 Nov 12, 2021
93ff9a9
set form permissions
chris18890 Nov 12, 2021
798959f
set page permissions
chris18890 Nov 12, 2021
69cf015
version bump
chris18890 Nov 12, 2021
3b16b1b
remove mentor_update/mentor_edit
chris18890 Nov 12, 2021
0787222
remove SQL from command_ functions
chris18890 Nov 12, 2021
9be1ac9
Merge pull request #483 from chris18890/permission_changes
chris18890 Nov 13, 2021
6e88d4e
move role page to user module
chris18890 Nov 14, 2021
7026b12
Merge pull request #486 from chris18890/user_role_edit
chris18890 Nov 14, 2021
416488b
Merge pull request #487 from elplatt/dev
chris18890 Nov 14, 2021
0fc180a
Update README.md
chris18890 Nov 14, 2021
0c20ef7
Merge pull request #488 from chris18890/user_role_edit
chris18890 Nov 14, 2021
ed4bc7b
Merge pull request #489 from elplatt/dev
chris18890 Nov 14, 2021
30025d6
typo correction
chris18890 Nov 18, 2021
5a385d7
add member_plan_view permission
chris18890 Nov 18, 2021
b242494
hide active/inactive member reports by default
chris18890 Nov 18, 2021
4a18553
Merge pull request #490 from chris18890/member_plan_view
chris18890 Nov 18, 2021
70593ea
Merge pull request #491 from elplatt/dev
chris18890 Nov 18, 2021
836650e
Update form.inc.php
chris18890 Nov 19, 2021
9d5906b
update member_plan_save & member_save
chris18890 Nov 19, 2021
64171a1
Merge pull request #492 from chris18890/plan_improvements
chris18890 Nov 20, 2021
1dc6929
Merge pull request #493 from elplatt/dev
chris18890 Nov 20, 2021
8eb4cbb
fix variable usage
chris18890 Dec 11, 2021
e5d5a36
Merge pull request #494 from chris18890/member_page
chris18890 Dec 11, 2021
3a114b5
Merge pull request #495 from elplatt/dev
chris18890 Dec 11, 2021
807f733
annual copyright update
chris18890 Dec 31, 2021
6ba0005
Merge pull request #496 from chris18890/new_year
chris18890 Dec 31, 2021
1ffec0b
Merge pull request #497 from elplatt/dev
chris18890 Dec 31, 2021
9a0d1de
remove deprecated & unused functions
chris18890 Dec 31, 2021
3d29e9a
reorder permissions to match other modules
chris18890 Jan 1, 2022
4ebf312
reorder fields to match other forms in the module
chris18890 Jan 1, 2022
690317a
fix variable
chris18890 Jan 1, 2022
a551adb
remove hiding of ops columns
chris18890 Jan 1, 2022
43bdbd5
allow members to self-unsubscribe
chris18890 Jan 1, 2022
92bc16b
Merge pull request #498 from chris18890/member_name
chris18890 Jan 1, 2022
e6a72d7
Merge pull request #499 from elplatt/dev
chris18890 Jan 1, 2022
aa9bc5f
spacing
chris18890 Jan 12, 2022
ccd88e0
show list name
chris18890 Jan 12, 2022
4d18322
fix plan permissions required
chris18890 Jan 12, 2022
9d56da3
Update user_meta.inc.php
chris18890 Jan 13, 2022
650bb12
Merge pull request #503 from chris18890/dev
chris18890 Jan 13, 2022
f1e4dbb
Merge pull request #504 from elplatt/dev
chris18890 Jan 13, 2022
b9437cb
typo, spacing, & variable corrections
chris18890 Jun 10, 2022
b737762
payment form tweaks
chris18890 Jun 10, 2022
26138a6
Merge pull request #505 from elplatt/dev
chris18890 Jun 11, 2022
fc8d10a
php 8.1 fix
chris18890 Oct 17, 2022
3d058b6
Merge pull request #506 from chris18890/array_string_offset
chris18890 Oct 22, 2022
832b1cd
Merge pull request #508 from elplatt/dev
chris18890 Oct 22, 2022
4561c07
typo fix
chris18890 Nov 26, 2022
eb333c2
Merge pull request #509 from elplatt/dev
chris18890 Nov 26, 2022
edeee88
Update email_list.inc.php
chris18890 Nov 26, 2022
2324178
Merge pull request #510 from elplatt/dev
chris18890 Nov 26, 2022
6ae52e5
php 8.1 compatibility, fixes #507
chris18890 Nov 29, 2022
cf32450
Merge pull request #511 from chris18890/issue_507
chris18890 Jan 10, 2023
2977d54
update copyright to 2023
chris18890 Jan 10, 2023
c30e206
Merge pull request #512 from chris18890/2023
chris18890 Jan 10, 2023
0da76f9
Merge pull request #513 from elplatt/dev
chris18890 Jan 10, 2023
73b7df2
Fix non existant function member_contact_data
drid Oct 1, 2023
9a70d66
Merge pull request #514 from drid/main
chris18890 Oct 1, 2023
5983126
spacing & version bump
chris18890 Oct 1, 2023
6951f31
Update CONTRIBUTORS
chris18890 Oct 1, 2023
6c140b1
Update CONTRIBUTORS
chris18890 Oct 1, 2023
835a94b
Merge pull request #515 from elplatt/dev
chris18890 Oct 1, 2023
34b8582
Fix plan end date not assigned
drid Oct 1, 2023
e754579
Move message
drid Oct 1, 2023
0e5552e
Fix variable in string syntax
drid Oct 2, 2023
815ae9f
Merge pull request #516 from drid/main
chris18890 Oct 2, 2023
fe6cdf2
spacing
chris18890 Oct 2, 2023
550bac7
implement permissions fixes
chris18890 Oct 5, 2023
ade9d5b
Merge pull request #522 from chris18890/permssion_fix
chris18890 Oct 5, 2023
3ecf214
email bugfix in register command
chris18890 Oct 5, 2023
f8daf97
Merge pull request #524 from chris18890/register_bugfix
chris18890 Oct 5, 2023
7933942
Show SQL error message
drid Oct 5, 2023
9828b63
Duplicate username or email skips entry instead of aborting
drid Oct 2, 2023
e902cf7
Check for empty mandatory fields
drid Oct 2, 2023
7ca26d2
Make plan creation from CSV optional
drid Oct 2, 2023
521bb21
fix comment describing form
chris18890 Oct 5, 2023
c10a1be
change reference from members to contacts
chris18890 Oct 9, 2023
0406588
Merge pull request #525 from chris18890/user_form
chris18890 Oct 13, 2023
aab5ae0
add missing db_connect
chris18890 Oct 15, 2023
a8ebed5
Merge pull request #526 from chris18890/mysqli_affected_rows
chris18890 Oct 15, 2023
58ef652
Merge branch 'dev' into show-sql-errors
chris18890 Oct 15, 2023
9e97ba8
Update user_meta.inc.php
chris18890 Oct 22, 2023
8ed1602
Update variable.inc.php
chris18890 Oct 22, 2023
5a7b93a
Update register.inc.php
chris18890 Oct 22, 2023
e723fdf
Update user.inc.php
chris18890 Oct 22, 2023
f3f703e
Merge pull request #521 from drid/show-sql-errors
chris18890 Oct 22, 2023
52b1668
Merge pull request #519 from drid/import-enhancments
chris18890 Oct 22, 2023
c5809f6
Hide memberhsip info from users without membership view permission
chris18890 Oct 22, 2023
db93698
Merge pull request #528 from chris18890/membership_view_permission
chris18890 Nov 28, 2023
9371c4c
Add option to resend notification of user account
drid Dec 12, 2023
63feb2c
Add last payment date in accounts
drid Oct 5, 2023
6c6603f
php 8.1 compatibility, fixes reports #527
drid Dec 12, 2023
aeea0ad
Partialy fix paypal table view and export
drid Dec 12, 2023
45eda76
linting
chris18890 Dec 13, 2023
8e038aa
Merge pull request #530 from drid/last-payment
chris18890 Dec 13, 2023
d165e91
linting
chris18890 Dec 13, 2023
a6520ac
linting
chris18890 Dec 13, 2023
7669d05
format SQL queries
chris18890 Dec 13, 2023
a1c1fb4
version number bump post merge of #530
chris18890 Dec 13, 2023
20015f7
Remove debug print
drid Dec 13, 2023
e27710b
version bump
chris18890 Dec 13, 2023
da0ed1c
version bump
chris18890 Dec 13, 2023
108c9d5
Merge branch 'dev' into renotify
chris18890 Dec 13, 2023
b8a6e8a
Merge pull request #529 from drid/renotify
chris18890 Dec 13, 2023
f4ff39b
revert Update table.inc.php
chris18890 Dec 17, 2023
43514ea
remove ID
chris18890 Dec 17, 2023
0bf8ae0
re-add page title
chris18890 Dec 17, 2023
034f2dc
Update payment.inc.php
chris18890 Dec 17, 2023
3c96683
bugfix for #530
chris18890 Dec 17, 2023
ee91611
fix balance total #530
chris18890 Dec 17, 2023
11e3e53
Merge pull request #533 from chris18890/dev
chris18890 Dec 17, 2023
4dd222b
syntax typo
chris18890 Dec 17, 2023
dece0e2
Merge pull request #532 from drid/php8.1-compat
chris18890 Dec 17, 2023
5d6ce4d
add command descriptor
chris18890 Dec 18, 2023
2b1a804
don't enable amazon payments by default
chris18890 Dec 18, 2023
667a608
Merge pull request #534 from chris18890/v0.8.0
chris18890 Dec 20, 2023
5a01fe9
Fix payment.inc error on home page for continue 2
chris18890 Jan 4, 2024
3ca1f43
Fix for variable_get single parameter
chris18890 Jan 4, 2024
991874c
update copyright year
chris18890 Jan 4, 2024
e512ef7
Merge pull request #536 from chris18890/dev
chris18890 Jan 4, 2024
1ba69e9
Merge pull request #537 from chris18890/2024
chris18890 Jan 4, 2024
97ab727
add missing $db_connect
chris18890 Mar 4, 2024
3564080
Merge pull request #539 from chris18890/missing-param
chris18890 Mar 4, 2024
3dffcbc
explicitly define payment filters
chris18890 Jun 15, 2024
9a4484a
Merge pull request #541 from chris18890/payment_filter_explicit
chris18890 Jun 15, 2024
edc7767
2025 yearly copyright update
chris18890 Jan 6, 2025
7d71b51
Merge pull request #545 from chris18890/year-update
chris18890 Jan 6, 2025
0a28917
Update jQuery version
chris18890 Jan 5, 2025
1fa57f8
Merge pull request #544 from chris18890/jquery-upgrade
chris18890 Jan 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Seltzer CRM 0.5.8 - An open source CRM for hackerspaces
Seltzer CRM 0.5.9 - An open source CRM for hackerspaces
Copyright 2009-2020 Edward L. Platt <[email protected]>
Distributed under GPLv3 (see COPYING for more info)

2 changes: 1 addition & 1 deletion crm/include/crm.inc.php
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
$crm_version = array(
'major' => 0
, 'minor' => 5
, 'patch' => 8
, 'patch' => 9
, 'revision' => 'dev'
);
require_once($crm_root . '/config.inc.php');
7 changes: 4 additions & 3 deletions crm/modules/amazon_payment/amazon_payment.inc.php
Original file line number Diff line number Diff line change
@@ -637,6 +637,7 @@ function theme_amazon_payment_button ($cid, $params = array()) {
global $config_amazon_payment_access_key_id;
global $config_amazon_payment_secret;
global $config_host;
global $config_protocol_security
if (empty($config_amazon_payment_access_key_id)) {
error_register('Missing Amazon Access Key ID');
return '';
@@ -652,11 +653,11 @@ function theme_amazon_payment_button ($cid, $params = array()) {
, 'amount' => 'USD 1.1'
, 'cobrandingStyle' => 'logo'
, 'description' => 'Test Widget'
, 'ipnUrl' => 'https://' . $config_host . base_path() . 'modules/amazon_payment/ipn.php'
, 'returnUrl' => 'https://' . $config_host . crm_url('contact', array('query'=>array('cid'=>$cid, 'tab'=>'account')))
, 'ipnUrl' => $config_protocol_security . '://' . $config_host . base_path() . 'modules/amazon_payment/ipn.php'
, 'returnUrl' => $config_protocol_security . '://' . $config_host . crm_url('contact', array('query'=>array('cid'=>$cid, 'tab'=>'account')))
, 'processImmediate' => '1'
, 'cobrandingStyle' => 'logo'
, 'abandonUrl' => 'https://' . $config_host . crm_url('contact', array('query'=>array('cid'=>$cid, 'tab'=>'account')))
, 'abandonUrl' => $config_protocol_security . '://' . $config_host . crm_url('contact', array('query'=>array('cid'=>$cid, 'tab'=>'account')))
);
// Use defaults for parameters not specified
foreach ($defaults as $key => $value) {
3 changes: 2 additions & 1 deletion crm/modules/billing/billing.inc.php
Original file line number Diff line number Diff line change
@@ -193,7 +193,8 @@ function command_billing_email () {
$to = $cidToContact[$cid]['email'];
$subject = "[$config_site_title] Payment Due";
$from = $config_email_from;
$headers = "Content-type: text/html\r\nFrom: $from\r\n";
$headers = "From: $from\r\nContent-Type: text/html; charset=ISO-8859-1\r\n";
$headers .= "MIME-Version: 1.0\r\n";
$message = "<p>Hello,<br/><br/>Your current account balance is $amount. To pay this balance using </p>";
if (function_exists('amazon_payment_revision')) {
$message .= "<p>Amazon Payments, please click the button below.</p>$button1";
2 changes: 2 additions & 0 deletions crm/modules/member/command.inc.php
Original file line number Diff line number Diff line change
@@ -149,6 +149,7 @@ function command_member_add () {
// Notify admins
$from = "\"$config_org_name\" <$config_email_from>";
$headers = "From: $from\r\nContent-Type: text/html; charset=ISO-8859-1\r\n";
$headers .= "MIME-Version: 1.0\r\n";
if (!empty($config_email_to)) {
$name = theme_contact_name($contact['cid']);
$content = theme('member_created_email', $contact['cid']);
@@ -529,6 +530,7 @@ function command_member_import () {
// Notify admins
$from = "\"$config_org_name\" <$config_email_from>";
$headers = "From: $from\r\nContent-Type: text/html; charset=ISO-8859-1\r\n";
$headers .= "MIME-Version: 1.0\r\n";
if (!empty($config_email_to)) {
$name = theme_contact_name($contact['cid']);
$content = theme('member_created_email', $contact['cid']);
1 change: 1 addition & 0 deletions crm/modules/register/register.inc.php
Original file line number Diff line number Diff line change
@@ -177,6 +177,7 @@ function command_register_member () {
// Notify admins
$from = "\"$config_org_name\" <$config_email_from>";
$headers = "From: $from\r\nContent-Type: text/html; charset=ISO-8859-1\r\n";
$headers .= "MIME-Version: 1.0\r\n";
if (!empty($config_email_to)) {
$name = theme_contact_name($contact['cid']);
$content = theme('member_created_email', $contact['cid']);
3 changes: 2 additions & 1 deletion crm/modules/user/user.inc.php
Original file line number Diff line number Diff line change
@@ -838,7 +838,8 @@ function command_reset_password () {
$to = $contact['email'];
$subject = "[$config_site_title] Reset Password";
$from = $config_email_from;
$headers = "From: $from\r\n";
$headers = "From: $from\r\nContent-Type: text/html; charset=ISO-8859-1\r\n";
$headers .= "MIME-Version: 1.0\r\n";
$message = "To reset your password, visit the following url: $url";
$res = mail($to, $subject, $message, $headers);
// Notify user to check their email