diff --git a/,dockerignore b/,dockerignore deleted file mode 100644 index 2bbc36f8a..000000000 --- a/,dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -.git -includes/settings.php -node_modules diff --git a/docker/Dockerfile-php8-dev b/docker/Dockerfile-php8-dev index 609197595..207f576cc 100644 --- a/docker/Dockerfile-php8-dev +++ b/docker/Dockerfile-php8-dev @@ -1,6 +1,5 @@ FROM php:8.0-apache -MAINTAINER craigk5n - +LABEL org.opencontainers.image.authors="craig@k5n.us" RUN docker-php-ext-install mysqli #COPY docker/cron-hourly /tmp/cron.hourly @@ -11,4 +10,3 @@ RUN docker-php-ext-install mysqli #TODO: setup cron #RUN chown -R www-data:www-data /var/www - diff --git a/view_d.php b/view_d.php index c90a157c9..aa6ab4b76 100644 --- a/view_d.php +++ b/view_d.php @@ -20,7 +20,6 @@ * (except for nonuser calendars... which we allow regardless of group). */ // $start = microtime(); -require_once 'includes/init.php'; require_once 'includes/views.php'; $error = ''; diff --git a/view_l.php b/view_l.php index 253e72094..09a2e8d89 100644 --- a/view_l.php +++ b/view_l.php @@ -21,7 +21,6 @@ * groups (except for nonuser calendars... which we allow regardless of group). */ -require_once 'includes/init.php'; require_once 'includes/views.php'; view_init ( $id ); diff --git a/view_m.php b/view_m.php index fcd8959be..ff87dbc9b 100644 --- a/view_m.php +++ b/view_m.php @@ -17,7 +17,6 @@ * user_sees_only_his_groups is enabled, then we remove users not in this user's * groups (except for nonuser calendars... which we allow regardless of group). */ -require_once 'includes/init.php'; require_once 'includes/views.php'; $error = ''; diff --git a/view_r.php b/view_r.php index 3183b040f..5fbc0fef0 100644 --- a/view_r.php +++ b/view_r.php @@ -44,7 +44,6 @@ * enabled, then we remove users not in this user's groups * (except for nonuser calendars... which we allow regardless of group). */ -require_once 'includes/init.php'; require_once 'includes/views.php'; $error = ''; diff --git a/view_t.php b/view_t.php index bd4da021a..ac4c6cd49 100644 --- a/view_t.php +++ b/view_t.php @@ -19,7 +19,6 @@ * then we remove users not in this user's groups * (except for nonuser calendars... which we allow regardless of group). */ -require_once 'includes/init.php'; require_once 'includes/views.php'; $error = ''; diff --git a/view_v.php b/view_v.php index 16cc236a6..17b5bcff2 100644 --- a/view_v.php +++ b/view_v.php @@ -20,7 +20,6 @@ * user_sees_only_his_groups is enabled, then we remove users not in this user's * groups (except for nonuser calendars... which we allow regardless of group). */ -require_once 'includes/init.php'; require_once 'includes/views.php'; $DAYS_PER_TABLE = 7; diff --git a/view_w.php b/view_w.php index 3adeb5574..38f334e60 100644 --- a/view_w.php +++ b/view_w.php @@ -19,7 +19,6 @@ * then we remove users not in this user's groups * (except for nonuser calendars... which we allow regardless of group). */ -require_once 'includes/init.php'; require_once 'includes/views.php'; $error = '';