Roles and Permissions

.dockerignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+.env

.env.example

@@ -1,8 +1,11 @@
+ATTENDIZE_DEV=true
+ATTENDIZE_CLOUD=false
+
 APP_NAME=Attendize
-APP_ENV=production
+APP_ENV=local
 APP_KEY=
-APP_DEBUG=false
-APP_URL=
+APP_DEBUG=true
+APP_URL=https://localhost
 
 LOG_CHANNEL=stack
 
@@ -28,7 +31,7 @@ MAIL_HOST=maildev
 MAIL_PORT=25
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+MAIL_ENCRYPTION=tls
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -55,9 +58,16 @@ MAIL_FROM_NAME=testing_service
 # https://github.com/NitMedia/wkhtml2pdf#driver-types
 WKHTML2PDF_BIN_FILE=wkhtmltopdf-amd64
 
+# Google Analytics
 GOOGLE_ANALYTICS_ID=
 GOOGLE_MAPS_GEOCODING_KEY=
 
+# Captcha Configuration
+CAPTCHA_IS_ON=false
+# can be recaptcha or hcaptcha
+CAPTCHA_TYPE=
+CAPTCHA_SECRET=
+
 TWITTER_WIDGET_ID=
 
 LOG=errorlog

Dockerfile

@@ -0,0 +1,39 @@
+# Multi stage docker file for the Attendize application layer images
+
+# Base image with nginx, php-fpm and composer built on debian
+FROM wyveo/nginx-php-fpm:latest as base
+
+# Set up code
+WORKDIR /usr/share/nginx/html
+COPY . .
+
+# run composer, chmod files, setup laravel key
+RUN ./scripts/setup
+
+# The worker container runs the laravel queue in the background
+FROM base as worker
+
+CMD ["php", "artisan", "queue:work", "--daemon"]
+
+# The web container runs the HTTP server and connects to all other services in the application stack
+FROM base as web
+
+# nginx config
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# self-signed ssl certificate for https support
+RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt -subj "/C=GB/ST=London/L=London/O=NA/CN=localhost" \
+    && openssl dhparam -out /etc/ssl/certs/dhparam.pem 2048 \
+    && mkdir /etc/nginx/snippets
+COPY self-signed.conf /etc/nginx/snippets/self-signed.conf
+COPY ssl-params.conf /etc/nginx/snippets/ssl-params.conf
+
+# Ports to expose
+EXPOSE 80
+EXPOSE 443
+
+# Starting nginx server
+CMD ["/start.sh"]
+
+# NOTE: if you are deploying to production with this image, you should extend this Dockerfile with another stage that
+# performs clean up (i.e. removing composer) and installs your own dependencies (i.e. your own ssl certificate).

Dockerfile-apache

@@ -0,0 +1,48 @@
+# Run Attendize on an apache server
+# Multi stage docker file for the Attendize application layer images
+
+# Base image with apache, php, composer and mysql built on ubuntu
+FROM leen15/apache-php-mysql as base
+
+# install dependencies
+RUN apt-get update && apt-get install -y \
+       libpq-dev \
+       libpng-dev \
+       libjpeg62-dev \
+       libfreetype6-dev \
+       libxrender1 \
+       libfontconfig \
+       libxext-dev \
+       libglib2.0-0 \
+       php-mysql \
+       php-pgsql \
+       php-gd \
+       php-zip \
+       zip \
+       unzip git nano
+
+# Set up code
+WORKDIR /var/www
+COPY . .
+
+# run composer, chmod files, setup laravel key
+RUN ./scripts/setup
+
+# The worker container runs the laravel queue in the background
+FROM base as worker
+
+CMD ["php", "artisan", "queue:work", "--daemon"]
+
+# The web container runs the HTTP server and connects to all other services in the application stack
+FROM base as web
+
+# TODO: Add self signed SSL certificate
+
+# Port to expose
+EXPOSE 80
+
+# Starting apache server
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+
+# NOTE: if you are deploying to production with this image, you should extend this Dockerfile with another stage that
+# performs clean up (i.e. removing composer) and installs your own dependencies (i.e. your own ssl certificate).

Makefile

