Attendance list, with birthdays highlighted
This also shows date of birth (a custom field) and whether they have had a birthday in the past week. The ODS version uses conditional formatting to omit dividing lines between members of the same family.
Handy hint:
diff --git a/conf.php.sample b/conf.php.sample
index fbf7b016..d37b83f5 100644
--- a/conf.php.sample
+++ b/conf.php.sample
@@ -21,12 +21,14 @@ define('DB_DATABASE', '');
define('DB_USERNAME', '');
define('DB_PASSWORD', '');
-// The URL jethro will be running at. NB The final slash is important!!
-define('BASE_URL', 'http://example.com/jethro/');
+// The URL jethro will be running at. Only needs to be set if Jethro is running behind a proxy without
+// X-Forwarded-Proto + X-Forwarded-Host, or running scripts/task_reminder.php, where the base URL cannot be inferred
+// define('BASE_URL', 'https://example.com/jethro/');
// Whether the system must be accessed by HTTPS.
// If this is true, the BASE_URL above must begin with https://
-define('REQUIRE_HTTPS', FALSE);
+// No longer used - Jethro will run wherever it finds itself.
+// define('REQUIRE_HTTPS', FALSE);
///////////////////////////////////////////////////////////////////////////
// OPTIONAL DATABASE SETTINGS -
diff --git a/db_objects/person_group.class.php b/db_objects/person_group.class.php
index dcc86077..e9f07dbb 100644
--- a/db_objects/person_group.class.php
+++ b/db_objects/person_group.class.php
@@ -50,7 +50,7 @@ protected static function _getFields()
'type' => 'select',
'options' => Array('No', 'Yes'),
'default' => 0,
- 'note' => 'Should members of this group be able to see each other\'s details in member portal?',
+ 'note' => 'Should members of this group be able to see each other\'s details in member portal?',
'label' => 'Share member details?',
),
);
diff --git a/db_objects/roster_view.class.php b/db_objects/roster_view.class.php
index 430f83e6..a035730f 100644
--- a/db_objects/roster_view.class.php
+++ b/db_objects/roster_view.class.php
@@ -106,7 +106,7 @@ protected static function _getFields()
'type' => 'select',
'options' => Array('' => 'Private', 'members' => 'Show in members area', 'public' => 'Show in public area'),
'default' => 0,
- 'note' => 'Whether this roster view is visible in the public area and/or to church members via the members area',
+ 'note' => 'Whether this roster view is visible in the public area and/or to church members via the members area',
),
'show_on_run_sheet' => Array(
'type' => 'select',
@@ -122,7 +122,7 @@ function printForm($prefix='', $fields=NULL)
{
$this->fields['members'] = Array(); // fake field for interface purposes
if ($this->id) {
- $url = BASE_URL.'public/?view=display_roster&roster_view='.$this->id;
+ $url = BASE_URL.'/public/?view=display_roster&roster_view='.$this->id;
if (defined('PUBLIC_ROSTER_SECRET') && strlen(PUBLIC_ROSTER_SECRET)) {
$url .= '&secret='.PUBLIC_ROSTER_SECRET;
}
@@ -575,7 +575,7 @@ private function _printOutputLabel($member, $service)
if (ifdef('PUBLIC_AREA_ENABLED', 1)) {
echo '';
} else {
- echo '';
+ echo '';
}
echo ents($member['role_title']);
echo '';
@@ -597,9 +597,9 @@ private function _printOutputValue($member, $service, $asn, $withLinks=TRUE)
if ($asn['absenceid']) {
echo ' !';
}
- if (('' === $asn['email'])) echo ' ';
+ if (('' === $asn['email'])) echo ' ';
if (('' === $asn['mobile']) && SMS_Sender::canSend()) {
- echo ' ';
+ echo ' ';
}
echo '';
@@ -841,9 +841,9 @@ function printView($start_date=NULL, $end_date=NULL, $editing=FALSE, $public=FAL
if (strlen(strval($vs['absenceid']))) {
$n .= ' !';
}
- if (('' === $vs['email'])) $n .= ' ';
+ if (('' === $vs['email'])) $n .= ' ';
if (('' === $vs['mobile']) && SMS_Sender::canSend()) {
- $n .= ' ';
+ $n .= ' ';
}
$n .= '';
$names[] = $n;
@@ -946,7 +946,7 @@ function _printRoleHeaders($editing, $public)
if ($public) {
echo '';
} else {
- echo '';
+ echo '';
}
echo ents($details['role_title']);
echo '';
diff --git a/db_objects/service.class.php b/db_objects/service.class.php
index 48d8caec..b11b6dec 100644
--- a/db_objects/service.class.php
+++ b/db_objects/service.class.php
@@ -402,7 +402,7 @@ function printFieldValue($fieldname, $value=NULL, $printableMode=FALSE)
$line .= '
Your personalised roster assignments iCal feed is available at
diff --git a/members/views/view_0_edit_me.class.php b/members/views/view_0_edit_me.class.php
index f792e825..6a145615 100644
--- a/members/views/view_0_edit_me.class.php
+++ b/members/views/view_0_edit_me.class.php
@@ -122,7 +122,7 @@ function printView()
$sm = new Staff_Member($person->id);
if ($sm && $sm->requires2FA()) {
- echo '
This person has a control centre account, so their details can only be edited via the control centre
';
+ echo '
This person has a control centre account, so their details can only be edited via the control centre
The public area is not enabled for this Jethro System. You may like to view the members area
+
The public area is not enabled for this Jethro System. You may like to view the members area
_role) {
?>
- Edit
+ Edit
_role->getValue('details');
} else {
diff --git a/scripts/task_reminder.php b/scripts/task_reminder.php
index 7782c107..2ecd955b 100644
--- a/scripts/task_reminder.php
+++ b/scripts/task_reminder.php
@@ -22,6 +22,7 @@
require_once JETHRO_ROOT.'/conf.php';
define('DB_MODE', 'PRIVATE');
require_once JETHRO_ROOT.'/include/init.php';
+if (!BASE_URL) throw new \RuntimeException('Please define a non-blank BASE_URL in conf.php');
if (ifdef('TASK_NOTIFICATION_ENABLED', FALSE) == FALSE) {
if ($VERBOSE) echo "Task notification is disabled in conf.php - exiting \n";
diff --git a/templates/bulk_actions.template.php b/templates/bulk_actions.template.php
index 32f6a434..f671f3ca 100644
--- a/templates/bulk_actions.template.php
+++ b/templates/bulk_actions.template.php
@@ -63,7 +63,7 @@
if ($GLOBALS['user_system']->havePerm(PERM_EDITGROUP)) {
?>
-
+
@@ -114,7 +114,7 @@
?>
-
+
-
+
';
+ if (('' === $asn['email'])) echo ' 
';
if (('' === $asn['mobile']) && SMS_Sender::canSend()) {
- echo ' 
';
+ echo ' 
';
}
echo '';
@@ -841,9 +841,9 @@ function printView($start_date=NULL, $end_date=NULL, $editing=FALSE, $public=FAL
if (strlen(strval($vs['absenceid']))) {
$n .= ' !';
}
- if (('' === $vs['email'])) $n .= ' 
icon below
icon below