Merge pull request #173 from ComputerScienceHouse/develop

Schedulemaker v3.1

Author: devinmatte

.travis.yml

@@ -0,0 +1,16 @@
+language: php
+php:
+  - 7.0
+  - 7.1
+  - 7.2
+  - hhvm
+  - nightly
+
+matrix:
+    allow_failures:
+        - php: 7.0
+        - php: hhvm
+        - php: nightly
+
+script:
+  - if find . -name "*.php" ! -path "./vendor/*" -exec php -l {} 2>&1 \; | grep "syntax error, unexpected"; then exit 1; fi

Dockerfile

@@ -0,0 +1,29 @@
+FROM php:7.1-apache
+MAINTAINER Devin Matte <[email protected]>
+
+ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf
+
+RUN a2enmod rewrite && a2enmod headers && a2enmod expires && \
+    sed -i '/Listen/{s/\([0-9]\+\)/8080/; :a;n; ba}' /etc/apache2/ports.conf && \
+    chmod og+rwx /var/lock/apache2 && chmod -R og+rwx /var/run/apache2
+
+RUN apt-get -yq update && \
+    apt-get -yq install gnupg libmagickwand-dev --no-install-recommends && \
+    apt-get -yq clean all
+
+RUN docker-php-ext-install mysqli && \
+    pecl install imagick && docker-php-ext-enable imagick
+
+COPY . /var/www/html
+
+RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
+    apt-get -yq update && \
+    apt-get -yq install nodejs && \
+    npm install && \
+    npm run-script build && \
+    rm -rf node_modules && \
+    apt-get -yq remove nodejs && \
+    apt-get -yq clean all
+
+EXPOSE 8080
+EXPOSE 8443

apache-config.conf

@@ -0,0 +1,15 @@
+<VirtualHost *:8080>
+  ServerAdmin [email protected]
+  DocumentRoot /var/www/html
+
+  <Directory /var/www/html/>
+      Options Indexes FollowSymLinks MultiViews
+      AllowOverride All
+      Order deny,allow
+      Allow from all
+  </Directory>
+
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+</VirtualHost>

api/entity.php

@@ -10,7 +10,11 @@
 ////////////////////////////////////////////////////////////////////////////
 
 // REQUIRED FILES //////////////////////////////////////////////////////////
-require_once "../inc/config.php";
+if (file_exists('../inc/config.php')) {
+    require_once "../inc/config.php";
+} else {
+    require_once "../inc/config.env.php";
+}
 require_once "../inc/databaseConn.php";
 require_once "../inc/timeFunctions.php";
 require_once "../inc/ajaxError.php";

api/generate.php

@@ -10,7 +10,11 @@
 ////////////////////////////////////////////////////////////////////////////
 
 // REQUIRED FILES
-require_once "../inc/config.php";
+if (file_exists('../inc/config.php')) {
+    require_once "../inc/config.php";
+} else {
+    require_once "../inc/config.env.php";
+}
 require_once "../inc/databaseConn.php";
 require_once "../inc/timeFunctions.php";
 require_once "../inc/ajaxError.php";

api/schedule.php

@@ -9,7 +9,11 @@
 ////////////////////////////////////////////////////////////////////////////
 
 // REQUIRED FILES //////////////////////////////////////////////////////////
-require_once('../inc/config.php');
+if (file_exists('../inc/config.php')) {
+    require_once "../inc/config.php";
+} else {
+    require_once "../inc/config.env.php";
+}
 require_once('../inc/databaseConn.php');
 require_once('../inc/timeFunctions.php');
 

api/search.php

@@ -25,7 +25,11 @@ function assertNumeric($var, $name) {
 }
 
 // REQUIRED FILES //////////////////////////////////////////////////////////
-require_once "../inc/config.php";
+if (file_exists('../inc/config.php')) {
+    require_once "../inc/config.php";
+} else {
+    require_once "../inc/config.env.php";
+}
 require_once "../inc/databaseConn.php";
 require_once "../inc/timeFunctions.php";
 require_once "../inc/ajaxError.php";