From 68332b75ee745ed278c8f2a8e9ce0e813f94db1a Mon Sep 17 00:00:00 2001
From: Bruce Bannon
Date: Sat, 16 Sep 2023 08:28:49 -0600
Subject: [PATCH] examples of new-ish php functions to shorten code
---
about.php | 2 +-
access.php | 32 ++++++++--------
admin.php | 11 ++++--
includes/functions.php | 84 +++++++++++++++---------------------------
4 files changed, 55 insertions(+), 74 deletions(-)
diff --git a/about.php b/about.php
index 56a6f7e45..43c692c4c 100644
--- a/about.php
+++ b/about.php
@@ -35,11 +35,11 @@
' . ( empty ( $credits ) ? '' : "
+
-
" ) . print_trailer ( false,true,true );
?>
diff --git a/access.php b/access.php
index 75eb09dcf..f8eaf87ed 100644
--- a/access.php
+++ b/access.php
@@ -204,9 +204,7 @@
$div = ceil( ACCESS_NUMBER_FUNCTIONS / 4 );
// We can reorder the display of user rights here.
- $order = [
- 1, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 27,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26];
+ $order = array_merge ( [1, 0], range ( 2, 14 ), [27], range ( 15, 26 ) );
// Make sure that we have defined all the types of access
// defined in access.php.
assert( count( $order ) == ACCESS_NUMBER_FUNCTIONS );
@@ -343,6 +341,10 @@
$bottomedge = '';
if( $j == 3 )
continue;
+
+ $j8 = $j * 8;
+ $j64 = $j * 64;
+
echo '
|
| '
. ( $guser != '__public__' ? '
|
|
|
|
|
| '
: '' ) . '
';
diff --git a/admin.php b/admin.php
index a1bcdb2b5..17e42567f 100644
--- a/admin.php
+++ b/admin.php
@@ -230,7 +230,7 @@ function save_pref ( $prefs, $src ) {
$handler = 'color_change_handler_' . $k;
$color_sets .= print_color_input_html ( $k, $v, '', '', 'p', '', $handler );
}
- $csp = empty($s['CSP']) ? 'none' : $s['CSP'];
+ $csp = ( $s['CSP'] ?: 'none' );
set_today ( date ( 'Ymd' ) );
@@ -755,11 +755,13 @@ function save_pref ( $prefs, $src ) {
+ . ( $s['SMTP_USERNAME'] ?: '' )
+ . '">
+ . ( $s['SMTP_PASSWORD'] ?: '' )
+ . '">
' . translate ( 'Default user settings' ) . ':
'
@@ -824,7 +826,8 @@ function save_pref ( $prefs, $src ) {
+ . ( $s['BGREPEAT'] ?: '' )
+ . '">
diff --git a/includes/functions.php b/includes/functions.php
index f5cff2daa..0fc933e94 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -932,60 +932,36 @@ function decode_string ( $instr ) {
* @return string HTML for one log entry.
*/
function display_activity_log( $cal_type, $cal_text = '', $break = '
' ) {
- if ( $cal_type == LOG_APPROVE )
- $ret = translate ( 'Event approved' );
- elseif ( $cal_type == LOG_APPROVE_J )
- $ret = translate ( 'Journal approved' );
- elseif ( $cal_type == LOG_APPROVE_T )
- $ret = translate ( 'Task approved' );
- elseif ( $cal_type == LOG_ATTACHMENT )
- $ret = translate ( 'Attachment' );
- elseif ( $cal_type == LOG_COMMENT )
- $ret = translate ( 'Comment' );
- elseif ( $cal_type == LOG_CREATE )
- $ret = translate ( 'Event created' );
- elseif ( $cal_type == LOG_CREATE_J )
- $ret = translate ( 'Journal created' );
- elseif ( $cal_type == LOG_CREATE_T )
- $ret = translate ( 'Task created' );
- elseif ( $cal_type == LOG_DELETE )
- $ret = translate ( 'Event deleted' );
- elseif ( $cal_type == LOG_DELETE_J )
- $ret = translate ( 'Journal deleted' );
- elseif ( $cal_type == LOG_DELETE_T )
- $ret = translate ( 'Task deleted' );
- elseif ( $cal_type == LOG_LOGIN_FAILURE )
- $ret = translate ( 'Invalid login' );
- elseif ( $cal_type == LOG_NEWUSER_EMAIL )
- $ret = translate ( 'New user via email (self registration)' );
- elseif ( $cal_type == LOG_NEWUSER_FULL )
- $ret = translate ( 'New user (self registration)' );
- elseif ( $cal_type == LOG_NOTIFICATION )
- $ret = translate ( 'Notification sent' );
- elseif ( $cal_type == LOG_REJECT )
- $ret = translate ( 'Event rejected' );
- elseif ( $cal_type == LOG_REJECT_J )
- $ret = translate ( 'Journal rejected' );
- elseif ( $cal_type == LOG_REJECT_T )
- $ret = translate ( 'Task rejected' );
- elseif ( $cal_type == LOG_REMINDER )
- $ret = translate ( 'Reminder sent' );
- elseif ( $cal_type == LOG_UPDATE )
- $ret = translate ( 'Event updated' );
- elseif ( $cal_type == LOG_UPDATE_J )
- $ret = translate ( 'Journal updated' );
- elseif ( $cal_type == LOG_UPDATE_T )
- $ret = translate ( 'Task updated' );
- elseif ( $cal_type == LOG_USER_ADD )
- $ret = translate ( 'Add User' );
- elseif ( $cal_type == LOG_USER_DELETE )
- $ret = translate ( 'Delete User' );
- elseif ( $cal_type == LOG_USER_UPDATE )
- $ret = translate ( 'Edit User' );
- elseif ( $cal_type == LOG_SYSTEM )
- $ret = translate ( 'System Message' );
- else
- $ret = '???';
+ $ret = match ( $cal_type ) {
+ LOG_APPROVE => translate ( 'Event approved' ),
+ LOG_APPROVE_J => translate ( 'Journal approved' ),
+ LOG_APPROVE_T => translate ( 'Task approved' ),
+ LOG_ATTACHMENT => translate ( 'Attachment' ),
+ LOG_COMMENT => translate ( 'Comment' ),
+ LOG_CREATE => translate ( 'Event created' ),
+ LOG_CREATE_J => translate ( 'Journal created' ),
+ LOG_CREATE_T => translate ( 'Task created' ),
+ LOG_DELETE => translate ( 'Event deleted' ),
+ LOG_DELETE_J => translate ( 'Journal deleted' ),
+ LOG_DELETE_T => translate ( 'Task deleted' ),
+ LOG_LOGIN_FAILURE => translate ( 'Invalid login' ),
+ LOG_NEWUSER_EMAIL => translate ( 'New user via email (self registration)' ),
+ LOG_NEWUSER_FULL => translate ( 'New user (self registration)' ),
+ LOG_NOTIFICATION => translate ( 'Notification sent' ),
+ LOG_REJECT => translate ( 'Event rejected' ),
+ LOG_REJECT_J => translate ( 'Journal rejected' ),
+ LOG_REJECT_T => translate ( 'Task rejected' ),
+ LOG_REMINDER => translate ( 'Reminder sent' ),
+ LOG_SYSTEM => translate ( 'System Message' ),
+ LOG_UPDATE => translate ( 'Event updated' ),
+ LOG_UPDATE_J => translate ( 'Journal updated' ),
+ LOG_UPDATE_T => translate ( 'Task updated' ),
+ LOG_USER_ADD => translate ( 'Add User' ),
+ LOG_USER_DELETE => translate ( 'Delete User' ),
+ LOG_USER_UPDATE => translate ( 'Edit User' ),
+ default => '???'
+ };
+
//fix any broken special characters
if (!empty($cal_text)) {
$cal_text = preg_replace("/&(#[0-9]+|[a-z]+);/i", "&$1;", htmlentities($cal_text));