@@ -0,0 +1,45 @@
+# Commonly used commands, compatible with Linux type shells
+
+# build the docker images for any environment
+build:
+	docker build --tag attendize_base --target base .
+	docker build --tag attendize_worker --target worker --cache-from attendize_base:latest .
+	docker build --tag attendize_web --target web --cache-from attendize_worker:latest .
+
+build-apache:
+	docker build --tag attendize_base --target base --file Dockerfile-apache .
+	docker build --tag attendize_worker --target worker --cache-from attendize_base:latest --file Dockerfile-apache .
+	docker build --tag attendize_web --target web --cache-from attendize_worker:latest --file Dockerfile-apache .
+
+################
+# The following commands are for local development use only and won't work in a production environment
+################
+
+# set up docker images and run containers for local development with docker-compose only
+setup: build
+	cp .env.example .env
+	docker-compose up -d
+	docker-compose exec web ./scripts/setup
+	open https://localhost:8081/install
+	docker-compose exec web tail -f /var/log/nginx/access.log /var/log/nginx/error.log /var/log/php-fpm.log storage/logs/*
+
+# run the whole stack and open up the app in the browser
+run:
+	docker-compose up -d
+	open https://localhost:8081/
+
+# open a bash prompt on a running web container
+shell:
+	docker-compose exec web /bin/bash
+
+# run the unit tests on a running web container
+test:
+	docker-compose exec web bash -c "touch database/database.sqlite && vendor/bin/phpunit"
+
+# clear all laravel caches on a running web container
+cache:
+	docker-compose exec web php artisan optimize:clear
+
+# clear and recompile the autoloder files, for example if you add a new class file
+autoload:
+	docker-compose exec web composer dump-autoload

README.md

@@ -43,8 +43,24 @@ Demo Back-end Demo: http://attendize.website/signup<br />
  - Browser based QR code scanner for door management
  - Elegant dashboard for easy management.
 
+## Minimum Requirements
+
+Attendize should run on most pre-configured LAMP or LEMP environments as long as certain requirements are adhered to. Attendize is based on the [Laravel Framework](https://laravel.com/)
+
+**PHP Requirements**
+1. PHP >= 7.1.3
+2. OpenSSL PHP Extension 
+3. PDO PHP Extension 
+4. Mbstring PHP Extension 
+5. Tokenizer PHP Extension 
+6. Fileinfo PHP Extension 
+7. GD PHP Extension
+
+**MySQL Requirements**
+1. MySQL version 5.7 or higher required
+
 ## Contributing
-Feel free to fork and contribute. If you are unsure about adding a feature create a Github issue to ask for Feedback. Read the [contribution guidelines](CONTRIBUTING.md)
+Feel free to fork and contribute. If you are unsure about adding a feature, create a Github issue to ask for Feedback. Read the [contribution guidelines](CONTRIBUTING.md)
 
 ## Submitting an issue
 If you encounter a bug in Attendize, please first search the list of current open [Issues on the GitHub repository](https://github.com/Attendize/Attendize/issues). You may add additional feedback on an existing bug report. If the issue you're having has not yet been reported, please open a new issue. There is a template available for new issues. Please fill out all information requested in the template so we can help you more easily.

VERSION

@@ -1 +1 @@
-1.0.0
+2.0.2

app/Attendize/Utils.php

@@ -155,4 +155,17 @@ public static function installed(): bool
     {
         return file_exists(base_path('installed'));
     }
+
+    /**
+     * Safely parse a version number from a string
+     *
+     * @return string
+     */
+    public static function parse_version($string): string
+    {
+        if (preg_match('/(\d+\.?\d+\.?\d+)/', $string, $matches) === 1) {
+            return $matches[0];
+        }
+        return '';
+    }
 }

app/Http/Controllers/EventViewController.php

@@ -11,10 +11,22 @@
 use Cookie;
 use Illuminate\Http\Request;
 use Mail;
+use Redirect;
 use Validator;
+use Services\Captcha\Factory;
 
 class EventViewController extends Controller
 {
+    protected $captchaService;
+
+    public function __construct()
+    {
+        $captchaConfig = config('attendize.captcha');
+        if ($captchaConfig["captcha_is_on"]) {
+            $this->captchaService = Factory::create($captchaConfig);
+        }
+    }
+
     /**
      * Show the homepage for an event
      *
@@ -90,9 +102,9 @@ public function showEventHomePreview($event_id)
     public function postContactOrganiser(Request $request, $event_id)
     {
         $rules = [
-            'name'    => 'required',
-            'email'   => ['required', 'email'],
-            'message' => ['required'],
+            'name'                  => 'required',
+            'email'                 => 'required|email',
+            'message'               => 'required',
         ];
 
         $validator = Validator::make($request->all(), $rules);
@@ -104,6 +116,14 @@ public function postContactOrganiser(Request $request, $event_id)
             ]);
         }
 
+        if (is_object($this->captchaService)) {
+            if (!$this->captchaService->isHuman($request)) {
+                return Redirect::back()
+                    ->with(['message' => trans("Controllers.incorrect_captcha"), 'failed' => true])
+                    ->withInput();
+            }
+        }
+
         $event = Event::findOrFail($event_id);
 
         $data = [

app/Http/Controllers/IndexController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Auth;
 
 class IndexController extends Controller
 {
@@ -13,6 +14,47 @@ class IndexController extends Controller
      */
     public function showIndex(Request $request)
     {
-        return redirect()->route('showSelectOrganiser');
+        /** @var $user App\Models\User */
+        $user = Auth::user();
+
+        // super admin users will get shown the organiser selection page
+        if ($user->can('manage organisers')) {
+            return redirect()->route('showSelectOrganiser');
+        }
+
+        $isCheckinUser = $user->hasRole('attendee check in');
+
+        // Normal users will get shown their dashboard
+        $organiser = $user->organiser;
+        $allowed_sorts = ['created_at', 'start_date', 'end_date', 'title'];
+
+        $searchQuery = $request->get('q');
+        $sort_by = (in_array($request->get('sort_by'), $allowed_sorts) ? $request->get('sort_by') : 'start_date');
+
+        // If user can manage events, then they can see all events, otherwise just their own
+        $events = $organiser->events()
+            ->where('organiser_id', $organiser->id)
+            ->orderBy($sort_by, 'desc');
+
+        // We only want to filter for normal users here. Check in users get a limited event UI
+        if (!$user->can('manage events') && !$isCheckinUser) {
+            $events->where('user_id', $user->id);
+        }
+
+        if ($searchQuery) {
+            $events->where('title', 'like', '%' . $searchQuery . '%');
+        }
+
+        $data = [
+            'events' => $events->paginate(12),
+            'organiser' => $organiser,
+            'search' => [
+                'q' => $searchQuery ? $searchQuery : '',
+                'sort_by' => $request->get('sort_by') ? $request->get('sort_by') : '',
+                'showPast' => $request->get('past'),
+            ],
+        ];
+
+        return view('ManageOrganiser.Events', $data);
     }
 }